Index: webapps/dnet-container-openaireplus/branches/beta/src/main/resources/log4j.properties
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/resources/log4j.properties	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/resources/log4j.properties	(revision 48157)
@@ -0,0 +1,61 @@
+### Root Level ###
+log4j.rootLogger=WARN, LOGFILE
+
+### Configuration for the LOGFILE appender ###
+log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
+log4j.appender.LOGFILE.MaxFileSize=25MB
+log4j.appender.LOGFILE.MaxBackupIndex=10
+log4j.appender.LOGFILE.File=logs/is/dnet.log
+log4j.appender.LOGFILE.Append=true
+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOGFILE.layout.ConversionPattern=[%-5p] %d %c - %m%n
+
+### Configuration for the CONSOLE appender ###
+#log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+#log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.CONSOLE.layout.ConversionPattern=[%-5p] %d %c - %m%n
+
+### Configuration for the QUERIES appender ###
+log4j.appender.QUERIES=org.apache.log4j.RollingFileAppender
+log4j.appender.QUERIES.MaxFileSize=25MB
+log4j.appender.QUERIES.MaxBackupIndex=10
+log4j.appender.QUERIES.File=logs/is/xqueries.log
+log4j.appender.QUERIES.Append=true
+log4j.appender.QUERIES.layout=org.apache.log4j.PatternLayout
+log4j.appender.QUERIES.layout.ConversionPattern=[%-5p] %d %c - %m%n
+
+org.apache.cxf.Logger=org.apache.cxf.common.logging.Log4jLogger
+
+### Application Level ###
+log4j.logger.eu.dnetlib=INFO
+log4j.logger.eu.dnetlib.enabling.is.sn=INFO
+log4j.logger.org.apache.cxf.interceptor=FATAL
+log4j.logger.org.apache.cxf.ws.addressing.ContextUtils=FATAL
+log4j.logger.eu.dnetlib.xml.database.LoggingTrigger=WARN
+log4j.logger.eu.dnetlib.enabling.inspector=FATAL
+log4j.logger.eu.dnetlib.springutils.stringtemplate.StringTemplateViewResolver=FATAL             
+log4j.logger.eu.dnetlib.enabling.is.sn.SynchronousNotificationSenderImpl=WARN
+log4j.logger.eu.dnetlib.enabling.tools.LocalServiceResolverImpl=WARN
+log4j.logger.eu.dnetlib.enabling.is.sn.NotificationInvokerImpl=WARN
+log4j.logger.org.apache.xerces.parsers.SAXParser=OFF
+log4j.logger.eu.dnetlib.conf.PropertyFetcher=WARN
+
+log4j.logger.eu.dnetlib.enabling.is.sn.ISSNServiceImpl=OFF
+log4j.logger.eu.dnetlib.enabling.datasources.DatasourceManagerClients=FATAL
+log4j.logger.eu.dnetlib.enabling.is.sn.ISSNServiceCore=WARN
+log4j.logger.eu.dnetlib.xml.database.exist.ExistDatabase=WARN
+log4j.logger.eu.dnetlib.enabling.is.store.AbstractContentInitializer=FATAL
+
+log4j.logger.org.apache.hadoop.hbase.mapreduce.TableInputFormatBase=FATAL
+
+### Spring ###
+log4j.logger.org.springframework=ERROR
+
+### XQUERIES ###
+###interceptors for xml database ###
+## Additivity = false means: do not inherit the appenders from the rootLogger. ##
+#  This allows the log of interceptor to be output of one only appender: QUERIES #
+#  See: http://examples.javacodegeeks.com/enterprise-java/log4j/log4j-additivity-property-example/ #
+##
+log4j.additivity.eu.dnetlib.enabling.tools.LogInterceptor = false
+log4j.logger.eu.dnetlib.enabling.tools.LogInterceptor=DEBUG, QUERIES
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/resources/eu/dnetlib/applicationContext-ehcache.xml
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/resources/eu/dnetlib/applicationContext-ehcache.xml	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/resources/eu/dnetlib/applicationContext-ehcache.xml	(revision 48157)
@@ -0,0 +1,27 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util" xmlns:cache="http://www.springframework.org/schema/cache"
+	xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:template="http://dnetlib.eu/springbeans/template"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+						http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd
+						http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+	<!-- THIS FILE MUST CONTAIN THE CACHEMANAGER DECALRED IN DEPENDENCY MODULES
+		THAT MUST BE USED BY THE CONTAINER BECAUSE WE CANNOT HAVE MULTIPLE <cache:annotation-driven> 
+		IN DIFFERENT MODULES. -->
+		<cache:annotation-driven cache-manager="isCacheManager" />
+
+		<!-- ADD TO THE ARRAY OF CACHE MANAGERS THE CACHE MANAGER DEFINED IN MODULES" APPLICATION CONTEXTS -->
+		<bean id="isCacheManager" class="org.springframework.cache.support.CompositeCacheManager">
+    		<property name="cacheManagers">
+        		<array>
+			      <!--  <ref bean="resultSetCacheManager" /> -->
+			    <!--    <ref bean="repoUICacheManager" /> -->
+           	 		<ref bean="issnCacheManager" />
+        		</array>
+    		</property>
+    		<property name="fallbackToNoOpCache" value="true" />
+		</bean>
+
+</beans>
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/resources/eu/dnetlib/cnr-site.properties
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/resources/eu/dnetlib/cnr-site.properties	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/resources/eu/dnetlib/cnr-site.properties	(revision 48157)
@@ -0,0 +1,52 @@
+container.hostname								= 	localhost
+services.is.store.database.bean          		=   persistentExistDatabase
+#services.is.store.database.bean                = 	temporaryExistDatabase
+
+dnet.data.path 									=	/tmp/dnet
+services.registration.default.hnmlocator   		=   dynamicHNMLocator
+
+services.schemas								=	classpath*:/eu/dnetlib/test/schemas/**/*.xsd
+
+services.msro.reindex.limit      				=   100
+#services.msro.disabled.beans   				=   reindexOAIPostCleaningEFGHandler,reindexOAIPostEditEFGHandler,reindexPostEditEFGHandler
+
+
+services.aggregator.host						=	localhost
+services.aggregator.name        				=   DRIVER
+
+services.aggregator.country						=	EE
+services.msro.data.source.resolver				=	extendedDataSourceResolver
+services.registry.pending.resource.manager		=	compatPendingManager
+transport.soap.force.local.address				=	true
+
+msro.wf.nodes.mdstoreSearch.format 				=	OAF
+msro.wf.nodes.mdstoreSearch.interpretation 		=	cleaned
+msro.wf.nodes.download.xpathMetadataId 			=	//*[local-name()='objIdentifier']/text()
+
+dnet.modular.ui.authorization.manager 			=	simpleAuthenticationManager
+dnet.modular.ui.authorization.default.superAdmin=	admin
+
+
+# MSRO SPECIFIC
+services.msro.graph.updateindex.incremental		=	classpath:/eu/dnetlib/enabling/manager/msro/wf/update-index-incremental.wf.xml
+dnet.datasource.updater 						=   openaireplusDatasourceUpdater
+
+hbase.mapred.datatable 							=	db_openaireplus
+hbase.actions.table 							=	db_actions
+
+# Mail configuration
+
+msro.wf.mail.smtp.host = smtp.isti.cnr.it
+msro.wf.mail.smtp.user = smtp-dnet
+msro.wf.mail.smtp.password = hhr*7932
+msro.wf.mail.cc = michele.artini@isti.cnr.it
+
+service.index.solr.rank.enable=true
+
+services.publisher.oai.host=localhost
+services.publisher.oai.port=27017
+services.objectstore.dao=fSObjectstoreDao
+
+#Transformator property: need to set something or the webapp does not start
+#TODO: please change this to the correct address of the validator service as soon as we have it
+services.transformation.blacklist_api = http://localhost:8280/validator-service/worfklows?request=GetBlacklistedRecords&datasourceId=
\ No newline at end of file
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/resources/eu/dnetlib/applicationContext-locators.xml
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/resources/eu/dnetlib/applicationContext-locators.xml	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/resources/eu/dnetlib/applicationContext-locators.xml	(revision 48157)
@@ -0,0 +1,25 @@
+<?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:sec="http://cxf.apache.org/configuration/security" xmlns:wsa="http://cxf.apache.org/ws/addressing"
+	xmlns:p="http://www.springframework.org/schema/p" xmlns:http="http://cxf.apache.org/transports/http/configuration"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://cxf.apache.org/ws/addressing http://cxf.apache.org/schemas/ws-addr-conf.xsd
+    http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+    http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+    http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+	<!-- service locators: TODO: parameterize via properties -->
+	<bean id="transformationServiceLocator" class="eu.dnetlib.enabling.tools.DynamicServiceLocator"
+		p:clazz="eu.dnetlib.data.transformation.service.rmi.TransformationService"
+		p:lookUpLocator-ref="lookupLocator" p:serviceResolver-ref="serviceResolver" />
+
+	<bean id="downloadServiceLocator" class="eu.dnetlib.enabling.tools.DynamicServiceLocator"
+		p:clazz="eu.dnetlib.data.download.rmi.DownloadService"
+		p:lookUpLocator-ref="lookupLocator" p:serviceResolver-ref="serviceResolver" />
+
+	<bean id="dynamicHadoopServiceLocator" class="eu.dnetlib.enabling.tools.DynamicServiceLocator" 
+		p:clazz="eu.dnetlib.data.hadoop.rmi.HadoopService"
+		p:lookUpLocator-ref="lookupLocator" p:serviceResolver-ref="serviceResolver" />
+
+</beans>
\ No newline at end of file
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/resources/log4j.properties.normal
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/resources/log4j.properties.normal	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/resources/log4j.properties.normal	(revision 48157)
@@ -0,0 +1,49 @@
+### Root Level ###
+log4j.rootLogger=WARN, LOGFILE
+
+### Configuration for the LOGFILE appender ###
+log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
+log4j.appender.LOGFILE.MaxFileSize=25MB
+log4j.appender.LOGFILE.MaxBackupIndex=10
+log4j.appender.LOGFILE.File=logs/dnet.log
+log4j.appender.LOGFILE.Append=true
+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOGFILE.layout.ConversionPattern=[%-5p] %d %c - %m%n
+
+
+org.apache.cxf.Logger=org.apache.cxf.common.logging.Log4jLogger
+
+### Application Level ###
+log4j.logger.eu.dnetlib=INFO
+log4j.logger.eu.dnetlib.enabling.is.sn=INFO
+log4j.logger.org.apache.cxf.interceptor=FATAL
+log4j.logger.org.apache.cxf.ws.addressing.ContextUtils=FATAL
+log4j.logger.eu.dnetlib.enabling.tools.AbstractBaseService=INFO
+log4j.logger.eu.dnetlib.enabling.inspector=DEBUG
+log4j.logger.eu.dnetlib.xml.database.LoggingTrigger=WARN
+log4j.logger.eu.dnetlib.enabling.tools.registration.ServiceRegistrator=INFO
+log4j.logger.eu.dnetlib.enabling.inspector=FATAL
+log4j.logger.eu.dnetlib.enabling.inspector.SubscriptionController=DEBUG
+log4j.logger.eu.dnetlib.springutils.stringtemplate.StringTemplateViewResolver=FATAL             
+log4j.logger.eu.dnetlib.enabling.is.sn.SynchronousNotificationSenderImpl=WARN
+log4j.logger.eu.dnetlib.enabling.tools.LocalServiceResolverImpl=WARN
+log4j.logger.eu.dnetlib.enabling.is.sn.NotificationInvokerImpl=WARN
+log4j.logger.eu.dnetlib.data.collective=INFO
+log4j.logger.eu.dnetlib.data.hadoop.utils.ScanFactory=DEBUG
+log4j.logger.org.apache.xerces.parsers.SAXParser=OFF
+log4j.logger.eu.dnetlib.conf.PropertyFetcher=WARN
+#log4j.logger.eu.dnetlib.data.transform.XsltRowTransformerFactory=DEBUG
+
+log4j.logger.eu.dnetlib.enabling.is.sn.ISSNServiceImpl=OFF
+log4j.logger.eu.dnetlib.enabling.datasources.DatasourceManagerClients=FATAL
+log4j.logger.eu.dnetlib.data.mdstore.modular.mongodb.utils.MetadataCheckJob=DEBUG
+log4j.logger.eu.dnetlib.enabling.is.sn.ISSNServiceCore=WARN
+log4j.logger.eu.dnetlib.xml.database.exist.ExistDatabase=WARN
+log4j.logger.eu.dnetlib.enabling.is.store.AbstractContentInitializer=FATAL
+
+log4j.logger.org.apache.hadoop.hbase.mapreduce.TableInputFormatBase=FATAL
+log4j.logger.eu.dnetlib.enabling.database.utils.DatabaseUtils=WARN
+### Spring ###
+log4j.logger.org.springframework=ERROR
+
+
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/resources/META-INF/services/javax.xml.transform.TransformerFactory
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/resources/META-INF/services/javax.xml.transform.TransformerFactory	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/resources/META-INF/services/javax.xml.transform.TransformerFactory	(revision 48157)
@@ -0,0 +1 @@
+net.sf.saxon.TransformerFactoryImpl
\ No newline at end of file
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/resources/META-INF/cxf/org.apache.cxf.Logger
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/resources/META-INF/cxf/org.apache.cxf.Logger	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/resources/META-INF/cxf/org.apache.cxf.Logger	(revision 48157)
@@ -0,0 +1 @@
+org.apache.cxf.common.logging.Log4jLogger
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/User.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/User.png
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/User.png	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/User.png	(revision 48157)

Property changes on: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/User.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/admin.svg
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/admin.svg	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/admin.svg	(revision 48157)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="819.81274"
+   height="801.9024"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="admin_tools.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="983.51788"
+     inkscape:cy="601.44005"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1440"
+     inkscape:window-height="801"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(1138.5179,-331.89985)">
+    <g
+       id="g3637"
+       transform="matrix(-0.60220798,0.79833924,-0.79833924,-0.60220798,-568.91854,1748.1963)"
+       style="stroke:#000000;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:export-filename="/Users/andersbr/Documents/coop/art/web/admin_tools.png"
+       inkscape:export-xdpi="5.6116552"
+       inkscape:export-ydpi="5.6116552">
+      <path
+         id="path3599"
+         d="m -720,340.9375 c -14.92025,0 -29.63885,0.84333 -44.125,2.46875 l 1.375,12.625 3.78125,31.375 -0.375,0.0312 0,0.0312 -0.15625,0 -0.0937,0 -4.28125,0.53125 -3.625,0.46875 0,0.0312 -4.25,0.59375 -0.28125,0.0312 -0.34375,0.0625 -3.59375,0.59375 -0.625,0.0937 -3.59375,0.625 -4.1875,0.75 -0.53125,0.125 -0.0937,0 -3.5625,0.71875 -0.59375,0.125 -3.5625,0.75 -0.59375,0.125 -3.53125,0.78125 -0.625,0.15625 -3.5,0.84375 -4.09375,1 -0.5,0.125 -0.0937,0.0312 -3.5,0.9375 -0.59375,0.15625 -3.4375,0.9375 -0.625,0.1875 -3.4375,1 -0.59375,0.1875 -3.40625,1.03125 -0.59375,0.1875 -3.40625,1.0625 -0.0625,0.0312 -0.53125,0.15625 -3.375,1.125 -0.59375,0.21875 -3.375,1.15625 -0.5625,0.1875 -3.34375,1.21875 -0.3125,0.125 -0.28125,0.0937 -3.3125,1.25 -0.59375,0.21875 -1.90625,0.71875 -16.125,-41.65625 c -31.01955,11.84799 -60.15932,27.53518 -86.8125,46.46875 l 26.53125,36.8125 -0.8125,0.5625 -0.4375,0.3125 -0.0312,0.0312 -2.8125,2.09375 -3.28125,2.46875 -0.46875,0.375 -2.78125,2.15625 -0.46875,0.34375 -2.75,2.1875 -0.1875,0.15625 -0.28125,0.21875 -2.71875,2.21875 -0.4375,0.375 -2.71875,2.25 -0.40625,0.34375 -0.0312,0.0312 -2.65625,2.28125 -0.1875,0.1875 -0.28125,0.21875 -2.625,2.3125 -0.4375,0.375 -2.625,2.34375 -0.4375,0.40625 -2.5625,2.375 -0.0625,0.0625 -0.375,0.34375 -2.5625,2.40625 -0.4375,0.40625 -2.53125,2.4375 -0.40625,0.40625 -2.5,2.46875 -0.40625,0.4375 -2.46875,2.46875 -0.4375,0.4375 -2.40625,2.53125 -0.4375,0.4375 -2.375,2.53125 -0.25,0.28125 -0.15625,0.15625 -2.375,2.59375 -0.40625,0.4375 -2.34375,2.59375 -0.40625,0.4375 L -978,503 l -0.28125,0.34375 -0.0937,0.0937 -2.28125,2.65625 -0.375,0.46875 -2.5,2.96875 -35.5625,-29.6875 c -21.251,25.14417 -39.4143,52.9871 -53.8438,82.96875 l 43.25,19.875 -1.4686,3.1875 -0.25,0.5625 -1.4376,3.21875 -0.031,0.0937 -0.2188,0.46875 -1.4062,3.25 -0.25,0.5625 -1.3438,3.28125 -1.5624,3.84375 -0.2189,0.59375 -1.2811,3.3125 -0.2189,0.5625 -1.25,3.34375 -0.2188,0.5625 -1.1874,3.34375 -0.2188,0.59375 -1.1562,3.375 -0.125,0.40625 -0.063,0.15625 -1.125,3.40625 -0.1874,0.59375 -1.0938,3.40625 -0.1875,0.5625 -1.0313,3.4375 -0.1874,0.59375 -1,3.4375 -0.1563,0.59375 -0.9687,3.46875 -0.125,0.46875 -0.031,0.125 -0.9063,3.46875 -0.1562,0.625 -0.875,3.46875 -0.031,0.0937 -0.125,0.53125 -0.8438,3.5 -0.125,0.59375 -0.8125,3.53125 -0.125,0.625 -0.75,3.53125 -0.094,0.4375 -0.031,0.1875 -0.6875,3.5625 -0.125,0.59375 -0.6875,3.75 -48.125,-8.90625 c -4.7434,24.35544 -7.25,49.53814 -7.25,75.28125 0,8.10663 0.2642,16.14057 0.75,24.125 l 22.1563,-1.53125 28.0624,-2.3125 0.031,0.34375 0.031,0.28125 0.2812,3.6875 0.031,0 0.4063,4.34375 0.031,0.25 0.031,0.375 0.4688,4.28125 -0.031,0 0.4687,3.65625 0.5626,4.28125 0.094,0.625 0.5313,3.625 0.094,0.59375 0.5625,3.625 0.094,0.625 0.75,4.1875 0.6562,3.59375 0.125,0.625 0.6875,3.53125 0.031,0.1875 0.094,0.4375 0.75,3.53125 0.125,0.625 0.8125,3.53125 0.125,0.59375 0.8438,3.53125 0.1562,0.59375 0.875,3.5 0.1562,0.59375 0.9063,3.46875 0.031,0.0625 0.125,0.53125 0.9687,3.46875 0.1563,0.59375 1,3.4375 0.1874,0.59375 1.0313,3.4375 0.125,0.375 0.062,0.21875 1.0938,3.40625 0.1874,0.5625 1.125,3.40625 0.031,0.0625 0.1563,0.5 0.5,1.40625 -49,16.90625 c 10.5965,32.21863 25.2781,62.5841 43.4062,90.5 l 44.1875,-29.46875 1,1.46875 0.3437,0.5 1.9688,2.90625 0.094,0.125 0.25,0.375 2.03125,2.875 0.34375,0.46875 2.03125,2.84375 0.375,0.5 2.0625,2.8125 0.375,0.46875 2.09375,2.8125 0.375,0.46875 2.15625,2.78125 0.3125,0.40625 0.0625,0.0625 2.1875,2.75 0.375,0.4375 2.1875,2.71875 0.40625,0.46875 2.25,2.6875 0.375,0.46875 2.28125,2.65625 0.0937,0.0937 0.28125,0.34375 2.3125,2.65625 0.40625,0.4375 2.34375,2.59375 0.40625,0.46875 2.375,2.5625 0.15625,0.15625 0.25,0.28125 2.8125,2.96875 -0.0312,0.0312 2.4375,2.5 0.4375,0.4375 2.46875,2.5 0.1875,0.1875 0.21875,0.21875 2.5,2.46875 0.40625,0.40625 2.53125,2.4375 0.4375,0.40625 2.5625,2.40625 0.375,0.34375 0.0625,0.0625 2.5625,2.375 0.4375,0.40625 2.25,2 -36.25,40.3751 c 24.86466,22.6221 52.66979,42.0786 82.75,57.75 l 4.96875,-9.5313 19.9375,-39.5625 0.5,0.25 0,-0.031 0.0625,0.031 0,0.031 3.125,1.5626 0.5625,0.2812 3.71875,1.8125 3.1875,1.5 0.5625,0.2813 3.1875,1.4687 0.53125,0.2187 0.0312,0.031 3.25,1.4375 0.5625,0.25 3.25,1.4062 0.5625,0.2188 3.84375,1.5938 0,0.031 3.28125,1.3125 0,-0.031 3.875,1.5313 0.59375,0.2187 3.3125,1.2188 0.59375,0.2189 3.34375,1.2186 0.5625,0.1875 3.375,1.1562 0.59375,0.2188 3.375,1.125 0.53125,0.1562 0.0625,0.031 3.40625,1.0625 0.59375,0.1875 4,1.2187 3.4375,1 0.625,0.1876 3.4375,0.9687 0,-0.031 4.09375,1.0938 0.15625,0.031 0.4375,0.125 3.5,0.875 0.59375,0.1563 3.5,0.8125 0.625,0.1562 3.375,0.75 -12.15625,54.25 c 27.55772,6.1494 56.2138,9.375 85.625,9.375 5.06672,0 10.10498,-0.09 15.125,-0.2812 l -0.65625,-20.7188 -1.5625,-34.9374 0.4375,-0.031 0.21875,0 3.71875,-0.1563 0.15625,0 0.5,-0.031 4.34375,-0.2812 0,0.031 3.71875,-0.2812 4.34375,-0.3438 0.625,-0.062 3.6875,-0.3437 0.25,-0.031 0.375,-0.031 3.6875,-0.4061 0.625,-0.062 4.28125,-0.5313 3.625,-0.4687 0.625,-0.094 3.625,-0.5313 0.125,-0.031 0.5,-0.062 3.59375,-0.5938 0.625,-0.094 3.59375,-0.625 4.1875,-0.75 0.53125,-0.125 0.0937,0 3.5625,-0.7187 0.59375,-0.125 3.5625,-0.75 0.59375,-0.125 3.53125,-0.7813 0.625,-0.1562 3.5,-0.8125 0.59375,-0.1563 3.5,-0.875 0.4375,-0.125 0.15625,-0.031 4.09375,-1.0939 0,0.031 3.4375,-0.9686 0.625,-0.1876 3.4375,-1 0.59375,-0.1562 0.90625,-0.2812 16.15625,53.0624 c 32.66879,-10.0167 63.52461,-24.1879 91.9375,-41.9062 l -28.78125,-46.7188 2.1875,-1.3437 0.53125,-0.3437 2.96875,-1.875 0.5,-0.3126 2.9375,-1.9062 0.5,-0.3438 2.9375,-1.9374 0.5,-0.3438 2.875,-1.9688 0.0625,-0.031 0.4375,-0.3125 2.875,-2.0313 0.5,-0.3437 2.84375,-2.0625 0.40625,-0.2812 0.0625,-0.063 2.8125,-2.0937 3.28125,-2.4688 0.46875,-0.375 2.78125,-2.125 0.46875,-0.375 2.75,-2.1875 0.0625,-0.0625 0.40625,-0.3125 2.71875,-2.21875 0.4375,-0.375 2.71875,-2.25 0.40625,-0.34375 0.0312,-0.0312 2.65625,-2.28125 0.1875,-0.1875 0.28125,-0.21875 2.625,-2.3125 0.4375,-0.375 2.625,-2.34375 0.4375,-0.40625 2.5625,-2.375 0.0625,-0.0625 0.375,-0.34375 2.5625,-2.40625 0.4375,-0.40625 2.53125,-2.4375 0.40625,-0.40625 2.5,-2.46875 0.21875,-0.21875 0.1875,-0.1875 2.46875,-2.5 0.4375,-0.4375 1.5,-1.5625 38.8125,37.4688 c 22.99636,-24.3893 42.89051,-51.74018 59.0625,-81.4063 L -422,893.40625 l 0.125,-0.1875 0.21875,-0.375 0.0625,-0.125 1.6875,-3.09375 1.96875,-3.65625 0.15625,-0.28125 0.125,-0.25 1.625,-3.125 0.28125,-0.53125 1.59375,-3.15625 0.25,-0.53125 1.5625,-3.1875 0.25,-0.53125 1.53125,-3.1875 0.25,-0.5625 1.46875,-3.21875 0.25,-0.5625 1.4375,-3.21875 0.0312,-0.0937 0.21875,-0.46875 1.40625,-3.25 0.25,-0.5625 1.34375,-3.28125 1.5625,-3.84375 0.21875,-0.59375 1.28125,-3.3125 0.21875,-0.5625 1.25,-3.3125 0.0937,-0.28125 0.125,-0.3125 1.1875,-3.34375 0.21875,-0.59375 1.15625,-3.375 0.15625,-0.46875 0.0312,-0.0937 1.125,-3.40625 0.1875,-0.5625 L -394,828.5 l 0.0625,-0.21875 0.125,-0.375 1.03125,-3.4375 0.1875,-0.59375 1,-3.4375 0.15625,-0.59375 0.96875,-3.46875 0.15625,-0.59375 0.78125,-2.96875 49.6875,13.125 c 7.35353,-29.98057 11.28125,-61.31443 11.28125,-93.5625 0,-22.18523 -1.8601,-43.94709 -5.40625,-65.125 l -6.71875,1 -41.78125,6.65625 -0.0937,-0.625 -0.5625,-3.625 -0.0937,-0.625 -0.625,-3.5625 -0.125,-0.625 -0.65625,-3.59375 -0.125,-0.59375 -0.6875,-3.5625 -0.0312,-0.1875 -0.0937,-0.4375 -0.75,-3.53125 -0.125,-0.625 -0.8125,-3.53125 -0.125,-0.59375 -0.84375,-3.5 -0.125,-0.53125 -0.0312,-0.0937 -0.875,-3.46875 -0.15625,-0.625 -0.90625,-3.46875 -0.0312,-0.125 -0.125,-0.46875 -0.96875,-3.46875 -0.15625,-0.59375 -1,-3.4375 -0.1875,-0.59375 -1.03125,-3.4375 -0.1875,-0.5625 -1.09375,-3.40625 -0.1875,-0.59375 -1.125,-3.40625 -0.0625,-0.15625 -0.125,-0.40625 -1.15625,-3.375 -0.21875,-0.59375 -1.1875,-3.34375 -0.21875,-0.5625 -1.25,-3.34375 -0.21875,-0.5625 -1.28125,-3.3125 -0.21875,-0.59375 -1.5625,-3.84375 -1.34375,-3.28125 -0.25,-0.5625 -1.0625,-2.4375 43.8125,-18.84375 c -13.6513,-30.4002 -31.06644,-58.74756 -51.65625,-84.4375 l -36.6875,28.46875 -0.0937,-0.0937 -0.375,-0.5 -2.1875,-2.71875 -0.0937,-0.0937 -0.28125,-0.375 -2.1875,-2.71875 -0.40625,-0.46875 -2.25,-2.6875 -0.375,-0.46875 -2.28125,-2.65625 -0.0937,-0.0937 L -462,503 l -2.3125,-2.65625 -0.40625,-0.4375 -2.34375,-2.59375 -0.40625,-0.4375 -2.375,-2.59375 L -470,494.125 l -0.25,-0.28125 -2.375,-2.53125 -0.4375,-0.4375 -2.40625,-2.53125 -0.4375,-0.4375 -2.46875,-2.46875 -0.40625,-0.4375 -2.5,-2.46875 -0.40625,-0.40625 -2.53125,-2.4375 -0.4375,-0.40625 -2.5625,-2.40625 -0.375,-0.34375 -0.0625,-0.0625 -2.5625,-2.375 -0.4375,-0.40625 -2.625,-2.34375 -0.4375,-0.375 -2.625,-2.3125 -0.28125,-0.21875 -0.1875,-0.1875 -2.65625,-2.28125 -0.0312,-0.0312 -0.40625,-0.34375 -2.71875,-2.25 -0.4375,-0.375 -2.71875,-2.21875 -0.28125,-0.21875 -0.1875,-0.15625 -2.75,-2.1875 -0.46875,-0.34375 -2.78125,-2.15625 -0.46875,-0.375 27.4375,-36.21875 c -26.18134,-19.64939 -54.87626,-36.09429 -85.5625,-48.75 l -17.1875,41.3125 -3.21875,-1.34375 -3.28125,-1.3125 -0.3125,-0.125 -0.25,-0.0937 -3.3125,-1.28125 -0.59375,-0.21875 -3.3125,-1.25 -0.28125,-0.0937 -0.3125,-0.125 -3.34375,-1.21875 -0.5625,-0.1875 -3.375,-1.15625 -0.59375,-0.21875 -3.375,-1.125 -0.53125,-0.15625 -0.0625,-0.0312 -3.40625,-1.0625 -0.59375,-0.1875 -3.40625,-1.03125 -0.59375,-0.1875 -3.4375,-1 -0.625,-0.1875 -3.4375,-0.9375 -0.59375,-0.15625 -3.5,-0.9375 -0.0937,-0.0312 -0.5,-0.125 -4.09375,-1 -3.5,-0.84375 -0.625,-0.15625 -3.53125,-0.78125 -0.59375,-0.125 -3.5625,-0.75 -0.59375,-0.125 -3.5625,-0.71875 -0.0937,0 -0.53125,-0.125 -4.1875,-0.75 -3.59375,-0.625 -0.625,-0.0937 -3.59375,-0.59375 -0.375,-0.0625 -0.25,-0.0312 -3.96875,-0.5625 6.40625,-43.875 c -17.7102,-2.45268 -35.80292,-3.7191 -54.18765,-3.7191 z m -2.71875,282.71875 c 18.24386,-0.41115 36.52456,4.77847 52.1875,13.875 35.61197,20.1637 56.43986,61.98996 53.28125,102.4375 -2.11172,38.4308 -25.85332,75.0508 -60.96875,91.34375 -31.64018,15.68923 -70.83563,12.15865 -99.90625,-7.6875 -37.08824,-24.05279 -54.52022,-72.1067 -45.25,-114.8125 8.53705,-46.9531 52.71562,-84.97833 100.65625,-85.15625 z"
+         style="fill:#c5c5c5;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         id="path3608"
+         d="m -720.3125,423.71875 c -2.14114,0.003 -4.29494,0.0416 -6.4375,0.0937 -92.77539,0.9057 -183.54225,48.46781 -238.1875,123.375 -51.4332,69.09779 -72.0894,160.54087 -55.0937,244.96875 15.5782,80.98865 64.5569,154.96425 133.81245,199.6875 58.29118,38.2162 130.18928,55.5604 199.5,47.1875 77.64477,-8.9068 151.44437,-49.42825 200.375,-110.6875 51.48409,-63.21341 76.4141,-146.95083 67.65625,-227.8125 -8.23411,-83.0141 -51.16656,-162.02417 -117.46875,-213 -52.28847,-40.71897 -117.78099,-63.91827 -184.15625,-63.8125 z m -2.40625,199.9375 c 18.24386,-0.41115 36.52456,4.77847 52.1875,13.875 35.61197,20.1637 56.43986,61.98996 53.28125,102.4375 -2.11172,38.4308 -25.85332,75.0508 -60.96875,91.34375 -31.64018,15.68923 -70.83563,12.15865 -99.90625,-7.6875 -37.08824,-24.05279 -54.52022,-72.1067 -45.25,-114.8125 8.53705,-46.9531 52.71562,-84.97833 100.65625,-85.15625 z"
+         style="fill:#b4b4b4;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       style="fill:#828a95;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m -542.85714,469.50504 -348.57143,448.57143 25.71428,20 348.57143,-448.57143 48.57143,-8.57143 62.85714,-94.28571 -60,-42.85714 -85.71428,80 8.57143,45.71428 z"
+       id="path3590"
+       inkscape:export-filename="/Users/andersbr/Documents/coop/art/web/admin_tools.png"
+       inkscape:export-xdpi="5.6116552"
+       inkscape:export-ydpi="5.6116552" />
+    <path
+       style="fill:#828a95;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m -998.22132,407.25798 57.352,67.78995 -18.25223,88.66188 -91.26125,20.85155 -70.4056,-86.02589 c 0,0 -28.3225,88.26556 23.4632,138.18736 55.8354,53.82589 156.45181,20.85563 164.27419,20.85563 l 388.51193,380.69364 c 0,0 62.59539,65.1784 112.13718,7.8142 49.54179,-57.36421 -13.06175,-101.67066 -13.06175,-101.67066 L -870.46782,594.99121 c 0,0 49.54585,-86.04218 -10.42578,-151.22876 -29.37493,-30.59482 -74.81067,-55.46566 -117.32772,-36.50447 z m 513.65795,542.34814 c 27.36117,0 49.53771,22.20506 49.53771,49.56623 0,27.36115 -22.17654,49.53765 -49.53771,49.53765 -27.36117,0 -49.53771,-22.1765 -49.53771,-49.53765 0,-27.36117 22.17654,-49.56623 49.53771,-49.56623 z"
+       id="path3594"
+       sodipodi:nodetypes="cccccsccscccccsssc"
+       inkscape:export-filename="/Users/andersbr/Documents/coop/art/web/admin_tools.png"
+       inkscape:export-xdpi="5.6116552"
+       inkscape:export-ydpi="5.6116552" />
+    <path
+       style="fill:#780c00;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m -708.12573,619.67525 89.01921,89.69143 -19.95761,49.50427 c 0,0 -20.79262,-19.59574 -46.06669,0.55668 -25.27405,20.15242 -5.44173,48.26566 -5.44173,48.26566 L -909.04847,1087.837 c 0,0 -50.5481,40.3049 -98.45183,6.1515 -47.9038,-34.1534 -32.9843,-89.9762 -32.9843,-89.9762 l 227.31348,-282.0226 c 0,0 29.95029,14.87774 46.70689,-6.23499 16.75659,-21.11273 6.18987,-61.57884 6.18987,-61.57884 l 52.14863,-34.50062 z"
+       id="path3592"
+       sodipodi:nodetypes="cccsccsccscc"
+       inkscape:export-filename="/Users/andersbr/Documents/coop/art/web/admin_tools.png"
+       inkscape:export-xdpi="5.6116552"
+       inkscape:export-ydpi="5.6116552" />
+  </g>
+</svg>
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/monitor.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/monitor.png
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/monitor.png	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/monitor.png	(revision 48157)

Property changes on: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/monitor.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/d-netLogo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/d-netLogo.png
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/d-netLogo.png	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/d-netLogo.png	(revision 48157)

Property changes on: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/images/d-netLogo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/index.html
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/index.html	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/index.html	(revision 48157)
@@ -0,0 +1,15 @@
+<table style="width :100%">
+	<tr><td style="text-align:center; width:100%"><a href="http://www.d-net.research-infrastructures.eu/"><img src='images/d-netLogo.png'/></a></td></tr>
+</table>
+<table style="width :100%">
+	<tr>
+		<td style="text-align:center"><a href="mvc/inspector"><img src='images/admin.svg' style="width:200px" /> </a></td>
+		<td style="text-align:center"><a href="mvc/ui/index.do"><img src='images/User.png' style="width:200px"/> </a></td>
+		<td style="text-align:center"><a href="monitoring"><img src='images/monitor.png' style="width:200px"/> </a></td>	
+	</tr>
+	<tr>
+		<td style="text-align:center">if this container runs the IS, you can access the web interface <a href="mvc/inspector">here</a><br/></img></td>
+		<td style="text-align:center">if this container runs the user interfaces, you can access them <a href="mvc/ui/index.do">here</a><br/></img></td>
+		<td style="text-align:center">if this container is monitored, you can access the monitoring web interface <a href="monitoring">here</a></td>	
+	</tr>
+</table>
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/web.xml
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/web.xml	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/web.xml	(revision 48157)
@@ -0,0 +1,59 @@
+<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">
+	<display-name>DNet-2.0 container web app</display-name>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>/WEB-INF/applicationContext.xml</param-value>
+	</context-param>
+	<filter>
+		<filter-name>springSecurityFilterChain</filter-name>
+		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+	</filter>
+	<filter>
+		<filter-name>encodingFilter</filter-name>
+		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>UTF-8</param-value>
+		</init-param>
+		<init-param>
+			<param-name>forceEncoding</param-name>
+			<param-value>true</param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>encodingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<filter-mapping>
+		<filter-name>springSecurityFilterChain</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+
+
+
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	<servlet>
+		<servlet-name>CXFServlet</servlet-name>
+		<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet>
+		<servlet-name>dispatcher</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>dispatcher</servlet-name>
+		<url-pattern>/mvc/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>CXFServlet</servlet-name>
+		<url-pattern>/services/*</url-pattern>
+	</servlet-mapping>
+</web-app>
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/applicationContext.xml
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/applicationContext.xml	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/applicationContext.xml	(revision 48157)
@@ -0,0 +1,23 @@
+<?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:p="http://www.springframework.org/schema/p"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:cxf="http://cxf.apache.org/core"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context.xsd
+           http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
+
+	<import resource="classpath:META-INF/cxf/cxf.xml" />
+	<import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" />
+	<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+	<import resource="classpath*:/eu/dnetlib/**/applicationContext*.xml" />
+
+	<context:annotation-config />
+	<!-- if the following import is not the last one, something overrides bus 
+		configuration disabling logging and any other customized feature. -->
+	<import resource="./cxf.xml" />
+
+</beans>
\ No newline at end of file
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/dispatcher-servlet.xml
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/dispatcher-servlet.xml	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/dispatcher-servlet.xml	(revision 48157)
@@ -0,0 +1,25 @@
+<?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:p="http://www.springframework.org/schema/p"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/mvc
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<mvc:annotation-driven />
+
+	<context:component-scan base-package="eu.dnetlib"/>
+
+	<import resource="classpath*:/eu/dnetlib/**/webContext*.xml" />
+
+	<bean id="beanHandlerMapping" p:order="1"
+		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping" />
+	
+	<bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter" />
+	
+	<mvc:resources mapping="/resources/**" location="classpath:/eu/dnetlib/web/resources/" />
+
+</beans>
Index: webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/cxf.xml
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/cxf.xml	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/src/main/webapp/WEB-INF/cxf.xml	(revision 48157)
@@ -0,0 +1,55 @@
+<?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:cxf="http://cxf.apache.org/core"
+	xmlns:http="http://cxf.apache.org/transports/http/configuration"
+	xmlns:wsa="http://cxf.apache.org/ws/addressing" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:pol="http://cxf.apache.org/policy" xmlns:condbean="http://dnetlib.eu/springbeans/condbean"
+	xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/ws/addressing http://cxf.apache.org/schemas/ws-addr-conf.xsd
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+http://dnetlib.eu/springbeans/condbean http://dnetlib.eu/springbeans/condbean.xsd">
+
+<!-- CXF bus with logging. Please set the log level of org.apache.cxf.interceptor to FATAL to hide the logging of EVERY incoming and outgoing messages. -->
+	<cxf:bus>
+		<cxf:outInterceptors>
+			<ref bean="outCxfLoggingInterceptor" />
+		</cxf:outInterceptors>
+		<cxf:inInterceptors>
+			<ref bean="inCxfLoggingInterceptor" />
+		</cxf:inInterceptors>
+	</cxf:bus>
+
+	<bean id="outCxfLoggingInterceptor" class="org.apache.cxf.interceptor.LoggingOutInterceptor" />
+	<bean id="inCxfLoggingInterceptor" class="org.apache.cxf.interceptor.LoggingInInterceptor" />
+
+
+	<!-- <cxf:bus> -->
+		<!--		<cxf:inInterceptors>-->
+		<!--
+			<bean id="logInbound"
+			class="org.apache.cxf.interceptor.LoggingInInterceptor" />
+		-->
+		<!--
+			<bean id="logOutbound"
+			class="org.apache.cxf.interceptor.LoggingOutInterceptor" />
+		-->
+		<!--			</condbean:cond>-->
+		<!--		</cxf:inInterceptors>-->
+
+<!-- 		<cxf:features> -->
+<!--			 <wsa:addressing />-->
+
+<!--			<cxf:logging />-->
+
+			<!--  <pol:policies ignoreUnknownAssertions="true"/> -->
+<!-- 		</cxf:features> -->
+<!-- 	</cxf:bus> -->
+
+
+	<http:conduit name="*.http-conduit">
+		<http:client AllowChunking="true" Connection="Keep-Alive" />
+	</http:conduit>
+</beans>
Index: webapps/dnet-container-openaireplus/branches/beta/pom.xml
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta/pom.xml	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta/pom.xml	(revision 48157)
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<groupId>eu.dnetlib</groupId>
+		<artifactId>dnet-container-parent</artifactId>
+		<version>1.0.0</version>
+		<relativePath></relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>eu.dnetlib</groupId>
+	<artifactId>dnet-container-openaireplus</artifactId>
+	<packaging>war</packaging>
+	<version>4.0.0-BETA-SNAPSHOT</version>
+	<scm>
+		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet40/webapps/dnet-container-openaireplus/branches/beta</developerConnection>
+	</scm>
+	<dependencies>
+
+		<!-- Common components in every container -->
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>cnr-log4j-inspector</artifactId>
+			<version>[1.0.0,2.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-schemas</artifactId>
+			<version>[1.0.0,2.0.0)</version>
+		</dependency>
+
+		<!-- Common services in every container -->
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>cnr-enabling-hnm-service</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>cnr-enabling-hcm-service</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+		</dependency>
+
+		<!-- Enabling services service -->
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>cnr-enabling-services</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+			<exclusions>
+				<exclusion>
+					<groupId>apache</groupId>
+					<artifactId>commons-pool</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>cnr-enabling-inspector</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>cnr-resultset-inspector</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+		</dependency>
+
+		<!-- Manager Service Resource Orchestration (required for workflows) -->
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-msro-service</artifactId>
+			<version>[3.0.0,4.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-mongo-logging</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+		</dependency>
+
+		<!-- Modular User Interfaces -->
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-modular-ui</artifactId>
+			<version>[3.0.0,4.0.0)</version>
+		</dependency>
+		
+		<dependency>
+		  <groupId>eu.dnetlib</groupId>
+		  <artifactId>dnet-objectStore-ui</artifactId>
+		  <version>[1.0.0,2.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-modular-workflows-ui</artifactId>
+			<version>[4.0.0,5.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-modular-is-ui</artifactId>
+			<version>[2.0.1,3.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-modular-repositories-ui</artifactId>
+			<version>[4.0.0,5.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-modular-oai-explorer-ui</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-oai-modular-ui</artifactId>
+			<version>[3.0.0,4.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-modular-vocabularies-ui</artifactId>
+			<version>[2.0.1,3.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-modular-cleaning-rules-ui</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-modular-database-ui</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-modular-index-ui</artifactId>
+			<version>[2.0.1,3.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-openaire-blacklist</artifactId>
+			<version>[1.0.0,2.0.0)</version>
+		</dependency>
+
+		<!-- Aggregation services -->
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>cnr-mongo-mdstore</artifactId>
+			<version>[5.0.0,6.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-modular-collector-service</artifactId>
+			<version>[3.0.0,4.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-fs-objectstore</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-data-transformation-service</artifactId>
+			<version>[3.0.0,4.0.0)</version>
+		</dependency>
+
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>cnr-enabling-database-service</artifactId>
+			<version>[3.0.0,4.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-openaireplus-profiles</artifactId>
+			<version>[1.0.0,2.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>cnr-data-utility-cleaner-service</artifactId>
+			<version>[3.0.0,4.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-openaireplus-workflows</artifactId>
+			<version>[6.0.0,7.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-validator-workflows</artifactId>
+			<version>[1.0.0,2.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-deduplication</artifactId>
+			<version>[1.0.0,2.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-hadoop-service</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.jruby</groupId>
+					<artifactId>jruby-complete</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-actionmanager-service</artifactId>
+			<version>[5.0.0,6.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-download-service</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-download-plugins</artifactId>
+			<version>[2.0.0,3.0.0)</version>
+		</dependency>
+
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>cnr-inspector-security</artifactId>
+			<version>[1.0.0,2.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-webapp-monitoring</artifactId>
+			<version>[1.0.0,2.0.0)</version>
+		</dependency>
+
+		<!-- Light-ui for pre-public check -->
+		<!-- 		<dependency> -->
+		<!-- 			<groupId>eu.dnetlib</groupId> -->
+		<!-- 			<artifactId>dnet-modular-lightui-ui</artifactId> -->
+		<!-- 			<version>[2.0.0,3.0.0)</version> -->
+		<!-- 		</dependency> -->
+
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.11.0</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>dnet-mapreduce-jobs</artifactId>
+			<version>[0.0.9.8,1.0.0)</version>
+		</dependency>
+
+	</dependencies>
+</project>
Index: webapps/dnet-container-openaireplus/branches/beta
===================================================================
--- webapps/dnet-container-openaireplus/branches/beta	(nonexistent)
+++ webapps/dnet-container-openaireplus/branches/beta	(revision 48157)

Property changes on: webapps/dnet-container-openaireplus/branches/beta
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,12 ##
+bin
+derby.log
+target
+logs
+.project
+.settings
+.classpath
+integration.xml
+
+*.iml
+
+.idea
