diff --git a/ccm-cms-types-researchnetwork/application.xml b/ccm-cms-types-researchnetwork/application.xml index 2d1d3e33d..76d90acea 100644 --- a/ccm-cms-types-researchnetwork/application.xml +++ b/ccm-cms-types-researchnetwork/application.xml @@ -7,7 +7,6 @@ - @@ -20,4 +19,4 @@ Content type for representing a research network. - \ No newline at end of file + diff --git a/ccm-core/src/com/arsdigita/kernel/permissions/PrivilegeDescriptor.java b/ccm-core/src/com/arsdigita/kernel/permissions/PrivilegeDescriptor.java index 195b80bfa..f65869ca9 100755 --- a/ccm-core/src/com/arsdigita/kernel/permissions/PrivilegeDescriptor.java +++ b/ccm-core/src/com/arsdigita/kernel/permissions/PrivilegeDescriptor.java @@ -107,7 +107,7 @@ public class PrivilegeDescriptor { priv.set("privilege", name); priv.save(); addChildPrivilege(ADMIN_NAME, name); - s_log.warn(String.format("Creating privilege %s...", name)); + s_log.debug(String.format("Creating privilege %s...", name)); // Constructor PrivilegeDescriptor is deprecated and should be // replaced by the class method get(name), // but this does not work under all circumstances. Further diff --git a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg index 43a985509..5f6f0fc6f 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg +++ b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg @@ -7,7 +7,6 @@ ccm-cms-assets-fileattachment ccm-cms-assets-imagestep ccm-cms-assets-notes ccm-cms-assets-relatedlink -ccm-cms-assets-imagestep # Content types ccm-cms-types-address @@ -32,17 +31,20 @@ ccm-cms-types-formsectionitem # -- ccm-cms-types-inlinesite # -- ccm-cms-types-job # -- ccm-cms-types-legalnotice +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-pressrelease +# -- ccm-cms-types-researchnetwork # -- ccm-cms-types-service ccm-cms-types-siteproxy # -- xmlfeed wird moeglicherweise ebenfalls nicht gebraucht ccm-cms-types-xmlfeed +ccm-sci-types-organization # Applications # ------------ @@ -75,6 +77,9 @@ ccm-ldn-terms ccm-ldn-theme ccm-ldn-util +# sci extensions +# -------------- +ccm-sci-publications # 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 96333eba4..174ebb6ae 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties +++ b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties @@ -95,7 +95,7 @@ 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?user\=zes&password\=zes47web +waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes-test?user\=zes&password\=zes47web waf.runtime.jdbc_pool_size=80 waf.web.server=localhost\:8080 @@ -107,6 +107,6 @@ waf.admin.password=nge2015 waf.admin.password.question=12345 waf.admin.password.answer=6 -; waf.debug=true -; waf.bebop.fancy_xsl_errors=true +waf.debug=true +waf.bebop.fancy_xsl_errors=true diff --git a/environment/project.xml.zes b/environment/project.xml.zes index 1373530cd..286ae08f9 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-0-9" - release="rc-3" + version="1-1-0" + release="beta-1" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> @@ -49,25 +49,24 @@ + + + + + + - - - - - - - - + @@ -103,6 +102,7 @@ +