diff --git a/examples/myfaces20-example/src/main/webapp/WEB-INF/facelets/extscripting.taglib.xml b/examples/myfaces20-example/src/main/webapp/WEB-INF/facelets/extscripting.taglib.xml
new file mode 100644
index 00000000..fffd6e3b
--- /dev/null
+++ b/examples/myfaces20-example/src/main/webapp/WEB-INF/facelets/extscripting.taglib.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+ http://myfaces.apache.org/ext-scripting
+
+ compilerOutput
+
+ org.apache.myfaces.extensions.scripting.components.CompilerComponent
+ org.apache.myfaces.extensions.scripting.components.CompilerComponentRenderer
+
+
+
diff --git a/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy-taglib.xml b/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy-taglib.xml
deleted file mode 100644
index 3552763e..00000000
--- a/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy-taglib.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
- http://myfaces.apache.org/groovy
-
- groovyvalidator
-
- org.apache.myfaces.groovyloader.test.TestValidator
-
-
-
- groovyconverter
-
- org.apache.myfaces.groovyloader.test.TestConverter
-
-
-
- testcomponent
-
- org.apache.myfaces.groovyloader.test.TestComponent
- org.apache.myfaces.groovyloader.test.Test
-
-
-
- compilerOutput
-
- org.apache.myfaces.extensions.scripting.components.CompilerComponent
- org.apache.myfaces.extensions.scripting.components.CompilerComponentRenderer
-
-
-
-
- testcomponent2
-
- at.irian.JavaTestComponent
- at.irian.JavaTestRenderer
-
-
-
- testcomponent3
-
- at.irian.JavaTestComponent
- at.irian.JavaTestRenderer
-
-
-
- testValidator1
-
- at.irian.CustomValidator
-
-
-
- testConverter1
-
- at.irian.CustomConverter
-
-
-
-
diff --git a/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy b/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy
index 388d2822..cee1d33d 100644
--- a/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy
+++ b/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy
@@ -21,7 +21,6 @@ package org.apache.myfaces.groovyloader.test
* @author Werner Punz
*/
-
class TestBean {
String helloworld = "hallo ist - die bean"
diff --git a/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java b/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
index 4519aa81..aaf877b0 100644
--- a/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
+++ b/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
@@ -21,6 +21,8 @@
/**
* @author werpu2
* @date: 01.09.2009
+ *
+ * This is the domain object we now edit it
*/
public class BlogEntry {
diff --git a/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java b/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java
index 956abe79..3c61d661 100644
--- a/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java
+++ b/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java
@@ -101,6 +101,7 @@
/**
* Simple component to be picked up by
*/
+
@FacesComponent("at.irian.JavaTestComponent")
public class JavaTestComponent extends UIInput implements Markable {
@@ -108,7 +109,7 @@ public class JavaTestComponent extends UIInput implements Markable {
enum PropertyKeys {
- inc, testAttr, testAttr2, testAttr3
+ inc, testAttr, testAttr2, testAttr3, testAttr4
}
public JavaTestComponent() {
@@ -148,11 +149,27 @@ public void setTestAttr2x(String testAttr) {
getStateHelper().put(PropertyKeys.testAttr2, testAttr);
}
- public String getTestAttr3() {
+ public String getTestAttr3() {
return (String) getStateHelper().eval(PropertyKeys.testAttr3, "");
}
public void setTestAttr3(String testAttr) {
getStateHelper().put(PropertyKeys.testAttr3, testAttr);
}
+
+ /**
+ * Ok guys, lets add a new attribute to the component
+ * which is displayed in our browser page
+ *
+ * Note we are on jsf 2 level
+ */
+
+ public String getTestAttr4() {
+ return (String) getStateHelper().eval(PropertyKeys.testAttr4, "");
+ }
+
+ public void setTestAttr4(String testAttr) {
+ getStateHelper().put(PropertyKeys.testAttr4, testAttr);
+ }
+
}
diff --git a/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java b/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
index ebdd4d39..d1c4f86e 100644
--- a/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
+++ b/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
@@ -46,12 +46,15 @@ public class JavaTestRenderer1 extends HtmlTextRendererBase {
static Log log = LogFactory.getLog(JavaTestRenderer1.class);
+
private static final String MSG2 = "aaaa Hello world from Renderer 1";
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
super.encodeBegin(context, component);
JavaTestComponent myComponent = (JavaTestComponent) component;
+
+
ResponseWriter writer = context.getResponseWriter();
test(myComponent, writer);
@@ -63,6 +66,8 @@ private void test(JavaTestComponent myComponent, ResponseWriter writer) throws I
writer.write(MSG2);
writer.write(myComponent.getMarker());
writer.write("
TestAttr: "+myComponent.getTestAttr()+" | "+myComponent.getTestAttr3()+"");
+ /*lets add the new attribute as extra output*/
+ writer.write(""+myComponent.getTestAttr4()+"
");
}
public void encodeEnd(FacesContext context, UIComponent component) throws IOException {
diff --git a/examples/myfaces20-example/src/main/webapp/WEB-INF/tomahawk.taglib.xml b/examples/myfaces20-example/src/main/webapp/WEB-INF/tomahawk.taglib.xml
deleted file mode 100644
index b9fc141f..00000000
--- a/examples/myfaces20-example/src/main/webapp/WEB-INF/tomahawk.taglib.xml
+++ /dev/null
@@ -1,458 +0,0 @@
-
-
-
-
- http://myfaces.apache.org/tomahawk
-
- commandButton
-
- org.apache.myfaces.HtmlCommandButton
- org.apache.myfaces.Button
-
-
-
- commandLink
-
- org.apache.myfaces.HtmlCommandLink
- org.apache.myfaces.Link
-
-
-
- dataTable
-
- org.apache.myfaces.HtmlDataTable
- org.apache.myfaces.Table
-
-
-
- inputHidden
-
- org.apache.myfaces.HtmlInputHidden
-
-
-
- inputSecret
-
- org.apache.myfaces.HtmlInputSecret
- org.apache.myfaces.Secret
-
-
-
- inputText
-
- org.apache.myfaces.HtmlInputText
- org.apache.myfaces.Text
-
-
-
- inputTextHelp
-
- org.apache.myfaces.HtmlInputTextHelp
- org.apache.myfaces.TextHelp
-
-
-
- inputTextarea
-
- org.apache.myfaces.HtmlInputTextarea
- org.apache.myfaces.Textarea
-
-
-
- graphicImage
-
- org.apache.myfaces.HtmlGraphicImage
- org.apache.myfaces.Image
-
-
-
- message
-
- org.apache.myfaces.HtmlMessage
- org.apache.myfaces.Message
-
-
-
- messages
-
- org.apache.myfaces.HtmlMessages
- org.apache.myfaces.Messages
-
-
-
- outputLabel
-
- org.apache.myfaces.HtmlOutputLabel
-
-
-
- outputText
-
- org.apache.myfaces.HtmlOutputText
- org.apache.myfaces.Text
-
-
-
- panelGrid
-
- org.apache.myfaces.HtmlPanelGrid
- org.apache.myfaces.Grid
-
-
-
- panelGroup
-
- org.apache.myfaces.HtmlPanelGroup
- org.apache.myfaces.Group
-
-
-
- selectOneMenu
-
- org.apache.myfaces.HtmlSelectOneMenu
- org.apache.myfaces.Menu
-
-
-
- selectManyMenu
-
- org.apache.myfaces.HtmlSelectManyMenu
- org.apache.myfaces.Menu
-
-
-
- selectOneRadio
-
- org.apache.myfaces.HtmlSelectOneRadio
- org.apache.myfaces.Radio
-
-
-
- selectBooleanCheckbox
-
- org.apache.myfaces.HtmlSelectBooleanCheckbox
- org.apache.myfaces.Checkbox
-
-
-
- selectManyCheckbox
-
- org.apache.myfaces.HtmlSelectManyCheckbox
- org.apache.myfaces.Checkbox
-
-
-
- selectOneListbox
-
- org.apache.myfaces.HtmlSelectOneListbox
- org.apache.myfaces.Listbox
-
-
-
- selectManyListbox
-
- org.apache.myfaces.HtmlSelectManyListbox
- org.apache.myfaces.Listbox
-
-
-
- inputCalendar
-
- org.apache.myfaces.HtmlInputCalendar
-
-
-
- jsValueChangeListener
-
- org.apache.myfaces.JsValueChangeListener
-
-
-
- jsValueSet
-
- org.apache.myfaces.HtmlJsValueSet
-
-
-
- checkbox
-
- org.apache.myfaces.HtmlCheckbox
-
-
-
- commandNavigation
-
- org.apache.myfaces.HtmlCommandNavigation
- org.apache.myfaces.Navigation
-
-
-
- commandNavigation2
-
- org.apache.myfaces.HtmlCommandNavigationItem
- org.apache.myfaces.NavigationMenu
-
-
-
- commandSortHeader
-
- org.apache.myfaces.HtmlCommandSortHeader
- org.apache.myfaces.SortHeader
-
-
-
- dataList
-
- org.apache.myfaces.HtmlDataList
-
-
-
- dataScroller
-
- org.apache.myfaces.HtmlDataScroller
-
-
-
- inputDate
-
- org.apache.myfaces.HtmlInputDate
-
-
-
- inputFileUpload
-
- org.apache.myfaces.HtmlInputFileUpload
-
-
-
- inputHtml
-
- org.apache.myfaces.InputHtml
-
-
-
- navigationMenuItem
-
- org.apache.myfaces.NavigationMenuItem
-
-
-
- navigationMenuItems
-
- javax.faces.SelectItems
-
-
-
- jscookMenu
-
- org.apache.myfaces.JSCookMenu
-
-
-
- panelLayout
-
- org.apache.myfaces.HtmlPanelLayout
-
-
-
- panelNavigation
-
- org.apache.myfaces.HtmlPanelNavigation
-
-
-
- panelNavigation2
-
- org.apache.myfaces.HtmlPanelNavigationMenu
- org.apache.myfaces.NavigationMenu
-
-
-
- panelTab
-
- org.apache.myfaces.HtmlPanelTab
-
-
-
- panelTabbedPane
-
- org.apache.myfaces.HtmlPanelTabbedPane
-
-
-
-
- collapsiblePanel
-
- org.apache.myfaces.HtmlCollapsiblePanel
-
-
-
- selectOneCountry
-
- org.apache.myfaces.SelectOneCountry
-
-
-
- selectOneLanguage
-
- org.apache.myfaces.SelectOneLanguage
-
-
-
- stylesheet
-
- org.apache.myfaces.Stylesheet
-
-
-
- div
-
- org.apache.myfaces.Div
-
-
-
- htmlTag
-
- org.apache.myfaces.HtmlTag
-
-
-
- radio
-
- org.apache.myfaces.HtmlRadio
-
-
-
- tree
-
- org.apache.myfaces.HtmlTree
- org.apache.myfaces.HtmlTree
-
-
-
-
-
- treeColumn
-
- org.apache.myfaces.HtmlTreeColumn
-
-
-
- treeCheckbox
-
- org.apache.myfaces.HtmlTreeCheckbox
-
-
-
- tree2
-
- org.apache.myfaces.HtmlTree2
-
-
-
- panelStack
-
- org.apache.myfaces.HtmlPanelStack
-
-
-
- popup
-
- org.apache.myfaces.HtmlPopup
-
-
-
- newspaperTable
-
- org.apache.myfaces.HtmlNewspaperTable
-
-
-
- aliasBean
-
- org.apache.myfaces.AliasBean
-
-
-
- aliasBeansScope
-
- org.apache.myfaces.AliasBeansScope
-
-
-
- buffer
-
- org.apache.myfaces.Buffer
-
-
-
- saveState
-
- org.apache.myfaces.SaveState
-
-
-
-
- validateCreditCard
-
- org.apache.myfaces.validator.CreditCard
-
-
-
- validateEmail
-
- org.apache.myfaces.validator.Email
-
-
-
- validateEqual
-
- org.apache.myfaces.validator.Equal
-
-
-
- swapImage
-
- org.apache.myfaces.HtmlSwapImage
-
-
-
- columns
-
- org.apache.myfaces.HtmlColumns
-
-
-
- column
-
- org.apache.myfaces.HtmlColumn
-
-
-
-
- validateRegExpr
-
- org.apache.myfaces.validator.RegExpr
-
-
-
\ No newline at end of file
diff --git a/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml b/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
index 10286852..ce988b67 100644
--- a/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
+++ b/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
@@ -33,7 +33,6 @@
-
+
diff --git a/examples/myfaces20-example/src/main/webapp/template.xhtml b/examples/myfaces20-example/src/main/webapp/template.xhtml
index 8f8ca0bd..329a4d42 100644
--- a/examples/myfaces20-example/src/main/webapp/template.xhtml
+++ b/examples/myfaces20-example/src/main/webapp/template.xhtml
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">