diff --git a/portal-module-dependency.properties b/portal-module-dependency.properties index 5444cf9a..2494ca46 100644 --- a/portal-module-dependency.properties +++ b/portal-module-dependency.properties @@ -8,12 +8,11 @@ #Add modules as dependency to other modules petra.modules=petra-concurrent,petra-content,petra-encryptor,petra-executor,petra-function,petra-io,petra-lang,petra-log4j,petra-mail,petra-memory,petra-nio,petra-process,petra-reflect,petra-string,petra-xml -portal.module.dependencies=portal-kernel,portal-test,portal-test-integration,registry-api +portal.module.dependencies=portal-kernel,portal-test,registry-api portal-impl=portal-kernel,registry-api,util-bridges,util-java,util-taglib portal-kernel=registry-api portal-test=portal-kernel,registry-api -portal-test-integration=portal-impl,portal-kernel,registry-api,util-java support-tomcat=portal-kernel util-bridges=portal-kernel util-java=portal-kernel,portal-test diff --git a/src/resources/project_properties.ftl b/src/resources/project_properties.ftl index 2b5334e4..1f3c4cca 100644 --- a/src/resources/project_properties.ftl +++ b/src/resources/project_properties.ftl @@ -79,10 +79,6 @@ src.${module.getModuleName()}.src.dir=${"$"}{file.reference.${module.getModuleNa file.reference.${module.getModuleName()}-resources=${module.getSourceResourcePath()} src.${module.getModuleName()}.resources.dir=${"$"}{file.reference.${module.getModuleName()}-resources} -<#if module.getModuleName() == "portal-impl"> -file.reference.portal-test-integration-src=${portalPath}/portal-test-integration/src -src.test.dir=${"$"}{file.reference.portal-test-integration-src} - <#if module.getModuleName() == "portal-kernel"> file.reference.portal-test-src=${portalPath}/portal-test/src src.test.dir=${"$"}{file.reference.portal-test-src} diff --git a/src/resources/project_xml.ftl b/src/resources/project_xml.ftl index 3ed23e8c..17af2bc5 100644 --- a/src/resources/project_xml.ftl +++ b/src/resources/project_xml.ftl @@ -14,9 +14,6 @@ <#if module.getJspPath()??> - <#if module.getModuleName() == "portal-impl"> - - <#if module.getModuleName() == "portal-kernel">