myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r427657 [22/42] - in /myfaces: core/trunk/api/src/main/java/javax/faces/component/ core/trunk/api/src/test/java/javax/faces/ core/trunk/api/src/test/java/javax/faces/application/ core/trunk/api/src/test/java/javax/faces/component/ core/trun...
Date Tue, 01 Aug 2006 17:44:01 GMT
Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlBufferResponseWriterWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlBufferResponseWriterWrapper.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlBufferResponseWriterWrapper.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlBufferResponseWriterWrapper.java Tue Aug  1 10:43:28 2006
@@ -1,64 +1,64 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.renderkit.html.util;
-
-import javax.faces.context.ResponseWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.IOException;
-
-/**
- * @author Sylvain Vieujot (latest modification by $Author: grantsmith $)
- * @version $Revision: 169649 $ $Date: 2005-05-11 17:47:12 +0200 (Wed, 11 May 2005) $
- */
-public class HtmlBufferResponseWriterWrapper extends org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlResponseWriterImpl {
-
-    private ByteArrayOutputStream stream;
-    private PrintWriter writer;
-    private ResponseWriter initialWriter;
-
-    public ResponseWriter getInitialWriter() {
-        return initialWriter;
-    }
-
-    static public HtmlBufferResponseWriterWrapper getInstance(ResponseWriter initialWriter){
-        ByteArrayOutputStream instanceStream = new ByteArrayOutputStream();
-        PrintWriter instanceWriter = new PrintWriter(instanceStream, true);
-
-        return new HtmlBufferResponseWriterWrapper(initialWriter, instanceStream, instanceWriter);
-    }
-
-    private HtmlBufferResponseWriterWrapper(ResponseWriter initialWriter, ByteArrayOutputStream stream, PrintWriter writer){
-        super(writer, initialWriter==null?null:initialWriter.getContentType(), initialWriter==null?null:initialWriter.getCharacterEncoding());
-        this.stream = stream;
-        this.writer = writer;
-        this.initialWriter = initialWriter;
-    }
-
-    public String toString(){
-        try{
-            stream.flush();
-            writer.close();           
-            return stream.toString( getCharacterEncoding() );
-        }catch(UnsupportedEncodingException e){
-            // an attempt to set an invalid character encoding would have caused this exception before
-            throw new RuntimeException("ResponseWriter accepted invalid character encoding " + getCharacterEncoding());
-        } catch (IOException e) {
-            throw new RuntimeException( e );
-        }
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.renderkit.html.util;
+
+import javax.faces.context.ResponseWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.IOException;
+
+/**
+ * @author Sylvain Vieujot (latest modification by $Author: grantsmith $)
+ * @version $Revision: 169649 $ $Date: 2005-05-11 17:47:12 +0200 (Wed, 11 May 2005) $
+ */
+public class HtmlBufferResponseWriterWrapper extends org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlResponseWriterImpl {
+
+    private ByteArrayOutputStream stream;
+    private PrintWriter writer;
+    private ResponseWriter initialWriter;
+
+    public ResponseWriter getInitialWriter() {
+        return initialWriter;
+    }
+
+    static public HtmlBufferResponseWriterWrapper getInstance(ResponseWriter initialWriter){
+        ByteArrayOutputStream instanceStream = new ByteArrayOutputStream();
+        PrintWriter instanceWriter = new PrintWriter(instanceStream, true);
+
+        return new HtmlBufferResponseWriterWrapper(initialWriter, instanceStream, instanceWriter);
+    }
+
+    private HtmlBufferResponseWriterWrapper(ResponseWriter initialWriter, ByteArrayOutputStream stream, PrintWriter writer){
+        super(writer, initialWriter==null?null:initialWriter.getContentType(), initialWriter==null?null:initialWriter.getCharacterEncoding());
+        this.stream = stream;
+        this.writer = writer;
+        this.initialWriter = initialWriter;
+    }
+
+    public String toString(){
+        try{
+            stream.flush();
+            writer.close();           
+            return stream.toString( getCharacterEncoding() );
+        }catch(UnsupportedEncodingException e){
+            // an attempt to set an invalid character encoding would have caused this exception before
+            throw new RuntimeException("ResponseWriter accepted invalid character encoding " + getCharacterEncoding());
+        } catch (IOException e) {
+            throw new RuntimeException( e );
+        }
+    }
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlBufferResponseWriterWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/MyFacesResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/MyFacesResourceLoader.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/MyFacesResourceLoader.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/MyFacesResourceLoader.java Tue Aug  1 10:43:28 2006
@@ -1,231 +1,231 @@
-/*
- /*
- * Copyright 2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.renderkit.html.util;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared_tomahawk.util.ClassUtils;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.ResourceBundle;
-
-/**
- * A ResourceLoader capable of fetching resources from the classpath,
- * but only for classes under package org.apache.myfaces.custom.
- * 
- * @author Mathias Broekelmann (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public class MyFacesResourceLoader implements ResourceLoader
-{
-    protected static final Log log = LogFactory.getLog(MyFacesResourceLoader.class);
-
-    static final String ORG_APACHE_MYFACES_CUSTOM = "org.apache.myfaces.custom";
-
-    private static long lastModified = 0;
-
-    /**
-     * Get the last-modified time of the resource.
-     * <p>
-     * Unfortunately this is not possible with files inside jars. Instead, the
-     * MyFaces build process ensures that there is a file AddResource.properties
-     * which has the datestamp of the time the build process was run. This method
-     * simply gets that value and returns it.
-     * <p>
-     * Note that this method is not related to the generation of "cache key"
-     * values by the AddResource class, nor does it affect the caching behaviour
-     * of web browsers. This value simply goes into the http headers as the
-     * last-modified time of the specified resource.
-     */
-    private static long getLastModified()
-    {
-        if (lastModified == 0)
-        {
-            final String format = "yyyy-MM-dd HH:mm:ss Z"; // Must match the one used in the build file
-            final String bundleName = AddResource.class.getName();
-            ResourceBundle resources = ResourceBundle.getBundle(bundleName);
-            String sLastModified = resources.getString("lastModified");
-            try
-            {
-                lastModified = new SimpleDateFormat(format).parse(sLastModified).getTime();
-            }
-            catch (ParseException e)
-            {
-                lastModified = new Date().getTime();
-                log.error("Unparsable lastModified : " + sLastModified);
-            }
-        }
-
-        return lastModified;
-    }
-
-    /**
-     * Given a URI of form "{partial.class.name}/{resourceName}", locate the
-     * specified file within the current classpath and write it to the
-     * response object.
-     * <p>
-     * The partial class name has "org.apache.myfaces.custom." prepended
-     * to it to form the fully qualified classname. This class object is
-     * loaded, and Class.getResourceAsStream is called on it, passing
-     * a uri of "resource/" + {resourceName}.
-     * <p>
-     * The data written to the response stream includes http headers
-     * which define the mime content-type; this is deduced from the
-     * filename suffix of the resource.
-     * <p>
-     * @see org.apache.myfaces.shared.renderkit.html.util.ResourceLoader#serveResource(javax.servlet.ServletContext,
-     *     javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, java.lang.String)
-     */
-    public void serveResource(ServletContext context, HttpServletRequest request,
-            HttpServletResponse response, String resourceUri) throws IOException
-    {
-        String[] uriParts = resourceUri.split("/", 2);
-
-        String component = uriParts[0];
-        if (component == null || component.trim().length() == 0)
-        {
-            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Invalid request");
-            log.error("Could not find parameter for component to load a resource.");
-            return;
-        }
-        Class componentClass;
-        String className = ORG_APACHE_MYFACES_CUSTOM + "." + component;
-        try
-        {
-            componentClass = loadComponentClass(className);
-        }
-        catch (ClassNotFoundException e)
-        {
-            response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
-            log.error("Could not find the class for component " + className
-                    + " to load a resource.");
-            return;
-        }
-        String resource = uriParts[1];
-        if (resource == null || resource.trim().length() == 0)
-        {
-            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "No resource defined");
-            log.error("No resource defined component class " + className);
-            return;
-        }
-        resource = "resource/" + resource;
-
-        InputStream is = componentClass.getResourceAsStream(resource);
-        if (is == null)
-        {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND, "Unable to find resource "
-                    + resource + " for component " + component
-                    + ". Check that this file is available " + "in the classpath in sub-directory "
-                    + "/resource of the package-directory.");
-            log.error("Unable to find resource " + resource + " for component " + component
-                    + ". Check that this file is available " + "in the classpath in sub-directory "
-                    + "/resource of the package-directory.");
-        }
-        else
-        {
-            defineContentHeaders(request, response, resource);
-            defineCaching(request, response, resource);
-            writeResource(request, response, is);
-        }
-    }
-
-    /**
-     * Copy the content of the specified input stream to the servlet response.
-     */
-    protected void writeResource(HttpServletRequest request, HttpServletResponse response,
-            InputStream in) throws IOException
-    {
-        ServletOutputStream out = response.getOutputStream();
-        try
-        {
-            byte[] buffer = new byte[1024];
-            for (int size = in.read(buffer); size != -1; size = in.read(buffer))
-            {
-                out.write(buffer, 0, size);
-            }
-        }
-        finally
-        {
-            out.close();
-        }
-    }
-
-    /**
-     * Output http headers telling the browser (and possibly intermediate caches) how
-     * to cache this data.
-     * <p>
-     * The expiry time in this header info is set to 7 days. This is not a problem as
-     * the overall URI contains a "cache key" that changes whenever the webapp is
-     * redeployed (see AddResource.getCacheKey), meaning that all browsers will
-     * effectively reload files on webapp redeploy.
-     */
-    protected void defineCaching(HttpServletRequest request, HttpServletResponse response,
-            String resource)
-    {
-        response.setDateHeader("Last-Modified", getLastModified());
-
-        Calendar expires = Calendar.getInstance();
-        expires.add(Calendar.DAY_OF_YEAR, 7);
-        response.setDateHeader("Expires", expires.getTimeInMillis());
-    }
-
-    /**
-     * Output http headers indicating the mime-type of the content being served.
-     * The mime-type output is determined by the resource filename suffix.
-     */
-    protected void defineContentHeaders(HttpServletRequest request, HttpServletResponse response,
-            String resource)
-    {
-        if (resource.endsWith(".js"))
-            response.setContentType(org.apache.myfaces.shared_tomahawk.renderkit.html.HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT);
-        else if (resource.endsWith(".css"))
-            response.setContentType(org.apache.myfaces.shared_tomahawk.renderkit.html.HTML.STYLE_TYPE_TEXT_CSS);
-        else if (resource.endsWith(".gif"))
-            response.setContentType("image/gif");
-        else if (resource.endsWith(".png"))
-            response.setContentType("image/png");
-        else if (resource.endsWith(".jpg") || resource.endsWith(".jpeg"))
-            response.setContentType("image/jpeg");
-        else if (resource.endsWith(".xml") || resource.endsWith(".xsl"))
-            response.setContentType("text/xml"); // XSL has to be served as XML.
-    }
-
-    protected Class loadComponentClass(String componentClass) throws ClassNotFoundException
-    {
-        return ClassUtils.classForName(componentClass);
-    }
-
-    // NOTE: This method is not being used. Perhaps it can be removed?
-    protected void validateCustomComponent(Class myfacesCustomComponent)
-    {
-        if (!myfacesCustomComponent.getName().startsWith(ORG_APACHE_MYFACES_CUSTOM + "."))
-        {
-            throw new IllegalArgumentException(
-                    "expected a myfaces custom component class in package "
-                            + ORG_APACHE_MYFACES_CUSTOM);
-        }
-    }
+/*
+ /*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.renderkit.html.util;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared_tomahawk.util.ClassUtils;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.ResourceBundle;
+
+/**
+ * A ResourceLoader capable of fetching resources from the classpath,
+ * but only for classes under package org.apache.myfaces.custom.
+ * 
+ * @author Mathias Broekelmann (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public class MyFacesResourceLoader implements ResourceLoader
+{
+    protected static final Log log = LogFactory.getLog(MyFacesResourceLoader.class);
+
+    static final String ORG_APACHE_MYFACES_CUSTOM = "org.apache.myfaces.custom";
+
+    private static long lastModified = 0;
+
+    /**
+     * Get the last-modified time of the resource.
+     * <p>
+     * Unfortunately this is not possible with files inside jars. Instead, the
+     * MyFaces build process ensures that there is a file AddResource.properties
+     * which has the datestamp of the time the build process was run. This method
+     * simply gets that value and returns it.
+     * <p>
+     * Note that this method is not related to the generation of "cache key"
+     * values by the AddResource class, nor does it affect the caching behaviour
+     * of web browsers. This value simply goes into the http headers as the
+     * last-modified time of the specified resource.
+     */
+    private static long getLastModified()
+    {
+        if (lastModified == 0)
+        {
+            final String format = "yyyy-MM-dd HH:mm:ss Z"; // Must match the one used in the build file
+            final String bundleName = AddResource.class.getName();
+            ResourceBundle resources = ResourceBundle.getBundle(bundleName);
+            String sLastModified = resources.getString("lastModified");
+            try
+            {
+                lastModified = new SimpleDateFormat(format).parse(sLastModified).getTime();
+            }
+            catch (ParseException e)
+            {
+                lastModified = new Date().getTime();
+                log.error("Unparsable lastModified : " + sLastModified);
+            }
+        }
+
+        return lastModified;
+    }
+
+    /**
+     * Given a URI of form "{partial.class.name}/{resourceName}", locate the
+     * specified file within the current classpath and write it to the
+     * response object.
+     * <p>
+     * The partial class name has "org.apache.myfaces.custom." prepended
+     * to it to form the fully qualified classname. This class object is
+     * loaded, and Class.getResourceAsStream is called on it, passing
+     * a uri of "resource/" + {resourceName}.
+     * <p>
+     * The data written to the response stream includes http headers
+     * which define the mime content-type; this is deduced from the
+     * filename suffix of the resource.
+     * <p>
+     * @see org.apache.myfaces.shared.renderkit.html.util.ResourceLoader#serveResource(javax.servlet.ServletContext,
+     *     javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, java.lang.String)
+     */
+    public void serveResource(ServletContext context, HttpServletRequest request,
+            HttpServletResponse response, String resourceUri) throws IOException
+    {
+        String[] uriParts = resourceUri.split("/", 2);
+
+        String component = uriParts[0];
+        if (component == null || component.trim().length() == 0)
+        {
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Invalid request");
+            log.error("Could not find parameter for component to load a resource.");
+            return;
+        }
+        Class componentClass;
+        String className = ORG_APACHE_MYFACES_CUSTOM + "." + component;
+        try
+        {
+            componentClass = loadComponentClass(className);
+        }
+        catch (ClassNotFoundException e)
+        {
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
+            log.error("Could not find the class for component " + className
+                    + " to load a resource.");
+            return;
+        }
+        String resource = uriParts[1];
+        if (resource == null || resource.trim().length() == 0)
+        {
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "No resource defined");
+            log.error("No resource defined component class " + className);
+            return;
+        }
+        resource = "resource/" + resource;
+
+        InputStream is = componentClass.getResourceAsStream(resource);
+        if (is == null)
+        {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND, "Unable to find resource "
+                    + resource + " for component " + component
+                    + ". Check that this file is available " + "in the classpath in sub-directory "
+                    + "/resource of the package-directory.");
+            log.error("Unable to find resource " + resource + " for component " + component
+                    + ". Check that this file is available " + "in the classpath in sub-directory "
+                    + "/resource of the package-directory.");
+        }
+        else
+        {
+            defineContentHeaders(request, response, resource);
+            defineCaching(request, response, resource);
+            writeResource(request, response, is);
+        }
+    }
+
+    /**
+     * Copy the content of the specified input stream to the servlet response.
+     */
+    protected void writeResource(HttpServletRequest request, HttpServletResponse response,
+            InputStream in) throws IOException
+    {
+        ServletOutputStream out = response.getOutputStream();
+        try
+        {
+            byte[] buffer = new byte[1024];
+            for (int size = in.read(buffer); size != -1; size = in.read(buffer))
+            {
+                out.write(buffer, 0, size);
+            }
+        }
+        finally
+        {
+            out.close();
+        }
+    }
+
+    /**
+     * Output http headers telling the browser (and possibly intermediate caches) how
+     * to cache this data.
+     * <p>
+     * The expiry time in this header info is set to 7 days. This is not a problem as
+     * the overall URI contains a "cache key" that changes whenever the webapp is
+     * redeployed (see AddResource.getCacheKey), meaning that all browsers will
+     * effectively reload files on webapp redeploy.
+     */
+    protected void defineCaching(HttpServletRequest request, HttpServletResponse response,
+            String resource)
+    {
+        response.setDateHeader("Last-Modified", getLastModified());
+
+        Calendar expires = Calendar.getInstance();
+        expires.add(Calendar.DAY_OF_YEAR, 7);
+        response.setDateHeader("Expires", expires.getTimeInMillis());
+    }
+
+    /**
+     * Output http headers indicating the mime-type of the content being served.
+     * The mime-type output is determined by the resource filename suffix.
+     */
+    protected void defineContentHeaders(HttpServletRequest request, HttpServletResponse response,
+            String resource)
+    {
+        if (resource.endsWith(".js"))
+            response.setContentType(org.apache.myfaces.shared_tomahawk.renderkit.html.HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT);
+        else if (resource.endsWith(".css"))
+            response.setContentType(org.apache.myfaces.shared_tomahawk.renderkit.html.HTML.STYLE_TYPE_TEXT_CSS);
+        else if (resource.endsWith(".gif"))
+            response.setContentType("image/gif");
+        else if (resource.endsWith(".png"))
+            response.setContentType("image/png");
+        else if (resource.endsWith(".jpg") || resource.endsWith(".jpeg"))
+            response.setContentType("image/jpeg");
+        else if (resource.endsWith(".xml") || resource.endsWith(".xsl"))
+            response.setContentType("text/xml"); // XSL has to be served as XML.
+    }
+
+    protected Class loadComponentClass(String componentClass) throws ClassNotFoundException
+    {
+        return ClassUtils.classForName(componentClass);
+    }
+
+    // NOTE: This method is not being used. Perhaps it can be removed?
+    protected void validateCustomComponent(Class myfacesCustomComponent)
+    {
+        if (!myfacesCustomComponent.getName().startsWith(ORG_APACHE_MYFACES_CUSTOM + "."))
+        {
+            throw new IllegalArgumentException(
+                    "expected a myfaces custom component class in package "
+                            + ORG_APACHE_MYFACES_CUSTOM);
+        }
+    }
 }

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/MyFacesResourceLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java Tue Aug  1 10:43:28 2006
@@ -1,49 +1,49 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.renderkit.html.util;
-
-public class ResourcePosition
-{
-	
-	private final int _pos;
-
-    protected ResourcePosition(int pos)
-    {
-        _pos = pos;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (obj == null)
-        {
-            return false;
-        }
-        if (obj == this)
-        {
-            return true;
-        }
-        if (obj instanceof ResourcePosition)
-        {
-            return ((ResourcePosition) obj)._pos == _pos;
-        }
-        return false;
-    }
-
-    public int hashCode()
-    {
-        return _pos;
-    }
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.renderkit.html.util;
+
+public class ResourcePosition
+{
+	
+	private final int _pos;
+
+    protected ResourcePosition(int pos)
+    {
+        _pos = pos;
+    }
+
+    public boolean equals(Object obj)
+    {
+        if (obj == null)
+        {
+            return false;
+        }
+        if (obj == this)
+        {
+            return true;
+        }
+        if (obj instanceof ResourcePosition)
+        {
+            return ((ResourcePosition) obj)._pos == _pos;
+        }
+        return false;
+    }
+
+    public int hashCode()
+    {
+        return _pos;
+    }
 }

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/RowInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/RowInfo.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/RowInfo.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/RowInfo.java Tue Aug  1 10:43:28 2006
@@ -1,36 +1,36 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.renderkit.html.util;
-
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * @author Ernst Fastl
- */
-public class RowInfo
-{
-    private List _columnInfos;
-
-    public List getColumnInfos()
-    {
-        if ( _columnInfos == null )
-        {
-            _columnInfos = new ArrayList();
-        }
-        return _columnInfos;
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.renderkit.html.util;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Ernst Fastl
+ */
+public class RowInfo
+{
+    private List _columnInfos;
+
+    public List getColumnInfos()
+    {
+        if ( _columnInfos == null )
+        {
+            _columnInfos = new ArrayList();
+        }
+        return _columnInfos;
+    }
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/RowInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/TableContext.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/TableContext.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/TableContext.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/TableContext.java Tue Aug  1 10:43:28 2006
@@ -1,36 +1,36 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.renderkit.html.util;
-
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * @author Ernst Fastl
- */
-public class TableContext
-{
-    private List _rowInfos;
-
-    public List getRowInfos()
-    {
-        if ( _rowInfos == null )
-        {
-            _rowInfos = new ArrayList();
-        }
-        return _rowInfos;
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.renderkit.html.util;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Ernst Fastl
+ */
+public class TableContext
+{
+    private List _rowInfos;
+
+    public List getRowInfos()
+    {
+        if ( _rowInfos == null )
+        {
+            _rowInfos = new ArrayList();
+        }
+        return _rowInfos;
+    }
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/TableContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlGraphicImageTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlGraphicImageTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlGraphicImageTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlGraphicImageTag.java Tue Aug  1 10:43:28 2006
@@ -1,102 +1,102 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.taglib.html.ext;
-
-import javax.faces.component.UIComponent;
-
-import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
-import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlGraphicImageTagBase;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.html.ext.HtmlGraphicImage;
-
-/**
- * @author Bruno Aranda
- * @version $Revision$ $Date: 2005-05-11 18:45:06 +0200 (Wed, 11 May 2005) $
- */
-public class HtmlGraphicImageTag
-        extends HtmlGraphicImageTagBase
-{
-    public String getComponentType()
-    {
-        return HtmlGraphicImage.COMPONENT_TYPE;
-    }
-
-    public String getRendererType()
-    {
-        return "org.apache.myfaces.Image";
-    }
-
-    private String _align;
-    private String _border;
-    private String _enabledOnUserRole;
-    private String _hspace;
-    private String _visibleOnUserRole;
-    private String _vspace;
-
-    public void release() {
-        super.release();
-
-        _align=null;
-        _border=null;
-        _enabledOnUserRole=null;
-        _hspace=null;
-        _visibleOnUserRole=null;
-        _vspace=null;
-   }
-
-    protected void setProperties(UIComponent component)
-    {
-        super.setProperties(component);
-
-        setStringProperty(component, HTML.ALIGN_ATTR, _align);
-        setStringProperty(component, HTML.BORDER_ATTR, _border);
-        setStringProperty(component, HTML.HSPACE_ATTR, _hspace);
-        setStringProperty(component, HTML.VSPACE_ATTR, _vspace);
-        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
-        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
-    }
-
-    public void setAlign(String align)
-    {
-        _align = align;
-    }
-
-    public void setBorder(String border)
-    {
-        _border = border;
-    }
-
-    public void setHspace(String hspace)
-    {
-        _hspace = hspace;
-    }
-
-    public void setVspace(String vspace)
-    {
-        _vspace = vspace;
-    }
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.taglib.html.ext;
+
+import javax.faces.component.UIComponent;
+
+import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
+import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlGraphicImageTagBase;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.html.ext.HtmlGraphicImage;
+
+/**
+ * @author Bruno Aranda
+ * @version $Revision$ $Date: 2005-05-11 18:45:06 +0200 (Wed, 11 May 2005) $
+ */
+public class HtmlGraphicImageTag
+        extends HtmlGraphicImageTagBase
+{
+    public String getComponentType()
+    {
+        return HtmlGraphicImage.COMPONENT_TYPE;
+    }
+
+    public String getRendererType()
+    {
+        return "org.apache.myfaces.Image";
+    }
+
+    private String _align;
+    private String _border;
+    private String _enabledOnUserRole;
+    private String _hspace;
+    private String _visibleOnUserRole;
+    private String _vspace;
+
+    public void release() {
+        super.release();
+
+        _align=null;
+        _border=null;
+        _enabledOnUserRole=null;
+        _hspace=null;
+        _visibleOnUserRole=null;
+        _vspace=null;
+   }
+
+    protected void setProperties(UIComponent component)
+    {
+        super.setProperties(component);
+
+        setStringProperty(component, HTML.ALIGN_ATTR, _align);
+        setStringProperty(component, HTML.BORDER_ATTR, _border);
+        setStringProperty(component, HTML.HSPACE_ATTR, _hspace);
+        setStringProperty(component, HTML.VSPACE_ATTR, _vspace);
+        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
+        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
+    }
+
+    public void setAlign(String align)
+    {
+        _align = align;
+    }
+
+    public void setBorder(String border)
+    {
+        _border = border;
+    }
+
+    public void setHspace(String hspace)
+    {
+        _hspace = hspace;
+    }
+
+    public void setVspace(String vspace)
+    {
+        _vspace = vspace;
+    }
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlGraphicImageTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputSecretTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputSecretTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputSecretTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputSecretTag.java Tue Aug  1 10:43:28 2006
@@ -1,118 +1,118 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.taglib.html.ext;
-
-import javax.faces.component.UIComponent;
-
-import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.html.ext.HtmlInputSecret;
-import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlInputSecretTagBase;
-
-/**
- * @author Bruno Aranda 
- * @version $Revision$ $Date: 2005-06-05 13:08:33 +0200 (Sun, 5 Jun 2005) $
- */
-public class HtmlInputSecretTag
-        extends HtmlInputSecretTagBase
-{
-    public String getComponentType()
-    {
-        return HtmlInputSecret.COMPONENT_TYPE;
-    }
-
-    public String getRendererType()
-    {
-        return "org.apache.myfaces.Secret";
-    }
-
-    private String _enabledOnUserRole;
-    private String _visibleOnUserRole;
-    private String _datafld;
-    private String _datasrc;
-    private String _dataformatas;
-
-    private String _displayValueOnly;
-    private String _displayValueOnlyStyle;
-    private String _displayValueOnlyStyleClass;
-
-    public void release() {
-        super.release();
-
-        _enabledOnUserRole=null;
-        _visibleOnUserRole=null;
-        _datafld=null;
-        _datasrc=null;
-        _dataformatas=null;
-        _displayValueOnly=null;
-        _displayValueOnlyStyle=null;
-        _displayValueOnlyStyleClass=null;
-    }
-
-    protected void setProperties(UIComponent component)
-    {
-        super.setProperties(component);
-        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
-        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
-        setStringProperty(component, HTML.DATAFLD_ATTR, _datafld);
-        setStringProperty(component, HTML.DATASRC_ATTR, _datasrc);
-        setStringProperty(component, HTML.DATAFORMATAS_ATTR, _dataformatas);
-        setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
-        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, _displayValueOnlyStyle);
-        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, _displayValueOnlyStyleClass);
-    }
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public void setDisplayValueOnly(String displayValueOnly)
-    {
-        _displayValueOnly = displayValueOnly;
-    }
-
-    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
-    {
-        _displayValueOnlyStyle = displayValueOnlyStyle;
-    }
-
-    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
-    {
-        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
-    }
-
-    public void setDatafld(String datafld)
-    {
-        _datafld = datafld;
-    }
-
-    public void setDatasrc(String datasrc)
-    {
-        _datasrc = datasrc;
-    }
-
-    public void setDataformatas(String dataformatas)
-    {
-        _dataformatas = dataformatas;
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.taglib.html.ext;
+
+import javax.faces.component.UIComponent;
+
+import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.html.ext.HtmlInputSecret;
+import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlInputSecretTagBase;
+
+/**
+ * @author Bruno Aranda 
+ * @version $Revision$ $Date: 2005-06-05 13:08:33 +0200 (Sun, 5 Jun 2005) $
+ */
+public class HtmlInputSecretTag
+        extends HtmlInputSecretTagBase
+{
+    public String getComponentType()
+    {
+        return HtmlInputSecret.COMPONENT_TYPE;
+    }
+
+    public String getRendererType()
+    {
+        return "org.apache.myfaces.Secret";
+    }
+
+    private String _enabledOnUserRole;
+    private String _visibleOnUserRole;
+    private String _datafld;
+    private String _datasrc;
+    private String _dataformatas;
+
+    private String _displayValueOnly;
+    private String _displayValueOnlyStyle;
+    private String _displayValueOnlyStyleClass;
+
+    public void release() {
+        super.release();
+
+        _enabledOnUserRole=null;
+        _visibleOnUserRole=null;
+        _datafld=null;
+        _datasrc=null;
+        _dataformatas=null;
+        _displayValueOnly=null;
+        _displayValueOnlyStyle=null;
+        _displayValueOnlyStyleClass=null;
+    }
+
+    protected void setProperties(UIComponent component)
+    {
+        super.setProperties(component);
+        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
+        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
+        setStringProperty(component, HTML.DATAFLD_ATTR, _datafld);
+        setStringProperty(component, HTML.DATASRC_ATTR, _datasrc);
+        setStringProperty(component, HTML.DATAFORMATAS_ATTR, _dataformatas);
+        setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
+        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, _displayValueOnlyStyle);
+        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, _displayValueOnlyStyleClass);
+    }
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+    public void setDisplayValueOnly(String displayValueOnly)
+    {
+        _displayValueOnly = displayValueOnly;
+    }
+
+    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
+    {
+        _displayValueOnlyStyle = displayValueOnlyStyle;
+    }
+
+    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
+    {
+        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
+    }
+
+    public void setDatafld(String datafld)
+    {
+        _datafld = datafld;
+    }
+
+    public void setDatasrc(String datasrc)
+    {
+        _datasrc = datasrc;
+    }
+
+    public void setDataformatas(String dataformatas)
+    {
+        _dataformatas = dataformatas;
+    }
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputSecretTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGridTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGridTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGridTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGridTag.java Tue Aug  1 10:43:28 2006
@@ -1,91 +1,91 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.taglib.html.ext;
-
-import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlPanelGridTagBase;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.html.ext.HtmlPanelGrid;
-
-import javax.faces.component.UIComponent;
-
-/**
- * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
- * @version $Revision: 170213 $ $Date: 2005-05-15 13:22:56 +0200 (Sun, 15 May 2005) $
- */
-public class HtmlPanelGridTag
-        extends HtmlPanelGridTagBase
-{
-    public String getComponentType()
-    {
-        return HtmlPanelGrid.COMPONENT_TYPE;
-    }
-
-    public String getRendererType()
-    {
-        return "org.apache.myfaces.Grid";
-    }
-
-    private String _enabledOnUserRole;
-    private String _visibleOnUserRole;
-
-    private String _displayValueOnly;
-	private String _displayValueOnlyStyle;
-	private String _displayValueOnlyStyleClass;
-
-    public void release() {
-        super.release();
-        _enabledOnUserRole=null;
-        _visibleOnUserRole=null;
-   }
-
-    protected void setProperties(UIComponent component)
-    {
-        super.setProperties(component);
-        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
-        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
-
-        setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
-        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, _displayValueOnlyStyle);
-        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, _displayValueOnlyStyleClass);
-    }
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public void setDisplayValueOnly(String displayValueOnly)
-    {
-        _displayValueOnly = displayValueOnly;
-    }
-
-    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
-    {
-        _displayValueOnlyStyle = displayValueOnlyStyle;
-    }
-
-    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
-    {
-        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
-    }
-
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.taglib.html.ext;
+
+import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlPanelGridTagBase;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.html.ext.HtmlPanelGrid;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
+ * @version $Revision: 170213 $ $Date: 2005-05-15 13:22:56 +0200 (Sun, 15 May 2005) $
+ */
+public class HtmlPanelGridTag
+        extends HtmlPanelGridTagBase
+{
+    public String getComponentType()
+    {
+        return HtmlPanelGrid.COMPONENT_TYPE;
+    }
+
+    public String getRendererType()
+    {
+        return "org.apache.myfaces.Grid";
+    }
+
+    private String _enabledOnUserRole;
+    private String _visibleOnUserRole;
+
+    private String _displayValueOnly;
+	private String _displayValueOnlyStyle;
+	private String _displayValueOnlyStyleClass;
+
+    public void release() {
+        super.release();
+        _enabledOnUserRole=null;
+        _visibleOnUserRole=null;
+   }
+
+    protected void setProperties(UIComponent component)
+    {
+        super.setProperties(component);
+        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
+        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
+
+        setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
+        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, _displayValueOnlyStyle);
+        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, _displayValueOnlyStyleClass);
+    }
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+    public void setDisplayValueOnly(String displayValueOnly)
+    {
+        _displayValueOnly = displayValueOnly;
+    }
+
+    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
+    {
+        _displayValueOnlyStyle = displayValueOnlyStyle;
+    }
+
+    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
+    {
+        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
+    }
+
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGridTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectBooleanCheckboxTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectBooleanCheckboxTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectBooleanCheckboxTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectBooleanCheckboxTag.java Tue Aug  1 10:43:28 2006
@@ -1,95 +1,95 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.taglib.html.ext;
-
-import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlSelectBooleanCheckboxTagBase;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.html.ext.HtmlSelectBooleanCheckbox;
-
-import javax.faces.component.UIComponent;
-
-
-/**
- * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
- * @version $Revision: 170212 $ $Date: 2005-05-15 12:58:15 +0200 (Sun, 15 May 2005) $
- */
-public class HtmlSelectBooleanCheckboxTag
-        extends HtmlSelectBooleanCheckboxTagBase
-{
-    public String getComponentType()
-    {
-        return HtmlSelectBooleanCheckbox.COMPONENT_TYPE;
-    }
-
-    public String getRendererType()
-    {
-        return "org.apache.myfaces.Checkbox";
-    }
-
-    private String _enabledOnUserRole;
-    private String _visibleOnUserRole;
-
-    private String _displayValueOnly;
-	private String _displayValueOnlyStyle;
-	private String _displayValueOnlyStyleClass;
-
-    public void release() {
-        super.release();
-        _enabledOnUserRole=null;
-        _visibleOnUserRole=null;
-
-        _displayValueOnly=null;
-        _displayValueOnlyStyle=null;
-        _displayValueOnlyStyleClass=null;
-   }
-
-    protected void setProperties(UIComponent component)
-    {
-        super.setProperties(component);
-        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
-        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
-
-        setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
-        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, _displayValueOnlyStyle);
-        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, _displayValueOnlyStyleClass);
-    }
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public void setDisplayValueOnly(String displayValueOnly)
-    {
-        _displayValueOnly = displayValueOnly;
-    }
-
-    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
-    {
-        _displayValueOnlyStyle = displayValueOnlyStyle;
-    }
-
-    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
-    {
-        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.taglib.html.ext;
+
+import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlSelectBooleanCheckboxTagBase;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.html.ext.HtmlSelectBooleanCheckbox;
+
+import javax.faces.component.UIComponent;
+
+
+/**
+ * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
+ * @version $Revision: 170212 $ $Date: 2005-05-15 12:58:15 +0200 (Sun, 15 May 2005) $
+ */
+public class HtmlSelectBooleanCheckboxTag
+        extends HtmlSelectBooleanCheckboxTagBase
+{
+    public String getComponentType()
+    {
+        return HtmlSelectBooleanCheckbox.COMPONENT_TYPE;
+    }
+
+    public String getRendererType()
+    {
+        return "org.apache.myfaces.Checkbox";
+    }
+
+    private String _enabledOnUserRole;
+    private String _visibleOnUserRole;
+
+    private String _displayValueOnly;
+	private String _displayValueOnlyStyle;
+	private String _displayValueOnlyStyleClass;
+
+    public void release() {
+        super.release();
+        _enabledOnUserRole=null;
+        _visibleOnUserRole=null;
+
+        _displayValueOnly=null;
+        _displayValueOnlyStyle=null;
+        _displayValueOnlyStyleClass=null;
+   }
+
+    protected void setProperties(UIComponent component)
+    {
+        super.setProperties(component);
+        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
+        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
+
+        setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
+        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, _displayValueOnlyStyle);
+        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, _displayValueOnlyStyleClass);
+    }
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+    public void setDisplayValueOnly(String displayValueOnly)
+    {
+        _displayValueOnly = displayValueOnly;
+    }
+
+    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
+    {
+        _displayValueOnlyStyle = displayValueOnlyStyle;
+    }
+
+    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
+    {
+        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
+    }
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectBooleanCheckboxTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java Tue Aug  1 10:43:28 2006
@@ -1,103 +1,103 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.taglib.html.ext;
-
-import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.html.ext.HtmlSelectManyListbox;
-import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlSelectListboxTagBase;
-
-import javax.faces.component.UIComponent;
-
-/**
- * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
- * @version $Revision: 170212 $ $Date: 2005-05-15 12:58:15 +0200 (Sun, 15 May 2005) $
- */
-public class HtmlSelectManyListboxTag
-        extends HtmlSelectListboxTagBase
-{
-    public String getComponentType()
-    {
-        return HtmlSelectManyListbox.COMPONENT_TYPE;
-    }
-
-    public String getRendererType()
-    {
-        return "org.apache.myfaces.Listbox";
-    }
-
-    private String _escape;
-    private String _enabledOnUserRole;
-    private String _visibleOnUserRole;
-
-    private String _displayValueOnly;
-	private String _displayValueOnlyStyle;
-	private String _displayValueOnlyStyleClass;
-
-    public void release() {
-        super.release();
-        _escape=null;
-        _enabledOnUserRole=null;
-        _visibleOnUserRole=null;
-
-        _displayValueOnly=null;
-        _displayValueOnlyStyle=null;
-        _displayValueOnlyStyleClass=null;
-    }
-
-    protected void setProperties(UIComponent component)
-    {
-        super.setProperties(component);
-        setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
-        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
-        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
-
-        setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
-        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, _displayValueOnlyStyle);
-        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, _displayValueOnlyStyleClass);
-    }
-
-    public void setEscape(String escape)
-    {
-        _escape = escape;
-    }
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public void setDisplayValueOnly(String displayValueOnly)
-    {
-        _displayValueOnly = displayValueOnly;
-    }
-
-    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
-    {
-        _displayValueOnlyStyle = displayValueOnlyStyle;
-    }
-
-    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
-    {
-        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.taglib.html.ext;
+
+import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.html.ext.HtmlSelectManyListbox;
+import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlSelectListboxTagBase;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
+ * @version $Revision: 170212 $ $Date: 2005-05-15 12:58:15 +0200 (Sun, 15 May 2005) $
+ */
+public class HtmlSelectManyListboxTag
+        extends HtmlSelectListboxTagBase
+{
+    public String getComponentType()
+    {
+        return HtmlSelectManyListbox.COMPONENT_TYPE;
+    }
+
+    public String getRendererType()
+    {
+        return "org.apache.myfaces.Listbox";
+    }
+
+    private String _escape;
+    private String _enabledOnUserRole;
+    private String _visibleOnUserRole;
+
+    private String _displayValueOnly;
+	private String _displayValueOnlyStyle;
+	private String _displayValueOnlyStyleClass;
+
+    public void release() {
+        super.release();
+        _escape=null;
+        _enabledOnUserRole=null;
+        _visibleOnUserRole=null;
+
+        _displayValueOnly=null;
+        _displayValueOnlyStyle=null;
+        _displayValueOnlyStyleClass=null;
+    }
+
+    protected void setProperties(UIComponent component)
+    {
+        super.setProperties(component);
+        setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
+        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
+        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
+
+        setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
+        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, _displayValueOnlyStyle);
+        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, _displayValueOnlyStyleClass);
+    }
+
+    public void setEscape(String escape)
+    {
+        _escape = escape;
+    }
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+    public void setDisplayValueOnly(String displayValueOnly)
+    {
+        _displayValueOnly = displayValueOnly;
+    }
+
+    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
+    {
+        _displayValueOnlyStyle = displayValueOnlyStyle;
+    }
+
+    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
+    {
+        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
+    }
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java Tue Aug  1 10:43:28 2006
@@ -1,103 +1,103 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.taglib.html.ext;
-
-import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.html.ext.HtmlSelectManyMenu;
-import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlSelectMenuTagBase;
-import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
-
-import javax.faces.component.UIComponent;
-
-/**
- * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
- * @version $Revision: 170212 $ $Date: 2005-05-15 12:58:15 +0200 (Sun, 15 May 2005) $
- */
-public class HtmlSelectManyMenuTag
-        extends HtmlSelectMenuTagBase
-{
-    public String getComponentType()
-    {
-        return HtmlSelectManyMenu.COMPONENT_TYPE;
-    }
-
-    public String getRendererType()
-    {
-        return "org.apache.myfaces.Menu";
-    }
-
-    private String _escape;
-    private String _enabledOnUserRole;
-    private String _visibleOnUserRole;
-
-    private String _displayValueOnly;
-	private String _displayValueOnlyStyle;
-	private String _displayValueOnlyStyleClass;
-
-    public void release() {
-        super.release();
-        _escape=null;
-        _enabledOnUserRole=null;
-        _visibleOnUserRole=null;
-
-        _displayValueOnly=null;
-        _displayValueOnlyStyle=null;
-        _displayValueOnlyStyleClass=null;
-    }
-
-    protected void setProperties(UIComponent component)
-    {
-        super.setProperties(component);
-        setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
-        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
-        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
-
-        setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
-        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, _displayValueOnlyStyle);
-        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, _displayValueOnlyStyleClass);
-    }
-
-    public void setEscape(String escape)
-    {
-        _escape = escape;
-    }
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public void setDisplayValueOnly(String displayValueOnly)
-    {
-        _displayValueOnly = displayValueOnly;
-    }
-
-    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
-    {
-        _displayValueOnlyStyle = displayValueOnlyStyle;
-    }
-
-    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
-    {
-        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.taglib.html.ext;
+
+import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.html.ext.HtmlSelectManyMenu;
+import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlSelectMenuTagBase;
+import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
+ * @version $Revision: 170212 $ $Date: 2005-05-15 12:58:15 +0200 (Sun, 15 May 2005) $
+ */
+public class HtmlSelectManyMenuTag
+        extends HtmlSelectMenuTagBase
+{
+    public String getComponentType()
+    {
+        return HtmlSelectManyMenu.COMPONENT_TYPE;
+    }
+
+    public String getRendererType()
+    {
+        return "org.apache.myfaces.Menu";
+    }
+
+    private String _escape;
+    private String _enabledOnUserRole;
+    private String _visibleOnUserRole;
+
+    private String _displayValueOnly;
+	private String _displayValueOnlyStyle;
+	private String _displayValueOnlyStyleClass;
+
+    public void release() {
+        super.release();
+        _escape=null;
+        _enabledOnUserRole=null;
+        _visibleOnUserRole=null;
+
+        _displayValueOnly=null;
+        _displayValueOnlyStyle=null;
+        _displayValueOnlyStyleClass=null;
+    }
+
+    protected void setProperties(UIComponent component)
+    {
+        super.setProperties(component);
+        setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
+        setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
+        setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
+
+        setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
+        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, _displayValueOnlyStyle);
+        setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, _displayValueOnlyStyleClass);
+    }
+
+    public void setEscape(String escape)
+    {
+        _escape = escape;
+    }
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+    public void setDisplayValueOnly(String displayValueOnly)
+    {
+        _displayValueOnly = displayValueOnly;
+    }
+
+    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
+    {
+        _displayValueOnlyStyle = displayValueOnlyStyle;
+    }
+
+    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
+    {
+        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
+    }
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message