You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/02/22 18:25:50 UTC

svn commit: r510598 [6/6] - in /myfaces/fusion/trunk: ./ core/ core/src/ core/src/main/ core/src/main/java/ core/src/main/java/org/ core/src/main/java/org/apache/ core/src/main/java/org/apache/myfaces/ core/src/main/java/org/apache/myfaces/fusion/ core...

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/metadata/impl/jsf/JsfRequestFieldExtractor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/metadata/impl/jsf/JsfRequestFieldExtractor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/metadata/impl/jsf/JsfRequestFieldExtractor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/metadata/utils/TypeInfos.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/metadata/utils/TypeInfos.java?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/metadata/utils/TypeInfos.java (added)
+++ myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/metadata/utils/TypeInfos.java Thu Feb 22 09:25:41 2007
@@ -0,0 +1,133 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.fusion.dynaForm.metadata.utils;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.Map;
+
+public class TypeInfos
+{
+	private final static Map<Class, Info> INFOS = new HashMap<Class, Info>(10);
+
+	public static class Info
+	{
+		/**
+		 * min possible value
+		 */
+		private final Double minValue;
+
+		/**
+		 * max possible value
+		 */
+		private final Double maxValue;
+
+		/**
+		 * display length, -1 means unknown
+		 */
+		private final int length;
+
+		/**
+		 * do this type has a fractional part
+		 */
+		private final boolean hasFractional;
+
+		/**
+		 * if this is a number
+		 */
+		private final boolean number;
+
+		private Info(boolean number, Double minValue, Double maxValue, boolean hasFractional)
+		{
+			if (minValue != null)
+			{
+				int length = String.valueOf(minValue).length();
+				if (!hasFractional)
+				{
+					length = length - 2; // strip off the .0 part after string conversion
+				}
+				this.length = length;
+			}
+			else
+			{
+				length = -1;
+			}
+			this.minValue = minValue;
+			this.maxValue = maxValue;
+			this.hasFractional = hasFractional;
+			this.number = number;
+		}
+
+		public int getLength()
+		{
+			return length;
+		}
+
+		public Double getMaxValue()
+		{
+			return maxValue;
+		}
+
+		public Double getMinValue()
+		{
+			return minValue;
+		}
+
+		public boolean isHasFractional()
+		{
+			return hasFractional;
+		}
+
+		public boolean isNumber()
+		{
+			return number;
+		}
+	}
+
+	static
+	{
+		addInfo(new Info(true, (double) Byte.MIN_VALUE, (double) Byte.MAX_VALUE, false), Byte.class, Byte.TYPE);
+		addInfo(new Info(true, (double) Short.MIN_VALUE, (double) Short.MAX_VALUE, false), Short.class, Short.TYPE);
+		addInfo(new Info(true, (double) Integer.MIN_VALUE, (double) Integer.MAX_VALUE, false), Integer.class, Integer.TYPE);
+		addInfo(new Info(true, (double) Long.MIN_VALUE, (double) Long.MAX_VALUE, false), Long.class, Long.TYPE);
+		addInfo(new Info(true, null, null, false), BigInteger.class);
+		addInfo(new Info(true, null, (double) Float.MAX_VALUE, true), Float.class, Float.TYPE);
+		addInfo(new Info(true, null, Double.MAX_VALUE, true), Double.class, Double.TYPE);
+		addInfo(new Info(true, null, null, true), BigDecimal.class);
+		addInfo(new Info(false, null, null, false), String.class);
+	}
+
+	private TypeInfos()
+	{
+	}
+
+	private static void addInfo(Info info, Class... types)
+	{
+		for (Class type : types)
+		{
+			INFOS.put(type, info);
+		}
+	}
+
+	public static Info getInfo(Class type)
+	{
+		return INFOS.get(type);
+	}
+}

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/metadata/utils/TypeInfos.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/metadata/utils/TypeInfos.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/metadata/utils/TypeInfos.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/FacesUriResolver.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/FacesUriResolver.java?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/FacesUriResolver.java (added)
+++ myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/FacesUriResolver.java Thu Feb 22 09:25:41 2007
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.fusion.dynaForm.uri;
+
+import javax.faces.context.FacesContext;
+import java.io.InputStream;
+
+/**
+ * try to locate the configuration through the faces context too
+ */
+public class FacesUriResolver extends UriResolver
+{
+	@Override
+	protected InputStream findConfig(String config)
+	{
+		InputStream is = FacesContext.getCurrentInstance().getExternalContext().getResourceAsStream("/WEB-INF/" + config);
+		if (is != null)
+		{
+			return is;
+		}
+
+		return super.findConfig(config);
+	}
+
+}

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/FacesUriResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/FacesUriResolver.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/FacesUriResolver.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/UriResolver.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/UriResolver.java?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/UriResolver.java (added)
+++ myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/UriResolver.java Thu Feb 22 09:25:41 2007
@@ -0,0 +1,187 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.fusion.dynaForm.uri;
+
+import org.apache.myfaces.fusion.dynaForm.lib.DynaFormException;
+import org.apache.myfaces.fusion.dynaForm.metadata.Extractor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.InvalidPropertiesFormatException;
+import java.util.Properties;
+
+/**
+ * Resolves the URI to a configuration
+ */
+public abstract class UriResolver
+{
+	/**
+	 * The configuration
+	 */
+	public static class Configuration
+	{
+		private final Extractor extractor;
+		private final String entity;
+
+		protected Configuration(Extractor extractor, String entity)
+		{
+			this.extractor = extractor;
+			this.entity = entity;
+		}
+
+		/**
+		 * metadata for the given entity
+		 */
+		public Extractor getExtractor()
+		{
+			return extractor;
+		}
+
+		/**
+		 * the entity identification
+		 */
+		public String getEntity()
+		{
+			return entity;
+		}
+	}
+
+	protected Configuration createConfiguration(Extractor extractor, String entity)
+	{
+		return new Configuration(extractor, entity);
+	}
+
+	/**
+	 * resolve the given uri
+	 */
+	public Configuration resolveUri(String uri)
+	{
+		int pos = uri.indexOf(":");
+		if (pos < 0)
+		{
+			return resolve("default", uri);
+		}
+		if (uri.length() < pos + 1)
+		{
+			throw new IllegalArgumentException("Invalid uri: " + uri);
+		}
+
+		return resolve(uri.substring(0, pos), uri.substring(pos + 1));
+	}
+
+	/**
+	 * do the hard work
+	 */
+	protected Configuration resolve(String scheme, String path)
+	{
+		String config = "dynaForm-" + scheme + ".xml";
+		Properties props = new Properties();
+		InputStream resource = null;
+		try
+		{
+			resource = findConfig(config);
+			if (resource == null)
+			{
+				throw new DynaFormException("configuration '" + config + "' not found.");
+			}
+
+			props.loadFromXML(resource);
+		}
+		catch (InvalidPropertiesFormatException e)
+		{
+			throw new DynaFormException(e);
+		}
+		catch (IOException e)
+		{
+			throw new DynaFormException(e);
+		}
+		finally
+		{
+			if (resource != null)
+			{
+				try
+				{
+					resource.close();
+				}
+				catch (IOException e)
+				{
+					// do not shadow the real exception
+				}
+			}
+		}
+
+		String extractor = getRequiredProperty(config, props, "Extractor");
+
+		try
+		{
+			Extractor extractorClass = (Extractor) Class.forName(extractor).newInstance();
+			return createConfiguration(
+				extractorClass,
+				path);
+		}
+		catch (InstantiationException e)
+		{
+			throw new DynaFormException(e);
+		}
+		catch (IllegalAccessException e)
+		{
+			throw new DynaFormException(e);
+		}
+		catch (ClassNotFoundException e)
+		{
+			throw new DynaFormException(e);
+		}
+		catch (SecurityException e)
+		{
+			throw new DynaFormException(e);
+		}
+		catch (IllegalArgumentException e)
+		{
+			throw new DynaFormException(e);
+		}
+	}
+
+	/**
+	 * load the configuration
+	 */
+	protected InputStream findConfig(String config)
+	{
+		return getResourceAsStream("META-INF/" + config);
+	}
+
+	protected InputStream getResourceAsStream(String resource)
+	{
+		InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
+		if (stream == null)
+		{
+			stream = UriResolver.class.getClassLoader().getResourceAsStream(resource);
+		}
+		return stream;
+	}
+
+	protected String getRequiredProperty(String config, Properties props, String key)
+	{
+		String value = props.getProperty(key);
+		if (value == null)
+		{
+			throw new IllegalStateException("Configuration '" + key + "' missing in config " + config);
+		}
+		return value;
+	}
+}

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/UriResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/UriResolver.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/core15/src/main/java/org/apache/myfaces/fusion/dynaForm/uri/UriResolver.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/fusion/trunk/core15/src/main/resources/META-INF/dynaForm-default.xml
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core15/src/main/resources/META-INF/dynaForm-default.xml?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/core15/src/main/resources/META-INF/dynaForm-default.xml (added)
+++ myfaces/fusion/trunk/core15/src/main/resources/META-INF/dynaForm-default.xml Thu Feb 22 09:25:41 2007
@@ -0,0 +1,25 @@
+<?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.
+  -->
+
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>DynaForm default configuration</comment>
+<entry key="Extractor">org.apache.myfaces.custom.dynaForm.metadata.impl.ejb.EjbExtractor</entry>
+</properties>
\ No newline at end of file

Propchange: myfaces/fusion/trunk/core15/src/main/resources/META-INF/dynaForm-default.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/core15/src/main/resources/META-INF/dynaForm-default.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/core15/src/main/resources/META-INF/dynaForm-default.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: myfaces/fusion/trunk/core15/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core15/src/main/resources/META-INF/faces-config.xml?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/core15/src/main/resources/META-INF/faces-config.xml (added)
+++ myfaces/fusion/trunk/core15/src/main/resources/META-INF/faces-config.xml Thu Feb 22 09:25:41 2007
@@ -0,0 +1,139 @@
+<?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.
+  -->
+
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+
+<faces-config>
+
+    <!-- components -->
+    <component>
+        <component-type>org.apache.myfaces.dynaForm.DynaConfigs</component-type>
+        <component-class>org.apache.myfaces.fusion.dynaForm.component.dynaForm.DynaConfigs</component-class>
+    </component>
+
+    <component>
+        <component-type>org.apache.myfaces.dynaForm.DynaConfig</component-type>
+        <component-class>org.apache.myfaces.fusion.dynaForm.component.dynaForm.DynaConfig</component-class>
+        <property>
+          <description>
+			The name of the property this configuration is for
+          </description>
+          <property-name>for</property-name>
+          <property-class>java.lang.String</property-class>
+        </property>
+        <property>
+          <description>
+			The size to be used to render the component
+          </description>
+          <property-name>displaySize</property-name>
+          <property-class>java.lang.Integer</property-class>
+        </property>
+        <property>
+          <description>
+			Configures this field as displayOnly
+          </description>
+          <property-name>displayOnly</property-name>
+          <property-class>java.lang.Boolean</property-class>
+        </property>
+        <property>
+          <description>
+			configure this field as readOnly - noneditable input field
+          </description>
+          <property-name>readOnly</property-name>
+          <property-class>java.lang.Boolean</property-class>
+        </property>
+        <property>
+          <description>
+			configure this field as disabled - like readOnly but grayed too
+          </description>
+          <property-name>disabled</property-name>
+          <property-class>java.lang.Boolean</property-class>
+        </property>
+    </component>
+
+    <component>
+        <component-type>org.apache.myfaces.dynaForm.DynaForm</component-type>
+        <component-class>org.apache.myfaces.fusion.dynaForm.component.dynaForm.DynaForm</component-class>
+        <property>
+          <description>
+            The root model
+          </description>
+          <property-name>uri</property-name>
+          <property-class>java.lang.String</property-class>
+        </property>
+        <property>
+          <description>
+              The value binding prefix which will be used to create the real value binding.
+              If this is missing and the layout component has a "var" attribute its value will be used.
+          </description>
+          <property-name>valueBindingPrefix</property-name>
+          <property-class>java.lang.String</property-class>
+        </property>
+        <property>
+          <description>
+            The var used to get access to the form controller
+          </description>
+          <property-name>var</property-name>
+          <property-class>java.lang.String</property-class>
+        </property>
+        <property>
+          <description>
+            Render the whole form in display (non editable) only mode
+          </description>
+          <property-name>displayOnly</property-name>
+          <property-class>java.lang.Boolean</property-class>
+        </property>
+        <property>
+          <description>
+			The bundle to use to convert the lables to readable strings
+          </description>
+          <property-name>bundle</property-name>
+          <property-class>java.lang.String</property-class>
+        </property>
+        <property>
+          <description>
+			Render only the fields listed by an facet
+          </description>
+          <property-name>exclusiveFields</property-name>
+          <property-class>java.lang.Boolean</property-class>
+        </property>
+    </component>
+
+    <!-- render kits -->
+    <render-kit>
+      <renderer>
+        <description>
+          Render the dynaForm (in fact it renders nothing but creates the children for the layout component)
+        </description>
+        <component-family>org.apache.myfaces.dynaForm.DynaForm</component-family>
+        <renderer-type>org.apache.myfaces.dynaForm.DynaForm</renderer-type>
+        <renderer-class>org.apache.myfaces.fusion.dynaForm.component.dynaForm.DynaFormRenderer</renderer-class>
+      </renderer>
+    </render-kit>
+
+	<!--  converters -->
+	<converter>
+		<converter-for-class>java.lang.Enum</converter-for-class>
+		<converter-class>org.apache.myfaces.fusion.converter.enumeration.EnumConverter</converter-class>
+	</converter>
+</faces-config>

Propchange: myfaces/fusion/trunk/core15/src/main/resources/META-INF/faces-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/core15/src/main/resources/META-INF/faces-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/core15/src/main/resources/META-INF/faces-config.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities-tlddoc.xsl
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities-tlddoc.xsl?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities-tlddoc.xsl (added)
+++ myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities-tlddoc.xsl Thu Feb 22 09:25:41 2007
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  - Stylesheet to expand xml entity references inline. 
+  - 
+  - This is a temporary workaround for a bug in the tlddoc application which means that
+  - a (valid) xmlns attribute is rejected; tlddoc v1.3 only accepts input that (incorrectly)
+  - puts the tld elements in no namespace. This stylesheet therefore generates a special
+  - version of the tld for feeding to the tlddoc app, until such time as tlddoc is fixed.
+  -->
+<xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <xsl:output method="xml"
+      encoding="ISO-8859-1"
+      doctype-public="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+      doctype-system="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"
+      indent="yes"/>
+
+  <xsl:template match="*" priority="2">
+    <!-- avoiding copy to get get rid of namespace attribute -->
+    <xsl:element name="{name(.)}">
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:element>
+  </xsl:template>
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>

Propchange: myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities-tlddoc.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities-tlddoc.xsl
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities-tlddoc.xsl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities.xsl
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities.xsl?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities.xsl (added)
+++ myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities.xsl Thu Feb 22 09:25:41 2007
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  - Stylesheet to pretty-print an xml document. In addition, if the input
+  - document contains any xml entity references, then those are expanded
+  - inline.
+  -
+  - Based on a stylesheet by John Mongan.
+  -->
+<xsl:stylesheet version="1.1"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+    <xsl:output method="xml"
+                encoding="ISO-8859-1"
+                doctype-public="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                doctype-system="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"/>
+
+    <xsl:param name="indent-increment" select="'   '" />
+
+    <xsl:template match="*">
+      <xsl:param name="indent" select="'&#xA;'"/>
+
+      <xsl:value-of select="$indent"/>
+      <xsl:copy>
+        <xsl:copy-of select="@*" />
+        <xsl:apply-templates>
+          <xsl:with-param name="indent"
+               select="concat($indent, $indent-increment)"/>
+        </xsl:apply-templates>
+        <xsl:if test="*">
+          <xsl:value-of select="$indent"/>
+        </xsl:if>
+      </xsl:copy>
+    </xsl:template>
+
+   <xsl:template match="comment()|processing-instruction()">
+      <xsl:param name="indent" select="'&#xA;'"/>
+      <xsl:value-of select="$indent"/>
+      <xsl:copy />
+   </xsl:template>
+
+   <!-- 
+     - Discard the text content of a node where the text content
+     - is nothing but whitespace. When this rule isn't matched
+     - the default xml processing applies, which is to copy the
+     - text directly to the output.
+     -
+     - WARNING: this is dangerous. Handle with care 
+     -->
+   <xsl:template match="text()[normalize-space(.)='']"/>
+
+</xsl:stylesheet>

Propchange: myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities.xsl
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/core15/src/main/tld/misc/resolve_entities.xsl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: myfaces/fusion/trunk/core15/src/main/tld/myfaces_fusion15.tld
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core15/src/main/tld/myfaces_fusion15.tld?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/core15/src/main/tld/myfaces_fusion15.tld (added)
+++ myfaces/fusion/trunk/core15/src/main/tld/myfaces_fusion15.tld Thu Feb 22 09:25:41 2007
@@ -0,0 +1,164 @@
+<?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.
+  -->
+
+<!DOCTYPE taglib
+  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+  "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+<taglib>
+
+  <tlib-version>1.0.10</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>sn</short-name>
+  <uri>http://myfaces.apache.org/fusion15</uri>
+  <description>
+      Enhanced standard JSP actions and custom MyFaces actions.
+  </description>
+
+  <tag>
+    <name>dynaFormConfigs</name>
+    <tag-class>org.apache.myfaces.fusion.dynaForm.component.dynaForm.DynaConfigsTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+		Container for field configurations
+    </description>
+  </tag>
+  
+  <tag>
+    <name>dynaFormConfig</name>
+    <tag-class>org.apache.myfaces.fusion.dynaForm.component.dynaForm.DynaConfigTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+		Field configurations
+    </description>
+
+    <attribute>
+      <name>for</name>
+      <required>true</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+      the name of the property this configuration is for
+      </description>
+    </attribute>
+    
+    <attribute>
+      <name>displaySize</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+      the displaySize to be used to render the component
+      </description>
+    </attribute>
+    
+    <attribute>
+      <name>displayOnly</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+      configure this field as displayOnly
+      </description>
+    </attribute>
+
+    <attribute>
+      <name>readOnly</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+      configure this field as readOnly - noneditable input field
+      </description>
+    </attribute>
+
+    <attribute>
+      <name>disabled</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+      configure this field as disabled - like readOnly but grayed too
+      </description>
+    </attribute>
+  </tag>
+  
+  <tag>
+    <name>dynaForm</name>
+    <tag-class>org.apache.myfaces.fusion.dynaForm.component.dynaForm.DynaFormTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+		Handle all the dynamic form creation for JSF
+    </description>
+
+    <attribute>
+      <name>var</name>
+      <required>true</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+      The var used to get access to the form controller
+      </description>
+    </attribute>
+    
+    <attribute>
+      <name>valueBindingPrefix</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+          The value binding prefix which will be used to create the real value binding.
+          If this is missing and the layout component has a "var" attribute its value will be used.
+      </description>
+    </attribute>
+
+    <attribute>
+      <name>uri</name>
+      <required>true</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+		The root model
+      </description>
+    </attribute>
+
+    <attribute>
+      <name>displayOnly</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+		Render the whole form in display (non editable) only mode
+      </description>
+    </attribute>
+
+    <attribute>
+      <name>bundle</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+      	The bundle to use to convert the lables to readable strings
+      </description>
+    </attribute>
+    
+    <attribute>
+      <name>exclusiveFields</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+      <description>
+        true|false - Set to true if only the fields listed within the configuration are to be rendered
+      </description>
+    </attribute>
+
+  </tag>
+
+</taglib>

Added: myfaces/fusion/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/pom.xml?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/pom.xml (added)
+++ myfaces/fusion/trunk/examples/pom.xml Thu Feb 22 09:25:41 2007
@@ -0,0 +1,256 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>war</packaging>
+	<name>MyFaces Fusion Examples Project</name>
+	<groupId>org.apache.myfaces.fusion</groupId>
+	<artifactId>myfaces-fusion-examples-project</artifactId>
+
+	<parent>
+		<groupId>org.apache.myfaces.fusion</groupId>
+		<artifactId>myfaces-fusion-project</artifactId>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/fusion/trunk/examples</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/fusion/trunk/examples
+		</developerConnection>
+		<url>http://svn.apache.org/viewcvs.cgi/myfaces/fusion/trunk/examples</url>
+	</scm>
+
+	<profiles>
+		<!-- By default, use the current snapshot of MyFaces Fusion -->
+		<profile>
+			<id>myfaces-fusion-current</id>
+			<activation>
+				<property>
+					<name>!myfaces-fusion-core</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.apache.myfaces.fusion</groupId>
+					<artifactId>myfaces-fusion-core</artifactId>
+					<version>${version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<!-- Use the specified version of MyFaces Fusion -->
+		<profile>
+			<id>myfaces-fusion-specified</id>
+			<activation>
+				<property>
+					<name>myfaces-fusion-core</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.apache.myfaces.fusion</groupId>
+					<artifactId>myfaces-fusion-core</artifactId>
+					<version>${myfaces-fusion-core}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+
+
+		<!-- By default the war examples use myfaces! :) -->
+		<profile>
+			<id>myfaces</id>
+			<activation>
+				<property>
+					<name>!jsf</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.apache.myfaces.core</groupId>
+					<artifactId>myfaces-api</artifactId>
+					<version>${myfaces.version}</version>
+				</dependency>
+			</dependencies>
+
+			<properties>
+				<jsf_implementation>MyFaces</jsf_implementation>
+			</properties>
+		</profile>
+
+		<!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
+		<profile>
+			<id>jsfri</id>
+			<activation>
+				<property>
+					<name>jsf</name>
+					<value>ri</value>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>javax.faces</groupId>
+					<artifactId>jsf-api</artifactId>
+					<version>1.1_02</version>
+					<exclusions>
+						<exclusion>
+							<groupId>java.servlet.servlet.jsp</groupId>
+							<artifactId>jsp-api</artifactId>
+						</exclusion>
+						<exclusion>
+							<groupId>javax.servlet.jsp</groupId>
+							<artifactId>jsp-api</artifactId>
+						</exclusion>
+						<exclusion>
+							<groupId>javax.servlet.jsp.jstl</groupId>
+							<artifactId>jstl</artifactId>
+						</exclusion>
+					</exclusions>
+				</dependency>
+				<dependency>
+					<groupId>javax.faces</groupId>
+					<artifactId>jsf-impl</artifactId>
+					<version>1.1_02</version>
+					<scope>runtime</scope>
+					<exclusions>
+						<exclusion>
+							<groupId>java.servlet.servlet.jsp</groupId>
+							<artifactId>jsp-api</artifactId>
+						</exclusion>
+						<exclusion>
+							<groupId>javax.servlet.jsp</groupId>
+							<artifactId>jsp-api</artifactId>
+						</exclusion>
+						<exclusion>
+							<groupId>javax.servlet.jsp.jstl</groupId>
+							<artifactId>jstl</artifactId>
+						</exclusion>
+					</exclusions>
+				</dependency>
+
+				<dependency>
+					<groupId>javax.servlet.jsp</groupId>
+					<artifactId>jsp-api</artifactId>
+					<version>1.2.0</version>
+					<scope>compile</scope>
+				</dependency>
+				<dependency>
+					<groupId>javax.servlet</groupId>
+					<artifactId>jstl</artifactId>
+					<version>1.1.0</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+
+			<repositories>
+				<repository>
+					<id>java.net</id>
+					<name>java.net Maven 1 Repository</name>
+					<url>https://maven-repository.dev.java.net/nonav/repository</url>
+					<layout>legacy</layout>
+				</repository>
+			</repositories>
+
+			<properties>
+				<jsf_implementation>JSF-RI</jsf_implementation>
+			</properties>
+		</profile>
+
+		<!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
+		<profile>
+			<id>jettyConfig</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.mortbay.jetty</groupId>
+						<artifactId>maven-jetty-plugin</artifactId>
+						<configuration>
+							<scanIntervalSeconds>10</scanIntervalSeconds>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+
+			<dependencies>
+				<dependency>
+					<groupId>javax.servlet</groupId>
+					<artifactId>jsp-api</artifactId>
+					<version>2.0</version>
+					<scope>compile</scope>
+				</dependency>
+				<dependency>
+					<groupId>tomcat</groupId>
+					<artifactId>jasper-compiler</artifactId>
+					<version>5.5.9</version>
+					<scope>compile</scope>
+				</dependency>
+				<dependency>
+					<groupId>tomcat</groupId>
+					<artifactId>jasper-runtime</artifactId>
+					<version>5.5.9</version>
+					<scope>compile</scope>
+				</dependency>
+				<dependency>
+					<groupId>tomcat</groupId>
+					<artifactId>jasper-compiler-jdt</artifactId>
+					<version>5.5.9</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+
+			<pluginRepositories>
+				<!-- Repository to get the jetty plugin -->
+				<pluginRepository>
+					<id>mortbay-repo</id>
+					<name>mortbay-repo</name>
+					<url>http://www.mortbay.org/maven2/snapshot</url>
+				</pluginRepository>
+			</pluginRepositories>
+
+		</profile>
+	</profiles>
+
+	<build>
+		<finalName>${artifactId}</finalName>
+
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+
+		<plugins>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-source</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.cargo</groupId>
+				<artifactId>cargo-maven2-plugin</artifactId>
+				<version>0.2</version>
+				<configuration>
+					<container>
+						<containerId>tomcat5x</containerId>
+						<home>${cargo.tomcat5x.home}</home>
+						<log>${project.build.directory}/tomcat5x.log</log>
+						<output>${project.build.directory}/tomcat5x.out</output>
+					</container>
+					<configuration>
+						<home>${project.build.directory}/tomcat5x</home>
+						<properties>
+							<cargo.jvmargs>-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n
+							</cargo.jvmargs>
+						</properties>
+					</configuration>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

Propchange: myfaces/fusion/trunk/examples/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/examples/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/examples/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml Thu Feb 22 09:25:41 2007
@@ -0,0 +1,128 @@
+<?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.
+  -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:tx="http://www.springframework.org/schema/tx"
+	   xmlns:aop="http://www.springframework.org/schema/aop"
+	   xsi:schemaLocation="
+			http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+			http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd
+			http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<!-- register our custom spring scope -->
+	<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
+		<property name="scopes">
+			<map>
+				<entry key="conversation">
+					<bean class="org.apache.myfaces.fusion.conversation.spring.SpringConversationScope">
+						<property name="advices">
+							<list>
+								<ref bean="persistentContextConversationInterceptor" />
+							</list>
+						</property>
+					</bean>
+				</entry>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="persistentContextConversationInterceptor" class="org.apache.myfaces.fusion.conversation.spring.PersistenceContextConversationInterceptor">
+		<property name="persistenceContextFactory" ref="hibernatePersistentContextFactory" />
+	</bean>
+
+	<bean id="hibernatePersistentContextFactory" class="org.apache.myfaces.fusion.conversation.spring.HibernatePersistenceContextFactory">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
+	<!-- persistence -->
+	<tx:annotation-driven />
+
+	<bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
+	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+			<property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+			<property name="url" value="jdbc:hsqldb:file:/home/im/tmp/myfacesFusion/db;shutdown=true"/>
+			<property name="username" value="sa"/>
+			<property name="password" value=""/>
+	</bean>
+
+	<bean id="sessionFactory" class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
+		<property name="dataSource" ref="dataSource"/>
+		<property name="annotatedClasses">
+			<list>
+				<value>org.apache.myfaces.examples.configurator.model.po.Component</value>
+				<value>org.apache.myfaces.examples.configurator.model.po.Piece</value>
+				<value>org.apache.myfaces.examples.configurator.model.po.OrderHead</value>
+				<value>org.apache.myfaces.examples.configurator.model.po.OrderItem</value>
+			</list>
+		</property>
+		<property name="hibernateProperties">
+			<props>
+				<prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>
+				<prop key="hibernate.show_sql">true</prop>
+				<prop key="hibernate.generate_statistics">true</prop>
+				<prop key="hibernate.hbm2ddl.auto">update</prop>
+				<prop key="hibernate.jdbc.batch_size">0</prop>
+				<prop key="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</prop>
+				<prop key="hibernate.cache.use_second_level_cache">true</prop>
+				<prop key="hibernate.cache.use_query_cache">true</prop>
+			</props>
+		</property>
+	</bean>
+
+	<!-- dao -->
+	<bean
+		name="componentDao"
+		class="org.apache.myfaces.examples.configurator.model.dao.ComponentDAO">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+	<bean
+		name="orderHeadDao"
+		class="org.apache.myfaces.examples.configurator.model.dao.OrderHeadDAO">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+	<bean
+		name="pieceDao"
+		class="org.apache.myfaces.examples.configurator.model.dao.PieceDAO">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
+	<!-- the beans -->
+	<bean
+		name="configuratorState"
+		class="org.apache.myfaces.examples.configurator.backings.ConfiguratorState"
+		scope="conversation"
+		autowire="byName">
+
+		<aop:scoped-proxy />
+	</bean>
+
+	<bean
+		name="configurator"
+		class="org.apache.myfaces.examples.configurator.backings.Configurator"
+		scope="request">
+
+		<property name="configuratorState" ref="configuratorState"/>
+	</bean>
+
+</beans>
\ No newline at end of file

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml Thu Feb 22 09:25:41 2007
@@ -0,0 +1,69 @@
+<!--
+  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.
+  -->
+
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+
+	<application>
+		<variable-resolver>org.springframework.web.jsf.DelegatingVariableResolver</variable-resolver>
+	</application>
+	<lifecycle>
+		<phase-listener>org.apache.myfaces.fusion.listenersner</phase-listener>
+	</lifecycle>
+
+	<navigation-rule>
+		<description>global navigation rules</description>
+		<navigation-case>
+			<from-outcome>configurator</from-outcome>
+			<to-view-id>/configurator/Configurator.jsp</to-view-id>
+			<redirect/>
+		</navigation-case>
+	</navigation-rule>
+
+	<navigation-rule>
+		<description>orderHead complete / checkout</description>
+		<navigation-case>
+			<from-action>#{configuratorState.checkoutAction}</from-action>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/configurator/Checkout.jsp</to-view-id>
+			<redirect/>
+		</navigation-case>
+	</navigation-rule>
+
+	<navigation-rule>
+		<description>checkout complete / next orderHead</description>
+		<navigation-case>
+			<from-action>#{configuratorState.buyAction}</from-action>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/configurator/Configurator.jsp</to-view-id>
+			<redirect/>
+		</navigation-case>
+	</navigation-rule>
+
+	<navigation-rule>
+		<description>cancel buy</description>
+		<navigation-case>
+			<from-action>#{configuratorState.cancelAction}</from-action>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/configurator/Configurator.jsp</to-view-id>
+			<redirect/>
+		</navigation-case>
+	</navigation-rule>
+
+</faces-config>

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/web.xml?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/web.xml (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/web.xml Thu Feb 22 09:25:41 2007
@@ -0,0 +1,132 @@
+<?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.
+  -->
+
+<web-app version="2.4"
+		 xmlns="http://java.sun.com/xml/ns/j2ee"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+	<display-name>MyFaces FUSION</display-name>
+
+	<listener>
+		<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+	</listener>
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	<listener>
+		<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+	</listener>
+
+	<context-param>
+		<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+		<param-value>server</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.myfaces.conversation.PERSISTENCE_MANAGER_FACTORY</param-name>
+		<param-value>com.ops.OPSJ.lib.model.ConversationPersistenceManagerFactory</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>javax.servlet.jsptl.ExpressionEvaluatorClass</param-name>
+		<param-value>org.apache.taglibs.jsptl.lang.spel.Evaluator</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+		<param-value>true</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+		<param-value>false</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+		<param-value>true</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
+		<param-value>false</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name>
+		<param-value>org.apache.myfaces.component.html.util.StreamingAddResource</param-value>
+	</context-param>
+
+	<filter>
+		<filter-name>FacesExtensionsFilter</filter-name>
+		<filter-class>org.apache.myfaces.component.html.util.ExtensionsFilter</filter-class>
+	</filter>
+
+	<filter>
+		<filter-name>requestEncodingFilter</filter-name>
+		<filter-class>org.apache.myfaces.filter.RequestEncodingFilter</filter-class>
+	</filter>
+
+	<filter>
+		<filter-name>requestParameterFilter</filter-name>
+		<filter-class>org.apache.myfaces.custom.requestParameterProvider.RequestParameterServletFilter</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>requestEncodingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<filter-mapping>
+		<filter-name>FacesExtensionsFilter</filter-name>
+		<url-pattern>/faces/*</url-pattern>
+	</filter-mapping>
+
+	<filter-mapping>
+		<filter-name>requestParameterFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<filter-mapping>
+		<filter-name>FacesExtensionsFilter</filter-name>
+		<url-pattern>*.faces</url-pattern>
+	</filter-mapping>
+
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>Faces Servlet</servlet-name>
+		<url-pattern>*.faces</url-pattern>
+	</servlet-mapping>
+
+	<session-config>
+		<session-timeout>30</session-timeout>
+	</session-config>
+
+	<error-page>
+		<error-code>500</error-code>
+		<location>/error.jsp</location>
+	</error-page>
+</web-app>

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: myfaces/fusion/trunk/examples/src/main/webapp/configurator/Checkout.jsp
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/configurator/Checkout.jsp?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/configurator/Checkout.jsp (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/configurator/Checkout.jsp Thu Feb 22 09:25:41 2007
@@ -0,0 +1,103 @@
+<%--
+  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.
+  --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+	<%@ include file="../header.jspf" %>
+
+	<h:form>
+
+		<t:htmlTag value="h3">
+			<h:outputText value="Buy your PC"/>
+		</t:htmlTag>
+
+		<t:dataTable
+			var="order"
+			value="#{configuratorState.orderItems}">
+
+			<f:facet name="footer">
+				<h:panelGroup>
+					<h:commandButton value="Cancel" action="#{configuratorState.cancelAction}"/>
+					<h:commandButton value="Buy" action="#{configuratorState.buyAction}"/>
+				</h:panelGroup>
+			</f:facet>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="position"/>
+				</f:facet>
+				<h:outputText value="#{order.posnr}"/>
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="count"/>
+				</f:facet>
+				<h:inputText value="#{order.amount}">
+					<s:convertNumber
+						groupingUsed="true"
+						minFractionDigits="0"
+						maxFractionDigits="0"/>
+				</h:inputText>
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="number"/>
+				</f:facet>
+				<h:outputText value="#{order.piece.number}"/>
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="description"/>
+				</f:facet>
+				<h:outputText value="#{order.piece.description}"/>
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="price"/>
+				</f:facet>
+				<h:outputText value="#{order.piece.price}">
+					<f:convertNumber
+						groupingUsed="true"
+						minFractionDigits="2"
+						maxFractionDigits="2"/>
+				</h:outputText>
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="value"/>
+				</f:facet>
+				<h:outputText value="???"/>
+			</h:column>
+
+		</t:dataTable>
+
+	</h:form>
+
+	<%@ include file="../footer.jspf" %>
+</f:view>
\ No newline at end of file

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/configurator/Checkout.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/configurator/Checkout.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/configurator/Checkout.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/fusion/trunk/examples/src/main/webapp/configurator/Configurator.jsp
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/configurator/Configurator.jsp?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/configurator/Configurator.jsp (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/configurator/Configurator.jsp Thu Feb 22 09:25:41 2007
@@ -0,0 +1,110 @@
+<%--
+  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.
+  --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+<%@include file="../header.jspf"%>
+
+<h:form>
+
+	<t:htmlTag value="h3">
+		<h:outputText value="Assemble your PC" />
+	</t:htmlTag>
+
+	<t:panelGrid
+			columns="2"
+			columnClasses="TR1,TR2">
+
+		<h:outputLabel
+				for="component"
+				value="Component"/>
+
+		<h:selectOneMenu
+				id="component"
+				value="#{configuratorState.selectedComponent}">
+			<f:selectItems
+					value="#{configuratorState.components}" />
+			<s:submitOnEvent
+					event="change"
+					for="showPieces" />
+		</h:selectOneMenu>
+
+		<h:outputText />
+		<h:commandButton
+				id="showPieces"
+				value="Show pieces"/>
+
+		<h:outputText
+				value="Pieces"/>
+
+		<t:dataTable
+				var="piece"
+				value="#{configuratorState.pieces}">
+
+			<f:facet name="footer">
+				<h:commandButton value="Checkout" action="#{configuratorState.checkoutAction}" />
+			</f:facet>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="number" />
+				</f:facet>
+				<h:outputText value="#{piece.number}" />
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="description" />
+				</f:facet>
+				<h:outputText value="#{piece.description}" />
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="value" />
+				</f:facet>
+				<h:outputText value="???" />
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="action" />
+				</f:facet>
+				<h:commandLink
+					value="order"
+					action="#{configuratorState.orderItemAction}">
+
+					<t:updateActionListener property="#{configuratorState.selectedPiece}" value="#{piece.id}" />
+
+				</h:commandLink>
+			</h:column>
+
+		</t:dataTable>
+
+	</t:panelGrid>
+
+</h:form>
+
+<%@include file="../footer.jspf"%>
+</f:view>
\ No newline at end of file

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/configurator/Configurator.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/configurator/Configurator.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/configurator/Configurator.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/fusion/trunk/examples/src/main/webapp/default.css
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/default.css?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/default.css (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/default.css Thu Feb 22 09:25:41 2007
@@ -0,0 +1,52 @@
+/*
+ * 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
+{
+	color: black;
+	font: Verdana Arial sans-serif;
+}
+
+h1
+{
+	background-color: #9999ff;
+	color: white;
+	display: block;
+}
+
+h2
+{
+	color: #6633ff;
+}
+
+h3
+{
+	color: #6633ff;
+}
+
+.navigation
+{
+	display: inline;
+}
+
+.navigation ul li
+{
+	list-style-type: none;
+	display: inline;
+}
\ No newline at end of file

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/default.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/default.css
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/default.css
------------------------------------------------------------------------------
    svn:mime-type = text/css

Added: myfaces/fusion/trunk/examples/src/main/webapp/error.jsp
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/error.jsp?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/error.jsp (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/error.jsp Thu Feb 22 09:25:41 2007
@@ -0,0 +1,112 @@
+<%--
+  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.
+  --%>
+
+<%@page pageEncoding="UTF-8"%><%@ page import="java.util.List,java.io.PrintWriter,org.apache.myfaces.shared_tomahawk.util.ExceptionUtils" isErrorPage="true" %>
+<html>
+<head>
+  <meta HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=UTF-8" />
+  <title>MyFaces - Error Message</title>
+</head>
+<body>
+<style>
+body {
+	font-family : arial, verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size : 1.1em;
+}
+.errorHeader {
+	font-size: 1.6em;
+	background-color: #6392C6;
+	color: white;
+	font-weight: bold;
+	padding: 3px;
+	margin-bottom: 10px;
+}
+
+.errorFooter {
+	font-size: 0.8em;
+	background-color: #6392C6;
+	color: white;
+	font-style: italic;
+	padding: 3px;
+	margin-top: 5px;
+}
+
+.errorMessage {
+	color: red;
+	font-weight: bold;
+}
+.errorExceptions {
+}
+.errorExceptionStack {
+	margin-top: 5px;
+	padding: 3px;
+	border-style: solid;
+	border-width: 1px;
+	border-color: #9F9F9F;
+	background-color: #E0E0E0;
+}
+.errorExceptionCause {
+	font-size: 1.1em;
+	padding: 3px;
+	border-style: solid;
+	border-width: 1px;
+	border-color: #9F9F9F;
+	background-color: #E0E0E0;
+}
+.errorException {
+	font-size: 1.0em;
+}
+</style>
+<div class="errorHeader">MyFaces encountered an error.</div>
+<%
+if (exception != null)
+{
+	List exceptions = ExceptionUtils.getExceptions(exception);
+	Throwable throwable = (Throwable) exceptions.get(exceptions.size()-1);
+	String exceptionMessage = ExceptionUtils.getExceptionMessage(exceptions);
+
+	%>Message: <span class="errorMessage"><%=exceptionMessage%></span><%
+
+	PrintWriter pw = new PrintWriter(out);
+
+ 	%><br/><%
+	%><span id="errorDetails" class="errorExceptions"><%
+		%><pre class="errorExceptionCause"><%
+		throwable.printStackTrace(pw);
+		%></pre><%
+
+	 	%><input type="button" value="More Details>>" onclick="document.getElementById('errorMoreDetails').style.display=''"/><%
+	 	%><div id="errorMoreDetails" style="display:none" class="errorExceptionStack"><%
+
+			throwable = (Throwable) exceptions.get(0);
+			%><pre class="errorException"><%
+			throwable.printStackTrace(pw);
+			%></pre><%
+
+		%></div><%
+	%></span><%
+}
+else
+{
+	%>Unknown error<%
+}
+%>
+<div class="errorFooter">MyFaces Exception Report</div>
+</body>
+</html>
\ No newline at end of file

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/error.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/error.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/error.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/fusion/trunk/examples/src/main/webapp/footer.jspf
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/footer.jspf?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/footer.jspf (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/footer.jspf Thu Feb 22 09:25:41 2007
@@ -0,0 +1,31 @@
+<%--
+  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.
+  --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+
+<h:messages showDetail="true" />
+
+<t:documentBody state="end" />
+
+<t:document state="end" />
\ No newline at end of file

Added: myfaces/fusion/trunk/examples/src/main/webapp/header.jspf
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/header.jspf?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/header.jspf (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/header.jspf Thu Feb 22 09:25:41 2007
@@ -0,0 +1,52 @@
+<%--
+  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.
+  --%>
+
+<%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:verbatim>
+	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+</f:verbatim>
+<t:document state="start"/>
+
+<t:documentHead>
+	<f:verbatim>
+		<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+	</f:verbatim>
+	<t:stylesheet path="/default.css" media="screen"/>
+	<f:verbatim>
+		<title>MyFaces FUSION</title>
+	</f:verbatim>
+</t:documentHead>
+
+<t:documentBody state="start"/>
+
+<t:htmlTag value="h1">MyFaces FUSION</t:htmlTag>
+<t:htmlTag value="h2">Bring Together: JSF, Spring, Persistence</t:htmlTag>
+<h:form styleClass="navigation">
+	<t:htmlTag value="ul">
+		<t:htmlTag value="li">
+			<h:commandLink action="home" value="Home" />
+		</t:htmlTag>
+	</t:htmlTag>
+</h:form>
+<t:htmlTag value="hr" />
\ No newline at end of file

Added: myfaces/fusion/trunk/examples/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/index.jsp?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/index.jsp (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/index.jsp Thu Feb 22 09:25:41 2007
@@ -0,0 +1,21 @@
+<%--
+  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.
+  --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<% response.sendRedirect("start.faces"); %>
\ No newline at end of file

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/fusion/trunk/examples/src/main/webapp/start.jsp
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/start.jsp?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/start.jsp (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/start.jsp Thu Feb 22 09:25:41 2007
@@ -0,0 +1,44 @@
+<%--
+  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.
+  --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+<%@include file="header.jspf"%>
+
+<h:form>
+
+	<t:htmlTag value="h3">
+		<h:outputText value="Examples" />
+	</t:htmlTag>
+
+	<t:htmlTag value="ul">
+		<t:htmlTag value="li">
+			<h:commandLink action="configurator" value="A PC Konfigurator" />
+		</t:htmlTag>
+	</t:htmlTag>
+
+</h:form>
+
+<%@include file="footer.jspf"%>
+</f:view>
\ No newline at end of file

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/start.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/start.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/start.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: myfaces/fusion/trunk/examples/src/main/webapp/web.xml
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/examples/src/main/webapp/web.xml?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/examples/src/main/webapp/web.xml (added)
+++ myfaces/fusion/trunk/examples/src/main/webapp/web.xml Thu Feb 22 09:25:41 2007
@@ -0,0 +1,127 @@
+<?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.
+  -->
+
+<web-app version="2.4"
+		 xmlns="http://java.sun.com/xml/ns/j2ee"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+	<display-name>MyFaces FUSION</display-name>
+
+	<listener>
+		<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+	</listener>
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	<listener>
+		<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+	</listener>
+
+	<context-param>
+		<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+		<param-value>server</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>javax.servlet.jsptl.ExpressionEvaluatorClass</param-name>
+		<param-value>org.apache.taglibs.jsptl.lang.spel.Evaluator</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+		<param-value>true</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+		<param-value>false</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+		<param-value>true</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
+		<param-value>false</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name>
+		<param-value>org.apache.myfaces.component.html.util.StreamingAddResource</param-value>
+	</context-param>
+
+	<filter>
+		<filter-name>FacesExtensionsFilter</filter-name>
+		<filter-class>org.apache.myfaces.component.html.util.ExtensionsFilter</filter-class>
+	</filter>
+
+	<filter>
+		<filter-name>requestEncodingFilter</filter-name>
+		<filter-class>org.apache.myfaces.filter.RequestEncodingFilter</filter-class>
+	</filter>
+
+	<filter>
+		<filter-name>requestParameterFilter</filter-name>
+		<filter-class>org.apache.myfaces.fusion.requestParameterProvider.RequestParameterServletFilter</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>requestEncodingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<filter-mapping>
+		<filter-name>FacesExtensionsFilter</filter-name>
+		<url-pattern>/faces/*</url-pattern>
+	</filter-mapping>
+
+	<filter-mapping>
+		<filter-name>requestParameterFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<filter-mapping>
+		<filter-name>FacesExtensionsFilter</filter-name>
+		<url-pattern>*.faces</url-pattern>
+	</filter-mapping>
+
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>Faces Servlet</servlet-name>
+		<url-pattern>*.faces</url-pattern>
+	</servlet-mapping>
+
+	<session-config>
+		<session-timeout>30</session-timeout>
+	</session-config>
+
+	<error-page>
+		<error-code>500</error-code>
+		<location>/error.jsp</location>
+	</error-page>
+</web-app>

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/examples/src/main/webapp/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: myfaces/fusion/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/pom.xml?view=auto&rev=510598
==============================================================================
--- myfaces/fusion/trunk/pom.xml (added)
+++ myfaces/fusion/trunk/pom.xml Thu Feb 22 09:25:41 2007
@@ -0,0 +1,106 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.myfaces.maven</groupId>
+		<artifactId>myfaces-master</artifactId>
+		<version>1.0.6-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.myfaces.fusion</groupId>
+	<artifactId>myfaces-fusion-project</artifactId>
+	<packaging>pom</packaging>
+	<name>MyFaces Fusion Project</name>
+	<url>http://myfaces.apache.org/fusion</url>
+	<version>1.0-SNAPSHOT</version>
+	<description>Apache MyFaces Fusion is a sub-project of Apache MyFaces
+	</description>
+
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/fusion/trunk</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/fusion/trunk</developerConnection>
+		<url>http://svn.apache.org/viewcvs.cgi/myfaces/fusion/trunk</url>
+	</scm>
+
+	<issueManagement>
+		<system>jira</system>
+		<url>http://issues.apache.org/jira/browse/FUSION</url>
+	</issueManagement>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.myfaces.core</groupId>
+				<artifactId>myfaces-api</artifactId>
+				<version>${myfaces.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.myfaces.core</groupId>
+				<artifactId>myfaces-impl</artifactId>
+				<version>${myfaces.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.myfaces.shared</groupId>
+				<artifactId>myfaces-shared-fusion</artifactId>
+				<version>${myfaces-shared.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>apache-maven-snapshots</id>
+			<url>http://people.apache.org/repo/m2-snapshot-repository</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+
+		<repository>
+			<id>myfaces-staging</id>
+			<url>http://people.apache.org/builds/myfaces/m2-staging-repository</url>
+			<releases>
+				<enabled>false</enabled>
+				<!-- Enable to test a MyFaces core release candidate with MyFaces Fusion -->
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<modules>
+		<module>core</module>
+		<module>core15</module>
+		<module>examples</module>
+	</modules>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-source</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<properties>
+		<myfaces.version>1.1.6-SNAPSHOT</myfaces.version>
+		<myfaces-shared.version>2.0.6-SNAPSHOT</myfaces-shared.version>
+	</properties>
+
+</project>

Propchange: myfaces/fusion/trunk/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/fusion/trunk/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/fusion/trunk/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml