Commit 15588fa2 authored by Antoine Grinenwald's avatar Antoine Grinenwald Committed by Yann Mombrun
Browse files

AGR : liferay 7 modification

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/branches/Liferay7/bundle@4492 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent b4eb0c0e
<?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:jaxws="http://cxf.apache.org/jaxws" xmlns:soap="http://cxf.apache.org/bindings/soap"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
<bean id="properties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="ignoreResourceNotFound" value="true" />
<property name="properties">
<props>
<prop key="tomcat.http.port">8181</prop>
<prop key="tomcat.jmx.port">18181</prop>
<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="activemq.main.port">61616</prop>
<prop key="activemq.jmx.port">1616</prop>
<prop key="tomcat.host">localhost</prop>
<prop key="solr.host">localhost</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>
<prop key="content.manager.opts">-Dweblab.content.manager=org.ow2.weblab.content.impl.SecureFileContentManager -Dfile.path=${content.folder}</prop>
<prop key="common.properties">-Dfile.encoding=UTF-8 -Duser.timezone=Europe/Paris</prop>
<prop key="jmx.remote">-Dcom.sun.management.jmxremote</prop>
<prop key="jmx.unsafe">-Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false</prop>
<prop key="karaf.endpoints">-Dweblab.files=${files.to.index}?initialDelay=60000 -Dweblab.warcs=${warcs.to.index}?initialDelay=60000</prop>
<prop key="karaf.jmx.conf">${jmx.remote}</prop>
<prop key="tomcat.jmx.conf">${jmx.remote} -Dcom.sun.management.jmxremote.port=${tomcat.jmx.port} ${jmx.unsafe}</prop>
<prop key="tomcat.paths.1">-Dweblab.files=${files.to.index} -Dweblab.warcs=${warcs.to.index}</prop>
<prop key="tomcat.paths.2">-Dweblab.home=${weblab.home} -Dweblab.repository=${weblab.data}repository</prop>
<prop key="exposed.configuration">http://localhost:${tomcat.http.port}/exposed-configuration/</prop>
<prop key="liferay.exposed.configuration">-Dweblab.client.url=${exposed.configuration}weblab-client.xml -Dweblab.portlet.filter.url=${exposed.configuration}weblab-portlet-filters.xml</prop>
<prop key="liferay.jmx.conf">${jmx.remote} -Dcom.sun.management.jmxremote.port=${liferay.jmx.port} ${jmx.unsafe}</prop>
<prop key="activemq.opts">-Xms128m -Xmx1024m -Djava.awt.headless=true -Dapplication.name=weblab_activemq ${common.properties}</prop>
<prop key="solr.a.opts">-DcoreRootDirectory=../cores/ -Dweblab.home=${weblab.home} -DshareSchema=false ${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}</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>
<prop key="liferay.java.opts">-Xmx1024m ${liferay.exposed.configuration} ${liferay.jmx.conf} ${content.manager.opts} ${common.properties} ${proxy.liferay}</prop>
<!-- <prop key="proxy"></prop>
<prop key="proxy.liferay"></prop>
<prop key="proxy.twitter"></prop> -->
<prop key="proxy">-Djava.net.useSystemProxies=true -Dweblab.httpProxyHost=10.38.116.104 -Dweblab.httpProxyPort=8080</prop>
<prop key="proxy.liferay">-Dhttp.proxyHost=10.38.116.104 -Dhttp.proxyPort=8080 -Dhttps.ProxyHost=10.38.116.104 -Dhttps.proxyPort=8080 -Dhttp.nonProxyHosts=&quot;localhost|127.0.0.1|10.38.121.*&quot; -Dhttps.nonProxyHosts=&quot;localhost|127.0.0.1|10.38.121.*&quot;</prop>
<prop key="proxy.twitter">&amp;httpProxyHost=10.38.116.104&amp;httpProxyPort=8080</prop>
</props>
</property>
</bean>
<bean id="WebLab" class="org.ow2.weblab.bundle.conf.WebLabBean">
<property name="remoteAccess" value="false" />
<property name="remoteLogin" value="weblab" />
<property name="remotePassword" value="weblab" />
<property name="repository" value="${weblab.data}repository" />
<property name="solrData" value="${weblab.home}solr-6.1.0/server/cores/core_default/data" />
<property name="contentFolder" value="${weblab.data}content" />
<property name="servicesReconfigure" value="true" />
<property name="bus">
<ref bean="Karaf" />
</property>
<property name="activeMQServer">
<ref bean="ActiveMQ" />
</property>
<property name="portal">
<ref bean="Liferay" />
</property>
<property name="applicationServer">
<ref bean="Tomcat" />
</property>
<property name="solrServer">
<ref bean="Solr" />
</property>
<property name="servers">
<list />
</property>
</bean>
<bean id="Tomcat" class="org.ow2.weblab.bundle.server.TomcatServer">
<property name="name" value="tomcat" />
<property name="enabled" value="true" />
<property name="mandatory" value="true" />
<property name="home" value="${weblab.home}apache-tomcat-7.0.59" />
<property name="binDirectory" value="${weblab.home}apache-tomcat-7.0.59/bin/" />
<property name="port" value="${tomcat.http.port}" />
<property name="jmxPort" value="${tomcat.jmx.port}" />
<property name="env">
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="CATALINA_HOME" value="${weblab.home}apache-tomcat-7.0.59" />
<entry key="JAVA_OPTS" value=" ${tomcat.java.opts} " />
</map>
</constructor-arg>
</bean>
</property>
<property name="stopEnv">
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="CATALINA_HOME" value="${weblab.home}apache-tomcat-7.0.59" />
</map>
</constructor-arg>
</bean>
</property>
<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" />
<property name="mandatory" value="true" />
<property name="home" value="${weblab.home}liferay-ce-portal-7.0-ga3/tomcat-8.0.32" />
<property name="binDirectory" value="${weblab.home}liferay-ce-portal-7.0-ga3/tomcat-8.0.32/bin" />
<property name="port" value="${liferay.http.port}" />
<property name="jmxPort" value="${liferay.jmx.port}" />
<property name="env">
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="CATALINA_HOME" value="${weblab.home}liferay-ce-portal-7.0-ga3/tomcat-8.0.32" />
<entry key="JAVA_OPTS" value=" ${liferay.java.opts} " />
</map>
</constructor-arg>
</bean>
</property>
<property name="stopEnv">
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="CATALINA_HOME" value="${weblab.home}liferay-ce-portal-7.0-ga3/tomcat-8.0.32" />
</map>
</constructor-arg>
</bean>
</property>
<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" />
<property name="mandatory" value="true" />
<property name="home" value="${weblab.home}karaf-weblab-2.1.0-SNAPSHOT" />
<property name="binDirectory" value="${weblab.home}karaf-weblab-2.1.0-SNAPSHOT/bin" />
<property name="port" value="${karaf.http.port}" />
<property name="jmxName" value="karaf-weblab" />
<property name="jmxUser" value="weblab" />
<property name="jmxPassword" value="weblab" />
<property name="jmxPort" value="1099" />
<property name="env">
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="JAVA_OPTS" value=" ${karaf.java.opts} " />
</map>
</constructor-arg>
</bean>
</property>
<property name="timeout" value="300000" />
</bean>
<bean id="ActiveMQ" class="org.ow2.weblab.bundle.server.ActiveMQServer">
<property name="name" value="activemq" />
<property name="processIdentificationClue" value="-Dapplication.name=weblab_activemq" />
<property name="enabled" value="true" />
<property name="mandatory" value="true" />
<property name="home" value="${weblab.home}apache-activemq-5.13.3" />
<property name="jmxPort" value="1616" />
<property name="binDirectory" value="${weblab.home}apache-activemq-5.13.3/bin" />
<!-- WARN this value is only set to check active MQ is correctly running. Changing this value will not change port on which activemq is listening -->
<!-- to edit activemq configuration see bundle/conf/activemq/activemq.xml file -->
<property name="port" value="${activemq.main.port}" />
<property name="env">
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="ACTIVEMQ_OPTS" value="${activemq.opts}" />
<entry key="ACTIVEMQ_DATA" value="${weblab.data}/activemq/data" />
<entry key="ACTIVEMQ_TMP" value="${weblab.data}/activemq/tmp" />
</map>
</constructor-arg>
</bean>
</property>
<property name="timeout" value="300000" />
</bean>
<bean id="Solr" class="org.ow2.weblab.bundle.server.SolrServer">
<property name="name" value="solr" />
<property name="enabled" value="true" />
<property name="mandatory" value="true" />
<property name="home" value="${weblab.home}solr-6.1.0" />
<property name="binDirectory" value="${weblab.home}solr-6.1.0/bin" />
<!-- 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">
<map>
<entry key="-a" value="${solr.a.opts}" />
<entry key="-m" value="${solr.m.opts}" />
</map>
</property>
<property name="stopOptions">
<map>
<entry key="-p" value="${solr.http.port}" />
</map>
</property>
<property name="timeout" value="300000" />
</bean>
</beans>
......@@ -11,51 +11,112 @@
<artifactId>portlets-custom</artifactId>
<packaging>pom</packaging>
<packaging>bundle</packaging>
<name>WebLab Portlets assembly.</name>
<description>WebLab Portlets.</description>
<dependencies>
<!-- Weblab core dependencies -->
<!-- <dependency> -->
<!-- <groupId>org.jvnet.jaxb2_commons</groupId> -->
<!-- <artifactId>jaxb2-basics-annotate</artifactId> -->
<!-- <version>1.0.2</version> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>org.apache.cxf.xjcplugins</groupId> -->
<!-- <artifactId>cxf-xjc-dv</artifactId> -->
<!-- <version>3.0.5</version> -->
<!-- </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.portlets</groupId>
<artifactId>weblab-portlet-filters</artifactId>
<version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>model</artifactId>
<version>1.2.8</version>
<scope>compile</scope>
</dependency>
<!--
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>${taglib.version}</version>
<type>jar</type>
<type>jar</type>
</dependency> -->
<!-- <dependency> -->
<!-- <groupId>xalan</groupId> -->
<!-- <artifactId>xalan</artifactId> -->
<!-- <version>${xalan.version}</version> -->
<!-- <type>jar</type> -->
<!-- </dependency> -->
<!-- Liferay 7 Mandatory -->
<!-- <dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-service</artifactId>
<version>7.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>5.0.0</version>
</dependency> -->
<dependency>
<groupId>org.ow2.weblab.components</groupId>
<artifactId>weblab-taglib</artifactId>
<version>0.1.2</version>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>${jstl.version}</version>
<type>jar</type>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
<type>jar</type>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>annotator</artifactId>
<version>1.2.8</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.8.2</version>
</dependency>
<dependency>
<groupId>org.joda</groupId>
<artifactId>joda-convert</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
<build>
<finalName>portlets</finalName>
<plugins>
<!-- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
......@@ -76,6 +137,84 @@
</configuration>
</plugin>
</plugins>
</build>
</build>-->
<!-- Liferay 7 mandatory plugins description -->
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.5.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<_dsannotations>*</_dsannotations>
<Provide-Capability>osgi.extender;osgi.extender="jsp.taglib";uri="http://org.ow2.weblab/taglib";version:Version="0.1.2"</Provide-Capability>
<Import-Package>
*
</Import-Package>
<Embed-Dependency>
*;scope=compile|runtime,
services,
interfaces,
model,
extended,
commons-logging,
annotator,
joda-time,
content-manager
</Embed-Dependency>
<Export-Package>
org.ow2.weblab.rdf,
org.ow2.weblab.portlets,
org.ow2.weblab.core,
<!-- This export weblab-filter-package -->
org.ow2.weblab.portlet.*,
org.ow2.weblab.portlets.weblab.portlet.filters,
org.ow2.weblab.core.*,
org.ow2.weblab.core.model,
org.ow2.weblab.core.model.annotator,
org.ow2.weblab.core.model.xsd,
org.ow2.weblab.core.services,
org.ow2.weblab.core.model.Query,
org.ow2.weblab.core.model.Resource,
org.ow2.weblab.core.model.PieceOfKnowledge,
org.ow2.weblab.core.model.Resource,
org.ow2.weblab.core.model.ResultSet,
org.ow2.weblab.core.annotator.AbstractAnnotator,
org.purl.dc.elements.DublinCoreAnnotator,
org.ow2.weblab.rdf.Value,
<!-- You need both components, and components.* to export components.weblab-taglib -->
org.ow2.weblab.components,
org.ow2.weblab.components.*,
services,
interfaces,
model
</Export-Package>
</instructions>
</configuration>
</plugin>
<!-- ancien Assembly -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<descriptor>assembly.xml</descriptor>
<finalName>portlets</finalName>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
</build>
</project>
......@@ -24,6 +24,8 @@
<module>libraries/portlets</module>
<!-- Bundle assembly -->
<module>assembly</module>
<!-- Build liferay OSGI dependency -->
<!-- <module>liferay-osgi</module> -->
</modules>
<!-- Properties used to build WebLab Assembly Project, dependencies are defined in assembly module -->
......@@ -47,15 +49,15 @@
<!-- Servers versions -->
<tomcat.version>7.0.59</tomcat.version>
<liferay.version>6.1.2-ce-ga3</liferay.version>
<liferay.version>7.0-ce-ga3</liferay.version>
<activemq.server.version>5.13.3</activemq.server.version>
<solr.server.version>6.3.0</solr.server.version>
<zookeeper.bin.version>3.4.9</zookeeper.bin.version>
<!-- Server paths -->
<tomcat.path>apache-tomcat-${tomcat.version}</tomcat.path>
<liferay.path>liferay-portal-${liferay.version}</liferay.path>
<liferay.tomcat.path>liferay-portal-${liferay.version}/tomcat-7.0.40</liferay.tomcat.path>
<liferay.path>liferay-ce-portal-7.0-ga3</liferay.path>
<liferay.tomcat.path>${liferay.path}/tomcat-8.0.32</liferay.tomcat.path>
<karaf.path>karaf-weblab-${weblab.bundle.version}</karaf.path>
<activemq.path>apache-activemq-${activemq.server.version}</activemq.path>
<solr.path>solr-${solr.server.version}</solr.path>
......
portlet.event.distribution=ALL_PORTLETS
#portlet.event.distribution=layout-set
#portlet.public.render.parameter.distribution=ALL_PORTLETS
portlet.max.event.generation=3
#layout.static.portlets.all=
setup.wizard.enabled=false
#jdbc.default.acquireIncrement=5
#jdbc.default.maxPoolSize=100
#jdbc.default.minPoolSize=10
#jdbc.default.numHelperThreads=10
dl.file.max.size=100000000
# change default email/password
admin.email.from.name=WebLab Administrator
admin.email.from.address=demo@weblab-project.org
company.default.web.id=weblab-project.org
default.admin.password=demo
#
# Set the default admin screen name prefix.
#
default.admin.screen.name=admin
#
# Set the default admin email address prefix.
#
default.admin.email.address.prefix=demo
#
# Disable reminder queries.
#
users.reminder.queries.enabled=false
#
# Set the default admin first name.
#
default.admin.first.name=WebLab
#
# Set the default admin last name.
#
default.admin.last.name=Admin
#
# Set the default landing page.
#
company.default.home.url=/web/guest/welcome
CATALINA_OPTS="$CATALINA_OPTS -Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Dorg.apache.catalina.loader.WebappClassLoader.ENABLE_CLEAR_REFERENCES=false -Duser.timezone=GMT -Dhttp.proxyHost=10.38.116.104 -Dhttp.proxyPort=8080 -Dhttps.proxyHost=10.38.116.104 -Dhttps.proxyPort=8080 -Dhttp.nonProxyHosts='localhost,127.0.0.1,10.38.121.*' -Dhttps.nonProxyHosts='127.0.0.1,localhost,10.38.121.*' -Xmx1024m -XX:MaxPermSize=384m"
Markdown is supported
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