click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadr...@apache.org
Subject svn commit: r1538295 [1/8] - in /click/branches/click-3.0.0/click: ./ build/ documentation/docs/ examples/ examples/src/org/apache/click/examples/control/ examples/src/org/apache/click/examples/page/ examples/src/org/apache/click/examples/page/ajax/for...
Date Sat, 02 Nov 2013 22:15:34 GMT
Author: aadrian
Date: Sat Nov  2 22:15:31 2013
New Revision: 1538295

URL: http://svn.apache.org/r1538295
Log:
Refactor Prototype.js based controls (DateField, CheckList, and ColorPicker) to their own package and JAR file: issue #CLK-529

Added:
    click/branches/click-3.0.0/click/build/click-extras-prototypejs.pom   (with props)
    click/branches/click-3.0.0/click/documentation/docs/prototypejs-overview.html   (with props)
    click/branches/click-3.0.0/click/prototypejs/   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/blue.css   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/calendar.gif   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/calendar_date_select.js   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/default.css   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/plain.css   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/red.css   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/silver.css   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/checklist/
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/checklist/checklist.css   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/checklist/checklist.js   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/colorpicker/
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/colorpicker/colorpicker.css   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/colorpicker/colorpicker.js   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/colorpicker/images/
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/colorpicker/images/clear.png   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/colorpicker/images/close.png   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/colorpicker/images/color-picker.png   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/colorpicker/images/crosshairs.png   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/colorpicker/images/h.png   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/colorpicker/images/position.png   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/colorpicker/images/sv.png   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/prototype/
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/prototype/builder.js   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/prototype/controls.js   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/prototype/dragdrop.js   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/prototype/effects.js   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/prototype/prototype.js   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/prototype/scriptaculous.js   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/prototype/slider.js   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/prototype/unittest.js   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/extras-prototypejs-controls.xml   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/CheckList.java   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker.htm   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker.java   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_cs.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_de.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_en.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_fr.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_it.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_ja.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_nl.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_pl.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_pt_BR.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_ro.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_ru.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_tr.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/ColorPicker_zh_CN.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField.java   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_cs.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_da.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_de.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_en.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_fi.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_fr.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_it_IT.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_ja.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_nl.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_pl.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_pt_BR.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_ro.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_ru.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_tr.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/DateField_zh_CN.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/src/org/apache/click/extras/prototypejs/package.html   (with props)
    click/branches/click-3.0.0/click/prototypejs/test/
    click/branches/click-3.0.0/click/prototypejs/test/org/
    click/branches/click-3.0.0/click/prototypejs/test/org/apache/
    click/branches/click-3.0.0/click/prototypejs/test/org/apache/click/
    click/branches/click-3.0.0/click/prototypejs/test/org/apache/click/extras/
    click/branches/click-3.0.0/click/prototypejs/test/org/apache/click/extras/prototypejs/
    click/branches/click-3.0.0/click/prototypejs/test/org/apache/click/extras/prototypejs/CheckListTest.java   (with props)
    click/branches/click-3.0.0/click/prototypejs/test/org/apache/click/extras/prototypejs/ColorPickerTest.java   (with props)
    click/branches/click-3.0.0/click/prototypejs/test/org/apache/click/extras/prototypejs/DateFieldTest$MyDateField.properties   (with props)
    click/branches/click-3.0.0/click/prototypejs/test/org/apache/click/extras/prototypejs/DateFieldTest.java   (with props)
Removed:
    click/branches/click-3.0.0/click/extras/src/META-INF/resources/click/calendar/
    click/branches/click-3.0.0/click/extras/src/META-INF/resources/click/checklist/
    click/branches/click-3.0.0/click/extras/src/META-INF/resources/click/colorpicker/
    click/branches/click-3.0.0/click/extras/src/META-INF/resources/click/prototype/
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/CheckList.java
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker.htm
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker.java
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_cs.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_de.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_en.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_fr.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_it.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_ja.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_nl.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_pl.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_pt_BR.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_ro.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_ru.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_tr.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/ColorPicker_zh_CN.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField.java
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_cs.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_da.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_de.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_en.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_fi.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_fr.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_it_IT.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_ja.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_nl.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_pl.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_pt_BR.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_ro.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_ru.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_tr.properties
    click/branches/click-3.0.0/click/extras/src/org/apache/click/extras/control/DateField_zh_CN.properties
    click/branches/click-3.0.0/click/extras/test/org/apache/click/extras/control/CheckListTest.java
    click/branches/click-3.0.0/click/extras/test/org/apache/click/extras/control/ColorPickerTest.java
    click/branches/click-3.0.0/click/extras/test/org/apache/click/extras/control/DateFieldTest$MyDateField.properties
    click/branches/click-3.0.0/click/extras/test/org/apache/click/extras/control/DateFieldTest.java
Modified:
    click/branches/click-3.0.0/click/   (props changed)
    click/branches/click-3.0.0/click/build/build.xml
    click/branches/click-3.0.0/click/documentation/docs/   (props changed)
    click/branches/click-3.0.0/click/documentation/docs/roadmap-changes.html
    click/branches/click-3.0.0/click/documentation/docs/upgrade-path.html
    click/branches/click-3.0.0/click/examples/build.xml
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/control/ClientPanel.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/control/FilterPanel.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/EditCustomer.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/ajax/form/AdvancedFormAjaxPage.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/cayenne/CayenneFormPage.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/cayenne/TabbedCayenneFormPage.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/control/CheckListDemo.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/control/FieldSetDemo.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/ExtraControlsForm.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/FormProperties.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/TabbedFormDemo.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/introduction/AdvancedForm.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/jsp/EditCustomerPage.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/pageflow/StartPage.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/quartz/QuartzJobAndTriggerPage.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/EditFormTablePage.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/EditTable.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/FormTablePage.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/SearchTablePage.java
    click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/wizard/Step1.java

Propchange: click/branches/click-3.0.0/click/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Nov  2 22:15:31 2013
@@ -13,3 +13,4 @@ design
 *.iws
 *.eml
 .idea
+out

Modified: click/branches/click-3.0.0/click/build/build.xml
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/build/build.xml?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/build/build.xml (original)
+++ click/branches/click-3.0.0/click/build/build.xml Sat Nov  2 22:15:31 2013
@@ -24,6 +24,7 @@
    <xmlproperty file="./build/javascript-syntax-highlighter.xml"/>
    <property name="click" value="click-${version}"/>
    <property name="click-extras" value="click-extras-${version}"/>
+   <property name="click-extras-prototypejs" value="click-extras-prototypejs-${version}"/>
    <property name="click-nodeps" value="click-nodeps-${version}"/>
    <property name="click-mock" value="click-mock-${version}"/>
 
@@ -118,7 +119,16 @@
       <pathelement location="dist/${click}.jar"/>
    </path>
 
-   <path id="classpath.mock">
+    <path id="classpath.extras-prototypejs">
+        <pathelement location="prototypejs/classes"/>
+        <pathelement location="lib/${jar.log4j}"/>
+        <pathelement location="lib/${jar.servlet}"/>
+        <pathelement location="lib/${jar.slf4j}"/>
+        <pathelement location="dist/${click}.jar"/>
+        <pathelement location="dist/${click-extras}.jar"/>
+    </path>
+
+    <path id="classpath.mock">
       <pathelement location="mock/classes"/>
       <pathelement location="lib/${jar.codec}"/>
       <pathelement location="lib/${jar.collections}"/>
@@ -136,6 +146,7 @@
       <pathelement location="lib/${jar.spring}"/>
       <pathelement location="dist/${click}.jar"/>
       <pathelement location="dist/${click-extras}.jar"/>
+      <pathelement location="dist/${click-extras-prototypejs}.jar"/>
    </path>
 
    <path id="classpath.test"> 
@@ -153,12 +164,12 @@
 
    <!-- Target Definitions -->
    <target name="build-all" 
-           depends="build-framework, build-mock, build-extras, build-examples" 
+           depends="build-framework, build-mock, build-extras, build-extras-prototypejs, build-examples"
            description="build Click framework, extras, mock, examples"/>
 
 
    <target name="build-distribution" 
-           depends="clean, build-framework, build-mock, build-extras, build-examples, javadoc" 
+           depends="clean, build-framework, build-mock, build-extras, build-extras-prototypejs, build-examples, javadoc"
            description="build distribution ZIP file">
       <!-- create distribution zip file -->
       <delete dir="${click}" quiet="false"/>
@@ -261,8 +272,59 @@
       <delete dir="temp" quiet="false"/>
    </target>
 
+    <target name="build-extras-prototypejs" description="build extras-prototypejs JAR file" depends="check-deps">
+        <available file="dist/${click}.jar" property="isClickAvail"/>
+        <fail message="Build framework first with 'build-framework'">
+            <condition>
+                <or><isfalse value="${isClickAvail}"/></or>
+            </condition>
+        </fail>
+        <available file="dist/${click-extras}.jar" property="isClickExtrasAvail"/>
+        <fail message="Build extras first with 'build-extras'">
+            <condition>
+                <or><isfalse value="${isClickExtrasAvail}"/></or>
+            </condition>
+        </fail>
+        <delete file="dist/${click-extras-prototypejs}.jar" quiet="false"/>
+        <delete dir="prototypejs/classes" quiet="false"/>
+        <mkdir dir="prototypejs/classes"/>
+        <copy todir="prototypejs/classes">
+            <fileset dir="prototypejs/src">
+                <exclude name="**/package.html"/>
+                <exclude name="${exclude-hibernate}"/>
+            </fileset>
+        </copy>
+        <copy file="LICENSE.txt" todir="prototypejs/classes/META-INF"/>
+        <copy file="NOTICE.txt" todir="prototypejs/classes/META-INF"/>
+        <javac srcdir="prototypejs/src"
+               destdir="prototypejs/classes"
+               debug="true"
+               excludes="**/Test*, ${exclude-hibernate}"
+               encoding="UTF-8"
+               source="${javac.source}">
+            <classpath refid="classpath.extras-prototypejs"/>
+        </javac>
+        <jar destfile="dist/${click-extras-prototypejs}.jar">
+            <manifest>
+                <attribute name="Click-Version" value="${version}"/>
+                <attribute name="Package" value="org.apache.click.extras.prototypejs"/>
+                <attribute name="Built-By" value="${user.name}"/>
+                <attribute name="Created-By" value="Apache Ant"/>
+                <attribute name="Build-Jdk" value="${java.version}"/>
+                <attribute name="Extension-Name" value="org.apache.click.extras.prototypejs"/>
+                <attribute name="Specification-Title" value="Click is a Java-based web application framework" />
+                <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
+                <attribute name="Implementation-Title" value="org.apache.click.extras.prototypejs"/>
+                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+                <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
+                <attribute name="Implementation-Version" value="${version}"/>
+            </manifest>
+            <fileset dir="prototypejs/classes"/>
+        </jar>
+        <delete dir="temp" quiet="false"/>
+    </target>
 
-   <target name="build-framework" description="build framework JAR file" depends="check-deps">
+    <target name="build-framework" description="build framework JAR file" depends="check-deps">
       <mkdir dir="dist"/>
       <delete file="dist/${click}.jar" quiet="false"/>
       <delete file="dist/${click-nodeps}.jar" quiet="false"/>
@@ -394,7 +456,7 @@
 
 
    <target name="build-maven-bundles" 
-           depends="build-framework, build-mock, build-extras, build-sources, build-javadoc-jars"
+           depends="build-framework, build-mock, build-extras, build-extras-prototypejs, build-sources, build-javadoc-jars"
            description="build Maven repository upload bundles">
       <!-- Start with a clean directory -->
       <delete dir="${maven-bundle}" quiet="false"/>
@@ -402,6 +464,7 @@
       <buildBundleMacro name="click"/>
       <buildBundleMacro name="click-nodeps"/>
       <buildBundleMacro name="click-extras"/>
+      <buildBundleMacro name="click-extras-prototypejs"/>
       <buildBundleMacro name="click-mock"/>
    </target>
 
@@ -424,13 +487,22 @@
             <exclude name="**/package.html"/>
          </fileset>
       </jar>
+
       <!-- zip extras -->
       <jar destfile="dist/${click-extras}-sources.jar" >
          <fileset dir="extras/src">
             <exclude name="**/*.html"/>
          </fileset>
       </jar>
-      <!-- zip mock -->
+
+       <!-- zip extras-prototypejs -->
+       <jar destfile="dist/${click-extras-prototypejs}-sources.jar" >
+           <fileset dir="prototypejs/src">
+               <exclude name="**/*.html"/>
+           </fileset>
+       </jar>
+
+       <!-- zip mock -->
       <jar destfile="dist/${click-mock}-sources.jar" >
          <fileset dir="mock/src">
             <exclude name="**/*.html"/>
@@ -460,6 +532,13 @@
             <fileset dir="documentation/docs/extras-api">
             </fileset>
         </zip>
+        <!-- zip extras-prototypejs -->
+        <copy file="LICENSE.txt" todir="documentation/docs/prototypejs-api/META-INF"/>
+        <copy file="NOTICE.txt" todir="documentation/docs/prototypejs-api/META-INF"/>
+        <zip destfile="dist/${click-extras-prototypejs}-javadoc.jar" >
+            <fileset dir="documentation/docs/prototypejs-api">
+            </fileset>
+        </zip>
         <!-- zip mock -->
         <copy file="LICENSE.txt" todir="documentation/docs/mock-api/META-INF"/>
         <copy file="NOTICE.txt" todir="documentation/docs/mock-api/META-INF"/>
@@ -484,6 +563,7 @@
       <checkstyle config="build/checkstyle-checks.xml">
          <fileset dir="framework/src/org/apache/click/" includes="**/*.java"/>
          <fileset dir="extras/src" includes="**/*.java"/>
+         <fileset dir="prototypejs/src" includes="**/*.java"/>
          <fileset dir="mock/src" includes="**/*.java"/>
         <classpath refid="classpath.checkstyle"/>
       </checkstyle>
@@ -515,7 +595,10 @@
       <delete>
         <fileset dir="extras/test" includes="TEST-*.txt"/>
       </delete>
-      <delete>
+       <delete>
+           <fileset dir="prototypejs/test" includes="TEST-*.txt"/>
+       </delete>
+       <delete>
         <fileset dir="mock/test" includes="TEST-*.txt"/>
       </delete>
    </target>
@@ -541,16 +624,18 @@
                classname="org.apache.click.tools.devtasks.ReplaceTabsTask"
                 classpath="lib/click-dev-tasks-1.1.jar"/>
 
-      <linetrim    srcdir="framework/src" includes="**/*.java"/>
-      <replacetabs srcdir="framework/src" includes="**/*.java"/>
-      <linetrim    srcdir="extras/src"    includes="**/*.java"/>
-      <replacetabs srcdir="extras/src"    includes="**/*.java"/>
-      <linetrim    srcdir="mock/src"      includes="**/*.java"/>
-      <replacetabs srcdir="mock/src"      includes="**/*.java"/>
-      <linetrim    srcdir="examples/src"  includes="**/*.java"/>
-      <replacetabs srcdir="examples/src"  includes="**/*.java"/>
-      <linetrim    srcdir="template/src"  includes="**/*.java"/>
-      <replacetabs srcdir="template/src"  includes="**/*.java"/>
+      <linetrim    srcdir="framework/src"   includes="**/*.java"/>
+      <replacetabs srcdir="framework/src"   includes="**/*.java"/>
+      <linetrim    srcdir="extras/src"      includes="**/*.java"/>
+      <replacetabs srcdir="extras/src"      includes="**/*.java"/>
+      <linetrim    srcdir="prototypejs/src" includes="**/*.java"/>
+      <replacetabs srcdir="prototypejs/src" includes="**/*.java"/>
+      <linetrim    srcdir="mock/src"        includes="**/*.java"/>
+      <replacetabs srcdir="mock/src"        includes="**/*.java"/>
+      <linetrim    srcdir="examples/src"    includes="**/*.java"/>
+      <replacetabs srcdir="examples/src"    includes="**/*.java"/>
+      <linetrim    srcdir="template/src"    includes="**/*.java"/>
+      <replacetabs srcdir="template/src"    includes="**/*.java"/>
    </target>
 
  
@@ -670,7 +755,20 @@ Please ensure you have configured build.
                     overview="documentation/docs/extras-overview.html"
                     excludes="${exclude-hibernate-package}"/>
 
-      <!-- Mock -->
+       <!-- Extras-prototypejs -->
+       <delete quiet="false" failonerror="false">
+           <fileset dir="documentation/docs/prototypejs-api" includes="**/*"/>
+       </delete>
+
+       <javadocMacro src="prototypejs/src"
+                     destdir="documentation/docs/prototypejs-api"
+                     windowtitle="Click Extras Prototype.js API - v${version}"
+                     doctitle="Click Extras Prototype.js API - v${version}"
+                     classpath="classpath.extras-prototypejs"
+                     overview="documentation/docs/prototypejs-overview.html"
+                     excludes=""/>
+
+       <!-- Mock -->
       <delete quiet="false" failonerror="false">
          <fileset dir="documentation/docs/mock-api" includes="**/*"/>
       </delete>
@@ -694,7 +792,7 @@ Please ensure you have configured build.
       <copy file="documentation/images/service-package.png"
             todir="documentation/docs/extras-api/org/apache/click/extras/service/"/>
       <copy file="documentation/images/calendar.gif"
-            todir="documentation/docs/extras-api/org/apache/click/extras/control"/>
+            todir="documentation/docs/prototypejs-api/org/apache/click/extras/prototypejs"/>
       <copy file="documentation/images/form-table.png"
             todir="documentation/docs/extras-api/org/apache/click/extras/control"/>
       <copy file="documentation/images/menu.png"
@@ -711,8 +809,8 @@ Please ensure you have configured build.
             todir="documentation/docs/click-api/org/apache/click/control"/>
       <copy file="documentation/images/inline-paginator.png"
             todir="documentation/docs/extras-api/org/apache/click/extras/control"/>
-      <copy file="extras/src/META-INF/resources/click/colorpicker/images/color-picker.png"
-            todir="documentation/docs/extras-api/org/apache/click/extras/control/colorpicker"/>
+      <copy file="prototypejs/src/META-INF/resources/click/colorpicker/images/color-picker.png"
+            todir="documentation/docs/prototypejs-api/org/apache/click/extras/prototypejs/colorpicker"/>
       <copy file="documentation/images/tree.png"
             todir="documentation/docs/extras-api/org/apache/click/extras/tree"/>
       <copy file="documentation/images/checkbox-tree.png"
@@ -723,7 +821,10 @@ Please ensure you have configured build.
       <copy file="documentation/docs/javadoc-stylesheet.css"  
             overwrite="true"
             tofile="documentation/docs/extras-api/stylesheet.css"/>
-      <copy file="documentation/docs/javadoc-stylesheet.css"  
+       <copy file="documentation/docs/javadoc-stylesheet.css"
+             overwrite="true"
+             tofile="documentation/docs/prototypejs-api/stylesheet.css"/>
+       <copy file="documentation/docs/javadoc-stylesheet.css"
             overwrite="true"
             tofile="documentation/docs/mock-api/stylesheet.css"/>
    </target>
@@ -806,8 +907,45 @@ Please ensure you have configured build.
       </delete>
    </target>
 
+    <target name="test-prototypejs" depends="check-deps">
+        <copy todir="prototypejs/classes">
+            <fileset dir="prototypejs/src">
+                <exclude name="**/package.html"/>
+            </fileset>
+        </copy>
+        <copy todir="prototypejs/classes">
+            <fileset dir="prototypejs/test">
+                <exclude name="**/package.html"/>
+            </fileset>
+        </copy>
+        <javac srcdir="prototypejs/src;prototypejs/test;mock/src"
+               destdir="prototypejs/classes"
+               debug="true"
+               encoding="UTF-8"
+               source="${javac.source}">
+            <classpath refid="classpath.framework"/>
+            <classpath refid="classpath.extras"/>
+            <classpath refid="classpath.extras-prototypejs"/>
+            <classpath refid="classpath.test"/>
+        </javac>
+        <junit haltonfailure="yes" showoutput="true">
+            <classpath refid="classpath.extras-prototypejs"/>
+            <classpath refid="classpath.extras"/>
+            <classpath refid="classpath.framework"/>
+            <classpath refid="classpath.test"/>
+            <formatter type="plain"/>
+            <batchtest fork="yes" todir="prototypejs/test">
+                <fileset dir="prototypejs/test">
+                    <include name="**/*Test.java"/>
+                </fileset>
+            </batchtest>
+        </junit>
+        <delete>
+            <fileset dir="prototypejs/test" includes="TEST-*.txt"/>
+        </delete>
+    </target>
 
-   <target name="test-mock" depends="check-deps">
+    <target name="test-mock" depends="check-deps">
       <copy todir="mock/classes">
          <fileset dir="mock/src">
             <exclude name="**/package.html"/>
@@ -845,7 +983,7 @@ Please ensure you have configured build.
    </target>
 
 
-   <target name="test-all" depends="test-framework, test-extras, test-mock"
+   <target name="test-all" depends="test-framework, test-extras, test-prototypejs, test-mock"
        description="run all unit tests"/>
 
 

Added: click/branches/click-3.0.0/click/build/click-extras-prototypejs.pom
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/build/click-extras-prototypejs.pom?rev=1538295&view=auto
==============================================================================
--- click/branches/click-3.0.0/click/build/click-extras-prototypejs.pom (added)
+++ click/branches/click-3.0.0/click/build/click-extras-prototypejs.pom Sat Nov  2 22:15:31 2013
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+<project>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.click</groupId>
+  <artifactId>click-extras-prototypejs</artifactId>
+  <packaging>jar</packaging>
+  <version>VERSION</version>
+
+<!--TEMPLATE-->
+
+  <dependencies>
+
+    <dependency>    
+      <groupId>org.apache.click</groupId>
+      <artifactId>click-nodeps</artifactId>
+      <version>VERSION</version>
+    </dependency>
+
+      <dependency>
+          <groupId>org.apache.click</groupId>
+          <artifactId>click-extras</artifactId>
+          <version>VERSION</version>
+      </dependency>
+
+      <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.16</version>
+      <optional>true</optional>
+
+      <exclusions>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.jms</groupId>
+          <artifactId>jms</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jdmk</groupId>
+          <artifactId>jmxtools</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jmx</groupId>
+          <artifactId>jmxri</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
+
+    </dependency>
+  </dependencies>
+
+</project>
\ No newline at end of file

Propchange: click/branches/click-3.0.0/click/build/click-extras-prototypejs.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: click/branches/click-3.0.0/click/documentation/docs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Nov  2 22:15:31 2013
@@ -3,4 +3,5 @@ mock-api
 user-guide
 click-api
 extras-api
+prototypejs-api
 Thumbs.db

Added: click/branches/click-3.0.0/click/documentation/docs/prototypejs-overview.html
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/documentation/docs/prototypejs-overview.html?rev=1538295&view=auto
==============================================================================
--- click/branches/click-3.0.0/click/documentation/docs/prototypejs-overview.html (added)
+++ click/branches/click-3.0.0/click/documentation/docs/prototypejs-overview.html Sat Nov  2 22:15:31 2013
@@ -0,0 +1,38 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+<body>
+
+<p>
+Click Extras-Prototypejs provides a library of additional Prototype.js based controls and components which are outside
+of the core Click framework. 
+</p>
+<p>
+Click Extras-Prototypejs are packaged as a separated JAR which
+you can deploy with your application. Extra packages include:
+<ul style="margin-top:0.75em;">
+ <li><a href="org/apache/click/extras/prototypejs/package-summary.html">Prototypejs</a>
+ - provides Prototype.js based controls</li>
+</ul>
+</p>
+
+<p/>
+For a detailed list of dependencies please see <a href="building.html#extras-dependencies">Extras Dependencies</a>.
+
+</body>
+

Propchange: click/branches/click-3.0.0/click/documentation/docs/prototypejs-overview.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: click/branches/click-3.0.0/click/documentation/docs/roadmap-changes.html
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/documentation/docs/roadmap-changes.html?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/documentation/docs/roadmap-changes.html (original)
+++ click/branches/click-3.0.0/click/documentation/docs/roadmap-changes.html Sat Nov  2 22:15:31 2013
@@ -80,7 +80,9 @@
       </div>
       <ul style="padding: 0em; margin-left:0em;margin-bottom: 2em">
           <li class="change">
-              change ...
+              The Prototype.js based Controls (DateField, CheckList, and ColorPicker) were refactored to a separate
+              package and JAR
+              [<a target="_blank" href="https://issues.apache.org/jira/browse/CLK-529">CLK-529</a>].
           </li>
       </ul>
   </dd>

Modified: click/branches/click-3.0.0/click/documentation/docs/upgrade-path.html
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/documentation/docs/upgrade-path.html?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/documentation/docs/upgrade-path.html (original)
+++ click/branches/click-3.0.0/click/documentation/docs/upgrade-path.html Sat Nov  2 22:15:31 2013
@@ -85,6 +85,11 @@ versions please email the Click user gro
   <dd>
       <ul style="padding: 0em; margin-left:0em;margin-bottom: 2em">
           <li class="change">
+              DateField, CheckList, and ColorPicker were refactored to package org.apache.click.extras.prototypejs and
+              to the JAR file click-extras-prototypejs-xxx.jar. You'll need to update your imports and also your project
+              dependency if those 3 controls were used in your project.
+          </li>
+          <li class="change">
               Minimal requirements are now: Java 6 and Servlet 3.0
           </li>
       </ul>

Modified: click/branches/click-3.0.0/click/examples/build.xml
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/build.xml?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/build.xml (original)
+++ click/branches/click-3.0.0/click/examples/build.xml Sat Nov  2 22:15:31 2013
@@ -32,6 +32,7 @@
    <property name="jar.cayenne" value="cayenne-server-${cayenne.version}.jar"/>
    <property name="jar.click" value="click-${version}.jar"/>
    <property name="jar.click-extras" value="click-extras-${version}.jar"/>
+   <property name="jar.click-extras-prototypejs" value="click-extras-prototypejs-${version}.jar"/>
    <property name="jar.hsqldb" value="hsqldb-${hsqldb.version}.jar"/>
    <property name="jar.jstl" value="jstl-${jstl.version}.jar"/>
    <property name="jar.log4j" value="log4j-${log4j.version}.jar"/>
@@ -71,6 +72,7 @@
    <path id="classpath">
       <pathelement location="../dist/${jar.click}"/>
       <pathelement location="../dist/${jar.click-extras}"/>
+      <pathelement location="../dist/${jar.click-extras-prototypejs}"/>
       <pathelement location="../lib/${jar.servlet}"/>
       <fileset dir="${dir.weblib}">
         <include name="*.jar"/>
@@ -126,6 +128,7 @@
         <fileset dir="../dist">
             <include name="${jar.click}"/>
             <include name="${jar.click-extras}"/>
+            <include name="${jar.click-extras-prototypejs}"/>
         </fileset>
       </deploy>
 
@@ -136,6 +139,7 @@
          </manifest>
          <lib file="../dist/${jar.click}"/>
          <lib file="../dist/${jar.click-extras}"/>
+         <lib file="../dist/${jar.click-extras-prototypejs}"/>
          <fileset dir="${dir.webapp}">
             <exclude name="**/web.xml"/>
          </fileset>
@@ -150,7 +154,15 @@
   	        <or><isfalse value="${isExtrasAvail}"/></or>
   	     </condition>
       </fail>
-      <delete dir="${dir.webapp}/WEB-INF/classes" quiet="false"/>
+
+       <available file="../dist/${jar.click-extras-prototypejs}" property="isExtrasPrototypejsAvail"/>
+       <fail message="Build extras-prototypejs first with 'build-extras-prototypejs'">
+           <condition>
+               <or><isfalse value="${isExtrasPrototypejsAvail}"/></or>
+           </condition>
+       </fail>
+
+       <delete dir="${dir.webapp}/WEB-INF/classes" quiet="false"/>
       <mkdir dir="${dir.webapp}/WEB-INF/classes"/>
       <copy todir="${dir.webapp}/WEB-INF/classes">
          <fileset dir="src">

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/control/ClientPanel.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/control/ClientPanel.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/control/ClientPanel.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/control/ClientPanel.java Sat Nov  2 22:15:31 2013
@@ -22,7 +22,7 @@ import org.apache.click.control.Form;
 import org.apache.click.control.Panel;
 import org.apache.click.control.Submit;
 import org.apache.click.control.TextField;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.DoubleField;
 
 /**

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/control/FilterPanel.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/control/FilterPanel.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/control/FilterPanel.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/control/FilterPanel.java Sat Nov  2 22:15:31 2013
@@ -22,7 +22,7 @@ import java.util.Date;
 
 import org.apache.click.control.Form;
 import org.apache.click.control.Panel;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 
 /**
  * Provides a custom date FilterPanel.

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/EditCustomer.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/EditCustomer.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/EditCustomer.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/EditCustomer.java Sat Nov  2 22:15:31 2013
@@ -30,7 +30,7 @@ import org.apache.click.control.TextFiel
 import org.apache.click.examples.control.InvestmentSelect;
 import org.apache.click.examples.domain.Customer;
 import org.apache.click.examples.service.CustomerService;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.DoubleField;
 import org.apache.click.extras.control.EmailField;
 import org.apache.click.extras.control.IntegerField;

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/ajax/form/AdvancedFormAjaxPage.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/ajax/form/AdvancedFormAjaxPage.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/ajax/form/AdvancedFormAjaxPage.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/ajax/form/AdvancedFormAjaxPage.java Sat Nov  2 22:15:31 2013
@@ -31,7 +31,7 @@ import org.apache.click.element.Element;
 import org.apache.click.element.JsImport;
 import org.apache.click.element.JsScript;
 import org.apache.click.examples.page.BorderPage;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.IntegerField;
 
 /**

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/cayenne/CayenneFormPage.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/cayenne/CayenneFormPage.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/cayenne/CayenneFormPage.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/cayenne/CayenneFormPage.java Sat Nov  2 22:15:31 2013
@@ -29,7 +29,7 @@ import org.apache.click.control.TextFiel
 import org.apache.click.examples.domain.Client;
 import org.apache.click.examples.service.ClientService;
 import org.apache.click.extras.cayenne.QuerySelect;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.EmailField;
 import org.apache.click.extras.control.IntegerField;
 import org.springframework.stereotype.Component;

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/cayenne/TabbedCayenneFormPage.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/cayenne/TabbedCayenneFormPage.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/cayenne/TabbedCayenneFormPage.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/cayenne/TabbedCayenneFormPage.java Sat Nov  2 22:15:31 2013
@@ -31,7 +31,7 @@ import org.apache.click.examples.service
 import org.apache.click.extras.cayenne.CayenneForm;
 import org.apache.click.extras.cayenne.QuerySelect;
 import org.apache.click.extras.cayenne.TabbedCayenneForm;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.EmailField;
 import org.apache.click.extras.control.IntegerField;
 import org.springframework.stereotype.Component;

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/control/CheckListDemo.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/control/CheckListDemo.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/control/CheckListDemo.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/control/CheckListDemo.java Sat Nov  2 22:15:31 2013
@@ -22,7 +22,7 @@ import org.apache.click.control.Option;
 import org.apache.click.control.Submit;
 import org.apache.click.examples.page.BorderPage;
 import org.apache.click.examples.page.HomePage;
-import org.apache.click.extras.control.CheckList;
+import org.apache.click.extras.prototypejs.CheckList;
 import org.apache.click.extras.control.PageSubmit;
 
 /**

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/control/FieldSetDemo.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/control/FieldSetDemo.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/control/FieldSetDemo.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/control/FieldSetDemo.java Sat Nov  2 22:15:31 2013
@@ -31,7 +31,7 @@ import org.apache.click.examples.control
 import org.apache.click.examples.page.BorderPage;
 import org.apache.click.examples.page.HomePage;
 import org.apache.click.extras.control.CreditCardField;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.IntegerField;
 import org.apache.click.extras.control.PageSubmit;
 import org.apache.click.util.ContainerUtils;

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/ExtraControlsForm.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/ExtraControlsForm.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/ExtraControlsForm.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/ExtraControlsForm.java Sat Nov  2 22:15:31 2013
@@ -33,11 +33,11 @@ import org.apache.click.examples.page.Bo
 import org.apache.click.examples.page.HomePage;
 import org.apache.click.examples.service.CustomerService;
 import org.apache.click.examples.util.ExampleUtils;
-import org.apache.click.extras.control.CheckList;
-import org.apache.click.extras.control.ColorPicker;
+import org.apache.click.extras.prototypejs.CheckList;
+import org.apache.click.extras.prototypejs.ColorPicker;
 import org.apache.click.extras.control.CountrySelect;
 import org.apache.click.extras.control.CreditCardField;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.DoubleField;
 import org.apache.click.extras.control.EmailField;
 import org.apache.click.extras.control.IntegerField;

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/FormProperties.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/FormProperties.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/FormProperties.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/FormProperties.java Sat Nov  2 22:15:31 2013
@@ -32,7 +32,7 @@ import org.apache.click.examples.control
 import org.apache.click.examples.page.BorderPage;
 import org.apache.click.examples.page.HomePage;
 import org.apache.click.examples.util.ExampleUtils;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.EmailField;
 import org.apache.click.extras.control.PageSubmit;
 

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/TabbedFormDemo.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/TabbedFormDemo.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/TabbedFormDemo.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/form/TabbedFormDemo.java Sat Nov  2 22:15:31 2013
@@ -35,7 +35,7 @@ import org.apache.click.examples.page.Bo
 import org.apache.click.examples.page.HomePage;
 import org.apache.click.examples.util.ExampleUtils;
 import org.apache.click.extras.control.CreditCardField;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.EmailField;
 import org.apache.click.extras.control.IntegerField;
 import org.apache.click.extras.control.PageSubmit;

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/introduction/AdvancedForm.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/introduction/AdvancedForm.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/introduction/AdvancedForm.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/introduction/AdvancedForm.java Sat Nov  2 22:15:31 2013
@@ -35,7 +35,7 @@ import org.apache.click.examples.domain.
 import org.apache.click.examples.page.BorderPage;
 import org.apache.click.examples.page.HomePage;
 import org.apache.click.examples.service.CustomerService;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.EmailField;
 import org.springframework.stereotype.Component;
 

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/jsp/EditCustomerPage.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/jsp/EditCustomerPage.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/jsp/EditCustomerPage.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/jsp/EditCustomerPage.java Sat Nov  2 22:15:31 2013
@@ -23,7 +23,7 @@ import org.apache.click.control.Form;
 import org.apache.click.control.Submit;
 import org.apache.click.control.TextField;
 import org.apache.click.examples.page.BorderPage;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.DoubleField;
 import org.apache.click.extras.control.EmailField;
 

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/pageflow/StartPage.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/pageflow/StartPage.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/pageflow/StartPage.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/pageflow/StartPage.java Sat Nov  2 22:15:31 2013
@@ -42,7 +42,7 @@ import org.apache.click.examples.domain.
 import org.apache.click.examples.page.BorderPage;
 import org.apache.click.examples.page.HomePage;
 import org.apache.click.examples.service.CustomerService;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.util.ClickUtils;
 import org.springframework.stereotype.Component;
 

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/quartz/QuartzJobAndTriggerPage.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/quartz/QuartzJobAndTriggerPage.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/quartz/QuartzJobAndTriggerPage.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/quartz/QuartzJobAndTriggerPage.java Sat Nov  2 22:15:31 2013
@@ -31,7 +31,7 @@ import org.apache.click.control.TextFiel
 import org.apache.click.examples.page.BorderPage;
 import org.apache.click.examples.quartz.JobAndSimpleTrigger;
 import org.apache.click.examples.quartz.SchedulerService;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.quartz.JobDetail;
 import org.quartz.ee.servlet.QuartzInitializerListener;
 import org.quartz.impl.StdSchedulerFactory;

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/EditFormTablePage.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/EditFormTablePage.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/EditFormTablePage.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/EditFormTablePage.java Sat Nov  2 22:15:31 2013
@@ -36,7 +36,7 @@ import org.apache.click.examples.control
 import org.apache.click.examples.domain.Customer;
 import org.apache.click.examples.page.BorderPage;
 import org.apache.click.examples.service.CustomerService;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.DoubleField;
 import org.apache.click.extras.control.EmailField;
 import org.apache.click.extras.control.FieldColumn;

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/EditTable.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/EditTable.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/EditTable.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/EditTable.java Sat Nov  2 22:15:31 2013
@@ -35,7 +35,7 @@ import org.apache.click.control.TextFiel
 import org.apache.click.examples.domain.Customer;
 import org.apache.click.examples.page.BorderPage;
 import org.apache.click.examples.service.CustomerService;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.DoubleField;
 import org.apache.click.extras.control.EmailField;
 import org.apache.click.extras.control.LinkDecorator;

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/FormTablePage.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/FormTablePage.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/FormTablePage.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/FormTablePage.java Sat Nov  2 22:15:31 2013
@@ -33,7 +33,7 @@ import org.apache.click.examples.control
 import org.apache.click.examples.domain.Customer;
 import org.apache.click.examples.page.BorderPage;
 import org.apache.click.examples.service.CustomerService;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.EmailField;
 import org.apache.click.extras.control.FieldColumn;
 import org.apache.click.extras.control.FormTable;

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/SearchTablePage.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/SearchTablePage.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/SearchTablePage.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/table/SearchTablePage.java Sat Nov  2 22:15:31 2013
@@ -36,7 +36,7 @@ import org.apache.click.examples.domain.
 import org.apache.click.examples.page.BorderPage;
 import org.apache.click.examples.page.EditCustomer;
 import org.apache.click.examples.service.CustomerService;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.LinkDecorator;
 import org.apache.click.extras.control.TableInlinePaginator;
 import org.apache.click.dataprovider.DataProvider;

Modified: click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/wizard/Step1.java
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/wizard/Step1.java?rev=1538295&r1=1538294&r2=1538295&view=diff
==============================================================================
--- click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/wizard/Step1.java (original)
+++ click/branches/click-3.0.0/click/examples/src/org/apache/click/examples/page/wizard/Step1.java Sat Nov  2 22:15:31 2013
@@ -28,7 +28,7 @@ import org.apache.click.examples.domain.
 import org.apache.click.examples.domain.Client;
 import org.apache.click.examples.domain.SystemCode;
 import org.apache.click.examples.service.ClientService;
-import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.prototypejs.DateField;
 import org.apache.click.extras.control.EmailField;
 
 /**

Propchange: click/branches/click-3.0.0/click/prototypejs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Nov  2 22:15:31 2013
@@ -0,0 +1,6 @@
+classes
+*.iml
+*.ipr
+.settings
+.classpath
+.project

Added: click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/blue.css
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/blue.css?rev=1538295&view=auto
==============================================================================
--- click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/blue.css (added)
+++ click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/blue.css Sat Nov  2 22:15:31 2013
@@ -0,0 +1,151 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+.calendar_date_select {
+  color:white;
+  border:#777 1px solid;
+  display:block;
+  width:195px;
+  z-index: 1000;
+}
+/* this is a fun ie6 hack to get drop downs to stay behind the popup window.  This should always be just underneath .calendar_date_select */
+iframe.ie6_blocker {
+  position: absolute;
+  z-index: 999;
+}
+
+.calendar_date_select  thead th {
+  font-weight:bold;
+  background-color: #000;
+  border-top:1px solid #777;
+  border-bottom:2px solid #334;
+  color: white !important;
+}
+
+.calendar_date_select .cds_buttons {
+  text-align:center;
+  padding:5px 0px;
+  background-color: #000055;
+}
+
+.calendar_date_select .cds_footer {
+  background-color: black;
+  padding:3px;
+  font-size:12px;
+  text-align:center;
+}
+
+.calendar_date_select table {
+  margin: 0px;
+  padding: 0px;
+}
+
+
+.calendar_date_select .cds_header {
+  background-color: #ccc;
+  border-bottom: 2px solid #aaa;
+  text-align:center;
+  padding-top: 1px;
+  height:19px;
+}
+
+.calendar_date_select .cds_header span {
+  font-size:15px;
+  color: black;
+  font-weight: bold;
+}
+
+.calendar_date_select select { font-size:11px;}
+
+.calendar_date_select .cds_header a:hover {
+  color: white;
+}
+.calendar_date_select .cds_header a {
+  width:18px;
+  height:20px;
+  text-decoration: none;
+  font-size:14px;
+  color:black !important;
+}
+
+.calendar_date_select .cds_header a.prev {
+  float:left;
+}
+
+.calendar_date_select .cds_header a.next {
+  float:right;
+}
+
+.calendar_date_select .cds_header a.close {
+  float:right;
+  display:none;
+}
+
+
+.calendar_date_select .cds_header select.month {
+  width:90px;
+}
+
+.calendar_date_select .cds_header select.year {
+  width:61px;
+}
+
+.calendar_date_select .cds_buttons a {
+  color: white;
+  font-size: 9px;
+}
+
+.calendar_date_select td {
+  background-color: #000066;
+  font-size:12px;
+  width: 24px;
+  height: 21px;
+  text-align:center;
+  vertical-align: middle;
+}
+.calendar_date_select td.weekend {
+  background-color: #00005a;
+}
+
+.calendar_date_select td div.other {
+  color: #4C5593;
+}
+
+.calendar_date_select tbody td {
+  border-bottom: 1px solid #000044;
+}
+.calendar_date_select td.selected {
+  background-color:white;
+  color:black;
+}
+
+.calendar_date_select td:hover {
+  background-color:#ccc;
+}
+
+.calendar_date_select td.disabled div {
+  color: #000044;
+}
+.calendar_date_select td.today {
+  border: 1px dashed blue;
+}
+
+.fieldWithErrors .calendar_date_select {
+  border: 2px solid red;
+}

Propchange: click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/blue.css
------------------------------------------------------------------------------
    svn:eol-style = native

Added: click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/calendar.gif
URL: http://svn.apache.org/viewvc/click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/calendar.gif?rev=1538295&view=auto
==============================================================================
Binary file - no diff available.

Propchange: click/branches/click-3.0.0/click/prototypejs/src/META-INF/resources/click/calendar/calendar.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message