Oh sorry! just stepped over this during build. ################################################# web: http://www.jgeppert.com twitter: http://twitter.com/jogep
2015-05-25 12:13 GMT+02:00 Lukasz Lenart <lukaszlen...@apache.org>: > hehe... I have started the same yesterday but didn't finish :) Thanks > for taking care! > > 2015-05-25 12:12 GMT+02:00 <jo...@apache.org>: > > Repository: struts > > Updated Branches: > > refs/heads/master 17d73d21a -> ffe0e20ed > > > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_1.jsp > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_1.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_1.jsp > > deleted file mode 100644 > > index a96ab7a..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_1.jsp > > +++ /dev/null > > @@ -1,52 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b>Print property value, using the <i>property tag</i></b> > > -</p> > > -<p> > > - On the OGNL demo you learned how to access values from the Value > Stack using OGNL expressions. > > - The <i>property</i> tag is used to print to the page the result of > an OGNL expression. The expression > > - is specified in the <i>value</i> attribute. > > -</p> > > -<p>To print the value of the expression <i>name</i> to the page type: > > -<p> > > - <i id="example0"> > > - <s:property value="name" /> > > - </i> > > -</p> > > -<p> > > - on the JSP console and hit enter. <a href="#" > onclick="execJSP('example0')">Do it for me</a> > > -</p> > > -<p> > > - As you saw in the OGNL demo, to print a property of an object that > is not on top of the stack, > > - use the <i>#object.property</i> notation. > > -</p> > > -<p>To print the value for the key "struts.view_uri" in <i>request</i> > to the page type: > > -<p> > > - <i id="example1"> > > - <s:property value="#request['struts.view_uri']" > /> > > - </i> > > -</p> > > -<p> > > - on the JSP console and hit enter. <a href="#" > onclick="execJSP('example1')">Do it for me</a> > > -</p> > > -<p> > > - <b>Print property value, using the <i>$</i> operator</b> > > -</p> > > -<p>Use the <i>${name}</i> notation to print values from the Value Stack > to the page. > > -<p>To print the value of the expression <i>name</i> to the page type: > > -<p> > > - <i id="example2"> > > - ${name} > > - </i> > > -</p> > > -<p> > > - on the JSP console and hit enter. <a href="#" > onclick="execJSP('example2')">Do it for me</a> > > -</p> > > -<p> > > - <a href="#" onclick="window.open(' > http://struts.apache.org/2.x/docs/property.html')">[More details]</a> > > -</p> > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_2.jsp > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_2.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_2.jsp > > deleted file mode 100644 > > index 565a7ec..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_2.jsp > > +++ /dev/null > > @@ -1,54 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b><i>if</i> tag</b> > > -</p> > > -<p> > > - The <i>if</i> tag allows you to optionally execute a JSP section. > Multiple <i>elseif</i> tags > > - and one <i>else</i> tag can be associated to an <i>if tag</i>. > > -</p> > > -<p> > > - To say hello to John Galt type: > > -</p> > > -<p> > > - <pre id="example0"> > > - <s:if test="name == 'John Galt'"> > > - Hi John > > - </s:if> > > - <s:else> > > - I don't know you! > > - </s:else> > > - </pre> > > -</p> > > -<p> > > - on the JSP console and hit enter. <a href="#" > onclick="execJSP('example0')">Do it for me</a> > > -</p> > > -<p> > > - <b><i>iterator</i> tag</b> > > -</p> > > -<p> > > - The <i>iterator</i> tag loops over an <i>Iterable</i> object one > object at a time into > > - the Value Stack (the value will be on top of the stack). > > -</p> > > -<p> > > - To print the all the elements in the "bands" property type: > > -</p> > > -<p> > > - <pre id="example1"> > > - <s:iterator value="bands"> > > - <s:property /> > > - <br /> > > - </s:iterator> > > - </pre> > > -</p> > > -<p> > > - on the JSP console and hit enter. <a href="#" > onclick="execJSP('example1')">Do it for me</a> > > -</p> > > -<p> > > - <a href="#" onclick="window.open(' > http://struts.apache.org/2.x/docs/property.html')">[More on the <i>if</i> > tag]</a> > > - <a href="#" onclick="window.open(' > http://struts.apache.org/2.x/docs/iterator.html')">[More on the > <i>iterator</i> tag]</a> > > -</p> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_3.jsp > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_3.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_3.jsp > > deleted file mode 100644 > > index 483db12..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_3.jsp > > +++ /dev/null > > @@ -1,65 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b><i>set</i> tag</b> > > -</p> > > -<p> > > - The <i>set</i> tag sets the variable with the name specified in the > <i>name</i> attribute to > > - the value specified in the <i>value</i> attribute in the scope > > - entered in the <i>scope</i> attribute. The available scopes are: > > - <ul> > > - <li>application - application scope according to servlet > spec</li> > > - <li>session - session scope according to servlet spec</li> > > - <li>request - request scope according to servlet spec</li> > > - <li>page - page scope according to servlet sepc</li> > > - <li>action - the value will be set in the request scope and > Struts' action context</li> > > - > > - </ul> > > -</p> > > -<p> > > - This example sets <i>favouriteBand</i> in the request scope to the > first element of the <i>bands</i> property: > > -</p> > > -<p> > > - <pre id="example0"> > > - <s:set name="favouriteBand" value="bands[0]" /> > > - <s:property value="#favouriteBand" /> > > - </pre> > > -</p> > > -<p> > > - <a href="#" onclick="execJSP('example0')">Do it for me</a> > > -</p> > > -<p> > > - <b><i>url</i> tag</b> > > -</p> > > -<p> > > - The <i>url</i> tag is used to build urls (who would have guessed!). > To build an url mapping to > > - an action, set the <i>namespace</i> and <i>action</i> attributes. > The url will be stored under > > - the name specified in the <i>id</i> attribute. <b>url tag uses the > <i>id</i> attribute while > > - the <i>set</i> tag uses name</b>. To specify a value (no action > lookup), just use the <i>value</i> > > - attribute. <i>param</i> tags can be nested inside the <i>url</i> > tag to add parameters to the url. > > -</p> > > -<p> > > - First link creates a url that maps to an action, second one creates > a url to google, passing one parameter: > > -</p> > > -<p> > > - <pre id="example1"> > > - <s:url id="evalAction" namespace="/nodecorate" > action="jspEval" /> > > - <s:a href="%{#evalAction}" >Eval</s:a> > > - > > - <s:url id="google" value="http://www.google.com"; > > > - <s:param name="q" value="%{'Struts 2'}" /> > > - </s:url> > > - <s:a href="%{#google}" >Eval</s:a> > > - </pre> > > -</p> > > -<p> > > - <a href="#" onclick="execJSP('example1')">Do it for me</a> > > -</p> > > -<p> > > - <a href="#" onclick="window.open(' > http://struts.apache.org/2.x/docs/set.html')">[More on the <i>set</i> > tag]</a> > > - <a href="#" onclick="window.open(' > http://struts.apache.org/2.x/docs/url.html')">[More on the <i>url</i> > tag]</a> > > -</p> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_4.jsp > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_4.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_4.jsp > > deleted file mode 100644 > > index 8d63ee5..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_4.jsp > > +++ /dev/null > > @@ -1,16 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b>More on JSP tags</b> > > -</p> > > -<p> > > - Struts 2 provides many more tags which you can learn about > > - <a href="#" onclick="window.open(' > http://cwiki.apache.org/confluence/display/WW/Tag+Reference')">here</a> > > -</p> > > -<br/> > > -You can keep playing with the JSP console or > > -<a href="#" onclick="startOgnl()">Start OGNL Interactive Demo</a> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_0.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_0.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_0.jsp > > deleted file mode 100644 > > index 7f441e4..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_0.jsp > > +++ /dev/null > > @@ -1,30 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b>Accessing properties</b> > > -</p> > > -<p> > > - The framework uses a standard naming context to evaluate OGNL > expressions. > > - The top level object dealing with OGNL is a Map (usually referred > as a context map or context). > > - OGNL has a notion of there being a root (or default) object within > the context. > > - In OGNL expressions, the properties of the root object can be > referenced without any special "marker" notion. > > - References to other objects are marked with a pound sign (#). > > - > > - In this example (and in your JSP pages) the last action executed > will be on the top of the stack. > > -</p> > > -<p> > > - <a href="#" onclick="selectClassSrcTab()">This action</a> is > available on the third tab above. > > - To access the <i>name</i> field type: > > -</p> > > -<p> > > - <i id="example"> > > - name > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl()">Do it for me</a> > > -</p> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_1.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_1.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_1.jsp > > deleted file mode 100644 > > index 17505bd..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_1.jsp > > +++ /dev/null > > @@ -1,28 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b>Accessing nested properties</b> > > -</p> > > -<p> > > - To access nested properties, use the dot "." operator to > concatenate the property names. The action > > - class has a <i>book</i> field, with <i>title</i> and <i>author</i> > fields. > > -</p> > > -<p> > > - To access the name of the book type: > > -</p> > > -<p> > > - <i id="example"> > > - book.title > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl()">Do it for me</a> > > -</p> > > -<br/> > > -<p> > > - <a href="#" onclick="window.open(' > http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/properties.html')">[More > details]</a> > > -</p> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_2.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_2.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_2.jsp > > deleted file mode 100644 > > index c1716db..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_2.jsp > > +++ /dev/null > > @@ -1,43 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b>Accessing properties inside Arrays</b> > > -</p> > > -<p> > > - To access properties inside arrays, use the brackets "[]" operators > with the desired index(starting from 0). The action > > - class has an array of String in the field <i>bands</i>. > > -</p> > > -<p> > > - To access the second element in the <i>bands</i> array type: > > -</p> > > -<p> > > - <i id="example0"> > > - bands[1] > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl('example0')">Do it for me</a> > > -</p> > > -<p> > > - <b>Accessing properties inside Lists</b> > > -</p> > > -<p>Lists can be accessed on the same way. The action class has a List > of String on the field <i>movies</i>.</p> > > -<p> > > - To access the first element in the <i>movies</i> list type: > > -</p> > > -<p> > > - <i id="example1"> > > - movies[0] > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl('example1')">Do it for me</a> > > -</p> > > -<br/> > > -<p> > > - <a href="#" onclick="window.open(' > http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/indexing.html#N10184')">[More > details]</a> > > -</p> > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_3.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_3.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_3.jsp > > deleted file mode 100644 > > index 03c3095..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_3.jsp > > +++ /dev/null > > @@ -1,54 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b>Accessing properties inside Maps</b> > > -</p> > > -<p> > > - To access properties inside maps, use the brackets "[]" operators > with the desired key. The action > > - class has a map of Book objects in the field <i>books</i>. > > -</p> > > -<p> > > - To access the book with key "Iliad" in the <i>books</i> map type: > > -</p> > > -<p> > > - <i id="example0"> > > - books['Iliad'] > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl('example0')">Do it for me</a> > > -</p> > > -<p>If the key does not have spaces in it, you can access an element in > the map, using the dot "." operator.</p> > > -<p> > > - To access the book with key "Iliad" in the <i>books</i> map type: > > -</p> > > -<p> > > - <i id="example1"> > > - books.Iliad > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl('example1')">Do it for me</a> > > -</p> > > -<p> > > - Note that the object returned is of type Book. If you want to > access one of its properties, you can do so using the dot > > - "." operator as you did before.</p> > > -<p> > > - To access the <i>author</i> property of the book with key "Iliad" > in the <i>books</i> map type: > > -</p> > > -<p> > > - <i id="example2"> > > - books['Iliad'].author > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl('example2')">Do it for me</a> > > -</p> > > -<br/> > > -<p> > > - <a href="#" onclick="window.open(' > http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/indexing.html#N10184')">[More > details]</a> > > -</p> > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_4.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_4.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_4.jsp > > deleted file mode 100644 > > index 7e158d5..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_4.jsp > > +++ /dev/null > > @@ -1,32 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b>Accessing properties on the stack</b> > > -</p> > > -<p> > > - Object that are not on the top of the Value Stack are accessed using > the "#name" notation. > > - Some objects are always pushed into the stack by Struts, like: > > -</p> > > -<ul> > > - <li>#application</li> > > - <li>#session</li> > > - <li>#request</li> > > - <li>#parameters</li> > > -</ul> > > -<p>To see the value of the first parameter type:</p> > > -<p> > > - <i id="example"> > > - #parameters['debug'][0] > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl()">Do it for me</a> > > -</p> > > -<br/> > > -<p> > > - <a href="#" onclick="window.open(' > http://struts.apache.org/2.x/docs/ognl.html')">[More details]</a> > > -</p> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_5.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_5.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_5.jsp > > deleted file mode 100644 > > index 5624567..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_5.jsp > > +++ /dev/null > > @@ -1,25 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b>Calling methods</b> > > -</p> > > -<p> > > - OGNL follows Java's syntax to execute a method. > > -</p> > > -<p>To execute the <i>getTitle()</i> method on the <i>book</i> object > type:</p> > > -<p> > > - <i id="example"> > > - book.getTitle() > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl()">Do it for me</a> > > -</p> > > -<br/> > > -<p> > > - <a href="#" onclick="window.open(' > http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/methods.html')">[More > details]</a> > > -</p> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_6.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_6.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_6.jsp > > deleted file mode 100644 > > index 91466e1..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_6.jsp > > +++ /dev/null > > @@ -1,43 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b>Expressions</b> > > -</p> > > -<p> > > - OGNL supports expressions using primitive values. > > -</p> > > -<p>Arithmetic:</p> > > -<p> > > - <i id="example0"> > > - (6 - 2)/2 > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl('example0')">Do it for me</a> > > -</p> > > -<p>Logical:</p> > > -<p> > > - <i id="example1"> > > - (true || false) and true > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl('example1')">Do it for me</a> > > -</p> > > -<p>Equality:</p> > > -<p> > > - <i id="example2"> > > - 'a' == 'a' > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl('example2')">Do it for me</a> > > -</p> > > -<p> > > - OGNL supports many more operators and expressions, see <a href="#" > onclick="window.open(' > http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/apa.html#operators')">[Operators > Reference]</a> > > - for more details. > > -</p> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_7.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_7.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_7.jsp > > deleted file mode 100644 > > index a0318ab..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_7.jsp > > +++ /dev/null > > @@ -1,55 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p><b>Creating arrays</b></p> > > -<p> > > - OGNL follows Java syntax to create arrys. > > -</p> > > -<p> > > - Create an array of integers: > > -</p> > > -<p> > > - <i id="example0"> > > - new int[] {0, 1, 2} > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl('example0')">Do it for me</a> > > -</p> > > -<p><b>Creating lists</b></p> > > -<p> > > - To create a list, enclose a list of comma separated expression in a > pair of braces. > > -</p> > > -<p> > > - Create a list of Strings: > > -</p> > > -<p> > > - <i id="example1"> > > - {'Is', 'there', 'any', 'body', 'out', 'there?'} > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl('example1')">Do it for me</a> > > -</p> > > -<p><b>Creating maps</b></p> > > -<p> > > - To create a map, use the syntax #@MAP_TYPE@{key:value}. > > -</p> > > -<p> > > - Create a LinkedHashMap: > > -</p> > > -<p> > > - <i id="example2"> > > - #@java.util.LinkedHashMap@{'name': 'John Galt', 'job' : > 'Engineer'} > > - </i> > > -</p> > > -<p> > > - on the OGNL console and hit enter. <a href="#" > onclick="execOgnl('example2')">Do it for me</a> > > -</p> > > -<br/> > > -<p> > > - <a href="#" onclick="window.open(' > http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/collectionConstruction.html#listConstruction')">[More > details]</a> > > -</p> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_8.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_8.jsp > b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_8.jsp > > deleted file mode 100644 > > index 3a2cc6e..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_8.jsp > > +++ /dev/null > > @@ -1,18 +0,0 @@ > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > -<p> > > - <b>More on OGNL</b> > > -</p> > > -<p> > > - There are a lot of OGNL features that we have not covered on this > short tutorial. > > -</p> > > -<br/> > > -<p> > > - To learn more see the <a href="#" onclick="window.open(' > http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/index.html')">[OGNL > Documentation]</a> > > -</p> > > -You can keep playing with the OGNL console or > > -<a href="#" onclick="startJSP()">Start JSP Interactive Demo</a> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/jsf/employee/edit.jsp > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/WEB-INF/jsf/employee/edit.jsp > b/apps/showcase/src/main/webapp/WEB-INF/jsf/employee/edit.jsp > > deleted file mode 100644 > > index 6f1d219..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/jsf/employee/edit.jsp > > +++ /dev/null > > @@ -1,113 +0,0 @@ > > -<%-- > > - > > - Copyright 2006 The Apache Software Foundation. > > - > > - Licensed 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. > > - > > - $Id$ > > - > > ---%> > > - > > -<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"; %> > > -<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"; %> > > - > > -<f:view> > > - <html> > > - <head> > > - <title>Struts2 Showcase - JSF Integration - Modify > Employee</title> > > - <s:head/> > > - </head> > > - > > - <body> > > - > > - <div class="page-header"> > > - <h1>Modify Employee</h1> > > - </div> > > - > > - <div class="container-fluid"> > > - <div class="row-fluid"> > > - <div class="span12"> > > - > > - <h:form> > > - <h:inputHidden > value="#{action.currentEmployee.empId}"/> > > - <h:panelGrid columns="3"> > > - <h:outputText > value="Employee Id:"/> > > - <h:inputText id="id" > size="5" value="#{action.currentEmployee.empId}" required="true"/> > > - <h:message for="id"/> > > - > > - <h:outputText > value="First Name:"/> > > - <h:inputText > id="firstName" size="30" value="#{action.currentEmployee.firstName}" > > - > required="true"> > > - > <f:validateLength minimum="2" maximum="30"/> > > - </h:inputText> > > - <h:message > for="firstName"/> > > - > > - <h:outputText > value="Last Name:"/> > > - <h:inputText > id="lastName" size="30" value="#{action.currentEmployee.lastName}" > required="true"> > > - > <f:validateLength minimum="2" maximum="30"/> > > - </h:inputText> > > - <h:message > for="lastName"/> > > - > > - <h:outputText > value="Salary:"/> > > - <h:inputText id="salary" > size="10" value="#{action.currentEmployee.salary}"/> > > - <h:message for="salary"/> > > - > > - <h:outputText > value="Married:"/> > > - <h:selectBooleanCheckbox > id="married" value="#{action.currentEmployee.married}"/> > > - <h:message > for="married"/> > > - > > - <h:outputText > value="Position:"/> > > - <h:selectOneMenu > id="position" value="#{action.currentEmployee.position}"> > > - <f:selectItems > value="#{action.availablePositionsAsMap}"/> > > - </h:selectOneMenu> > > - <h:message > for="position"/> > > - > > - <h:outputText > value="Main Skill:"/> > > - <h:selectOneMenu > id="mainSkill" value="#{action.currentEmployee.mainSkill.name}"> > > - <f:selectItems > value="#{action.availableSkills}"/> > > - </h:selectOneMenu> > > - <h:message > for="mainSkill"/> > > - > > - <h:outputText > value="Other Skills:"/> > > - <h:selectManyListbox > id="otherSkills" value="#{action.selectedSkills}"> > > - <f:selectItems > value="#{action.availableSkills}"/> > > - </h:selectManyListbox> > > - <h:message > for="otherSkills"/> > > - > > - <h:outputText > value="Password:"/> > > - <h:inputSecret > id="password" value="#{action.currentEmployee.password}"/> > > - <h:message > for="password"/> > > - > > - <h:outputText > value="Level:"/> > > - <h:selectOneRadio > id="level" value="#{action.currentEmployee.level}"> > > - <f:selectItems > value="#{action.availableLevelsAsMap}"/> > > - </h:selectOneRadio> > > - <h:message for="level"/> > > - > > - <h:outputText > value="Comment:"/> > > - <h:inputTextarea > id="comment" value="#{action.currentEmployee.comment}" cols="50" rows="3"/> > > - <h:message > for="comment"/> > > - </h:panelGrid> > > - > > - <h:commandButton value="Save" > action="#{action.save}" styleClass="btn btn-primary"/> > > - <br/><br/> > > - <h:outputLink > value="list.action" styleClass="btn btn-info"> > > - <h:outputText > value="Back"/> > > - </h:outputLink> > > - </h:form> > > - </div> > > - </div> > > - </div> > > - </body> > > - </html> > > -</f:view> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/jsf/employee/list.jsp > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/WEB-INF/jsf/employee/list.jsp > b/apps/showcase/src/main/webapp/WEB-INF/jsf/employee/list.jsp > > deleted file mode 100644 > > index 403c92e..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/jsf/employee/list.jsp > > +++ /dev/null > > @@ -1,75 +0,0 @@ > > -<%-- > > - > > - Copyright 2006 The Apache Software Foundation. > > - > > - Licensed 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. > > - > > - $Id$ > > - > > ---%> > > - > > -<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"; %> > > -<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"; %> > > - > > -<f:view> > > - <html> > > - <head> > > - <title>Struts2 Showcase - JSF Integration - Available > Employees</title> > > - <s:head/> > > - </head> > > - > > - <body> > > - > > - <div class="page-header"> > > - <h1>Available Employees</h1> > > - </div> > > - > > - <div class="container-fluid"> > > - <div class="row-fluid"> > > - <div class="span12"> > > - > > - <h:dataTable > value="#{action.availableItems}" var="e" styleClass="table table-striped > table-bordered table-hover table-condensed"> > > - <h:column> > > - <f:facet name="header"> > > - <h:outputText > value="Id"/> > > - </f:facet> > > - <h:outputLink > value="edit.action"> > > - <f:param > name="empId" value="#{e.empId}"/> > > - <h:outputText > value="#{e.empId}"/> > > - </h:outputLink> > > - </h:column> > > - <h:column> > > - <f:facet name="header"> > > - <h:outputText > value="First Name"/> > > - </f:facet> > > - <h:outputText > value="#{e.firstName}"/> > > - </h:column> > > - <h:column> > > - <f:facet name="header"> > > - <h:outputText > value="Last Name"/> > > - </f:facet> > > - <h:outputText > value="#{e.lastName}"/> > > - </h:column> > > - </h:dataTable> > > - > > - <p> > > - <h:outputLink > value="edit.action" styleClass="btn btn-primary"> > > - <h:outputText > value="Create new Employee"/> > > - </h:outputLink> > > - </p> > > - </div> > > - </div> > > - </div> > > - </body> > > - </html> > > -</f:view> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/jsf/index.jsp > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/WEB-INF/jsf/index.jsp > b/apps/showcase/src/main/webapp/WEB-INF/jsf/index.jsp > > deleted file mode 100644 > > index 9685a84..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/jsf/index.jsp > > +++ /dev/null > > @@ -1,35 +0,0 @@ > > -<%@ taglib prefix="s" uri="/struts-tags" %> > > -<html> > > -<head> > > - <title>Struts2 Showcase - JSF Integration</title> > > - <s:head/> > > -</head> > > - > > -<body> > > - > > -<div class="page-header"> > > - <h1>JavaServer Faces Integration</h1> > > -</div> > > - > > -<div class="container-fluid"> > > - <div class="row-fluid"> > > - <div class="span12"> > > - > > - <p> > > - The following pages show how Struts and > JSF components can work together, > > - each doing what they do best. > > - </p> > > - > > - <p> > > - <ul> > > - <li><s:url var="url" > namespace="/jsf/employee" action="list"/><s:a > > - href="%{url}">List > available Employees</s:a></li> > > - <li><s:url var="url" > namespace="/jsf/employee" action="edit"/><s:a > > - > href="%{url}">Create/Edit Employee</s:a></li> > > - </ul> > > - </p> > > - </div> > > - </div> > > -</div> > > -</body> > > -</html> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/tags/ui/datepicker/index.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/datepicker/index.jsp > b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/datepicker/index.jsp > > deleted file mode 100644 > > index db9c7fb..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/datepicker/index.jsp > > +++ /dev/null > > @@ -1,33 +0,0 @@ > > -<%@taglib prefix="s" uri="/struts-tags" %> > > -<%@ taglib prefix="sx" uri="/struts-dojo-tags" %> > > -<html> > > -<head> > > - <title>Struts2 Showcase - UI Tags - Datepicker Tag</title> > > - <sx:head extraLocales="en-us,nl-nl,de-de" /> > > -</head> > > -<body> > > -<div class="page-header"> > > - <h1>UI Tags - Datepicker Tag</h1> > > -</div> > > - > > -<div class="container-fluid"> > > - <div class="row-fluid"> > > - <div class="span12"> > > - <table> > > - <sx:datetimepicker > label="toggleType='wipe'" value="%{'2006-10-31'}" toggleType="wipe" > toggleDuration="300" name="test"/> > > - <sx:datetimepicker > label="toggleType='explode'" value="%{'2006-07-22'}" toggleType="explode" > toggleDuration="500" id="dp2"/> > > - <sx:datetimepicker > label="toggleType='fade'" value="%{'2006-06-30'}" toggleType="fade" > toggleDuration="500"/> > > - <sx:datetimepicker label="With > value='today'" name="dddp1" value="%{'today'}" /> > > - <sx:datetimepicker label="US format, > empty" name="dddp2" language="en-us" /> > > - <sx:datetimepicker label="US format with > initial date of 2006-06-26" name="dddp3" value="%{'2006-06-26'}" > language="en-us" /> > > - <sx:datetimepicker label="With initial > date of 1969-04-25 and a custom format dd/MM/yyyy" name="dddp5" > value="%{'25/04/1969'}" displayFormat="dd/MM/yyyy" /> > > - <sx:datetimepicker label="In German" > name="dddp7" value="%{'2006-06-28'}" language="de-de" /> > > - <sx:datetimepicker label="In Dutch" > name="dddp8" value="%{'2006-06-28'}" language="nl-nl" /> > > - <sx:datetimepicker label="US format with > initial date of 2006-06-26 and long formatting (parse not supported)" > name="dddp12" value="%{'2006-06-26'}" formatLength="long" language="en-us" > /> > > - <sx:datetimepicker label="German format > with initial date of 2006-06-26 and long formatting (parse not supported)" > name="dddp13" value="%{'2006-06-26'}" formatLength="long" language="de" /> > > - </table> > > - </div> > > - </div> > > -</div> > > -</body> > > -</html> > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp > b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp > > index 0e89c03..98d2881 100644 > > --- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp > > +++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp > > @@ -1,5 +1,4 @@ > > <%@taglib prefix="s" uri="/struts-tags" %> > > -<%@ taglib prefix="sx" uri="/struts-dojo-tags" %> > > <html> > > <head> > > <title>Struts2 Showcase - UI Tags Example</title> > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm > b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm > > index 23a5d58..64d6431 100644 > > --- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm > > +++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm > > @@ -2,7 +2,6 @@ > > <head> > > <title>Struts2 Showcase - UI Tags Example (Velocity)</title> > > #shead() > > - #sxhead() > > </head> > > <body> > > <div class="page-header"> > > @@ -15,8 +14,6 @@ > > > > #sform ("action=exampleSubmitVelocity" > "method=post" "enctype=multipart/form-data") > > #stextfield ("label=Name" "name=name") > > - #sxdatetimepicker ("label=Birthday" > "name=birthday") > > - #sxdatetimepicker ("label=Wake up time" > "name=wakeup" "type=time") > > #stextarea ("label=Biography" "name=bio" > "cols=20" "rows=3") > > #sselect ("label=Favourite Color" > "list={'Red', 'Blue', 'Green'}" "name=favouriteColor" "emptyOption=true" > "headerKey=None" "headerValue=None") > > #sselect ("label=Favourite Language" > "list=favouriteLanguages" "name=favouriteLanguage" "listKey=key" > "listValue=description" "emptyOption=true" "headerKey=None" > "headerValue=None") > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/tags/ui/staticTreeSelect.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/staticTreeSelect.jsp > b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/staticTreeSelect.jsp > > deleted file mode 100644 > > index b126aa9..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/staticTreeSelect.jsp > > +++ /dev/null > > @@ -1,11 +0,0 @@ > > -<%@taglib prefix="s" uri="/struts-tags" %> > > -<%@ taglib prefix="sx" uri="/struts-dojo-tags" %> > > - > > -<% > > - request.setAttribute("decorator", "none"); > > - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 > > - response.setHeader("Pragma","no-cache"); //HTTP 1.0 > > - response.setDateHeader ("Expires", 0); //prevents caching at the > proxy server > > -%> > > - > > -${parameters.nodeId[0]} > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/tags/ui/timepicker/index.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/timepicker/index.jsp > b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/timepicker/index.jsp > > deleted file mode 100644 > > index 4c98f12..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/timepicker/index.jsp > > +++ /dev/null > > @@ -1,31 +0,0 @@ > > -<%@taglib prefix="s" uri="/struts-tags" %> > > -<%@ taglib prefix="sx" uri="/struts-dojo-tags" %> > > -<html> > > -<head> > > - <title>Struts2 Showcase - UI Tags - Timepicker Tag</title> > > - <sx:head extraLocales="en-us,nl-nl,de-de" /> > > -</head> > > -<body> > > -<div class="page-header"> > > - <h1>UI Tags - Timepicker Tag</h1> > > -</div> > > - > > -<div class="container-fluid"> > > - <div class="row-fluid"> > > - <div class="span12"> > > - > > - <table> > > - <sx:datetimepicker > label="toggleType='wipe'" type="time" value="%{'10:30'}" toggleType="wipe" > toggleDuration="300"/> > > - <sx:datetimepicker > label="toggleType='explode'" type="time" value="%{'13:00'}" > toggleType="explode" toggleDuration="500"/> > > - <sx:datetimepicker > label="toggleType='fade'" type="time" value="%{'13:00'}" toggleType="fade" > toggleDuration="500"/> > > - <sx:datetimepicker label="With > value='today'" name="dddp4" type="time" value="%{'today'}" /> > > - <sx:datetimepicker label="US format, > empty" name="dddp5" type="time" language="en-us" /> > > - <sx:datetimepicker label="US format, > 13:00 hours" name="dddp6" type="time" value="%{'13:00'}" language="en-us" /> > > - <sx:datetimepicker label="In German" > name="dddp7" type="time" value="%{'13:00'}" language="de" /> > > - <sx:datetimepicker label="In Dutch" > name="dddp8" type="time" value="%{'13:00'}" language="nl" /> > > - </table> > > - </div> > > - </div> > > -</div> > > -</body> > > -</html> > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl > b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl > > deleted file mode 100644 > > index 8c78f6c..0000000 > > --- > a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl > > +++ /dev/null > > @@ -1,9 +0,0 @@ > > -[ > > -<#list category.children as node> > > - { > > - label: '${node.name}', > > - id: '${node.id}', > > - hasChildren: ${(node.children.size() > 0)?string} > > - }, > > -</#list> > > -] > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp > b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp > > deleted file mode 100644 > > index e858fd5..0000000 > > --- > a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp > > +++ /dev/null > > @@ -1,25 +0,0 @@ > > -<%@taglib prefix="s" uri="/struts-tags" %> > > -<%@ taglib prefix="sx" uri="/struts-dojo-tags" %> > > -<html> > > -<head> > > - <title>Struts2 Showcase - UI Tags - Tree Example AJAX > (Dynamic)</title> > > - <sx:head /> > > -</head> > > -<body> > > -<div class="page-header"> > > - <h1>UI Tags - Tree Example AJAX (Dynamic)</h1> > > -</div> > > - > > -<div class="container-fluid"> > > - <div class="row-fluid"> > > - <div class="span12"> > > - > > - <s:url var="nodesUrl" namespace="/nodecorate" > action="getNodes" /> > > - <div style="float:left; margin-right: 50px;"> > > - <sx:tree id="tree" href="%{#nodesUrl}" /> > > - </div> > > - </div> > > - </div> > > -</div> > > -</body> > > -</html> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleDynamic.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleDynamic.jsp > b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleDynamic.jsp > > deleted file mode 100644 > > index 07a5adb..0000000 > > --- > a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleDynamic.jsp > > +++ /dev/null > > @@ -1,54 +0,0 @@ > > -<%@taglib prefix="s" uri="/struts-tags" %> > > -<%@ taglib prefix="sx" uri="/struts-dojo-tags" %> > > -<html> > > -<head> > > - <title>Struts2 Showcase - UI Tags - Tree Example > (Dynamic)</title> > > - <sx:head/> > > -</head> > > -<body> > > -<div class="page-header"> > > - <h1>UI Tags - Tree Example (Dynamic)</h1> > > -</div> > > - > > -<div class="container-fluid"> > > - <div class="row-fluid"> > > - <div class="span12"> > > - > > - <!-- START SNIPPET: treeExampleDynamicJsp --> > > - > > - <script language="JavaScript" > type="text/javascript"> > > - dojo.event.topic.subscribe("treeSelected", > function treeNodeSelected(node) { > > - dojo.io.bind({ > > - url: "<s:url > value='/tags/ui/ajax/dynamicTreeSelectAction.action'/>?nodeId="+node.node.widgetId, > > - load: function(type, data, evt) { > > - var divDisplay = > dojo.byId("displayId"); > > - divDisplay.innerHTML=data; > > - }, > > - mimeType: "text/html" > > - }); > > - }); > > - </script> > > - > > - > > - > > - <div style="float:left; margin-right: 50px;"> > > - <sx:tree > > - id="tree" > > - rootNode="%{treeRootNode}" > > - childCollectionProperty="children" > > - nodeIdProperty="id" > > - nodeTitleProperty="name" > > - treeSelectedTopic="treeSelected"> > > - </sx:tree> > > - </div> > > - > > - <div id="displayId"> > > - Please click on any of the tree nodes. > > - </div> > > - > > - <!-- END SNIPPET: treeExampleDynamicJsp --> > > - </div> > > - </div> > > -</div> > > -</body> > > -</html> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleStatic.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleStatic.jsp > b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleStatic.jsp > > deleted file mode 100644 > > index 76ab074..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleStatic.jsp > > +++ /dev/null > > @@ -1,61 +0,0 @@ > > -<%@taglib prefix="s" uri="/struts-tags" %> > > -<%@ taglib prefix="sx" uri="/struts-dojo-tags" %> > > -<html> > > -<head> > > - <title>Struts2 Showcase - UI Tags - Tree Example (Static)</title> > > -<sx:head/> > > -</head> > > -<body> > > -<div class="page-header"> > > - <h1>UI Tags - Tree Example (Static)</h1> > > -</div> > > - > > -<div class="container-fluid"> > > - <div class="row-fluid"> > > - <div class="span12"> > > - > > - <!-- START SNIPPET: treeExampleStaticJsp --> > > - > > - <script language="JavaScript" > type="text/javascript"> > > - dojo.event.topic.subscribe("treeSelected", > function treeNodeSelected(node) { > > - dojo.io.bind({ > > - url: "<s:url > value='/tags/ui/ajax/staticTreeSelectAction.action'/>?nodeId="+node.node.title, > > - load: function(type, data, evt) { > > - var divDisplay = > dojo.byId("displayIt"); > > - divDisplay.innerHTML=data; > > - }, > > - mimeType: "text/html" > > - }); > > - }); > > - </script> > > - > > - > > - <div style="float:left; margin-right: 50px;"> > > - <sx:tree label="parent" > templateCssPath="/struts/tree.css" > > - showRootGrid="true" showGrid="true" > treeSelectedTopic="treeSelected"> > > - <sx:treenode label="child1" > > > - <sx:treenode label="grandchild1" > id="grandchild1Id"/> > > - <sx:treenode label="grandchild2" > id="grandchild2Id"/> > > - <sx:treenode label="grandchild3" > id="grandchild3Id"/> > > - </sx:treenode> > > - <sx:treenode label="child2" id="child2Id"/> > > - <sx:treenode label="child3" id="child3Id"/> > > - <sx:treenode label="child4" id="child4Id"/> > > - <sx:treenode label="child5" id="child5Id"> > > - <sx:treenode label="gChild1" > id="gChild1Id"/> > > - <sx:treenode label="gChild2" > id="gChild2Id"/> > > - </sx:treenode> > > - </sx:tree> > > - </div> > > - > > - > > - <div id="displayIt"> > > - Please click on any node on the tree. > > - </div> > > - > > - <!-- END SNIPPET: treeExampleStaticJsp --> > > - </div> > > - </div> > > -</div> > > -</body> > > -</html> > > \ No newline at end of file > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp > b/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp > > index 96a331f..cca10f1 100644 > > --- a/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp > > +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp > > @@ -24,7 +24,6 @@ > > <s:url var="quizBasic" namespace="/validation" > action="quizBasic" method="input"/> > > <s:url var="quizClient" namespace="/validation" > action="quizClient" method="input"/> > > <s:url var="quizClientCss" > namespace="/validation" action="quizClientCss" method="input"/> > > - <s:url var="quizAjax" namespace="/validation" > action="quizAjax" method="input"/> > > <s:url var="fieldValidatorUrl" > action="showFieldValidatorsExamples" namespace="/validation"/> > > <s:url var="nonFieldValidatorUrl" > action="showNonFieldValidatorsExamples" namespace="/validation"/> > > <s:url var="visitorValidatorUrl" > action="showVisitorValidatorsExamples" namespace="/validation"/> > > @@ -37,7 +36,6 @@ > > <li><s:a > href="%{clientSideValidationUrl}">Field Validators with client-side > JavaScript</s:a></li> > > <li><s:a > href="%{nonFieldValidatorUrl}">Non Field Validator</s:a></li> > > <li><s:a > href="%{storeMessageAcrossRequestExample}">Store across request using > MessageStoreInterceptor (Example)</s:a></li> > > - <li><s:a href="%{quizAjax}">Validation > (ajax)</s:a></li> > > <li><s:a href="%{quizBasic}">Validation > (basic)</s:a></li> > > <li><s:a href="%{quizClient}">Validation > (client)</s:a></li> > > <li><s:a > href="%{quizClientCss}">Validation (client using css_xhtml theme)</s:a></li> > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-ajax.jsp > > ---------------------------------------------------------------------- > > diff --git > a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-ajax.jsp > b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-ajax.jsp > > deleted file mode 100644 > > index 9ce9bdb..0000000 > > --- a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-ajax.jsp > > +++ /dev/null > > @@ -1,104 +0,0 @@ > > -<%@ taglib prefix="s" uri="/struts-tags" %> > > -<%@ taglib prefix="sx" uri="/struts-dojo-tags" %> > > - > > -<!-- START SNIPPET: ajaxValidation --> > > - > > -<html> > > -<head> > > - <title>Struts2 Showcase - Validation - Ajax</title> > > - <sx:head cache="true" compressed="true"/> > > -</head> > > - > > -<s:url var="url" namespace="/validation" action="quizAjax"/> > > - > > -<body> > > - > > -<div class="page-header"> > > - <h1>AJAX validation Example</h1> > > -</div> > > - > > -<div class="container-fluid"> > > - <div class="row-fluid"> > > - <div class="span12"> > > - <h5>1.Use AJAX validation, and AJAX request > (ajaxAfterValidation="true"), if validation succeeds</h5> > > - > > - <div id="response" class="well"> > > - Response goes here > > - </div> > > - > > - <br/> > > - > > - <s:form method="post" theme="xhtml" > namespace="/nodecorate" action="quizAjax" id="form"> > > - <s:textfield label="Name" name="name"/> > > - <s:textfield label="Age" name="age"/> > > - <s:textfield label="Favorite color" > name="answer"/> > > - <sx:submit > > - validate="true" > > - > ajaxAfterValidation="true" > > - targets="response" > > - showLoadingText="false" > > - cssClass="btn > btn-primary"/> > > - </s:form> > > - > > - <sx:a > > - formId="form" > > - validate="true" > > - ajaxAfterValidation="true" > > - targets="response" > > - showLoadingText="false" > > - cssClass="btn > btn-primary">Submit Form with a link</sx:a> > > - <br/><br/> > > - > > - <input type="checkbox" id="checkbox">Submit Form > listening to an event on an element (check to submit) > > - <sx:bind > > - id="bind" > > - formId="form" > > - sources="checkbox" > > - validate="true" > > - events="onchange" > > - ajaxAfterValidation="true" > > - targets="response" > > - showLoadingText="false"/> > > - > > - <br/><br/><br/><br/> > > - > > - <h5>2.Use AJAX validation, and regular request > (ajaxAfterValidation="false", default), if validation > > - succeeds</h5> > > - <br/> > > - > > - <s:form method="post" theme="xhtml" > namespace="/nodecorate" action="quizAjax" id="form2"> > > - <s:textfield label="Name" name="name"/> > > - <s:textfield label="Age" name="age"/> > > - <s:textfield label="Favorite color" > name="answer"/> > > - <sx:submit > > - validate="true" > > - > ajaxAfterValidation="false" > > - showLoadingText="false" > > - cssClass="btn > btn-primary"/> > > - </s:form> > > - > > - <sx:a > > - formId="form2" > > - validate="true" > > - ajaxAfterValidation="false" > > - showLoadingText="false" > > - cssClass="btn > btn-primary">Submit Form with a link</sx:a> > > - <br/><br/> > > - > > - <input type="checkbox" id="checkbox2">Submit > Form listening to an event on an element (check to submit) > > - <sx:bind > > - formId="form2" > > - sources="checkbox2" > > - validate="true" > > - events="onchange" > > - ajaxAfterValidation="false" > > - showLoadingText="false"/> > > - > > - > > - <s:include value="footer.jsp"/> > > - </div> > > - </div> > > -</div> > > -</body> > > -</html> > > -<!-- END SNIPPET: ajaxValidation --> > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/ajax/JSONList.js > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/ajax/JSONList.js > b/apps/showcase/src/main/webapp/ajax/JSONList.js > > deleted file mode 100644 > > index d856727..0000000 > > --- a/apps/showcase/src/main/webapp/ajax/JSONList.js > > +++ /dev/null > > @@ -1,63 +0,0 @@ > > -[ > > - ["Alabama","AL"], > > - ["Alaska","AK"], > > - ["American Samoa","AS"], > > - ["Arizona","AZ"], > > - ["Arkansas","AR"], > > - ["Armed Forces Europe","AE"], > > - ["Armed Forces Pacific","AP"], > > - ["Armed Forces the Americas","AA"], > > - ["California","CA"], > > - ["Colorado","CO"], > > - ["Connecticut","CT"], > > - ["Delaware","DE"], > > - ["District of Columbia","DC"], > > - ["Federated States of Micronesia","FM"], > > - ["Florida","FL"], > > - ["Georgia","GA"], > > - ["Guam","GU"], > > - ["Hawaii","HI"], > > - ["Idaho","ID"], > > - ["Illinois","IL"], > > - ["Indiana","IN"], > > - ["Iowa","IA"], > > - ["Kansas","KS"], > > - ["Kentucky","KY"], > > - ["Louisiana","LA"], > > - ["Maine","ME"], > > - ["Marshall Islands","MH"], > > - ["Maryland","MD"], > > - ["Massachusetts","MA"], > > - ["Michigan","MI"], > > - ["Minnesota","MN"], > > - ["Mississippi","MS"], > > - ["Missouri","MO"], > > - ["Montana","MT"], > > - ["Nebraska","NE"], > > - ["Nevada","NV"], > > - ["New Hampshire","NH"], > > - ["New Jersey","NJ"], > > - ["New Mexico","NM"], > > - ["New York","NY"], > > - ["North Carolina","NC"], > > - ["North Dakota","ND"], > > - ["Northern Mariana Islands","MP"], > > - ["Ohio","OH"], > > - ["Oklahoma","OK"], > > - ["Oregon","OR"], > > - ["Pennsylvania","PA"], > > - ["Puerto Rico","PR"], > > - ["Rhode Island","RI"], > > - ["South Carolina","SC"], > > - ["South Dakota","SD"], > > - ["Tennessee","TN"], > > - ["Texas","TX"], > > - ["Utah","UT"], > > - ["Vermont","VT"], > > - ["Virgin Islands, U.S.","VI"], > > - ["Virginia","VA"], > > - ["Washington","WA"], > > - ["West Virginia","WV"], > > - ["Wisconsin","WI"], > > - ["Wyoming","WY"] > > -] > > > > > http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/ajax/index.html > > ---------------------------------------------------------------------- > > diff --git a/apps/showcase/src/main/webapp/ajax/index.html > b/apps/showcase/src/main/webapp/ajax/index.html > > deleted file mode 100644 > > index 175fd9a..0000000 > > --- a/apps/showcase/src/main/webapp/ajax/index.html > > +++ /dev/null > > @@ -1,24 +0,0 @@ > > -<html> > > -<head><title>AJAX Examples</title></head> > > - > > -<body> > > - > > -<h1>AJAX Example</h1> > > - > > -<p> > > -Note: The Ajax tags are experimental. These examples have only been > tested under FireFox 1.5 and IE 6. > > -</p> > > - > > -<ul> > > - <li><a href="bind.action">Bind tag</a></li> > > - <li><a href="autocompleter.action">Autocompleter combobox > tag</a></li> > > - <li><a href="remotebutton.action">Remote button tag</a></li> > > - <li><a href="remotediv.action">Remote div tag</a></li> > > - <li><a href="remotelink.action">Remote link tag</a></li> > > - <li><a href="tabbedpanel.action">Tabbed panel</a></li> > > - <li><a href="remoteforms.action">Remote forms</a></li> > > - <li><a href="widgets.action">Widgets </a> (may not work in all > browsers!) > > - see the <a href="http://www.dojotoolkit.org";>dojo website</a> > for more information</li> > > -</ul> > > -</body> > > -</html> > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org > For additional commands, e-mail: dev-h...@struts.apache.org > >
