Author: alexsmirnov Date: 2008-09-30 21:04:03 -0400 (Tue, 30 Sep 2008) New Revision: 10631 Added: branches/jsf2.0/examples/ branches/jsf2.0/examples/pom.xml branches/jsf2.0/pom.xml branches/jsf2.0/ui/pom.xml Modified: branches/jsf2.0/cdk/generator/pom.xml branches/jsf2.0/cdk/pom.xml branches/jsf2.0/framework/pom.xml branches/jsf2.0/ui/core/pom.xml Log: Add examples subproject. Refactor dependencies Modified: branches/jsf2.0/cdk/generator/pom.xml =================================================================== --- branches/jsf2.0/cdk/generator/pom.xml 2008-10-01 00:00:49 UTC (rev 10630) +++ branches/jsf2.0/cdk/generator/pom.xml 2008-10-01 01:04:03 UTC (rev 10631) @@ -50,9 +50,9 @@ <version>1.5</version> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</version> + <groupId>com.sun.faces</groupId> + <artifactId>mojarra-jsf-api</artifactId> + <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.servlet.jsp</groupId> Modified: branches/jsf2.0/cdk/pom.xml =================================================================== --- branches/jsf2.0/cdk/pom.xml 2008-10-01 00:00:49 UTC (rev 10630) +++ branches/jsf2.0/cdk/pom.xml 2008-10-01 01:04:03 UTC (rev 10631) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Copied: branches/jsf2.0/examples/pom.xml (from rev 10627, trunk/samples/pom.xml) =================================================================== --- branches/jsf2.0/examples/pom.xml (rev 0) +++ branches/jsf2.0/examples/pom.xml 2008-10-01 01:04:03 UTC (rev 10631) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>root</artifactId> + <groupId>org.richfaces</groupId> + <version>4.0.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>examples</artifactId> + <packaging>pom</packaging> + <name>RichFaces Components Examples</name> + <url>http://labs.jboss.com/jbossrichfaces/examples</url> + <properties> + <!-- --> + </properties> + <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default --> + <build> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>8080</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + </configuration> + + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Modified: branches/jsf2.0/framework/pom.xml =================================================================== --- branches/jsf2.0/framework/pom.xml 2008-10-01 00:00:49 UTC (rev 10630) +++ branches/jsf2.0/framework/pom.xml 2008-10-01 01:04:03 UTC (rev 10631) @@ -3,7 +3,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Copied: branches/jsf2.0/pom.xml (from rev 10627, trunk/pom.xml) =================================================================== --- branches/jsf2.0/pom.xml (rev 0) +++ branches/jsf2.0/pom.xml 2008-10-01 01:04:03 UTC (rev 10631) @@ -0,0 +1,183 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>root</artifactId> + <packaging>pom</packaging> + <name>Jboss RichFaces project</name> + <version>4.0.0-SNAPSHOT</version> + <url>http://labs.jboss.com/jbossrichfaces</url> + <properties> + <snapshotRepository> + dav:https://snapshots.jboss.org/maven2 + </snapshotRepository> + </properties> + <dependencies /> + <build> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav</artifactId> + <version>1.0-beta-2</version> + </extension> + </extensions> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.1</version> + <configuration> + <archive> + <index>true</index> + <manifest> + <addDefaultSpecificationEntries> + true + </addDefaultSpecificationEntries> + <addDefaultImplementationEntries> + true + </addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <mode>development</mode> + <Build-Number> + ${buildNumber} + </Build-Number> + </manifestEntries> + </archive> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <modules> + <module>cdk</module> + <module>framework</module> + <module>ui</module> + </modules> + <repositories> + <repository> + <releases /> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>maven-repository.dev.java.net</id> + <name>Java.net Repository for Maven</name> + <url>http://download.java.net/maven/1</url> + <layout>legacy</layout> + </repository> + <repository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + <id>glassfish</id> + <name>Glassfish Repository</name> + <url> + http://download.java.net/maven/glassfish/ + </url> + <layout>default</layout> + </repository> + <repository> + <id>java.net</id> + <url>http://download.java.net/maven/1</url> + <layout>legacy</layout> + </repository> + + <repository> + <releases /> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + </repositories> + <pluginRepositories> + </pluginRepositories> + <distributionManagement> + <downloadUrl> + http://labs.jboss.com/portal/jbossrichfaces/downloads + </downloadUrl> + <repository> + <id>repository.jboss.org</id> + <uniqueVersion>false</uniqueVersion> + <url>${releaseRepository}</url> + </repository> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <uniqueVersion>true</uniqueVersion> + <url>${snapshotRepository}</url> + </snapshotRepository> + <site> + <url>${richfacesSite}</url> + </site> + </distributionManagement> + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/jira/browse/RF</url> + </issueManagement> + <ciManagement> + <system>cruisecontrol</system> + </ciManagement> + <developers> + <developer> + <id>alexsmirnov</id> + <name>Alexander Smirnov</name> + <email&gt;alexsmirnov(a)exadel.com&lt;/email&gt; + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>-3</timezone> + </developer> + <developer> + <id>sergeysmirnov</id> + <name>Sergey Smirnov</name> + <email&gt;sergeysmirnov(a)exadel.com&lt;/email&gt; + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>+8</timezone> + </developer> + <developer> + <id>nbelayevsky</id> + <name>Nik Belyaevsky</name> + <email&gt;nbelayevsky(a)exadel.com&lt;/email&gt; + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>-2</timezone> + </developer> + </developers> + <licenses> + <license> + <name>LGPL 2.1</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + <distribution>repo</distribution> + <comments> + GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 + </comments> + </license> + </licenses> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/brunches/j... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/brun... + <url>https://svn.jboss.org/repos/richfaces/brunches/jsf2.0</url> + </scm> + <profiles> + </profiles> +</project> Modified: branches/jsf2.0/ui/core/pom.xml =================================================================== --- branches/jsf2.0/ui/core/pom.xml 2008-10-01 00:00:49 UTC (rev 10630) +++ branches/jsf2.0/ui/core/pom.xml 2008-10-01 01:04:03 UTC (rev 10631) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> Copied: branches/jsf2.0/ui/pom.xml (from rev 10627, trunk/ui/pom.xml) =================================================================== --- branches/jsf2.0/ui/pom.xml (rev 0) +++ branches/jsf2.0/ui/pom.xml 2008-10-01 01:04:03 UTC (rev 10631) @@ -0,0 +1,171 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>root</artifactId> + <groupId>org.richfaces</groupId> + <version>4.0.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>ui</artifactId> + <packaging>pom</packaging> + <name>RichFaces Components</name> + <properties> + <!-- --> + </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <index>true</index> + <manifest> + <addDefaultSpecificationEntries> + true + </addDefaultSpecificationEntries> + <addDefaultImplementationEntries> + true + </addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <mode>development</mode> + <Build-Number> + ${buildNumber} + </Build-Number> + </manifestEntries> + </archive> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> + </profiles> + <modules> + <module>core</module><!-- + <module>drag-drop</module> + <module>effect</module> + <module>panel</module> + <module>panelbar</module> + <module>dataFilterSlider</module> + <module>gmap</module> + <module>jQuery</module> + <module>virtualEarth</module> + <module>separator</module> + <module>spacer</module> + <module>paint2D</module> + <module>togglePanel</module> + <module>tabPanel</module> + <module>simpleTogglePanel</module> + <module>toolBar</module> + <module>inputnumber-slider</module> + <module>inputnumber-spinner</module> + <module>tree</module> + <module>suggestionbox</module> + <module>dataTable</module> + <module>modal-panel</module> + <module>datascroller</module> + <module>menu-components</module> + <module>dropdown-menu</module> + <module>tooltip</module> + <module>panelmenu</module> + <module>calendar</module> + <module>treeModel</module> + <module>message</module> + <module>scrollableDataTable</module> + <module>insert</module> + <module>componentControl</module> + <module>orderingList</module> + <module>listShuttle</module> + <module>contextMenu</module> + <module>columns</module> + <module>combobox</module> + <module>pickList</module> + <module>progressBAR</module> + <module>fileUpload</module> + <module>inplaceInput</module> + <module>inplaceSelect</module> + <module>functions</module> + <module>hotKey</module> + <module>beanValidator</module> + <module>state</module> + <module>extendedDataTable</module> + --></modules> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-test</artifactId> + <version>4.0.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.14</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jstl</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>mojarra-jsf-api</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + </dependencies> +</project> \ No newline at end of file