Commit e20c908f authored by Arnaud Saval's avatar Arnaud Saval
Browse files

WEBLAB-1162 correct file encoding assembly

WEBLAB-1061 update to fuseki 1.0.1
WEBLAB-1163 update description in portlet

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabApplications/bundle@3773 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent 6436cda2
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......
......@@ -12,10 +12,10 @@
<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.53</prop>
<prop key="tomcat.path">apache-tomcat-7.0.54</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.1</prop>
<prop key="fuseki.path">jena-fuseki-1.0.0</prop>
<prop key="karaf.path">karaf-weblab-2.0.2-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>
......@@ -80,6 +80,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 " />
</map>
</constructor-arg>
......@@ -110,6 +111,7 @@
<constructor-arg>
<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 " />
</map>
</constructor-arg>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../versions/pom.xml</relativePath>
</parent>
......@@ -77,8 +77,8 @@
<descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
<descriptor>mvn:io.hawt/hawtio-karaf/${hawtio.version}/xml/features</descriptor>
<descriptor>mvn:org.ow2.weblab.engine/camel-weblab-karaf/2.0.1/xml/features</descriptor>
<descriptor>mvn:org.ow2.weblab.osgi/weblab-camel-chains-karaf/2.0.1/xml/features</descriptor>
<descriptor>mvn:org.ow2.weblab.engine/camel-weblab-karaf/${weblab.version}/xml/features</descriptor>
<descriptor>mvn:org.ow2.weblab.osgi/weblab-camel-chains-karaf/${weblab.version}/xml/features</descriptor>
</descriptors>
<features>
<feature>cxf</feature>
......
......@@ -2,7 +2,7 @@
#
# Comma separated list of features repositories to register by default
#
featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:io.hawt/hawtio-karaf/${hawtio.version}/xml/features,mvn:org.ow2.weblab.osgi/weblab-camel-chains-karaf/2.0.1/xml/features,mvn:org.ow2.weblab.engine/camel-weblab-karaf/2.0.1/xml/features
featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:io.hawt/hawtio-karaf/${hawtio.version}/xml/features,mvn:org.ow2.weblab.osgi/weblab-camel-chains-karaf/${weblab.version}/xml/features,mvn:org.ow2.weblab.engine/camel-weblab-karaf/${weblab.version}/xml/features
#
# Comma separated list of features to install at startup
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../../../versions/pom.xml</relativePath>
</parent>
......
......@@ -22,6 +22,7 @@ import junit.framework.Assert;
import org.junit.Test;
import org.ow2.weblab.bundle.server.ActiveMQ;
import org.ow2.weblab.bundle.utils.PathUtils;
import org.ow2.weblab.bundle.utils.Utils;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.core.io.FileSystemResource;
......@@ -35,6 +36,7 @@ public class ActiveMQTest {
@Test
public void beanLoading() throws IOException{
Utils.writeInFile = false;
PathUtils.setHome("target/");
System.setProperty("weblab.home", PathUtils.getWebLabHome("target/"));
int port = 16161;
......
#
# The logging properties used
#
log4j.rootLogger=FATAL, out
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../../../versions/pom.xml</relativePath>
</parent>
......
#
# The logging properties used
#
log4j.rootLogger=FATAL, out
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../../../versions/pom.xml</relativePath>
</parent>
......
......@@ -22,6 +22,7 @@ import java.util.logging.Logger;
import org.junit.Test;
import org.ow2.weblab.bundle.utils.PathUtils;
import org.ow2.weblab.bundle.utils.Utils;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.core.io.FileSystemResource;
......@@ -31,6 +32,7 @@ public class HeritrixManager {
@Test
public void testStopTomcat(){
Utils.writeInFile = false;
PathUtils.setHome("target/");
System.setProperty("weblab.home", PathUtils.getWebLabHome(""));
System.setProperty("weblab.conf", PathUtils.getWebLabHome("conf"));
......
#
# The logging properties used
#
log4j.rootLogger=FATAL, out
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../../../versions/pom.xml</relativePath>
</parent>
......
......@@ -24,6 +24,7 @@ import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
import org.junit.Test;
import org.ow2.weblab.bundle.utils.PathUtils;
import org.ow2.weblab.bundle.utils.Utils;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.core.io.FileSystemResource;
......@@ -36,6 +37,7 @@ import org.springframework.core.io.FileSystemResource;
public class KarafTest {
private Karaf getKarafFrom(String conf){
Utils.writeInFile = false;
PathUtils.setHome("target/");
System.setProperty("weblab.home", PathUtils.getWebLabHome(""));
......@@ -47,6 +49,7 @@ public class KarafTest {
@Test
public void beanLoading() throws IOException{
Utils.writeInFile = false;
int port = 8282;
Karaf karaf = getKarafFrom("src/test/resources/karaf.xml");
......
#
# The logging properties used
#
log4j.rootLogger=FATAL, out
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../../../versions/pom.xml</relativePath>
</parent>
......
#
# The logging properties used
#
log4j.rootLogger=FATAL, out
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
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