Remove portal-test,portal-test-integration

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

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>
-<#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>
 <#if module.getModuleName() == "portal-kernel">
 file.reference.portal-test-src=${portalPath}/portal-test/src
 src.test.dir=${"$"}{file.reference.portal-test-src}

src/resources/project_xml.ftl

@@ -14,9 +14,6 @@
 				<#if module.getJspPath()??>
 					<root id="src.${module.getModuleName()}.jsp.dir" name="jsp-src"/>
 				</#if>
-				<#if module.getModuleName() == "portal-impl">
-					<root id="src.test.dir" name="portal-test-integration"/>
-				</#if>
 				<#if module.getModuleName() == "portal-kernel">
 					<root id="src.test.dir" name="portal-test"/>
 				</#if>