Commit de5c5a94 authored by Yann Mombrun's avatar Yann Mombrun
Browse files

New version 2.0.4-R-SNAPSHOT (to prevent from being in conflict with 2.0.4-SNAPSHOT)

WEBLAB-1229 and WEBLAB-1236 - Now only call chmod on required files to prevent from trying to change permissions on non requried files. Never reduce permission
WEBLAB-1193 - A property in configuration.xml can be set up to locate a script to be executed after reset
WEBLAB-1216 - Addtional servers can have a mandatory flag. When true, if an error is detected when starting that server, then the weblab.sh script stops.
WEBLAB-1155 - WebLab restart has been added
WEBLAB-1420 - Use filtering on configuration.xml to prevent from having to change the location of karaf if the version has changed.
Cleanup the code, conversion to \n line endings, update headers
Update dependencies to latests versions of camel-weblab, tika, gate, repo and doc-view 

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabApplications/bundle@4219 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent 9795982c
......@@ -73,6 +73,7 @@
<!-- WebLab configuration -->
<source>../conf/configuration.xml</source>
<outputDirectory>conf</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<!-- Copy WebLab Launcher -->
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.4-RC2</version>
<version>2.0.4-R-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.4-RC2</version>
<version>2.0.4-R-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.4-RC2</version>
<version>2.0.4-R-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......
......@@ -3,17 +3,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:soap="http://cxf.apache.org/bindings/soap" xmlns:camel="http://camel.apache.org/schema/spring"
xmlns:cxf="http://camel.apache.org/schema/cxf"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://camel.apache.org/schema/spring
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd">
<!--======================================================= -->
<!--========== SPECIFIC BEANS =========== -->
<!--======================================================= -->
......@@ -27,11 +26,8 @@
<!-- This route consume Files -->
<route id="consumeFile" streamCache="true" autoStartup="true">
<!-- <from uri="file:../data/toIndex/" /> -->
<from uri="ref:files-endpoint" />
<log message="new file to process ..." />
<setHeader headerName="weblab:dc:source">
<simple>${headers.CamelFileAbsolutePath}</simple>
......@@ -49,9 +45,6 @@
<convertBodyTo type="java.io.File" />
<!-- To produce Document with native content -->
<to uri="weblab://create?type=Document&amp;outputMethod=xml" />
<convertBodyTo type="java.lang.String" />
<inOnly uri="jms:queue:weblabdocsin" />
</route>
</routeContext>
......
<?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"
xmlns:camel="http://camel.apache.org/schema/spring" xmlns:cxf="http://camel.apache.org/schema/cxf"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://camel.apache.org/schema/spring
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd">
......@@ -116,8 +116,6 @@
<!-- To produce an Text with no content embedded (native content) -->
<to uri="weblab://create?type=Document&amp;outputMethod=xml" />
<convertBodyTo type="java.lang.String" />
<inOnly uri="jms:queue:weblabdocsin" />
</when>
......
......@@ -3,163 +3,175 @@
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="ignoreResourceNotFound" value="true" />
<property name="properties">
<props>
<prop key="tomcat.http.port">8181</prop>
<prop key="liferay.http.port">8080</prop>
<prop key="karaf.http.port">8282</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.4-RC2</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>
<prop key="content.manager.opts">-Dweblab.content.manager=org.ow2.weblab.content.impl.SecureFileContentManager -Dfile.path=${content.folder}</prop>
<prop key="karaf.java.opts">-server -Xms128M -Xmx1024m -XX:MaxPermSize=512m -Dcom.sun.management.jmxremote -Dweblab.files=${files.to.index}?initialDelay=60000 -Dweblab.warcs=${warcs.to.index}?initialDelay=60000 ${content.manager.opts}</prop>
<prop key="tomcat.java.opts">-Xmx1500m -XX:MaxPermSize=256m -Dtomcat.http.port=${tomcat.http.port} -Dweblab.home=${weblab.home} -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 ${content.manager.opts}</prop>
<prop key="liferay.java.opts">-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 ${content.manager.opts}</prop>
</props>
<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="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="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} -Dsolr.solr.home=${weblab.conf}solr -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="karaf.java.opts">-server -Xms128M -Xmx1024m -XX:MaxPermSize=512m ${karaf.jmx.conf} ${karaf.endpoints} ${content.manager.opts}</prop>
<prop key="tomcat.java.opts">-Xmx1500m -XX:MaxPermSize=256m -Dtomcat.http.port=${tomcat.http.port} ${tomcat.paths.1} ${tomcat.paths.2} ${tomcat.jmx.conf} ${content.manager.opts}</prop>
<prop key="liferay.java.opts">-Xmx1024m -XX:MaxPermSize=512m ${liferay.exposed.configuration} ${liferay.jmx.conf} ${content.manager.opts}
</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="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="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.data}solr" />
<property name="servicesReconfigure" value="true" />
<property name="chainManagerService" value="http://localhost:${tomcat.http.port}/camel-router/chainManager" />
<property name="solrData" value="${weblab.data}solr" />
<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="timeout" value="300000" />
<property name="toindex" value="${files.to.index}" />
<property name="warcs" value="${warcs.to.index}" />
<property name="bus">
<ref bean="Karaf"/>
<ref bean="Karaf" />
</property>
<property name="portal">
<ref bean="Liferay"/>
<ref bean="Liferay" />
</property>
<property name="applicationServer">
<ref bean="Tomcat"/>
<ref bean="Tomcat" />
</property>
<property name="servers">
<list>
<!-- <ref bean="Fuseki"/> -->
<!-- <ref bean="Heritrix"/> -->
<!-- <ref bean="ActiveMQ"/> -->
</list>
<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="home" value="${weblab.home}${tomcat.path}" />
<property name="binDirectory" value="${weblab.home}" />
<property name="port" value="${tomcat.http.port}" />
<property name="jmxPort" value="18181" />
<property name="env" >
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="CATALINA_HOME" value="${weblab.home}${tomcat.path}" />
<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}${tomcat.path}" />
</map>
</constructor-arg>
</bean>
</property>
<!-- <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" />
<property name="home" value="${weblab.home}${liferay.path}" />
<property name="binDirectory" value="${weblab.home}${liferay.path}/bin" />
<property name="port" value="${liferay.http.port}" />
<property name="jmxPort" value="18080" />
<property name="env" >
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<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=" ${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.path}" />
</map>
</constructor-arg>
</bean>
</property>
<!-- <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" />
<property name="home" value="${weblab.home}${karaf.path}" />
<property name="binDirectory" value="${weblab.home}${karaf.path}/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>
<property name="name" value="tomcat" />
<property name="enabled" value="true" />
<property name="home" value="${weblab.home}${tomcat.path}" />
<property name="binDirectory" value="${weblab.home}${tomcat.path}/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}${tomcat.path}" />
<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}${tomcat.path}" />
</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="home" value="${weblab.home}${liferay.tomcat.path}" />
<property name="binDirectory" value="${weblab.home}${liferay.tomcat.path}/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.tomcat.path}" />
<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.tomcat.path}" />
</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="home" value="${weblab.home}${karaf.path}" />
<property name="binDirectory" value="${weblab.home}${karaf.path}/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="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>
<property name="server"><value>toChange</value></property>
<property name="threshold"><value>90</value></property>
</bean>
<property name="delay">
<value>300000</value>
</property>
<property name="email">
<value>demo@weblab-project.org</value>
</property>
<property name="server">
<value>toChange</value>
</property>
<property name="threshold">
<value>90</value>
</property>
</bean>
</beans>
\ No newline at end of file
<?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<servlet>
<servlet-name>default</servlet-name>
<servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
<init-param>
<param-name>debug</param-name>
<param-value>0</param-value>
</init-param>
<init-param>
<param-name>listings</param-name>
<param-value>true</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
<servlet-name>jsp</servlet-name>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
<init-param>
<param-name>fork</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>xpoweredBy</param-name>
<param-value>false</param-value>
</init-param>
<load-on-startup>3</load-on-startup>
</servlet>
<!-- The mapping for the default servlet -->
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
<!-- The mappings for the JSP servlet -->
<servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>*.jsp</url-pattern>
<url-pattern>*.jspx</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>30</session-timeout>
</session-config>
</web-app>
<?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<servlet>
<servlet-name>default</servlet-name>
<servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
<init-param>
<param-name>debug</param-name>
<param-value>0</param-value>
</init-param>
<init-param>
<param-name>listings</param-name>
<param-value>true</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
<servlet-name>jsp</servlet-name>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
<init-param>
<param-name>fork</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>xpoweredBy</param-name>
<param-value>false</param-value>
</init-param>
<load-on-startup>3</load-on-startup>
</servlet>
<!-- The mapping for the default servlet -->
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
<!-- The mappings for the JSP servlet -->
<servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>*.jsp</url-pattern>
<url-pattern>*.jspx</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>30</session-timeout>
</session-config>
</web-app>
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"><beans> <bean id="servicesConfig" class="org.ow2.weblab.components.client.config.ServiceConfigMap"> <description> This is the main bean that will handle the weblab-client configuration. The principle is simple: for each service port (ie implementation of one generic interface) the configuration will have the implementation URI (in general linked to the application service taxonomy) and will link it to the actual URL to be used. </description> <constructor-arg> <map> <!-- For processing --> <entry key="http://weblab.ow2.org/core/1.2/services/resourceContainer#Load_Resource"> <value>http://localhost:8181/simple-file-repository/resourceContainer</value> </entry> <!-- For retrieval --> <entry key="http://weblab.ow2.org/core/1.2/services/searcher#Full_Text_Search"> <value>http://localhost:8181/solr-engine/searcher</value> </entry> <entry key="http://weblab.ow2.org/core/1.2/services/analyser#FacetSuggestion"> <value>http://localhost:8181/solr-engine/rdfFacetSuggestion</value> </entry> <entry key="http://weblab.ow2.org/core/1.2/services/analyser#SpellSuggestion"> <value>http://localhost:8181/solr-engine/spellSuggestion</value> </entry> </map> </constructor-arg> </bean></beans>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
<bean id="servicesConfig" class="org.ow2.weblab.components.client.config.ServiceConfigMap">
<description>
This is the main bean that will handle the weblab-client configuration. The principle is simple: for each service port
(ie implementation of one generic interface) the configuration will have the implementation URI (in general linked to
the application service taxonomy) and will link it to the actual URL to be used.
</description>
<constructor-arg>
<map>
<!-- For processing -->
<entry key="http://weblab.ow2.org/core/1.2/services/resourceContainer#Load_Resource">
<value>http://localhost:8181/simple-file-repository/resourceContainer</value>
</entry>
<!-- For retrieval -->
<entry key="http://weblab.ow2.org/core/1.2/services/searcher#Full_Text_Search">
<value>http://localhost:8181/solr-engine/searcher</value>
</entry>
<entry key="http://weblab.ow2.org/core/1.2/services/analyser#FacetSuggestion">
<value>http://localhost:8181/solr-engine/rdfFacetSuggestion</value>
</entry>
<entry key="http://weblab.ow2.org/core/1.2/services/analyser#SpellSuggestion">
<value>http://localhost:8181/solr-engine/spellSuggestion</value>
</entry>
</map>
</constructor-arg>
</bean>
</beans>
<?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
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
......@@ -10,17 +10,16 @@
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
<!-- JMX integration see http://cxf.apache.org/docs/jmx-management.html -->
<bean id="org.apache.cxf.management.InstrumentationManager"
class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="enabled" value="true" />
<property name="bus" ref="cxf" />
<property name="usePlatformMBeanServer" value="true" />
<property name="createMBServerConnectorFactory" value="false" />
<bean id="org.apache.cxf.management.InstrumentationManager" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="enabled" value="true" />
<property name="bus" ref="cxf" />
<property name="usePlatformMBeanServer" value="true" />
<property name="createMBServerConnectorFactory" value="false" />
</bean>
<!-- Performance counter -->
<bean id="CounterRepository" class="org.apache.cxf.management.counters.CounterRepository">
<property name="bus" ref="cxf" />
</bean>
<property name="bus" ref="cxf" />
</bean>
<jaxws:endpoint id="resourceContainerEndpoint" implementor="#resourceContainer" address="/resourceContainer">
<jaxws:properties>
......@@ -31,12 +30,7 @@
<bean class="org.apache.cxf.jaxb.JAXBDataBinding">
<property name="namespaceMap">
<map>
<entry>
<key>
<value>http://weblab.ow2.org/core/1.2/model#</value>
</key>
<value>wl</value>
</entry>
<entry key="http://weblab.ow2.org/core/1.2/model#" value="wl" />
</map>
</property>
</bean>
......@@ -53,12 +47,7 @@
<bean class="org.apache.cxf.jaxb.JAXBDataBinding">
<property name="namespaceMap">
<map>
<entry>