diff --git a/dnet-core-components/src/main/resources/eu/dnetlib/applicationContext-properties.xml b/dnet-core-components/src/main/resources/eu/dnetlib/applicationContext-properties.xml
new file mode 100644
index 0000000..3fbe49b
--- /dev/null
+++ b/dnet-core-components/src/main/resources/eu/dnetlib/applicationContext-properties.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<import resource="classpath:/eu/dnetlib/cnr-common-properties.xml" />
+
+</beans>
diff --git a/dnet-core-components/src/main/resources/eu/dnetlib/cnr-common-properties.xml b/dnet-core-components/src/main/resources/eu/dnetlib/cnr-common-properties.xml
new file mode 100644
index 0000000..b8d2f5f
--- /dev/null
+++ b/dnet-core-components/src/main/resources/eu/dnetlib/cnr-common-properties.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p" xmlns="http://www.springframework.org/schema/beans"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="propertyLocations" class="eu.dnetlib.conf.WebappContextPropertyLocationFactory">
+        <property name="locations">
+            <list>
+                <value>classpath*:eu/dnetlib/**/applicationContext-*.properties</value>
+
+                <!-- this stuff should gradually disappear -->
+                <value>classpath*:eu/dnetlib/cnr-default.properties</value>
+                <value>classpath*:eu/dnetlib/cnr-site.properties</value>
+                <value>classpath*:cnr-override.properties</value>
+
+                <!-- this stuff will be moved into a common place -->
+                <value>classpath*:eu/dnetlib/dnet-default.properties</value>
+
+                <value>classpath*:dnet-site-override.properties</value>
+
+                <value>classpath*:dnet-wizard.properties</value>
+                <value>classpath*:dnet-override.properties</value>
+
+                <value>classpath*:dnet-@{webapp}-override.properties</value>
+
+                <value>classpath*:dnet-site-force-override.properties</value>
+                <value>classpath*:dnet-force-override.properties</value>
+
+                <value>classpath*:dnet-@{webapp}-force-override.properties</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="propertyFetcher" class="eu.dnetlib.conf.PropertyFetcher"
+          p:locations-ref="propertyLocations"/>
+
+
+    <bean id="propertyConfigurer"
+          class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
+          p:ignoreResourceNotFound="true" p:localOverride="true"
+          p:locations-ref="propertyLocations">
+        <property name="properties">
+            <bean class="eu.dnetlib.conf.WebappContextProperyFactory"
+                  p:propertyFetcher-ref="propertyFetcher"/>
+        </property>
+    </bean>
+</beans>
diff --git a/dnet-core-components/src/main/resources/eu/dnetlib/cnr-default.properties b/dnet-core-components/src/main/resources/eu/dnetlib/cnr-default.properties
new file mode 100644
index 0000000..61d5026
--- /dev/null
+++ b/dnet-core-components/src/main/resources/eu/dnetlib/cnr-default.properties
@@ -0,0 +1,89 @@
+# you may need to override this
+infrastructure.name = development
+container.hostname = localhost
+
+# normally this are less likely to be overriden
+
+transport.soap.baseAddress = http://${container.hostname}:${container.port}/${container.context}/services
+
+container.logging = 1
+inspector.template.cache.enabled = false
+
+dnet.data.path = ${java.io.tmpdir}/dnet
+services.is.sn.data.path = ${dnet.data.path}/issn
+services.is.store.data.path = ${dnet.data.path}/isstore
+services.resultset.data.path = ${dnet.data.path}/resultset
+
+services.is.sn.subscription.db.driver = org.apache.derby.jdbc.EmbeddedDriver
+services.is.sn.subscription.db.dialect = org.hibernate.dialect.DerbyDialect
+services.is.sn.subscription.db.url = jdbc:derby:${services.is.sn.data.path}/subscriptions;create=true
+
+services.registration.delay = 6700
+services.registration.default.hnmlocator = nullHNMLocator
+
+oai.publisher.data.path = ${dnet.data.path}/oai_publisher
+oai.publisher.baseUrl = http://localhost:8081/servlet/oai
+
+services.is.store.bulk.validation = true
+
+# for development temporary exist database is preferred
+
+services.is.store.database.bean = temporaryExistDatabase
+#services.is.store.database.bean = persistentExistDatabase
+
+
+services.is.ui.munin.baseUrl = http://munin.isti.cnr.it/by-id/
+services.is.ui.smokeping.baseUrl = http://smokeping.isti.cnr.it/by-id/
+
+# obtain a key from GoogleMap API. Leave blank for localhost
+services.is.ui.google.maps.key =
+
+# put here the url pointed by the logo on top of each UI page (both IS UI and Repo UI)
+services.is.ui.logo.image.href = #
+
+# put here the url pointed by the logo on top of each Repo UI page
+services.is.ui.repo.logo.image.href = ${services.is.ui.logo.image.href}
+services.is.ui.repo.logo.image = driverLogoSmall.png
+
+# put here the url pointed by the logo on top of each IS UI page
+services.is.ui.infra.logo.image.href = ${services.is.ui.logo.image.href}
+services.is.ui.infra.logo.image = driverLogoSmall.png
+
+
+services.is.ui.admin.user = admin
+services.is.ui.admin.password = driver
+services.is.ui.data.path = ${dnet.data.path}/isui
+services.is.ui.workflow.db.driver = org.apache.derby.jdbc.EmbeddedDriver
+services.is.ui.workflow.db.url = jdbc:derby:${services.is.ui.data.path}/rules;create=true
+services.is.ui.workflow.db.dialect = org.hibernate.dialect.DerbyDialect
+services.is.ui.smtp.host = localhost
+services.is.ui.smtp.port = 25
+services.is.ui.smtp.auth = false
+services.is.ui.smtp.user =
+services.is.ui.smtp.password =
+services.is.ui.smtp.from =
+services.is.ui.smtp.to =
+services.is.ui.metadata.harv.format = oai_dc
+services.is.ui.metadata.aggr.format = DMF
+services.is.ui.metadata.indexed.format = DMF
+
+
+services.aggregator.name=Aggregator TEST
+services.aggregator.host=driver33.isti.cnr.it
+services.aggregator.port=9000
+services.aggregator.country=DE
+services.aggregator.ui.address=http://${services.aggregator.host}:${services.aggregator.port}/cgi-bin/ASmanager.pl
+services.aggregator.ws.endpoint=http://${services.aggregator.host}:${services.aggregator.port}/cgi-bin/SoapDriver.cgi
+
+
+services.msro.process.image.baseurl=http://${container.hostname}:${container.port}/${container.context}/mvc/inspector/msroProcessImage.do?pid=
+
+services.schemas=classpath*:/eu/dnetlib/test/schemas/**/*.xsd
+
+
+# Properties for OAI Publisher
+services.oai.publisher.doroty = 
+services.oai.publisher.driver = 1
+services.oai.publisher.layout = oai
+services.oai.publisher.layout.defaultQuery = Textual
+services.oai.publisher.layout.indexedDate = oaiDate
diff --git a/dnet-core-components/src/main/resources/eu/dnetlib/webContext-properties.xml b/dnet-core-components/src/main/resources/eu/dnetlib/webContext-properties.xml
new file mode 100644
index 0000000..3fbe49b
--- /dev/null
+++ b/dnet-core-components/src/main/resources/eu/dnetlib/webContext-properties.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<import resource="classpath:/eu/dnetlib/cnr-common-properties.xml" />
+
+</beans>