Commit 0544b932 authored by Laurent Martin's avatar Laurent Martin

WEBLAB-1512 WEBLAB-1513 solr is now running in cloud mode. add a zookeper...

WEBLAB-1512 WEBLAB-1513 solr is now running in cloud mode. add a zookeper instance to manage it. Also modify launcher so that solr conf files are corectly uploaded in zookeeper server and core_default collection is created on solr start up


git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabApplications/bundle@4443 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent b719a427
......@@ -47,6 +47,12 @@
<outputDirectory>${karaf.path}</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
<!-- create sub directories for solr nodes -->
<fileSet>
<directory>../conf/solr/solr_node1/cores</directory>
<outputDirectory>data/solr_node1/cores</outputDirectory>
</fileSet>
</fileSets>
<files>
......@@ -88,6 +94,11 @@
<source>../conf/activemq/activemq.xml</source>
<outputDirectory>${activemq.path}/conf/</outputDirectory>
</file>
<!-- copy zookeeper conf file -->
<file>
<source>../conf/zookeeper/zoo_alone.cfg</source>
<outputDirectory>${zookeeper.path}/conf/</outputDirectory>
</file>
<file>
<!-- Add third party license descriptors -->
<source>target/site/dependencies.html</source>
......@@ -294,7 +305,7 @@
<include>org.ow2.weblab.components:solr-config:jar:*</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
<outputDirectory>${solr.path}/</outputDirectory>
<outputDirectory>conf/solr/</outputDirectory>
<unpack>true</unpack>
<unpackOptions>
<excludes>
......@@ -303,6 +314,18 @@
</unpackOptions>
<fileMode>0755</fileMode>
</dependencySet>
<!-- Extract zookeeper server -->
<dependencySet>
<includes>
<include>org.apache.zookeeper:zookeeper:tar.gz</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping>
<unpack>true</unpack>
<fileMode>0755</fileMode>
</dependencySet>
</dependencySets>
</assembly>
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.1.0-gamma</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......@@ -56,6 +56,14 @@
</exclusions>
</dependency>
<!-- zookeeper binaries -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.bin.version}</version>
<type>tar.gz</type>
</dependency>
<!-- activemq binaries -->
<dependency>
<groupId>org.apache.activemq</groupId>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.1.0-gamma</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.1.0-gamma</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......
......@@ -11,7 +11,9 @@
<prop key="liferay.http.port">8080</prop>
<prop key="liferay.jmx.port">18080</prop>
<prop key="karaf.http.port">8282</prop>
<prop key="solr.http.port">8983</prop>
<prop key="solr1.http.port">8983</prop>
<prop key="solr2.http.port">8984</prop>
<prop key="zookeeper1.port">2181</prop>
<prop key="activemq.main.port">61616</prop>
<prop key="activemq.jmx.port">1616</prop>
<prop key="karaf.rest.port">8383</prop>
......@@ -21,6 +23,8 @@
<prop key="karaf.host">localhost</prop>
<prop key="activemq.host">localhost</prop>
<prop key="solr.cloud.zk.ensemble">localhost:${zookeeper1.port}</prop>
<prop key="files.to.index">${weblab.data}toIndex</prop>
<prop key="warcs.to.index">${weblab.data}warcs</prop>
......@@ -49,7 +53,7 @@
<prop key="activemq.opts">-Xms128m -Xmx1024m -Djava.awt.headless=true -Dapplication.name=weblab_activemq ${activemq.ports} ${common.properties}</prop>
<prop key="solr.a.opts">-DcoreRootDirectory=../cores/ -Dweblab.home=${weblab.home} -DshareSchema=false ${common.properties}</prop>
<prop key="solr.a.opts">-Dweblab.home=${weblab.home} -DshareSchema=false -Dsolr.jetty.http.idleTimeout=310000 -Dsolr.jetty.https.timeout=310000 ${common.properties}</prop>
<prop key="solr.m.opts">1G</prop>
<prop key="karaf.java.opts">-server -Xms128m -Xmx1024m ${karaf.jmx.conf} ${karaf.endpoints} ${content.manager.opts} ${common.properties} ${karaf.rest} ${activemq.ports}</prop>
<prop key="tomcat.java.opts">-Xmx1536m -Dtomcat.http.port=${tomcat.http.port} ${tomcat.paths.1} ${tomcat.paths.2} ${tomcat.jmx.conf} ${content.manager.opts} ${common.properties}</prop>
......@@ -64,7 +68,6 @@
<property name="remotePassword" value="weblab" />
<property name="repository" value="${weblab.data}repository" />
<property name="solrData" value="${weblab.home}${solr.path}/server/cores/core_default/data" />
<property name="contentFolder" value="${weblab.data}content" />
<property name="servicesReconfigure" value="true" />
......@@ -85,12 +88,11 @@
<ref bean="Tomcat" />
</property>
<property name="solrServer">
<ref bean="Solr" />
</property>
<property name="servers">
<list />
<list>
<ref bean="ZooKeeperServerStandAlone"/>
<ref bean="SolrServer1"/>
</list>
</property>
</bean>
......@@ -200,27 +202,73 @@
<property name="timeout" value="300000" />
</bean>
<bean id="Solr" class="org.ow2.weblab.bundle.server.SolrServer">
<property name="name" value="solr" />
<bean id="ZooKeeperServerStandAlone" class="org.ow2.weblab.bundle.server.ZooKeeperServer">
<property name="name" value="zookeeper" />
<property name="enabled" value="true" />
<property name="home" value="${weblab.home}${zookeeper.path}" />
<property name="binDirectory" value="${weblab.home}${zookeeper.path}/bin" />
<!-- WARN this value is only set to check zookeeper is correctly running. Changing this value will not change port on which zookeeper is running -->
<!-- to edit zookeeper configuration see bundle/conf/zookeeper/zoo.cfg file -->
<property name="port" value="${zookeeper1.port}" />
<property name="confFile" value="zoo_alone.cfg" />
<property name="env" >
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
</map>
</constructor-arg>
</bean>
</property>
<property name="timeout" value="300000" />
</bean>
<bean id="SolrServer1" class="org.ow2.weblab.bundle.server.SolrServer">
<property name="name" value="solr1" />
<property name="identificationClue" value="solr_node1"/>
<property name="enabled" value="true" />
<property name="mandatory" value="true" />
<property name="home" value="${weblab.home}${solr.path}" />
<property name="binDirectory" value="${weblab.home}${solr.path}/bin" />
<property name="zookeeperEnsemble" value="${solr.cloud.zk.ensemble}" />
<property name="dataDirectory" value="${weblab.data}/solr_node1"/>
<!-- WARN this value is only set to check solr server is correctly running. Changing this value will not change port on which solr is listening -->
<!-- to edit solr configuration see weblab-solr-config project -->
<property name="port" value="${solr.http.port}" />
<property name="startOptions">
<!-- see -p options below -->
<property name="port" value="${solr1.http.port}" />
<property name="startOptions" >
<map>
<entry key="-a" value="${solr.a.opts}" />
<entry key="-m" value="${solr.m.opts}" />
<entry key="-s" value="${weblab.data}/solr_node1"/>
<entry key="-p" value="${solr1.http.port}"/>
<entry key="-a" value="${solr.a.opts}"/>
<entry key="-m" value="${solr.m.opts}"/>
<entry key="-z" value="${solr.cloud.zk.ensemble}" />
<entry key="-cloud" value="" />
</map>
</property>
<property name="stopOptions">
<map>
<entry key="-p" value="${solr.http.port}" />
<entry key="-p" value="${solr1.http.port}" />
</map>
</property>
<property name="collectionConfigs">
<list>
<value>core_default_config</value>
</list>
</property>
<property name="initCollections">
<map>
<entry key="core_default">
<map>
<entry key="config" value="core_default_config"/>
<entry key="shards" value="shard1"/>
<entry key="routerField" value=""/>
<entry key="numReplicas" value="1"/>
<entry key="maxShardPerNode" value="3"/>
</map>
</entry>
</map>
</property>
<property name="timeout" value="300000" />
</bean>
</beans>
# The number of milliseconds of each tick
tickTime=2000
# The number of ticks that the initial
# synchronization phase can take
initLimit=10
# The number of ticks that can pass between
# sending a request and getting an acknowledgement
syncLimit=5
# the directory where the snapshot is stored.
# do not use /tmp for storage, /tmp here is just
# example sakes.
dataDir=../../data/zookeeper
# the port at which the clients will connect
clientPort=2181
# the maximum number of client connections.
# increase this if you need to handle more clients
#maxClientCnxns=60
#
# Be sure to read the maintenance section of the
# administrator guide before turning on autopurge.
#
# http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_maintenance
#
# The number of snapshots to retain in dataDir
autopurge.snapRetainCount=3
# Purge task interval in hours
# Set to "0" to disable auto purge feature
autopurge.purgeInterval=1
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.1.0-gamma</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.1.0-gamma</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.1.0-gamma</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......@@ -17,6 +17,10 @@
<description>Launcher to configure and start servers.
In case something goes wrong, explains, as much as possible, where it failed and why.</description>
<properties>
<solr.utils.version>1.0.0-SNAPSHOT</solr.utils.version>
</properties>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
......@@ -56,7 +60,12 @@ In case something goes wrong, explains, as much as possible, where it failed and
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.2.5</version>
<version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
......@@ -69,6 +78,11 @@ In case something goes wrong, explains, as much as possible, where it failed and
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.ow2.weblab.components</groupId>
<artifactId>solr-utils</artifactId>
<version>${solr.utils.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
......
......@@ -21,6 +21,7 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
import java.util.logging.Level;
......@@ -35,12 +36,14 @@ import org.ow2.weblab.bundle.server.ServerManager;
import org.ow2.weblab.bundle.server.SolrServer;
import org.ow2.weblab.bundle.server.TomcatServer;
import org.ow2.weblab.bundle.server.WebLabServer;
import org.ow2.weblab.bundle.server.ZooKeeperServer;
import org.ow2.weblab.bundle.utils.PathUtils;
import org.ow2.weblab.bundle.utils.ProcessUtils;
import org.ow2.weblab.bundle.utils.ProcessUtils.Env;
import org.ow2.weblab.bundle.utils.Utils;
import org.ow2.weblab.bundle.utils.manager.ProcessManager;
import org.ow2.weblab.bundle.utils.monitor.ServerMonitor;
import org.springframework.util.CollectionUtils;
/**
* WebLab Launcher to launch and stop servers
......@@ -49,7 +52,18 @@ import org.ow2.weblab.bundle.utils.monitor.ServerMonitor;
*
*/
public class Launcher {
private static final String STATUS = "status";
private static final String ZOOKEEPER = "zookeeper";
private static final String SOLR = "solr";
private static final String RESTART = "restart";
private static final String STOP = "stop";
private static final String START = "start";
public static Logger logger = Utils.getLogger();
......@@ -124,7 +138,7 @@ public class Launcher {
final Map<String, String> serverCommands = serverManager.getServersCommands();
// start all
if ("start".equals(command)) {
if (START.equals(command)) {
Launcher.check();
serverManager.start(Utils.getServer(Launcher.logger, args));
} // end all
......@@ -150,6 +164,56 @@ public class Launcher {
} else {
serverManager.rmi(command, command2, args);
}
} else if (SOLR.equals(command) &&(STOP.equals(command2)||START.equals(command2)||RESTART.equals(command2))) {
ArrayList<SolrServer>solrServers=new ArrayList<>();
for(WebLabServer server : configuration.getServers()) {
if(server instanceof SolrServer) {
solrServers.add((SolrServer)server);
}
}
if(!CollectionUtils.isEmpty(solrServers)) {
if(START.equals(command2)) {
for(SolrServer solrServer : solrServers) {
solrServer.start();
}
}else if(STOP.equals(command2)) {
for(SolrServer solrServer : solrServers) {
solrServer.stop();
}
}else if(RESTART.equals(command2)) {
for(SolrServer solrServer : solrServers) {
solrServer.stop();
}
for(SolrServer solrServer : solrServers) {
solrServer.start();
}
}
}
} else if (ZOOKEEPER.equals(command) &&(STOP.equals(command2)||START.equals(command2)||RESTART.equals(command2))) {
ArrayList<ZooKeeperServer>zooServers=new ArrayList<>();
for(WebLabServer server : configuration.getServers()) {
if(server instanceof ZooKeeperServer) {
zooServers.add((ZooKeeperServer)server);
}
}
if(!CollectionUtils.isEmpty(zooServers)) {
if(START.equals(command2)) {
for(ZooKeeperServer zooServer : zooServers) {
zooServer.start();
}
}else if(STOP.equals(command2)) {
for(ZooKeeperServer zooServer : zooServers) {
zooServer.stop();
}
}else if(RESTART.equals(command2)) {
for(ZooKeeperServer zooServer : zooServers) {
zooServer.stop();
}
for(ZooKeeperServer zooServer : zooServers) {
zooServer.start();
}
}
}
} else if ("chain".equals(command)) {
chainManager.execute(command2, command3);
} else if ("details".equals(command)) {
......@@ -209,25 +273,26 @@ public class Launcher {
}
// solr index
final String solrDataPath = Launcher.configuration.getSolrData();
if (solrDataPath == null) {
Launcher.logger.info("No path to Solr index found. Nothing to delete from index.");
} else {
final boolean needRestart = Launcher.configuration.getSolrServer().isEnabled() && Launcher.configuration.getSolrServer().isServerFullyStarted(true);
if (needRestart) {
Launcher.logger.info("Solr is running. Stopping it to enable reset of index.");
ServerManager.stop(Launcher.configuration.getSolrServer(), true, Launcher.logger);
}
final File index = new File(solrDataPath);
FileUtils.deleteDirectory(index);
Launcher.logger.info(index.getAbsolutePath() + " has been removed.");
if (needRestart) {
Launcher.logger.info("Restarting Solr.");
ServerManager.start(Launcher.configuration.getSolrServer(), Launcher.logger, true);
}
}
//TODO
// final String solrDataPath = Launcher.configuration.getSolrData();
// if (solrDataPath == null) {
// Launcher.logger.info("No path to Solr index found. Nothing to delete from index.");
// } else {
// final boolean needRestart = Launcher.configuration.getSolrServer().isEnabled() && Launcher.configuration.getSolrServer().isServerFullyStarted(true);
// if (needRestart) {
// Launcher.logger.info("Solr is running. Stopping it to enable reset of index.");
// ServerManager.stop(Launcher.configuration.getSolrServer(), true, Launcher.logger);
// }
//
// final File index = new File(solrDataPath);
// FileUtils.deleteDirectory(index);
// Launcher.logger.info(index.getAbsolutePath() + " has been removed.");
//
// if (needRestart) {
// Launcher.logger.info("Restarting Solr.");
// ServerManager.start(Launcher.configuration.getSolrServer(), Launcher.logger, true);
// }
// }
// Content
final String contentFolder = Launcher.configuration.getContentFolder();
......@@ -331,10 +396,6 @@ public class Launcher {
if ((activeMQ != null) && activeMQ.isEnabled() && (activeMQ.getBinDirectory() != null)) {
procManager.setPermission(activeMQ.getBinDirectory(), "u+rx", true, Launcher.logger);
}
final SolrServer solr = Launcher.configuration.getSolrServer();
if ((solr != null) && solr.isEnabled() && (solr.getBinDirectory() != null)) {
procManager.setPermission(solr.getBinDirectory(), "u+rx", true, Launcher.logger);
}
for (final WebLabServer server : Launcher.configuration.getServers()) {
if ((server != null) && server.isEnabled() && (server.getBinDirectory() != null)) {
procManager.setPermission(server.getBinDirectory(), "u+rx", true, Launcher.logger);
......@@ -410,4 +471,4 @@ public class Launcher {
private Launcher() {
}
}
\ No newline at end of file
}
......@@ -77,9 +77,6 @@ public class WebLabBean {
private boolean servicesReconfigure = true;
private String solrData = null;
// TODO remove ?
@Deprecated
private String split = "";
......@@ -128,10 +125,6 @@ public class WebLabBean {
private ActiveMQServer activeMQServer;
private SolrServer solrServer;
private TomcatServer applicationServer;
......@@ -234,17 +227,6 @@ public class WebLabBean {
this.servicesReconfigure = servicesReconfigure;
}
public String getSolrData() {
return this.solrData;
}
public void setSolrData(final String solrData) {
this.solrData = solrData;
}
public String getSplit() {
return this.split;
}
......@@ -412,17 +394,6 @@ public class WebLabBean {
}
public SolrServer getSolrServer() {
return this.solrServer;
}
public void setSolrServer(final SolrServer solrServer) {
this.solrServer = solrServer;
}
/**
* @return the contentFolder
......
......@@ -57,9 +57,6 @@ public class ServerManager {
this.configuration = configuration;
// create a map of <name, server>
if (configuration.getSolrServer().isEnabled()) {
this.webLabServersCommands.put(configuration.getSolrServer().getName(), configuration.getSolrServer().supportedCommands());
}
if (configuration.getBus().isEnabled()) {
this.webLabServersCommands.put(configuration.getBus().getName(), configuration.getBus().supportedCommands());
}
......@@ -112,12 +109,6 @@ public class ServerManager {
}
}
if (server == null || server.equals(this.configuration.getSolrServer().getName())) {
final SolrServer solrServer = this.configuration.getSolrServer();
solrServer.setTimeout(timeout);
ServerManager.displayStatus(solrServer, this.logger);
}
if (server == null || server.equals(this.configuration.getApplicationServer().getName())) {
final TomcatServer tomcat = this.configuration.getApplicationServer();
tomcat.setTimeout(timeout);
......@@ -212,12 +203,6 @@ public class ServerManager {
ServerManager.stop(tomcat, force, this.logger);
}
// Stops solr
if (server == null || server.equals(this.configuration.getSolrServer().getName())) {
final SolrServer solrServer = this.configuration.getSolrServer();
ServerManager.stop(solrServer, force, this.logger);
}
for (final WebLabServer otherServer : this.configuration.getServers()) {
if (server == null || server.equals(otherServer.getName())) {
ServerManager.stop(otherServer, force, this.logger);
......@@ -305,11 +290,6 @@ public class ServerManager {
}
}
// Starts solr server
if (server == null || server.equals(this.configuration.getSolrServer().getName())) {
ServerManager.start(this.configuration.getSolrServer(), this.logger, true);
}
// Starts Tomcat
if (server == null || server.equals(this.configuration.getApplicationServer().getName())) {
// configure Services spring beans only if we launch tomcat
......
/**
* WEBLAB: Service oriented integration platform for media mining and intelligence applications
*
* Copyright (C) 2004 - 2013 CASSIDIAN an EADS Company
*
* This library is free software; you can redistribute it and/or modify it under the terms of
* the GNU Lesser General Public License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along with this
* library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
package org.ow2.weblab.bundle.server;
import javax.management.MBeanServerConnection;
import org.ow2.weblab.bundle.utils.PathUtils;
import org.ow2.weblab.bundle.utils.Utils;
/**
* Zookeeper server used by solr cloud instances
* @author lmartin
*
*/
public class ZooKeeperServer extends AbstractApplicationServer {
private String confFile;
public ZooKeeperServer() {
}
@Override
protected String[] getStartScript() {
return new String[]{PathUtils.createPath(this.getHome(), "bin") + "zkServer.sh",START,confFile};
}
@Override
protected String[] getStopScript() {
return new String[]{PathUtils.createPath(this.getHome(), "bin") + "zkServer.sh",STOP,confFile};
}
@Override
public MBeanServerConnection getMBeanServerConnection() {
// TODO Auto-generated method stub
return null;
}
@Override
public String getProcessIdentificationClue() {
return this.confFile;
}
@Override
public boolean isServerFullyStarted(final boolean showDetails) {
return !Utils.isPortAvailable(this.logger, this.getPort());
//return State.STARTED.equals(status());
}
/**
* @return the confFile
*/
public String getConfFile() {
return confFile;
}
/**
* @param confFile the confFile to set
*/
public void setConfFile(String confFile) {
this.confFile = confFile;
}
}
......@@ -11,7 +11,9 @@
<prop key="liferay.http.port">8080</prop>
<prop key="liferay.jmx.port">18080</prop>
<prop key="karaf.http.port">8282</prop>
<prop key="solr.http.port">8983</prop>
<prop key="solr1.http.port">8983</prop>
<prop key="solr2.http.port">8984</prop>
<prop key="zookeeper1.port">2181</prop>
<prop key="activemq.main.port">61616</prop>
<prop key="activemq.jmx.port">1616</prop>
<prop key="karaf.rest.port">8383</prop>
......@@ -21,6 +23,8 @@
<prop key="karaf.host">localhost</prop>
<prop key="activemq.host">localhost</prop>
<prop key="solr.cloud.zk.ensemble">localhost:${zookeeper1.port}</prop>
<prop key="files.to.index">${weblab.data}toIndex</prop>
<prop key="warcs.to.index">${weblab.data}warcs</prop>
......@@ -49,7 +53,7 @@
<prop key="activemq.opts">-Xms128m -Xmx1024m -Djava.awt.headless=true -Dapplication.name=weblab_activemq ${activemq.ports} ${common.properties}</prop>
<prop key="solr.a.opts">-DcoreRootDirectory=../cores/ -Dweblab.home=${weblab.home} -DshareSchema=false ${common.properties}</prop>
<prop key="solr.a.opts">-Dweblab.home=${weblab.home} -DshareSchema=false -Dsolr.jetty.http.idleTimeout=310000 -Dsolr.jetty.https.timeout=310000 ${common.properties}</prop>
<prop key="solr.m.opts">1G</prop>
<prop key="karaf.java.opts">-server -Xms128m -Xmx1024m ${karaf.jmx.conf} ${karaf.endpoints} ${content.manager.opts} ${common.properties} ${karaf.rest} ${activemq.ports}</prop>
<prop key="tomcat.java.opts">-Xmx1536m -Dtomcat.http.port=${tomcat.http.port} ${tomcat.paths.1} ${tomcat.paths.2} ${tomcat.jmx.conf} ${content.manager.opts} ${common.properties}</prop>
......@@ -64,7 +68,6 @@
<property name="remotePassword" value="weblab" />
<property name="repository" value="${weblab.data}repository" />
<property name="solrData" value="${weblab.home}${solr.path}/server/cores/core_default/data" />
<property name="contentFolder" value="${weblab.data}content" />
<property name="servicesReconfigure" value="true" />
......@@ -85,12 +88,11 @@
<ref bean="Tomcat" />