Author: Alex.Kolonitsky Date: 2010-07-31 08:26:12 -0400 (Sat, 31 Jul 2010) New Revision: 18314 Removed: root/trunk/examples/misc-demo/ Modified: root/trunk/archetypes/pom.xml root/trunk/core/pom.xml root/trunk/examples/pom.xml root/trunk/pom.xml Log: Richfaces 4.0 change svn structure pom files modifications Modified: root/trunk/archetypes/pom.xml =================================================================== --- root/trunk/archetypes/pom.xml 2010-07-31 11:44:30 UTC (rev 18313) +++ root/trunk/archetypes/pom.xml 2010-07-31 12:26:12 UTC (rev 18314) @@ -36,7 +36,10 @@ <name>RichFaces Archetypes: Aggregator</name> <modules> - <module>richfaces-archetype-simpleapp/trunk</module> + <module>richfaces-archetype-simpleapp</module> + <module>richfaces-component</module> + <module>richfaces-component-short</module> + <module>richfaces-components-aggregator</module> </modules> <properties> Modified: root/trunk/core/pom.xml =================================================================== --- root/trunk/core/pom.xml 2010-07-31 11:44:30 UTC (rev 18313) +++ root/trunk/core/pom.xml 2010-07-31 12:26:12 UTC (rev 18314) @@ -36,6 +36,7 @@ <description>The root aggregator for the richfaces core module. This manages intermodule relationships, and destribution assembly where needed.</description> <modules> + <module>commons</module> <module>bom</module> <module>parent</module> <module>api</module> Modified: root/trunk/examples/pom.xml =================================================================== --- root/trunk/examples/pom.xml 2010-07-31 11:44:30 UTC (rev 18313) +++ root/trunk/examples/pom.xml 2010-07-31 12:26:12 UTC (rev 18314) @@ -38,11 +38,12 @@ <name>RichFaces Examples: Aggregator</name> <modules> - <module>core-demo/trunk</module> - <module>misc-demo/trunk</module> - <module>repeater-demo/trunk</module> - <module>iteration-demo/trunk</module> - <module>richfaces-showcase/trunk</module> + <module>core-demo</module> + <module>misc-demo</module> + <module>output-demo</module> + <module>repeater-demo</module> + <module>iteration-demo</module> + <module>richfaces-showcase</module> <!--<module>dist/trunk</module>--> </modules> Modified: root/trunk/pom.xml =================================================================== --- root/trunk/pom.xml 2010-07-31 11:44:30 UTC (rev 18313) +++ root/trunk/pom.xml 2010-07-31 12:26:12 UTC (rev 18314) @@ -10,105 +10,31 @@ <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces Aggregator</name> - - <properties> - <richfaces.bom.path>trunk</richfaces.bom.path> - <richfaces.commons.path>trunk</richfaces.commons.path> - <richfaces.cdk.path>trunk</richfaces.cdk.path> - <richfaces.core.path>trunk</richfaces.core.path> - <richfaces.ui.core.path>trunk</richfaces.ui.core.path> - <richfaces.ui.iteration.path>trunk</richfaces.ui.iteration.path> - <richfaces.ui.misc.path>trunk</richfaces.ui.misc.path> - <richfaces.ui.output.path>trunk</richfaces.ui.output.path> - <richfaces.ui.dist.path>trunk</richfaces.ui.dist.path> - <richfaces.archetype.simpleapp.path>trunk</richfaces.archetype.simpleapp.path> - <richfaces.examples.core-demo.path>trunk</richfaces.examples.core-demo.path> - <richfaces.examples.showcase.path>trunk</richfaces.examples.showcase.path> - <richfaces.docs.path>trunk</richfaces.docs.path> - <richfaces.dist.path>trunk</richfaces.dist.path> - </properties> <modules> - <!-- These trunk settings, and this pom.xml will be removed --> - <!-- Added bom, parent, for temp integration --> - <!--<module>build/parent/tags/richfaces-parent-5</module>--> - <!--<module>build/resources/trunk/checkstyle</module>--> - <!--<module>build/resources/trunk/faces-shade-transformers</module>--> - - <module>build/bom/${richfaces.bom.path}</module> - <module>commons/${richfaces.commons.path}</module> - <module>cdk/${richfaces.cdk.path}</module> - <module>core/${richfaces.core.path}</module> + <module>bom</module> + <module>core</module> + <module>cdk</module> <!-- richfaces ui --> - <module>ui/core/${richfaces.ui.core.path}</module> - <module>ui/iteration/${richfaces.ui.iteration.path}</module> - <module>ui/misc/${richfaces.ui.misc.path}</module> - <module>ui/output/${richfaces.ui.output.path}</module> - <module>ui/dist/${richfaces.ui.dist.path}</module> - - <!-- Remaining --> - <module>archetypes/richfaces-archetype-simpleapp/${richfaces.archetype.simpleapp.path}</module> - <module>examples/core-demo/${richfaces.examples.core-demo.path}</module> - <module>examples/richfaces-showcase/${richfaces.examples.showcase.path}</module> - <module>docs/${richfaces.docs.path}</module> + <module>ui/core</module> + <module>ui/iteration</module> + <module>ui/misc</module> + <module>ui/output</module> + <module>ui/dist</module> + + <!-- Remaining --> + <module>archetypes</module> + <module>examples</module> + <module>docs\trunk</module> </modules> <profiles> <profile> - <id>sandbox</id> - <modules> - <module>ui-sandbox</module> - <module>examples-sandbox/trunk</module> - </modules> - </profile> - <profile> <id>release</id> <modules> <module>dist/${richfaces.dist.path}</module> </modules> </profile> - <profile> - <id>tag_based</id> - <properties> - <!-- TODO this can be generalized, and driven by property file, or script --> - <build-version>4.0.0.20100715-M1</build-version> - <richfaces.bom.path>tags/richfaces-bom-${build-version}</richfaces.bom.path> - <richfaces.commons.path>tags/richfaces-commons-${build-version}</richfaces.commons.path> - <richfaces.cdk.path>tags/richfaces-cdk-${build-version}</richfaces.cdk.path> - <richfaces.core.path>tags/richfaces-core-${build-version}</richfaces.core.path> - <richfaces.ui.core.path>tags/richfaces-ui-core-${build-version}</richfaces.ui.core.path> - <richfaces.ui.iteration.path>tags/richfaces-ui-iteration-${build-version}</richfaces.ui.iteration.path> - <richfaces.ui.misc.path>tags/richfaces-ui-misc-${build-version}</richfaces.ui.misc.path> - <richfaces.ui.output.path>tags/richfaces-ui-output-${build-version}</richfaces.ui.output.path> - <richfaces.ui.dist.path>tags/richfaces-ui-dist-${build-version}</richfaces.ui.dist.path> - <richfaces.archetype.simpleapp.path>tags/richfaces-archetype-simpleapp-${build-version}</richfaces.archetype.simpleapp.path> - <richfaces.examples.core-demo.path>tags/richfaces-core-demo-${build-version}</richfaces.examples.core-demo.path> - <richfaces.examples.showcase.path>tags/richfaces-showcase-${build-version}</richfaces.examples.showcase.path> - <richfaces.docs.path>tags/richfaces-docs-${build-version}</richfaces.docs.path> - <richfaces.dist.path>tags/richfaces-dist-${build-version}</richfaces.dist.path> - </properties> - </profile> - <profile> - <id>branch_based</id> - <properties> - <!-- TODO this can be generalized, and driven by property file, or script --> - <build-version>4.0.0.20100715-M1</build-version> - <richfaces.bom.path>branches/richfaces-bom-${build-version}</richfaces.bom.path> - <richfaces.commons.path>branches/richfaces-commons-${build-version}</richfaces.commons.path> - <richfaces.cdk.path>branches/richfaces-cdk-${build-version}</richfaces.cdk.path> - <richfaces.core.path>branches/richfaces-core-${build-version}</richfaces.core.path> - <richfaces.ui.core.path>branches/richfaces-ui-core-${build-version}</richfaces.ui.core.path> - <richfaces.ui.iteration.path>branches/richfaces-ui-iteration-${build-version}</richfaces.ui.iteration.path> - <richfaces.ui.misc.path>branches/richfaces-ui-misc-${build-version}</richfaces.ui.misc.path> - <richfaces.ui.output.path>branches/richfaces-ui-output-${build-version}</richfaces.ui.output.path> - <richfaces.ui.dist.path>branches/richfaces-ui-dist-${build-version}</richfaces.ui.dist.path> - <richfaces.archetype.simpleapp.path>branches/richfaces-archetype-simpleapp-${build-version}</richfaces.archetype.simpleapp.path> - <richfaces.examples.core-demo.path>branches/richfaces-core-demo-${build-version}</richfaces.examples.core-demo.path> - <richfaces.examples.showcase.path>branches/richfaces-showcase-${build-version}</richfaces.examples.showcase.path> - <richfaces.docs.path>branches/richfaces-docs-${build-version}</richfaces.docs.path> - <richfaces.dist.path>branches/richfaces-dist-${build-version}</richfaces.dist.path> - </properties> - </profile> </profiles> </project>