[portal-commits] JBoss Portal SVN: r8418 - in modules: portlet/trunk/tools/etc/buildfragments and 2 other directories.

Author: thomas.heute(a)jboss.com Date: 2007-09-21 12:05:00 -0400 (Fri, 21 Sep 2007) New Revision: 8418 Modified: modules/identity/trunk/tools/etc/buildfragments/defaults.ent modules/portlet/trunk/tools/etc/buildfragments/defaults.ent modules/test/trunk/tools/etc/buildfragments/defaults.ent modules/web/trunk/tools/etc/buildfragments/defaults.ent Log: oups Modified: modules/identity/trunk/tools/etc/buildfragments/defaults.ent =================================================================== --- modules/identity/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 15:53:21 UTC (rev 8417) +++ modules/identity/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 16:05:00 UTC (rev 8418) @@ -37,17 +37,15 @@ <!-- ========= --> <!-- Where source files live --> - <property name="source.classes" value="${module.source}/main/java"/> + <property name="source.classes" value="${module.source}/main"/> <property name="source.docs" value="${module.source}/docs"/> <property name="source.etc" value="${module.source}/etc"/> <property name="source.examples" value="${module.source}/examples"/> <property name="source.bin" value="${module.source}/bin"/> - <property name="source.resources" value="${module.source}/main/resources"/> + <property name="source.resources" value="${module.source}/resources"/> <property name="source.stylesheets" value="${module.source}/stylesheets"/> <property name="source.web" value="${module.source}/web"/> <property name="source.test" value="${module.source}/test"/> - <property name="source.test.classes" value="${module.source}/test/java"/> - <property name="source.test.resources" value="${module.source}/test/resources"/> <!-- Where build generated files will go --> <property name="build.api" value="${module.output}/api"/> @@ -70,9 +68,7 @@ <property name="build.log" value="${module.output}/log"/> <property name="build.cache" value="${module.output}/cache"/> <property name="build.test" value="${module.output}/test"/> - <property name="build.test.classes" value="${module.output}/test/classes"/> - <property name="build.test.resources" value="${module.output}/test/resources"/> - <property name="build.test.gen" value="${build.gen}/test/gen"/> + <property name="build.gen.test" value="${build.gen}/test"/> <!-- Legacy --> <property name="build.metadata" value="${module.output}/metadata"/> Modified: modules/portlet/trunk/tools/etc/buildfragments/defaults.ent =================================================================== --- modules/portlet/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 15:53:21 UTC (rev 8417) +++ modules/portlet/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 16:05:00 UTC (rev 8418) @@ -37,17 +37,15 @@ <!-- ========= --> <!-- Where source files live --> - <property name="source.classes" value="${module.source}/main/java"/> + <property name="source.classes" value="${module.source}/main"/> <property name="source.docs" value="${module.source}/docs"/> <property name="source.etc" value="${module.source}/etc"/> <property name="source.examples" value="${module.source}/examples"/> <property name="source.bin" value="${module.source}/bin"/> - <property name="source.resources" value="${module.source}/main/resources"/> + <property name="source.resources" value="${module.source}/resources"/> <property name="source.stylesheets" value="${module.source}/stylesheets"/> <property name="source.web" value="${module.source}/web"/> <property name="source.test" value="${module.source}/test"/> - <property name="source.test.classes" value="${module.source}/test/java"/> - <property name="source.test.resources" value="${module.source}/test/resources"/> <!-- Where build generated files will go --> <property name="build.api" value="${module.output}/api"/> @@ -70,9 +68,7 @@ <property name="build.log" value="${module.output}/log"/> <property name="build.cache" value="${module.output}/cache"/> <property name="build.test" value="${module.output}/test"/> - <property name="build.test.classes" value="${module.output}/test/classes"/> - <property name="build.test.resources" value="${module.output}/test/resources"/> - <property name="build.test.gen" value="${build.gen}/test/gen"/> + <property name="build.gen.test" value="${build.gen}/test"/> <!-- Legacy --> <property name="build.metadata" value="${module.output}/metadata"/> Modified: modules/test/trunk/tools/etc/buildfragments/defaults.ent =================================================================== --- modules/test/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 15:53:21 UTC (rev 8417) +++ modules/test/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 16:05:00 UTC (rev 8418) @@ -37,17 +37,15 @@ <!-- ========= --> <!-- Where source files live --> - <property name="source.classes" value="${module.source}/main/java"/> + <property name="source.classes" value="${module.source}/main"/> <property name="source.docs" value="${module.source}/docs"/> <property name="source.etc" value="${module.source}/etc"/> <property name="source.examples" value="${module.source}/examples"/> <property name="source.bin" value="${module.source}/bin"/> - <property name="source.resources" value="${module.source}/main/resources"/> + <property name="source.resources" value="${module.source}/resources"/> <property name="source.stylesheets" value="${module.source}/stylesheets"/> <property name="source.web" value="${module.source}/web"/> <property name="source.test" value="${module.source}/test"/> - <property name="source.test.classes" value="${module.source}/test/java"/> - <property name="source.test.resources" value="${module.source}/test/resources"/> <!-- Where build generated files will go --> <property name="build.api" value="${module.output}/api"/> @@ -70,9 +68,7 @@ <property name="build.log" value="${module.output}/log"/> <property name="build.cache" value="${module.output}/cache"/> <property name="build.test" value="${module.output}/test"/> - <property name="build.test.classes" value="${module.output}/test/classes"/> - <property name="build.test.resources" value="${module.output}/test/resources"/> - <property name="build.test.gen" value="${build.gen}/test/gen"/> + <property name="build.gen.test" value="${build.gen}/test"/> <!-- Legacy --> <property name="build.metadata" value="${module.output}/metadata"/> Modified: modules/web/trunk/tools/etc/buildfragments/defaults.ent =================================================================== --- modules/web/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 15:53:21 UTC (rev 8417) +++ modules/web/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 16:05:00 UTC (rev 8418) @@ -37,17 +37,15 @@ <!-- ========= --> <!-- Where source files live --> - <property name="source.classes" value="${module.source}/main/java"/> + <property name="source.classes" value="${module.source}/main"/> <property name="source.docs" value="${module.source}/docs"/> <property name="source.etc" value="${module.source}/etc"/> <property name="source.examples" value="${module.source}/examples"/> <property name="source.bin" value="${module.source}/bin"/> - <property name="source.resources" value="${module.source}/main/resources"/> + <property name="source.resources" value="${module.source}/resources"/> <property name="source.stylesheets" value="${module.source}/stylesheets"/> <property name="source.web" value="${module.source}/web"/> <property name="source.test" value="${module.source}/test"/> - <property name="source.test.classes" value="${module.source}/test/java"/> - <property name="source.test.resources" value="${module.source}/test/resources"/> <!-- Where build generated files will go --> <property name="build.api" value="${module.output}/api"/> @@ -70,9 +68,7 @@ <property name="build.log" value="${module.output}/log"/> <property name="build.cache" value="${module.output}/cache"/> <property name="build.test" value="${module.output}/test"/> - <property name="build.test.classes" value="${module.output}/test/classes"/> - <property name="build.test.resources" value="${module.output}/test/resources"/> - <property name="build.test.gen" value="${build.gen}/test/gen"/> + <property name="build.gen.test" value="${build.gen}/test"/> <!-- Legacy --> <property name="build.metadata" value="${module.output}/metadata"/>