Commit 9d468c35 authored by Arnaud Saval's avatar Arnaud Saval
Browse files

WEBLAB-1132 use stable release versions of all components

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabApplications/bundle@3673 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent b589d504
......@@ -19,7 +19,7 @@ It is mainly composed of the following WebLab servers:
* liferay publishing portlets
* customised karaf framework providing camel, activemq, web application and weblab features
WebLab Bundle provide following tools services:
WebLab Bundle provide following tools open sources libraries as web services:
* Gate : named entities extractor
* Ngramj : a language detector
* SolR indexer : a full text indexer/searcher
......@@ -38,7 +38,7 @@ Processing chains:
Getting Started
**************************************************************************************
You should have a jdk1.6.26 or greater installed in order to run the WebLab bundle,
You should have a jdk 1.7 or greater installed in order to run the WebLab bundle,
JAVA_HOME must be declared and java must be available in your path
Ports 8080, 8005, 8009 (Liferay), 8181, 8105, 8109 (Tomcat) 8282 (Jetty), 61616 (ActiveMQ) must be available.
Your computer should have at least a 4 core processor and 6Go of RAM to run the WebLab bundle.
......@@ -51,8 +51,6 @@ Running
File processing chain is started automatically, go to the 'Search' tab, then you can start a search for processed documents.
TODO:
* add link to support
* add link to explain architecture
* add link to issue tracker
* add link to detailed documentation with WebLab launcher
More details
**************************************************************************************
More details and information about the Bundle are available at the following address: http://weblab-project.org/index.php?title=Bundle_2.0.0
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......
......@@ -19,7 +19,7 @@
-->
<features name="weblab-chains">
<feature name="weblab-camel-chains" version="1.0.0-SNAPSHOT" resolver="(obr)">
<feature name="weblab-camel-chains" version="2.0.0" resolver="(obr)">
<bundle>mvn:org.ow2.weblab.osgi/weblab-camel-chains/${version}</bundle>
<feature dependency="true">camel-weblab</feature>
</feature>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@
<!--======================================================= -->
<routeContext id="fileProcess" xmlns="http://camel.apache.org/schema/spring">
<!-- This route consume WARCS -->
<!-- This route consume Files -->
<route id="consumeFile" streamCache="true" autoStartup="true">
<!-- <from uri="file:../data/toIndex/" /> -->
......
......@@ -10,11 +10,11 @@
<props>
<prop key="tomcat.http.port">8181</prop>
<prop key="liferay.http.port">8080</prop>
<prop key="karaf.http.port">8182</prop>
<prop key="karaf.http.port">8282</prop>
<!-- <prop key="fuseki.http.port">3030</prop> -->
<prop key="tomcat.path">apache-tomcat-7.0.42</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.0-SNAPSHOT</prop>
<prop key="karaf.path">karaf-weblab-2.0.0</prop>
<prop key="fuseki.path">jena-fuseki-1.0.0</prop>
<prop key="files.to.index">${weblab.data}toIndex</prop>
......@@ -26,7 +26,6 @@
<bean id="WebLab" class="org.ow2.weblab.bundle.conf.WebLabBean">
<property name="debug" value = "info" />
<!-- <property name="home">/path/to/WebLab-Bundle-2.0.0/</property> -->
<property name="jmxEnabled" value="true" />
<property name="monitoring"><ref bean="Monitoring"/></property>
......@@ -36,7 +35,6 @@
<property name="repository" value="${weblab.data}repository" />
<property name="servicesReconfigure" value="true" />
<!-- <property name="portletsReconfigure" value="true" /> -->
<property name="solrData" value="${weblab.data}solr" />
......@@ -105,7 +103,7 @@
<property name="enabled" value="true" />
<property name="home" value="${weblab.home}${liferay.path}" />
<property name="binDirectory" value="${weblab.home}${liferay.path}/bin" />
<property name="port" value="8080" />
<property name="port" value="${liferay.http.port}" />
<property name="jmxPort" value="18080" />
<property name="env" >
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
......@@ -135,7 +133,7 @@
<property name="enabled" value="true" />
<property name="home" value="${weblab.home}${karaf.path}" />
<property name="binDirectory" value="${weblab.home}${karaf.path}/bin" />
<property name="port" value="8182" />
<property name="port" value="${karaf.http.port}" />
<property name="jmxUser" value="weblab" />
<property name="jmxPassword" value="weblab" />
<property name="jmxPort" value="1099" />
......@@ -143,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} -Dweblab.warcs=${warcs.to.index} " />
<entry key="JAVA_OPTS" value=" -server -Xms128M -Xmx1024m -XX:MaxPermSize=512m -Dcom.sun.management.jmxremote -Dweblab.files=${files.to.index}?maxMessagesPerPoll=500&amp;recursive=true -Dweblab.warcs=${warcs.to.index}?maxMessagesPerPoll=500&amp;recursive=true " />
</map>
</constructor-arg>
</bean>
......@@ -151,7 +149,7 @@
<property name="timeout" value="300000" />
</bean>
<bean id="Fuseki" class="org.ow2.weblab.bundle.server.Fuseki">
<!-- <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}" />
......@@ -162,14 +160,14 @@
<constructor-arg>
<map>
<entry key="JAVA_OPTIONS" value=" -Xmx512m " />
<entry key="FUSEKI_ARGS" value=" --config=${weblab.conf}fuseki/config-tdb.ttl " />
<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> -->
<bean id="Monitoring" class="org.ow2.weblab.bundle.conf.MonitoringBean">
<property name="delay"><value>300000</value></property>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../versions/pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......@@ -21,7 +21,7 @@
<dependency>
<groupId>org.ow2.weblab.components</groupId>
<artifactId>camel-content-manager</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<type>jar</type>
</dependency>
......@@ -29,14 +29,14 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http</artifactId>
<version>2.10.4</version>
<version>${camel.version}</version>
</dependency>
<!-- uncomment to use Hadoop content manager
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-hdfs</artifactId>
<version>2.10.0</version>
<version>${camel.version}</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......@@ -12,7 +12,6 @@
<packaging>pom</packaging>
<name>WebLab Portlets assembly.</name>
<description>WebLab Portlets.</description>
......@@ -31,18 +30,6 @@
<version>${weblab.extended.version}</version>
<type>jar</type>
</dependency>
<!-- <dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>annotator</artifactId>
<version>${weblab.annotator.version}</version>
<type>jar</type>
</dependency> -->
<!-- <dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>weblab-portlet</artifactId>
<version>${weblab.weblab-portlet.version}</version>
<type>jar</type>
</dependency> -->
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../../versions/pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../../versions/pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../../versions/pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../../versions/pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../../versions/pom.xml</relativePath>
</parent>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../../versions/pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......@@ -26,136 +26,7 @@
</dependency>
<!-- Common libraries -->
<!-- <dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>model</artifactId>
<version>${weblab.model.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>extended</artifactId>
<version>${weblab.extended.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>annotator</artifactId>
<version>${weblab.annotator.version}</version>
<type>jar</type>
</dependency> -->
<!-- <dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena</artifactId>
<version>${weblab.rdf-helper-jena.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena-selection</artifactId>
<version>${weblab.rdf-helper-jena-selection.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena-structure</artifactId>
<version>${weblab.rdf-helper-jena-structure.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json-simple.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
<type>jar</type>
</dependency> -->
<!-- Common libraries to copy into Tomcat -->
<!-- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency> -->
<!-- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
<type>jar</type>
</dependency> -->
<!-- <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>${xml-apis.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
<type>jar</type>
</dependency> -->
</dependencies>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......
......@@ -17,8 +17,10 @@
*/
package org.ow2.weblab.bundle;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.Map;
import java.util.logging.Level;
......@@ -82,7 +84,7 @@ public class Launcher {
}
// check if it is the first launch
checkFirstLaunch();
initChecks();
logger.finest("Logger level : "+debug);
logger.finest("Given args : "+args.length+" "+Arrays.asList(args));
......@@ -246,14 +248,39 @@ public class Launcher {
/**
* Check if it is the first run of the launcher by checking if the the weblab.log file exist
* and check if JRE supports class version de spec
*/
private static void checkFirstLaunch() {
private static void initChecks() {
File pidsFile = new File(PathUtils.createPath(PathUtils.getWebLabHome("data"),"pids"));
if (!pidsFile.exists()){
// run processmanager to set rights
// to avoid WEBLAB-882, WebLab Bundle unarchive might not set permission correctly on linux or macos.
ProcessUtils.setStandardPermissions(logger);
}
// check JVM version, stop if JVM does not expected class version spec
if (Float.parseFloat(System.getProperty("java.class.version")) < configuration.getClassVersion()){
logger.warning("The current JVM is not compatible with required java class version: "+configuration.getClassVersion()+", please upgrade your installation.\nProcessing chains and GUI will not work properly, do you want to start WebLab anyway? (Yes/No, default=No )");
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
try {
String answer = br.readLine();
if ("Yes".equalsIgnoreCase(answer)){
return;
}
} catch (IOException ioe) {
logger.log(Level.FINEST, ioe.getLocalizedMessage(),ioe);
}finally{
if (br != null){
try {
br.close();
} catch (IOException ioe) {
logger.log(Level.FINEST, ioe.getLocalizedMessage(),ioe);
}
}
}
end(0);
}
}
/**
......
......@@ -41,6 +41,8 @@ public class WebLabBean {
// TODO remove ?
private boolean jmxEnabled = true;
private float classVersion = 51.0f;
private MonitoringBean monitoring = new MonitoringBean();
private boolean remoteAccess = false;
......@@ -95,6 +97,14 @@ public class WebLabBean {
this.home = home;
}
public float getClassVersion() {
return classVersion;
}
public void setClassVersion(float classVersion) {
this.classVersion = classVersion;
}
public boolean isJmxEnabled() {
return jmxEnabled;
}
......
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