diff --git a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg index 099de0aa9..0e6a545fb 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg +++ b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg @@ -31,13 +31,13 @@ ccm-cms-types-formsectionitem # -- ccm-cms-types-inlinesite # -- ccm-cms-types-job # -- ccm-cms-types-legalnotice -ccm-cms-types-member +# ccm-cms-types-member # -- ccm-cms-types-minutes # -- ccm-cms-types-motditem - ccm-cms-types-mparticle ccm-cms-types-newsitem # -- ccm-cms-types-organization +ccm-cms-types-person # -- ccm-cms-types-pressrelease # -- ccm-cms-types-researchnetwork # -- ccm-cms-types-service @@ -45,8 +45,6 @@ ccm-cms-types-siteproxy # -- xmlfeed wird moeglicherweise ebenfalls nicht gebraucht ccm-cms-types-xmlfeed -ccm-sci-types-organization - # Applications # ------------ # -- ccm-auth-http @@ -80,7 +78,9 @@ ccm-ldn-util # sci extensions # -------------- -#ccm-sci-publications +ccm-cms-dabinimporter +ccm-sci-publications +ccm-sci-types-organization # integration layer ccm-zes-aplaws diff --git a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties index 174ebb6ae..2ca750031 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties +++ b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties @@ -95,7 +95,9 @@ com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl x ; ============================================================================================= ; devel specific configurations + waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes-test?user\=zes&password\=zes47web +; waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes-testupd?user\=zes&password\=zes47web waf.runtime.jdbc_pool_size=80 waf.web.server=localhost\:8080 diff --git a/environment/project.xml.zes b/environment/project.xml.zes index 81a927e7d..2993c16a8 100644 --- a/environment/project.xml.zes +++ b/environment/project.xml.zes @@ -7,8 +7,8 @@ ccmVersion="6.1" name="aplaws-zes" prettyName="APLAWS plus" - version="1-1-0" - release="beta-1" + version="1-1-1" + release="beta-2" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> @@ -49,9 +49,7 @@ - - - + @@ -59,6 +57,7 @@ + @@ -66,14 +65,12 @@ - - + @@ -86,9 +83,9 @@ - + - + @@ -102,6 +99,8 @@ + +