You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2006/10/11 23:50:08 UTC
svn commit: r462978 - in /myfaces/tomahawk/trunk:
core/src/main/resources-facesconfig/META-INF/
core/src/main/resources/org/apache/myfaces/custom/dojo/ core/src/main/tld/
core/src/main/tld/tomahawk-entities/ core/src/site/ core/src/site/xdoc/
sandbox/c...
Author: werpu
Date: Wed Oct 11 14:50:07 2006
New Revision: 462978
URL: http://svn.apache.org/viewvc?view=rev&rev=462978
Log:
dojo infrastructure moving TOMAHAWK-733
Added:
myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/dojo/
- copied from r462899, myfaces/tomahawk/trunk/sandbox/core/src/main/resources/org/apache/myfaces/custom/dojo/
myfaces/tomahawk/trunk/core/src/main/tld/tomahawk-entities/tomahawk_dojo_initializer_attributes.xml
myfaces/tomahawk/trunk/core/src/site/xdoc/dojoInitializer.xml
- copied, changed from r462899, myfaces/tomahawk/trunk/sandbox/core/src/site/xdoc/dojoInitializer.xml
Removed:
myfaces/tomahawk/trunk/sandbox/core/src/main/resources/org/apache/myfaces/custom/dojo/
myfaces/tomahawk/trunk/sandbox/core/src/site/xdoc/dojoInitializer.xml
Modified:
myfaces/tomahawk/trunk/core/src/main/resources-facesconfig/META-INF/faces-config.xml
myfaces/tomahawk/trunk/core/src/main/tld/tomahawk.tld
myfaces/tomahawk/trunk/core/src/site/site.xml
myfaces/tomahawk/trunk/sandbox/core/src/main/resources-facesconfig/META-INF/faces-config.xml
myfaces/tomahawk/trunk/sandbox/core/src/site/site.xml
myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/debugconsole.jsp
myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/debugconsolejsfonly.jsp
myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/dojoDialog.jsp
myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/dojoimporttest.jsp
myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/splitpanejsfonly.jsp
myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/splitpanetest.jsp
myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/textareatestjsfonly.jsp
Modified: myfaces/tomahawk/trunk/core/src/main/resources-facesconfig/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources-facesconfig/META-INF/faces-config.xml?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources-facesconfig/META-INF/faces-config.xml (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources-facesconfig/META-INF/faces-config.xml Wed Oct 11 14:50:07 2006
@@ -179,6 +179,11 @@
</component>
<component>
+ <component-type>org.apache.myfaces.DojoInitializer</component-type>
+ <component-class>org.apache.myfaces.custom.dojo.DojoInitializer</component-class>
+ </component>
+
+ <component>
<component-type>org.apache.myfaces.HtmlCheckbox</component-type>
<component-class>org.apache.myfaces.custom.checkbox.HtmlCheckbox</component-class>
</component>
@@ -730,6 +735,12 @@
<renderer-type>org.apache.myfaces.HtmlTagRenderer</renderer-type>
<renderer-class>org.apache.myfaces.custom.htmlTag.HtmlTagRenderer</renderer-class>
</renderer>
+
+ <renderer>
+ <component-family>javax.faces.Output</component-family>
+ <renderer-type>org.apache.myfaces.DojoInitializerRenderer</renderer-type>
+ <renderer-class>org.apache.myfaces.custom.dojo.DojoInitializerRenderer</renderer-class>
+ </renderer>
<renderer>
<component-family>org.apache.myfaces.HtmlTree2</component-family>
Added: myfaces/tomahawk/trunk/core/src/main/tld/tomahawk-entities/tomahawk_dojo_initializer_attributes.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/tld/tomahawk-entities/tomahawk_dojo_initializer_attributes.xml?view=auto&rev=462978
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/tld/tomahawk-entities/tomahawk_dojo_initializer_attributes.xml (added)
+++ myfaces/tomahawk/trunk/core/src/main/tld/tomahawk-entities/tomahawk_dojo_initializer_attributes.xml Wed Oct 11 14:50:07 2006
@@ -0,0 +1,92 @@
+<attribute>
+ <name>ioSendTransport</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+</attribute>
+<attribute>
+ <name>debug</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.Boolean</type>
+</attribute>
+<attribute>
+ <name>debugConsole</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.Boolean</type>
+</attribute>
+<attribute>
+ <name>debugAtAllCosts</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.Boolean</type>
+</attribute>
+<attribute>
+ <name>expanded</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.Boolean</type>
+</attribute>
+
+
+<attribute>
+ <name>baseScriptUri</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+</attribute>
+<attribute>
+ <name>allowQueryConfig</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.Boolean</type>
+</attribute>
+<attribute>
+ <name>debugContainerId</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+</attribute>
+<attribute>
+ <name>searchIds</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+</attribute>
+<attribute>
+ <name>parseWidgets</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.Boolean</type>
+</attribute>
+<attribute>
+ <name>bindEncoding</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+</attribute>
+<attribute>
+ <name>ignoreClassNames</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.Boolean</type>
+</attribute>
+<attribute>
+ <name>preventBackButtonFix</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.Boolean</type>
+</attribute>
+<attribute>
+ <name>require</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+</attribute>
+<attribute>
+ <name>provide</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.String</type>
+</attribute>
Modified: myfaces/tomahawk/trunk/core/src/main/tld/tomahawk.tld
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/tld/tomahawk.tld?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/tld/tomahawk.tld (original)
+++ myfaces/tomahawk/trunk/core/src/main/tld/tomahawk.tld Wed Oct 11 14:50:07 2006
@@ -101,6 +101,7 @@
<!ENTITY standard_select_one_radio_attributes SYSTEM "entities/standard_select_one_radio_attributes.xml">
<!ENTITY alt_location_attributes SYSTEM "entities/alt_location_attributes.xml">
+
<!ENTITY tomahawk_input_secret_attributes
SYSTEM "tomahawk-entities/tomahawk_input_secret_attributes.xml">
<!ENTITY tomahawk_message_attributes
@@ -211,6 +212,9 @@
SYSTEM "tomahawk-entities/tomahawk_html_schedule_attributes.xml">
<!ENTITY tomahawk_panel_group_attributes
SYSTEM "tomahawk-entities/tomahawk_panel_group_attributes.xml">
+<!ENTITY tomahawk_dojo_intializer_attributes
+ SYSTEM "tomahawk-entities/tomahawk_dojo_initializer_attributes.xml">
+
]>
<taglib>
@@ -1571,6 +1575,16 @@
&ui_command_attributes;
&tomahawk_ui_schedule_attributes;
&tomahawk_html_schedule_attributes;
+ </tag>
+
+
+ <tag>
+ <name>dojoInitializer</name>
+ <tag-class>org.apache.myfaces.custom.dojo.DojoInitializerTag</tag-class>
+ <body-content>JSP</body-content>
+ <description>Dojo initializer helper tag for debugging and communication flags. This tag encapsules the Dojo DjConfig meta configuration and also adds the needed dojo required functionality.</description>
+ &ui_component_attributes;
+ &tomahawk_dojo_intializer_attributes;
</tag>
Modified: myfaces/tomahawk/trunk/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/site/site.xml?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/core/src/site/site.xml (original)
+++ myfaces/tomahawk/trunk/core/src/site/site.xml Wed Oct 11 14:50:07 2006
@@ -61,6 +61,7 @@
<item name="Columns" href="columns.html"/>
<item name="Column" href="column.html"/>
<item name="Schedule" href="schedule.html"/>
+ <item name="Dojo Initializer" href="dojoInitializer.html"/>
</menu>
<menu name="Validators">
Copied: myfaces/tomahawk/trunk/core/src/site/xdoc/dojoInitializer.xml (from r462899, myfaces/tomahawk/trunk/sandbox/core/src/site/xdoc/dojoInitializer.xml)
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/site/xdoc/dojoInitializer.xml?view=diff&rev=462978&p1=myfaces/tomahawk/trunk/sandbox/core/src/site/xdoc/dojoInitializer.xml&r1=462899&p2=myfaces/tomahawk/trunk/core/src/site/xdoc/dojoInitializer.xml&r2=462978
==============================================================================
(empty)
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/resources-facesconfig/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/resources-facesconfig/META-INF/faces-config.xml?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/resources-facesconfig/META-INF/faces-config.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/resources-facesconfig/META-INF/faces-config.xml Wed Oct 11 14:50:07 2006
@@ -165,10 +165,6 @@
<component-class>org.apache.myfaces.custom.selectOneRow.SelectOneRow</component-class>
</component>
- <component>
- <component-type>org.apache.myfaces.DojoInitializer</component-type>
- <component-class>org.apache.myfaces.custom.dojo.DojoInitializer</component-class>
- </component>
<component>
<component-type>org.apache.myfaces.StateChangedNotifier</component-type>
@@ -399,11 +395,6 @@
<renderer-class>org.apache.myfaces.custom.effect.EffectRenderer</renderer-class>
</renderer>
- <renderer>
- <component-family>javax.faces.Output</component-family>
- <renderer-type>org.apache.myfaces.DojoInitializerRenderer</renderer-type>
- <renderer-class>org.apache.myfaces.custom.dojo.DojoInitializerRenderer</renderer-class>
- </renderer>
<renderer>
Modified: myfaces/tomahawk/trunk/sandbox/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/site/site.xml?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/site/site.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/site/site.xml Wed Oct 11 14:50:07 2006
@@ -43,7 +43,6 @@
<item name="Dynamic Image" href="graphicImageDynamic.html"/>
<item name="FishEye Navigation Menu" href="fisheye.html"/>
<item name="SelectItems" href="selectItems.html"/>
- <item name="Dojo Initializer" href="dojoInitializer.html"/>
</menu>
<menu name="Validators">
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/debugconsole.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/debugconsole.jsp?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/debugconsole.jsp (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/debugconsole.jsp Wed Oct 11 14:50:07 2006
@@ -35,10 +35,10 @@
<body>
<f:view>
<h:panelGroup>
- <s:dojoInitializer require="dojo.widget.Editor" debug="true"/>
- <s:dojoInitializer require="dojo.widget.DebugConsole"/>
- <s:dojoInitializer require="dojo.widget.ResizeHandle"/>
- <s:dojoInitializer require="dojo.widget.Button"/>
+ <t:dojoInitializer require="dojo.widget.Editor" debug="true"/>
+ <t:dojoInitializer require="dojo.widget.DebugConsole"/>
+ <t:dojoInitializer require="dojo.widget.ResizeHandle"/>
+ <t:dojoInitializer require="dojo.widget.Button"/>
<f:verbatim>
<script type="text/javascript">
function generateSomeDebuggingInfo() {
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/debugconsolejsfonly.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/debugconsolejsfonly.jsp?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/debugconsolejsfonly.jsp (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/debugconsolejsfonly.jsp Wed Oct 11 14:50:07 2006
@@ -36,10 +36,10 @@
<body>
<f:view>
<h:panelGroup>
- <s:dojoInitializer require="dojo.widget.Editor" debug="true"/>
- <s:dojoInitializer require="dojo.widget.DebugConsole" debugAtAllCosts="false"/>
- <s:dojoInitializer require="dojo.widget.ResizeHandle" />
- <s:dojoInitializer debugConsole="true" expanded="true"/>
+ <t:dojoInitializer require="dojo.widget.Editor" debug="true"/>
+ <t:dojoInitializer require="dojo.widget.DebugConsole" debugAtAllCosts="false"/>
+ <t:dojoInitializer require="dojo.widget.ResizeHandle" />
+ <t:dojoInitializer debugConsole="true" expanded="true"/>
<f:verbatim>
<script type="text/javascript" >
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/dojoDialog.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/dojoDialog.jsp?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/dojoDialog.jsp (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/dojoDialog.jsp Wed Oct 11 14:50:07 2006
@@ -49,8 +49,13 @@
<h:outputLink value="#" onclick="dojoDialog.show();document.getElementById('filter3').focus();">
<h:outputText value="search"/>
</h:outputLink>
+ <h:outputLink value="#" onclick="dojoDialogOuterform.show();">
+ <h:outputText value="searchOuterForm"/>
+ </h:outputLink>
+
</h:panelGrid>
</h:panelGrid>
+
<s:modalDialog dialogId="DialogContent" dialogVar="dojoDialog"
dialogAttr="bgColor='white' bgOpacity='0.5' toggle='fade' toggleDuration='250'"
hiderIds="cancel1,cancel2,cancel3" styleClass="dojoDialog">
@@ -69,6 +74,30 @@
</h:panelGrid>
</h:panelGrid>
</s:modalDialog>
+
+ <h:form id="outerform">
+ <s:modalDialog dialogId="FormDialog" dialogVar="dojoDialogOuterform"
+ dialogAttr="bgColor='white' bgOpacity='0.5' toggle='fade' toggleDuration='250'"
+ hiderIds="cancel1x,cancel2x,cancel3x" styleClass="dojoDialog">
+ <h:panelGrid columns="1">
+ <h:panelGrid columns="2">
+ <t:inputText id="filter1Outerform" forceId="true" value="Test" size="25"/>
+ <t:commandButton id="cancel1Outerform" forceId="true" value="Cancel" onclick="dojo.widget.byId('FormDialog').hide();" />
+ </h:panelGrid>
+ <h:panelGrid columns="2">
+ <t:inputText id="filter2Outerform" forceId="true" value="Test" size="25"/>
+ <t:commandButton id="cancel2Outerform" forceId="true" value="Cancel" onclick="dojo.widget.byId('FormDialog').hide();" />
+ </h:panelGrid>
+ <h:panelGrid columns="2">
+ <t:inputText id="filter3Outerform" forceId="true" value="Test" size="25"/>
+ <t:commandButton id="cancel3Outerform" forceId="true" value="Cancel" onclick="dojo.widget.byId('FormDialog').hide();" />
+ </h:panelGrid>
+ <h:commandLink id="outerformsubmit"><h:outputFormat value="Submit"/></h:commandLink>
+ </h:panelGrid>
+ </s:modalDialog>
+ </h:form>
+
+
</f:view>
</body>
</html>
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/dojoimporttest.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/dojoimporttest.jsp?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/dojoimporttest.jsp (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/dojoimporttest.jsp Wed Oct 11 14:50:07 2006
@@ -90,8 +90,8 @@
- <s:dojoInitializer require="dojo.fx.*"/>
- <s:dojoInitializer require="dojo.widget.Editor"/>
+ <t:dojoInitializer require="dojo.fx.*"/>
+ <t:dojoInitializer require="dojo.widget.Editor"/>
<h:outputText value="Dojo import tests, you now can setup dojo by using the s:dojoInitializer component." />
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/splitpanejsfonly.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/splitpanejsfonly.jsp?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/splitpanejsfonly.jsp (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/splitpanejsfonly.jsp Wed Oct 11 14:50:07 2006
@@ -46,8 +46,8 @@
<body>
<f:view>
<h:panelGroup style="width: 100%; height: 100%;">
- <s:dojoInitializer require="dojo.widget.SplitContainer" />
- <s:dojoInitializer require="dojo.widget.ContentPane" />
+ <t:dojoInitializer require="dojo.widget.SplitContainer" />
+ <t:dojoInitializer require="dojo.widget.ContentPane" />
<s:layoutingSplitPane id="split" activeSizing="0"
style="width: 400px; height: 400px; background: #eeeeee; padding: 10px;" sizerWidth="2">
<s:layoutingContentPane id="left" sizeShare="10">
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/splitpanetest.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/splitpanetest.jsp?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/splitpanetest.jsp (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/splitpanetest.jsp Wed Oct 11 14:50:07 2006
@@ -46,8 +46,8 @@
<body>
<f:view>
<h:panelGroup>
- <s:dojoInitializer require="dojo.widget.SplitContainer" />
- <s:dojoInitializer require="dojo.widget.ContentPane" />
+ <t:dojoInitializer require="dojo.widget.SplitContainer" />
+ <t:dojoInitializer require="dojo.widget.ContentPane" />
<t:div id="origSplitContainer" forceId="true"
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/textareatestjsfonly.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/textareatestjsfonly.jsp?view=diff&rev=462978&r1=462977&r2=462978
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/textareatestjsfonly.jsp (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/dojo/textareatestjsfonly.jsp Wed Oct 11 14:50:07 2006
@@ -36,7 +36,7 @@
<body>
<f:view>
<h:panelGroup>
- <s:dojoInitializer require="dojo.widget.Editor"/>
+ <t:dojoInitializer require="dojo.widget.Editor"/>
<h:form id="myForm">
<h:inputTextarea id="editarea2" styleClass="dojo-Editor" value="hello world">