Author: alexsmirnov Date: 2010-03-22 20:26:05 -0400 (Mon, 22 Mar 2010) New Revision: 16654 Added: branches/framework-shared/ branches/framework-shared/impl-jsf2/ branches/framework-shared/impl-jsf2/pom.xml branches/framework-shared/impl-jsf2/src/ branches/framework-shared/impl-jsf2/src/main/ branches/framework-shared/impl-jsf2/src/main/java/ branches/framework-shared/impl-jsf2/src/main/java/org/ branches/framework-shared/impl-jsf2/src/main/resources/ branches/framework-shared/impl-jsf2/src/test/ branches/framework-shared/impl-jsf2/src/test/java/ branches/framework-shared/impl-jsf2/src/test/java/org/ branches/framework-shared/impl-jsf2/src/test/java/org/richfaces/ branches/framework-shared/impl-jsf2/src/test/java/org/richfaces/AppTest.java branches/framework-shared/impl-shared/ branches/framework-shared/impl-shared/build.xml branches/framework-shared/impl-shared/generatescript.xml branches/framework-shared/impl-shared/pom.xml branches/framework-shared/impl-shared/src/ branches/framework-shared/impl-shared/src/main/ branches/framework-shared/impl-shared/src/main/java/ branches/framework-shared/impl-shared/src/main/java/META-INF/ branches/framework-shared/impl-shared/src/main/java/org/ branches/framework-shared/impl-shared/src/main/javacc/ branches/framework-shared/impl-shared/src/main/javascript/ branches/framework-shared/impl-shared/src/main/resources/ branches/framework-shared/impl-shared/src/test/ branches/framework-shared/impl-shared/src/test/java/ branches/framework-shared/impl-shared/src/test/resources/ Removed: branches/framework-shared/impl/build.xml branches/framework-shared/impl/generatescript.xml branches/framework-shared/impl/src/main/java-jsf20/org/ branches/framework-shared/impl/src/main/java/ branches/framework-shared/impl/src/main/javacc/ branches/framework-shared/impl/src/main/javascript/ branches/framework-shared/impl/src/main/resources-jsf20/ branches/framework-shared/impl/src/main/resources/ branches/framework-shared/impl/src/test/java/ branches/framework-shared/impl/src/test/resources/ Modified: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java branches/framework-shared/impl/pom.xml branches/framework-shared/pom.xml Log: create shared project Copied: branches/framework-shared (from rev 16649, branches/community/3.3.X/framework) Deleted: branches/framework-shared/impl/build.xml =================================================================== --- branches/community/3.3.X/framework/impl/build.xml 2010-03-22 12:59:20 UTC (rev 16649) +++ branches/framework-shared/impl/build.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- WARNING: Eclipse auto-generated file. - Any modifications will be overwritten. - To include a user specific buildfile here, simply create one in the same - directory with the processing instruction <?eclipse.ant.import?> - as the first entry and export the buildfile again. --> -<project basedir="." default="build" name="common"> - <property environment="env"/> - <property file="build.properties" /> - <!--!!! Correct .m2 location for current user --> - <property name="M2_REPO" value="C:/Documents and Settings/Administrator/.m2/repository"/> - <property name="CLOVER" value="${M2_REPO}/com/cenqua/clover/clover/1.3.13/clover-1.3.13.jar" /> - - <taskdef resource="com/cenqua/ant/antlib.xml" classpath="cenquatasks.jar"/> - <extendclasspath path="${CLOVER}" /> - <taskdef resource="clovertasks" classpath="${CLOVER}" /> - - <path id="common.classpath"> - <pathelement location="${CLOVER}"/> - <pathelement location="target/classes"/> - <pathelement location="target/test-classes"/> - <pathelement location="${M2_REPO}/opensymphony/oscache/2.3/oscache-2.3.jar"/> - <pathelement location="${M2_REPO}/org/richfaces/framework/richfaces-api/3.1.0-SNAPSHOT/richfaces-api-3.1.0-SNAPSHOT.jar"/> - <pathelement location="${M2_REPO}/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> - <pathelement location="${M2_REPO}/jaxen/jaxen/1.1-beta-11/jaxen-1.1-beta-11.jar"/> - <pathelement location="${M2_REPO}/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/> - <pathelement location="${M2_REPO}/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> - <pathelement location="${M2_REPO}/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.jar"/> - <pathelement location="${M2_REPO}/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> - <pathelement location="${M2_REPO}/jdom/jdom/1.0/jdom-1.0.jar"/> - <pathelement location="${M2_REPO}/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"/> - <pathelement location="${M2_REPO}/javax/el/el-api/1.0/el-api-1.0.jar"/> - <pathelement location="${M2_REPO}/commons-io/commons-io/1.2/commons-io-1.2.jar"/> - <pathelement location="${M2_REPO}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> - <pathelement location="${M2_REPO}/el-impl/el-impl/1.0/el-impl-1.0.jar"/> - <pathelement location="${M2_REPO}/xalan/xalan/2.6.0/xalan-2.6.0.jar"/> - <pathelement location="${M2_REPO}/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/> - <pathelement location="${M2_REPO}/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/> - <pathelement location="${M2_REPO}/com/sun/facelets/jsf-facelets/1.1.11/jsf-facelets-1.1.11.jar"/> - <pathelement location="${M2_REPO}/javax/servlet/jstl/1.0/jstl-1.0.jar"/> - <pathelement location="${M2_REPO}/xom/xom/1.0b3/xom-1.0b3.jar"/> - <pathelement location="${M2_REPO}/commons-digester/commons-digester/1.5/commons-digester-1.5.jar"/> - <pathelement location="${M2_REPO}/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/> - <pathelement location="${M2_REPO}/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/> - <pathelement location="${M2_REPO}/org/richfaces/framework/richfaces-impl/3.1.0-SNAPSHOT/richfaces-impl-3.1.0-SNAPSHOT.jar"/> - <pathelement location="${M2_REPO}/javax/faces/jsf-api/1.1_02/jsf-api-1.1_02.jar"/> - <pathelement location="${M2_REPO}/nekohtml/nekohtml/0.9.5/nekohtml-0.9.5.jar"/> - <pathelement location="${M2_REPO}/htmlunit/htmlunit/1.10/htmlunit-1.10.jar"/> - <pathelement location="${M2_REPO}/commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.jar"/> - <pathelement location="${M2_REPO}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> - <pathelement location="${M2_REPO}/junit/junit/3.8.1/junit-3.8.1.jar"/> - <pathelement location="${M2_REPO}/commons-collections/commons-collections/3.0/commons-collections-3.0.jar"/> - <pathelement location="${M2_REPO}/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/> - <pathelement location="${M2_REPO}/rhino/js/1.6R2/js-1.6R2.jar"/> - <pathelement location="${M2_REPO}/javax/faces/jsf-impl/1.1_02/jsf-impl-1.1_02.jar"/> - <pathelement location="${M2_REPO}/log4j/log4j/1.2.12/log4j-1.2.12.jar"/> - - - </path> - <target name="init" depends="clean"> - <mkdir dir="target/clover/classes"/> - <clover-clean initstring="target/clover/clover.db" keepdb="false"/> - <clover-setup initstring="target/clover/clover.db" flushpolicy="interval" flushinterval="1000"> - <fileset dir="src" includes="**/*.java"/> - </clover-setup> - <copy includeemptydirs="false" todir="target/clover/classes"> - <fileset dir="target/classes" excludes="**/*.launch, **/*.java, **/*.class"/> - </copy> - <copy includeemptydirs="false" todir="target/clover/classes"> - <fileset dir="src" excludes="**/*.launch, **/*.java"/> - </copy> - <copy includeemptydirs="false" todir="target/clover/classes"> - <fileset dir="src" excludes="**/*.launch, **/*.java"/> - </copy> - </target> - <target name="clean"> - <delete dir="target/clover/classes"/> - <delete file="target/clover/richfaces-clovered-impl.jar"/> - </target> - <target depends="clean" name="cleanall"/> - <target depends="build-project" name="build"/> - <target depends="init" name="build-project"> - <echo message="${ant.project.name}: ${ant.file}"/> - - <javac source="1.4" srcdir="src" classpathref="common.classpath" debug="true" debuglevel="source,lines,vars" destdir="target/clover/classes" /> - - <jar destfile="target/clover/richfaces-clovered-impl.jar"> - <fileset dir="target/clover/classes" /> - </jar> - </target> -</project> Deleted: branches/framework-shared/impl/generatescript.xml =================================================================== --- branches/community/3.3.X/framework/impl/generatescript.xml 2010-03-22 12:59:20 UTC (rev 16649) +++ branches/framework-shared/impl/generatescript.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -1,157 +0,0 @@ -<?xml version="1.0"?> -<!-- ====================================================================== - 12.11.2005 23:40:43 - - assemblescripts - Assemble all javaScript library files to one AJAXJSF.js - - shura - ====================================================================== --> -<project name="assemblescripts" default="assembly"> - <description> - Assemble all javaScript library files to one AJAXJSF.js - </description> - - <property name="scripts-path" value="org/ajax4jsf/javascript/scripts"></property> - <property name="prototype-scripts-path" value="org/ajax4jsf/javascript/scripts"></property> - <property name="scriptaculous-scripts-path" value="org/richfaces/renderkit/html/scripts/scriptaculous"></property> - <property name="jquery-scripts-path" value="org/richfaces/renderkit/html/scripts/jquery"></property> - - <property name="target-dir" value="${project.build.directory}/javascript"></property> - - <property name="scripts.dir" - value="${target-dir}/${scripts-path}" - /> - <property name="prototype.scripts.dir" - value="${target-dir}/${prototype-scripts-path}" - /> - <property name="script" value="AJAX.js" /> - - <property name="script.rico" value="rico.js"></property> - <property name="script.aculo" value="scriptaculo.js"></property> - <property name="script.scriptaculous" value="scriptaculous.js"></property> - <property name="scriptaculous.scripts.dir" - value="${target-dir}/${scriptaculous-scripts-path}"/> - <property name="jquery.scripts.dir" - value="${target-dir}/${jquery-scripts-path}"/> - - <property name="script.prototype" value="prototype.js"></property> - <property name="script.jquery" value="jquery.js"></property> - - <property name="script.imagecache" value="imagecache.js"></property> - <property name="script.dnd" value="dnd.js"></property> - <property name="script.css-rules" value="css-rules.js"></property> - <filelist id="imagecache" dir="${basedir}/src/main/javascript/ajaxjsf" files="imagecache.js"></filelist> -<!-- - <filelist id="prototype" - dir="${basedir}/src/main/javascript/prototype" - files="empty.js,base.js,string.js,enumerable.js,array.js,hash.js,range.js" - > ---> - <filelist id="jquery" - dir="${basedir}/src/main/javascript/jquery" - files="jquery-1.3.2.js,../memory.js,patches.js"> - </filelist> - - <filelist id="scriptaculous" - dir="${basedir}/src/main/javascript/scriptaculous" - files="builder.js,effects.js,dragdrop.js,controls.js,slider.js,sound.js" > - </filelist> - - - <filelist id="prototype" - dir="${basedir}/src/main/javascript/prototype" - files="prototype-1.6.0.3.js,../memory.js,patches.js"> - </filelist> - - - <filelist id="dnd" - dir="${basedir}/src/main/javascript/dnd" - files="prolog.js,dnd.js,epilog.js"> - </filelist> - - <filelist id="ajaxjsf" dir="${basedir}/src/main/javascript/ajaxjsf" files="prolog.js,sarissa.js,JSFAJAX.js,queue.js,log4ajax.js,epilog.js,../memory.js"></filelist> - <!-- ================================= - target: assemble - ================================= --> - <target name="assembly" - depends="depends" - description="--> Assemble all javaScript library files to one AJAXJSF.js" - > - <concat append="false" - binary="false" - destfile="${scripts.dir}/${script}" - fixlastline="yes" - eol="unix" - > - <filelist refid="ajaxjsf"> - </filelist> - </concat> - <concat append="false" - binary="false" - destfile="${scripts.dir}/${script.imagecache}" - fixlastline="yes" - eol="unix" - > - <filelist refid="imagecache"/> - </concat> - <concat append="false" - binary="false" - destfile="${scripts.dir}/${script.dnd}" - fixlastline="yes" - eol="unix" - > - <filelist refid="dnd"/> - </concat> - <concat append="false" - binary="false" - destfile="${prototype.scripts.dir}/${script.prototype}" - fixlastline="yes" - eol="unix"> - <filelist refid="prototype"> - </filelist> - </concat> - <concat append="false" - binary="false" - destfile="${scriptaculous.scripts.dir}/${script.scriptaculous}" - fixlastline="yes" - eol="unix" - > - <filelist refid="scriptaculous"></filelist> - </concat> - - <concat append="false" - binary="false" - destfile="${jquery.scripts.dir}/${script.jquery}" - fixlastline="yes" - eol="unix" - > - <filelist refid="jquery"></filelist> - </concat> - - - <copy todir="${prototype.scripts.dir}" file="${basedir}/src/main/javascript/ajaxjsf/smartposition.js"> - </copy> - <copy todir="${scriptaculous.scripts.dir}"> - <fileset dir="${basedir}/src/main/javascript/scriptaculous"></fileset> - </copy> - </target> - - - <!-- ================================= - target: fixeol - ================================= --> - <target name="fixeol" depends="depends" description="--> Fix CR/LF in files"> - <fixcrlf srcdir="${basedir}" includes="*.js" eol="unix"> - </fixcrlf> - </target> - - - <!-- - - - - - - - - - - - - - - - - - - target: depends - - - - - - - - - - - - - - - - - - --> - <target name="depends"> - </target> - -</project> - Modified: branches/framework-shared/impl/pom.xml =================================================================== --- branches/community/3.3.X/framework/impl/pom.xml 2010-03-22 12:59:20 UTC (rev 16649) +++ branches/framework-shared/impl/pom.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -7,139 +7,36 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> - <artifactId>${classifiedArtifactId}</artifactId> + <artifactId>richfaces-impl</artifactId> <name>Java Server Faces AJAX framework implementation</name> <version>3.3.3-SNAPSHOT</version> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>target/javascript</directory> - </resource> - </resources> <plugins> <plugin> <!-- Necessary due to http://jira.codehaus.org/browse/MINSTALL-41 --> <artifactId>maven-install-plugin</artifactId> <version>2.3</version> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${frameworkAdditionalSourceFolder}</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <goals> - <goal>javacc</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>javascript</id> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="${basedir}/generatescript.xml" inheritRefs="true"> - <target name="assembly" /> - <property name="target-dir" value="${project.build.directory}/javascript" /> - </ant> - </tasks> - <resourceRoot>${project.build.directory}/javascript</resourceRoot> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-javascript-plugin</artifactId> - <version>${project.version}</version> - <executions> - <execution> - <goals> - <goal>compress</goal> - </goals> - <configuration> - <nosuffix>false</nosuffix> - <outputDirectory>${project.build.directory}/compressed/</outputDirectory> - <aggregations> - <aggregation> - <insertNewLine>true</insertNewLine> - <output>${project.build.outputDirectory}/org/ajax4jsf/framework.pack.js</output> - <includes> - <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/prototype-min.js</include> - <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/AJAX-min.js</include> - <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous-min.js</include> - <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery/jquery-min.js</include> - <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery.utils-min.js</include> - <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/dnd-min.js</include> - <include>**/*-min.js</include> - </includes> - <excludes> - <exclude>**/*.pack.js</exclude> - <exclude>**/scriptaculous/*.js</exclude> - <exclude>**/extend-min.js</exclude> - <exclude>**/jquery.jcarousel-min.js</exclude> - <exclude>**/compressed.css</exclude> - </excludes> - </aggregation> - </aggregations> - <resources> - <resource> - <directory>target/javascript</directory> - </resource> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>jslint</id> - <phase>test</phase> - <goals> - <goal>jslint</goal> - </goals> - <configuration> - <includes> - <include>**/framework.pack.js</include> - </includes> - <resources> - <resource> - <directory>${project.build.outputDirectory}</directory> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.3.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>org.richfaces.framework:richfaces-impl-shared</include> + </includes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> @@ -157,99 +54,23 @@ </plugins> </build> </profile> - <profile> - <id>jsf2_0</id> - <build> - <plugins> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>false</skip> - </configuration> - </plugin> - </plugins> - <resources> - <resource> - <directory>src/main/resources-jsf20</directory> - </resource> - </resources> - </build> - <dependencies> + </profiles> + <dependencies> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <properties> - <frameworkAdditionalSourceFolder>src/main/java-jsf20</frameworkAdditionalSourceFolder> - <classifiedArtifactId>richfaces-impl-jsf2</classifiedArtifactId> - </properties> - </profile> - <profile> - <id>jsf1_2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope> </dependency> - </dependencies> - <properties> - <frameworkAdditionalSourceFolder>src/main/java-jsf12</frameworkAdditionalSourceFolder> - <classifiedArtifactId>richfaces-impl</classifiedArtifactId> - </properties> - </profile> - </profiles> - <dependencies> <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <version>2.3</version> - <optional>true</optional> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.3.3-SNAPSHOT</version> </dependency> <dependency> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>1.9.6</version> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> - <optional>true</optional> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.8.1</version> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> + <artifactId>richfaces-impl-shared</artifactId> <version>3.3.3-SNAPSHOT</version> + <optional>true</optional> </dependency> </dependencies> </project> \ No newline at end of file Added: branches/framework-shared/impl-jsf2/pom.xml =================================================================== --- branches/framework-shared/impl-jsf2/pom.xml (rev 0) +++ branches/framework-shared/impl-jsf2/pom.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>framework</artifactId> + <groupId>org.richfaces</groupId> + <version>3.3.3-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl-jsf2</artifactId> + <version>3.3.3-SNAPSHOT</version> + <name>impl-jsf2</name> + <url>http://maven.apache.org</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> Copied: branches/framework-shared/impl-jsf2/src/main/java/org (from rev 16649, branches/community/3.3.X/framework/impl/src/main/java-jsf20/org) Copied: branches/framework-shared/impl-jsf2/src/main/resources (from rev 16649, branches/community/3.3.X/framework/impl/src/main/resources-jsf20) Added: branches/framework-shared/impl-jsf2/src/test/java/org/richfaces/AppTest.java =================================================================== --- branches/framework-shared/impl-jsf2/src/test/java/org/richfaces/AppTest.java (rev 0) +++ branches/framework-shared/impl-jsf2/src/test/java/org/richfaces/AppTest.java 2010-03-23 00:26:05 UTC (rev 16654) @@ -0,0 +1,38 @@ +package org.richfaces; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} Copied: branches/framework-shared/impl-shared/build.xml (from rev 16649, branches/community/3.3.X/framework/impl/build.xml) =================================================================== --- branches/framework-shared/impl-shared/build.xml (rev 0) +++ branches/framework-shared/impl-shared/build.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- WARNING: Eclipse auto-generated file. + Any modifications will be overwritten. + To include a user specific buildfile here, simply create one in the same + directory with the processing instruction <?eclipse.ant.import?> + as the first entry and export the buildfile again. --> +<project basedir="." default="build" name="common"> + <property environment="env"/> + <property file="build.properties" /> + <!--!!! Correct .m2 location for current user --> + <property name="M2_REPO" value="C:/Documents and Settings/Administrator/.m2/repository"/> + <property name="CLOVER" value="${M2_REPO}/com/cenqua/clover/clover/1.3.13/clover-1.3.13.jar" /> + + <taskdef resource="com/cenqua/ant/antlib.xml" classpath="cenquatasks.jar"/> + <extendclasspath path="${CLOVER}" /> + <taskdef resource="clovertasks" classpath="${CLOVER}" /> + + <path id="common.classpath"> + <pathelement location="${CLOVER}"/> + <pathelement location="target/classes"/> + <pathelement location="target/test-classes"/> + <pathelement location="${M2_REPO}/opensymphony/oscache/2.3/oscache-2.3.jar"/> + <pathelement location="${M2_REPO}/org/richfaces/framework/richfaces-api/3.1.0-SNAPSHOT/richfaces-api-3.1.0-SNAPSHOT.jar"/> + <pathelement location="${M2_REPO}/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> + <pathelement location="${M2_REPO}/jaxen/jaxen/1.1-beta-11/jaxen-1.1-beta-11.jar"/> + <pathelement location="${M2_REPO}/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/> + <pathelement location="${M2_REPO}/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> + <pathelement location="${M2_REPO}/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.jar"/> + <pathelement location="${M2_REPO}/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> + <pathelement location="${M2_REPO}/jdom/jdom/1.0/jdom-1.0.jar"/> + <pathelement location="${M2_REPO}/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"/> + <pathelement location="${M2_REPO}/javax/el/el-api/1.0/el-api-1.0.jar"/> + <pathelement location="${M2_REPO}/commons-io/commons-io/1.2/commons-io-1.2.jar"/> + <pathelement location="${M2_REPO}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> + <pathelement location="${M2_REPO}/el-impl/el-impl/1.0/el-impl-1.0.jar"/> + <pathelement location="${M2_REPO}/xalan/xalan/2.6.0/xalan-2.6.0.jar"/> + <pathelement location="${M2_REPO}/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/> + <pathelement location="${M2_REPO}/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/> + <pathelement location="${M2_REPO}/com/sun/facelets/jsf-facelets/1.1.11/jsf-facelets-1.1.11.jar"/> + <pathelement location="${M2_REPO}/javax/servlet/jstl/1.0/jstl-1.0.jar"/> + <pathelement location="${M2_REPO}/xom/xom/1.0b3/xom-1.0b3.jar"/> + <pathelement location="${M2_REPO}/commons-digester/commons-digester/1.5/commons-digester-1.5.jar"/> + <pathelement location="${M2_REPO}/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/> + <pathelement location="${M2_REPO}/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/> + <pathelement location="${M2_REPO}/org/richfaces/framework/richfaces-impl/3.1.0-SNAPSHOT/richfaces-impl-3.1.0-SNAPSHOT.jar"/> + <pathelement location="${M2_REPO}/javax/faces/jsf-api/1.1_02/jsf-api-1.1_02.jar"/> + <pathelement location="${M2_REPO}/nekohtml/nekohtml/0.9.5/nekohtml-0.9.5.jar"/> + <pathelement location="${M2_REPO}/htmlunit/htmlunit/1.10/htmlunit-1.10.jar"/> + <pathelement location="${M2_REPO}/commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.jar"/> + <pathelement location="${M2_REPO}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> + <pathelement location="${M2_REPO}/junit/junit/3.8.1/junit-3.8.1.jar"/> + <pathelement location="${M2_REPO}/commons-collections/commons-collections/3.0/commons-collections-3.0.jar"/> + <pathelement location="${M2_REPO}/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/> + <pathelement location="${M2_REPO}/rhino/js/1.6R2/js-1.6R2.jar"/> + <pathelement location="${M2_REPO}/javax/faces/jsf-impl/1.1_02/jsf-impl-1.1_02.jar"/> + <pathelement location="${M2_REPO}/log4j/log4j/1.2.12/log4j-1.2.12.jar"/> + + + </path> + <target name="init" depends="clean"> + <mkdir dir="target/clover/classes"/> + <clover-clean initstring="target/clover/clover.db" keepdb="false"/> + <clover-setup initstring="target/clover/clover.db" flushpolicy="interval" flushinterval="1000"> + <fileset dir="src" includes="**/*.java"/> + </clover-setup> + <copy includeemptydirs="false" todir="target/clover/classes"> + <fileset dir="target/classes" excludes="**/*.launch, **/*.java, **/*.class"/> + </copy> + <copy includeemptydirs="false" todir="target/clover/classes"> + <fileset dir="src" excludes="**/*.launch, **/*.java"/> + </copy> + <copy includeemptydirs="false" todir="target/clover/classes"> + <fileset dir="src" excludes="**/*.launch, **/*.java"/> + </copy> + </target> + <target name="clean"> + <delete dir="target/clover/classes"/> + <delete file="target/clover/richfaces-clovered-impl.jar"/> + </target> + <target depends="clean" name="cleanall"/> + <target depends="build-project" name="build"/> + <target depends="init" name="build-project"> + <echo message="${ant.project.name}: ${ant.file}"/> + + <javac source="1.4" srcdir="src" classpathref="common.classpath" debug="true" debuglevel="source,lines,vars" destdir="target/clover/classes" /> + + <jar destfile="target/clover/richfaces-clovered-impl.jar"> + <fileset dir="target/clover/classes" /> + </jar> + </target> +</project> Property changes on: branches/framework-shared/impl-shared/build.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Copied: branches/framework-shared/impl-shared/generatescript.xml (from rev 16649, branches/community/3.3.X/framework/impl/generatescript.xml) =================================================================== --- branches/framework-shared/impl-shared/generatescript.xml (rev 0) +++ branches/framework-shared/impl-shared/generatescript.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -0,0 +1,157 @@ +<?xml version="1.0"?> +<!-- ====================================================================== + 12.11.2005 23:40:43 + + assemblescripts + Assemble all javaScript library files to one AJAXJSF.js + + shura + ====================================================================== --> +<project name="assemblescripts" default="assembly"> + <description> + Assemble all javaScript library files to one AJAXJSF.js + </description> + + <property name="scripts-path" value="org/ajax4jsf/javascript/scripts"></property> + <property name="prototype-scripts-path" value="org/ajax4jsf/javascript/scripts"></property> + <property name="scriptaculous-scripts-path" value="org/richfaces/renderkit/html/scripts/scriptaculous"></property> + <property name="jquery-scripts-path" value="org/richfaces/renderkit/html/scripts/jquery"></property> + + <property name="target-dir" value="${project.build.directory}/javascript"></property> + + <property name="scripts.dir" + value="${target-dir}/${scripts-path}" + /> + <property name="prototype.scripts.dir" + value="${target-dir}/${prototype-scripts-path}" + /> + <property name="script" value="AJAX.js" /> + + <property name="script.rico" value="rico.js"></property> + <property name="script.aculo" value="scriptaculo.js"></property> + <property name="script.scriptaculous" value="scriptaculous.js"></property> + <property name="scriptaculous.scripts.dir" + value="${target-dir}/${scriptaculous-scripts-path}"/> + <property name="jquery.scripts.dir" + value="${target-dir}/${jquery-scripts-path}"/> + + <property name="script.prototype" value="prototype.js"></property> + <property name="script.jquery" value="jquery.js"></property> + + <property name="script.imagecache" value="imagecache.js"></property> + <property name="script.dnd" value="dnd.js"></property> + <property name="script.css-rules" value="css-rules.js"></property> + <filelist id="imagecache" dir="${basedir}/src/main/javascript/ajaxjsf" files="imagecache.js"></filelist> +<!-- + <filelist id="prototype" + dir="${basedir}/src/main/javascript/prototype" + files="empty.js,base.js,string.js,enumerable.js,array.js,hash.js,range.js" + > +--> + <filelist id="jquery" + dir="${basedir}/src/main/javascript/jquery" + files="jquery-1.3.2.js,../memory.js,patches.js"> + </filelist> + + <filelist id="scriptaculous" + dir="${basedir}/src/main/javascript/scriptaculous" + files="builder.js,effects.js,dragdrop.js,controls.js,slider.js,sound.js" > + </filelist> + + + <filelist id="prototype" + dir="${basedir}/src/main/javascript/prototype" + files="prototype-1.6.0.3.js,../memory.js,patches.js"> + </filelist> + + + <filelist id="dnd" + dir="${basedir}/src/main/javascript/dnd" + files="prolog.js,dnd.js,epilog.js"> + </filelist> + + <filelist id="ajaxjsf" dir="${basedir}/src/main/javascript/ajaxjsf" files="prolog.js,sarissa.js,JSFAJAX.js,queue.js,log4ajax.js,epilog.js,../memory.js"></filelist> + <!-- ================================= + target: assemble + ================================= --> + <target name="assembly" + depends="depends" + description="--> Assemble all javaScript library files to one AJAXJSF.js" + > + <concat append="false" + binary="false" + destfile="${scripts.dir}/${script}" + fixlastline="yes" + eol="unix" + > + <filelist refid="ajaxjsf"> + </filelist> + </concat> + <concat append="false" + binary="false" + destfile="${scripts.dir}/${script.imagecache}" + fixlastline="yes" + eol="unix" + > + <filelist refid="imagecache"/> + </concat> + <concat append="false" + binary="false" + destfile="${scripts.dir}/${script.dnd}" + fixlastline="yes" + eol="unix" + > + <filelist refid="dnd"/> + </concat> + <concat append="false" + binary="false" + destfile="${prototype.scripts.dir}/${script.prototype}" + fixlastline="yes" + eol="unix"> + <filelist refid="prototype"> + </filelist> + </concat> + <concat append="false" + binary="false" + destfile="${scriptaculous.scripts.dir}/${script.scriptaculous}" + fixlastline="yes" + eol="unix" + > + <filelist refid="scriptaculous"></filelist> + </concat> + + <concat append="false" + binary="false" + destfile="${jquery.scripts.dir}/${script.jquery}" + fixlastline="yes" + eol="unix" + > + <filelist refid="jquery"></filelist> + </concat> + + + <copy todir="${prototype.scripts.dir}" file="${basedir}/src/main/javascript/ajaxjsf/smartposition.js"> + </copy> + <copy todir="${scriptaculous.scripts.dir}"> + <fileset dir="${basedir}/src/main/javascript/scriptaculous"></fileset> + </copy> + </target> + + + <!-- ================================= + target: fixeol + ================================= --> + <target name="fixeol" depends="depends" description="--> Fix CR/LF in files"> + <fixcrlf srcdir="${basedir}" includes="*.js" eol="unix"> + </fixcrlf> + </target> + + + <!-- - - - - - - - - - - - - - - - - - + target: depends + - - - - - - - - - - - - - - - - - --> + <target name="depends"> + </target> + +</project> + Added: branches/framework-shared/impl-shared/pom.xml =================================================================== --- branches/framework-shared/impl-shared/pom.xml (rev 0) +++ branches/framework-shared/impl-shared/pom.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>framework</artifactId> + <groupId>org.richfaces</groupId> + <version>3.3.3-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl-shared</artifactId> + <version>3.3.3-SNAPSHOT</version> + <name>impl-shared</name> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>target/javascript</directory> + </resource> + </resources> + <plugins> + <plugin> + <!-- Necessary due to http://jira.codehaus.org/browse/MINSTALL-41 --> + <artifactId>maven-install-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <goals> + <goal>javacc</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>javascript</id> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="${basedir}/generatescript.xml" inheritRefs="true"> + <target name="assembly" /> + <property name="target-dir" value="${project.build.directory}/javascript" /> + </ant> + </tasks> + <resourceRoot>${project.build.directory}/javascript</resourceRoot> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-javascript-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <goals> + <goal>compress</goal> + </goals> + <configuration> + <nosuffix>false</nosuffix> + <outputDirectory>${project.build.directory}/compressed/</outputDirectory> + <aggregations> + <aggregation> + <insertNewLine>true</insertNewLine> + <output>${project.build.outputDirectory}/org/ajax4jsf/framework.pack.js</output> + <includes> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/prototype-min.js</include> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/AJAX-min.js</include> + <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous-min.js</include> + <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery/jquery-min.js</include> + <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery.utils-min.js</include> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/dnd-min.js</include> + <include>**/*-min.js</include> + </includes> + <excludes> + <exclude>**/*.pack.js</exclude> + <exclude>**/scriptaculous/*.js</exclude> + <exclude>**/extend-min.js</exclude> + <exclude>**/jquery.jcarousel-min.js</exclude> + <exclude>**/compressed.css</exclude> + </excludes> + </aggregation> + </aggregations> + <resources> + <resource> + <directory>target/javascript</directory> + </resource> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>jslint</id> + <phase>test</phase> + <goals> + <goal>jslint</goal> + </goals> + <configuration> + <includes> + <include>**/framework.pack.js</include> + </includes> + <resources> + <resource> + <directory>${project.build.outputDirectory}</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>clover</id> + <build> + <plugins> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <configuration> + <includesAllSourceRoots>false</includesAllSourceRoots> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <dependencies> + <dependency> + <groupId>opensymphony</groupId> + <artifactId>oscache</artifactId> + <version>2.3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.6</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.3.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + </dependencies> +</project> Copied: branches/framework-shared/impl-shared/src/main/java/META-INF (from rev 16649, branches/community/3.3.X/framework/impl/src/main/java/META-INF) Copied: branches/framework-shared/impl-shared/src/main/java/org (from rev 16649, branches/community/3.3.X/framework/impl/src/main/java/org) Modified: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java 2010-03-22 12:59:20 UTC (rev 16649) +++ branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java 2010-03-23 00:26:05 UTC (rev 16654) @@ -79,7 +79,7 @@ public final static DataModel EMPTY_MODEL = new ListDataModel( Collections.EMPTY_LIST); - private static final Log _log = LogFactory.getLog(UIDataAdaptor.class); + private static final Log _log = LogFactory.getLog(UIDataAdaptorBase.class); /** * Base class for visit data model at phases decode, validation and update Copied: branches/framework-shared/impl-shared/src/main/javacc (from rev 16649, branches/community/3.3.X/framework/impl/src/main/javacc) Copied: branches/framework-shared/impl-shared/src/main/javascript (from rev 16649, branches/community/3.3.X/framework/impl/src/main/javascript) Copied: branches/framework-shared/impl-shared/src/main/resources (from rev 16649, branches/community/3.3.X/framework/impl/src/main/resources) Copied: branches/framework-shared/impl-shared/src/test/java (from rev 16649, branches/community/3.3.X/framework/impl/src/test/java) Copied: branches/framework-shared/impl-shared/src/test/resources (from rev 16649, branches/community/3.3.X/framework/impl/src/test/resources) Modified: branches/framework-shared/pom.xml =================================================================== --- branches/community/3.3.X/framework/pom.xml 2010-03-22 12:59:20 UTC (rev 16649) +++ branches/framework-shared/pom.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -1,144 +1,147 @@ -<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>3.3.3-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>framework</artifactId> - <version>3.3.3-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Java Server Faces AJAX framework</name> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.2</version> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>2.0.2</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-source</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.15.B1</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> - </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>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - </dependencies> - <modules> - <!-- - <module>api-parent</module> - <module>impl-parent</module> - --> - <module>api</module> - <module>impl</module> - <module>test</module> - <module>jsf-test</module> - </modules> - -</project> +<?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>3.3.3-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>framework</artifactId> + <version>3.3.3-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Java Server Faces AJAX framework</name> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.2</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.2</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_12</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_12</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.15.B1</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> + </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>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + </dependencies> + <modules> + <!-- + <module>api-parent</module> + <module>impl-parent</module> + --> + <module>api</module> + <module>impl</module> + <module>test</module> + <module>jsf-test</module> + <module>impl-shared</module> + <module>impl-jsf2</module> + </modules> + +</project> \ No newline at end of file