You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/07/03 23:48:00 UTC
svn commit: r673829 [1/3] - in /myfaces/shared/trunk_3.0.x/core/src:
main/java/org/apache/myfaces/shared/component/
main/java/org/apache/myfaces/shared/renderkit/html/
main/java/org/apache/myfaces/shared/taglib/core/
main/java/org/apache/myfaces/shared...
Author: skitching
Date: Thu Jul 3 14:47:59 2008
New Revision: 673829
URL: http://svn.apache.org/viewvc?rev=673829&view=rev
Log:
Set svn:eol-style native
Modified:
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/EscapeCapable.java (props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java (props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/el/GenericMap.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/el/StringMap.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/el/TestsMap.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/serial/DefaultSerialFactory.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/serial/SerialFactory.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/servlet/SourceCodeServlet.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/DelegatedFacesServlet.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderTest.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java (props changed)
myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java (contents, props changed)
myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java (contents, props changed)
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java?rev=673829&r1=673828&r2=673829&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java Thu Jul 3 14:47:59 2008
@@ -1,24 +1,24 @@
-/*
- * 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.shared.component;
-
-public interface BindingAware
-{
- void handleBindings();
-}
+/*
+ * 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.shared.component;
+
+public interface BindingAware
+{
+ void handleBindings();
+}
Propchange: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java?rev=673829&r1=673828&r2=673829&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java Thu Jul 3 14:47:59 2008
@@ -1,47 +1,47 @@
-/*
- * 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.shared.component;
-
-/**
- * Behavioral interface.
- * By default, displayValueOnly is false, and the components have the default behaviour.
- * When displayValueOnly is true, the renderer should not render any input widget.
- * Only the text corresponding to the component's value should be rendered instead.
- *
- * @author Sylvain Vieujot (latest modification by $Author: svieujot $)
- * @author Martin Marinschek
- *
- * @version $Revision: 169739 $ $Date: 2005-05-12 02:45:14 +0200 (Thu, 12 May 2005) $
- */
-public interface DisplayValueOnlyCapable
-{
- String DISPLAY_VALUE_ONLY_ATTR = "displayValueOnly";
- String DISPLAY_VALUE_ONLY_STYLE_ATTR = "displayValueOnlyStyle";
- String DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR = "displayValueOnlyStyleClass";
-
- boolean isSetDisplayValueOnly();
- boolean isDisplayValueOnly();
- void setDisplayValueOnly(boolean displayValueOnly);
-
- String getDisplayValueOnlyStyle();
- void setDisplayValueOnlyStyle(String style);
-
- String getDisplayValueOnlyStyleClass();
- void setDisplayValueOnlyStyleClass(String styleClass);
-}
+/*
+ * 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.shared.component;
+
+/**
+ * Behavioral interface.
+ * By default, displayValueOnly is false, and the components have the default behaviour.
+ * When displayValueOnly is true, the renderer should not render any input widget.
+ * Only the text corresponding to the component's value should be rendered instead.
+ *
+ * @author Sylvain Vieujot (latest modification by $Author: svieujot $)
+ * @author Martin Marinschek
+ *
+ * @version $Revision: 169739 $ $Date: 2005-05-12 02:45:14 +0200 (Thu, 12 May 2005) $
+ */
+public interface DisplayValueOnlyCapable
+{
+ String DISPLAY_VALUE_ONLY_ATTR = "displayValueOnly";
+ String DISPLAY_VALUE_ONLY_STYLE_ATTR = "displayValueOnlyStyle";
+ String DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR = "displayValueOnlyStyleClass";
+
+ boolean isSetDisplayValueOnly();
+ boolean isDisplayValueOnly();
+ void setDisplayValueOnly(boolean displayValueOnly);
+
+ String getDisplayValueOnlyStyle();
+ void setDisplayValueOnlyStyle(String style);
+
+ String getDisplayValueOnlyStyleClass();
+ void setDisplayValueOnlyStyleClass(String styleClass);
+}
Propchange: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/component/EscapeCapable.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java?rev=673829&r1=673828&r2=673829&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java Thu Jul 3 14:47:59 2008
@@ -1,99 +1,99 @@
-/*
- * 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.shared.renderkit.html;
-
-import org.apache.myfaces.shared.renderkit.RendererUtils;
-
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
-import javax.faces.component.html.HtmlPanelGroup;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-
-/**
- * @author Martin Marinschek
- * @version $Revision: $ $Date: $
- * <p/>
- * $Log: $
- */
-public class HtmlGroupRendererBase
- extends HtmlRenderer
-{
- private static final String LAYOUT_BLOCK_VALUE = "block";
-
- public boolean getRendersChildren()
- {
- return true;
- }
-
- public void encodeBegin(FacesContext context, UIComponent component)
- throws IOException
- {
- }
-
- public void encodeChildren(FacesContext context, UIComponent component)
- throws IOException
- {
- }
-
- public void encodeEnd(FacesContext context, UIComponent component)
- throws IOException
- {
- ResponseWriter writer = context.getResponseWriter();
- boolean span = false;
-
- // will be SPAN or DIV, depending on the layout attribute value
- String layoutElement = HTML.SPAN_ELEM;
-
- HtmlPanelGroup panelGroup = (HtmlPanelGroup) component;
-
- // if layout is 'block', render DIV instead SPAN
- String layout = panelGroup.getLayout();
- if (layout != null && layout.equals(LAYOUT_BLOCK_VALUE))
- {
- layoutElement = HTML.DIV_ELEM;
- }
-
- if(component.getId()!=null && !component.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
- {
- span = true;
-
- writer.startElement(layoutElement, component);
-
- HtmlRendererUtils.writeIdIfNecessary(writer, component, context);
-
- HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.COMMON_PASSTROUGH_ATTRIBUTES);
- }
- else
- {
- span=HtmlRendererUtils.renderHTMLAttributesWithOptionalStartElement(writer,
- component,
- layoutElement,
- HTML.COMMON_PASSTROUGH_ATTRIBUTES);
- }
-
- RendererUtils.renderChildren(context, component);
- if (span)
- {
- writer.endElement(layoutElement);
- }
- }
-
-}
+/*
+ * 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.shared.renderkit.html;
+
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
+import javax.faces.component.html.HtmlPanelGroup;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import java.io.IOException;
+
+/**
+ * @author Martin Marinschek
+ * @version $Revision: $ $Date: $
+ * <p/>
+ * $Log: $
+ */
+public class HtmlGroupRendererBase
+ extends HtmlRenderer
+{
+ private static final String LAYOUT_BLOCK_VALUE = "block";
+
+ public boolean getRendersChildren()
+ {
+ return true;
+ }
+
+ public void encodeBegin(FacesContext context, UIComponent component)
+ throws IOException
+ {
+ }
+
+ public void encodeChildren(FacesContext context, UIComponent component)
+ throws IOException
+ {
+ }
+
+ public void encodeEnd(FacesContext context, UIComponent component)
+ throws IOException
+ {
+ ResponseWriter writer = context.getResponseWriter();
+ boolean span = false;
+
+ // will be SPAN or DIV, depending on the layout attribute value
+ String layoutElement = HTML.SPAN_ELEM;
+
+ HtmlPanelGroup panelGroup = (HtmlPanelGroup) component;
+
+ // if layout is 'block', render DIV instead SPAN
+ String layout = panelGroup.getLayout();
+ if (layout != null && layout.equals(LAYOUT_BLOCK_VALUE))
+ {
+ layoutElement = HTML.DIV_ELEM;
+ }
+
+ if(component.getId()!=null && !component.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
+ {
+ span = true;
+
+ writer.startElement(layoutElement, component);
+
+ HtmlRendererUtils.writeIdIfNecessary(writer, component, context);
+
+ HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.COMMON_PASSTROUGH_ATTRIBUTES);
+ }
+ else
+ {
+ span=HtmlRendererUtils.renderHTMLAttributesWithOptionalStartElement(writer,
+ component,
+ layoutElement,
+ HTML.COMMON_PASSTROUGH_ATTRIBUTES);
+ }
+
+ RendererUtils.renderChildren(context, component);
+ if (span)
+ {
+ writer.endElement(layoutElement);
+ }
+ }
+
+}
Propchange: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java?rev=673829&r1=673828&r2=673829&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java Thu Jul 3 14:47:59 2008
@@ -1,84 +1,84 @@
-/*
- * 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.shared.renderkit.html;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIGraphic;
-import javax.faces.component.html.HtmlGraphicImage;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-
-
-/**
- * @author Manfred Geiler (latest modification by $Author: grantsmith $)
- * @author Thomas Spiegl
- * @author Anton Koinov
- * @version $Revision$ $Date: 2005-05-11 18:45:06 +0200 (Wed, 11 May 2005) $
- */
-public class HtmlImageRendererBase
- extends HtmlRenderer
-{
- private static final Log log = LogFactory.getLog(HtmlImageRendererBase.class);
-
- public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
- throws IOException
- {
- org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, UIGraphic.class);
-
- ResponseWriter writer = facesContext.getResponseWriter();
-
- String url;
- if (uiComponent instanceof HtmlGraphicImage)
- {
- url = ((HtmlGraphicImage) uiComponent).getUrl();
- }
- else
- {
- url = (String) uiComponent.getAttributes().get(JSFAttr.URL_ATTR);
- }
-
- writer.startElement(HTML.IMG_ELEM, uiComponent);
-
- HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
-
- if (url != null && url.length() > 0)
- {
- String src = facesContext.getApplication()
- .getViewHandler().getResourceURL(facesContext, url);
- writer.writeURIAttribute(HTML.SRC_ATTR,
- facesContext.getExternalContext().encodeResourceURL(src),
- JSFAttr.VALUE_ATTR);
- }
- else
- {
- if (log.isWarnEnabled()) log.warn("Graphic with id " + uiComponent.getClientId(facesContext) + " has no value (url).");
- }
-
- HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.IMG_PASSTHROUGH_ATTRIBUTES);
-
- writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.IMG_ELEM);
-
- }
-
-}
+/*
+ * 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.shared.renderkit.html;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIGraphic;
+import javax.faces.component.html.HtmlGraphicImage;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import java.io.IOException;
+
+
+/**
+ * @author Manfred Geiler (latest modification by $Author: grantsmith $)
+ * @author Thomas Spiegl
+ * @author Anton Koinov
+ * @version $Revision$ $Date: 2005-05-11 18:45:06 +0200 (Wed, 11 May 2005) $
+ */
+public class HtmlImageRendererBase
+ extends HtmlRenderer
+{
+ private static final Log log = LogFactory.getLog(HtmlImageRendererBase.class);
+
+ public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
+ throws IOException
+ {
+ org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, UIGraphic.class);
+
+ ResponseWriter writer = facesContext.getResponseWriter();
+
+ String url;
+ if (uiComponent instanceof HtmlGraphicImage)
+ {
+ url = ((HtmlGraphicImage) uiComponent).getUrl();
+ }
+ else
+ {
+ url = (String) uiComponent.getAttributes().get(JSFAttr.URL_ATTR);
+ }
+
+ writer.startElement(HTML.IMG_ELEM, uiComponent);
+
+ HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
+
+ if (url != null && url.length() > 0)
+ {
+ String src = facesContext.getApplication()
+ .getViewHandler().getResourceURL(facesContext, url);
+ writer.writeURIAttribute(HTML.SRC_ATTR,
+ facesContext.getExternalContext().encodeResourceURL(src),
+ JSFAttr.VALUE_ATTR);
+ }
+ else
+ {
+ if (log.isWarnEnabled()) log.warn("Graphic with id " + uiComponent.getClientId(facesContext) + " has no value (url).");
+ }
+
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.IMG_PASSTHROUGH_ATTRIBUTES);
+
+ writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.IMG_ELEM);
+
+ }
+
+}
Propchange: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java?rev=673829&r1=673828&r2=673829&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java Thu Jul 3 14:47:59 2008
@@ -1,213 +1,213 @@
-/*
- * 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.shared.taglib.core;
-
-import java.util.Locale;
-import java.util.TimeZone;
-
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.DateTimeConverter;
-import javax.faces.webapp.ConverterTag;
-import javax.faces.webapp.UIComponentTag;
-import javax.faces.el.ValueBinding;
-import javax.servlet.jsp.JspException;
-
-import org.apache.myfaces.shared.util.LocaleUtils;
-
-/**
- * @author Manfred Geiler (latest modification by $Author: schof $)
- * @version $Revision: 382015 $ $Date: 2006-03-01 14:47:11 +0100 (Wed, 01 Mar 2006) $
- */
-public class ConvertDateTimeTagBase
- extends ConverterTag
-{
- private static final long serialVersionUID = -757757296071312897L;
- private String _dateStyle = "default"; // the default value as required by the spec (default in this case)
- private String _locale = null;
- private String _pattern = null;
- private String _timeStyle = "default"; // the default value as required by the spec (default in this case)
- private String _timeZone = null;
- private String _type = null;
-
- public void setDateStyle(String dateStyle)
- {
- _dateStyle = dateStyle;
- }
-
- public void setLocale(String locale)
- {
- _locale = locale;
- }
-
- public void setPattern(String pattern)
- {
- _pattern = pattern;
- }
-
- public void setTimeStyle(String timeStyle)
- {
- _timeStyle = timeStyle;
- }
-
- public void setTimeZone(String timeZone)
- {
- _timeZone = timeZone;
- }
-
- public void setType(String type)
- {
- _type = type;
- }
-
- protected Converter createConverter() throws JspException
- {
- DateTimeConverter converter = (DateTimeConverter)super.createConverter();
-
- FacesContext facesContext = FacesContext.getCurrentInstance();
- setConverterDateStyle(facesContext, converter, _dateStyle);
- setConverterLocale(facesContext, converter, _locale);
- setConverterPattern(facesContext, converter, _pattern);
- setConverterTimeStyle(facesContext, converter, _timeStyle);
- setConverterTimeZone(facesContext, converter, _timeZone);
- setConverterType(facesContext, converter, _type);
-
- return converter;
- }
-
- protected static void setConverterLocale(FacesContext facesContext,
- DateTimeConverter converter,
- String value)
- {
- Locale locale = null;
- Object _value = null;
-
- if (value == null) return;
- if (UIComponentTag.isValueReference(value))
- {
- ValueBinding vb = facesContext.getApplication().createValueBinding(value);
- _value = vb.getValue(facesContext);
- if(_value instanceof Locale)
- {
- locale = (Locale) _value;
- }
- else
- {
- locale = LocaleUtils.converterTagLocaleFromString(_value.toString());
- }
- }
- else
- {
- locale = LocaleUtils.converterTagLocaleFromString( value);
- }
- converter.setLocale(locale);
- }
-
-
- private static void setConverterDateStyle(FacesContext facesContext,
- DateTimeConverter converter,
- String value)
- {
- if (value == null) return;
- if (UIComponentTag.isValueReference(value))
- {
- ValueBinding vb = facesContext.getApplication().createValueBinding(value);
- converter.setDateStyle((String)vb.getValue(facesContext));
- }
- else
- {
- converter.setDateStyle(value);
- }
- }
-
- private static void setConverterPattern(FacesContext facesContext,
- DateTimeConverter converter,
- String value)
- {
- if (value == null) return;
- if (UIComponentTag.isValueReference(value))
- {
- ValueBinding vb = facesContext.getApplication().createValueBinding(value);
- converter.setPattern((String)vb.getValue(facesContext));
- }
- else
- {
- converter.setPattern(value);
- }
- }
-
- private static void setConverterTimeStyle(FacesContext facesContext,
- DateTimeConverter converter,
- String value)
- {
- if (value == null) return;
- if (UIComponentTag.isValueReference(value))
- {
- ValueBinding vb = facesContext.getApplication().createValueBinding(value);
- converter.setTimeStyle((String)vb.getValue(facesContext));
- }
- else
- {
- converter.setTimeStyle(value);
- }
- }
-
- private static void setConverterTimeZone(FacesContext facesContext,
- DateTimeConverter converter,
- String value)
- {
- if (value == null) return;
- if (UIComponentTag.isValueReference(value))
- {
- ValueBinding vb = facesContext.getApplication().createValueBinding(value);
- TimeZone timeZone = null;
- Object _value = vb.getValue(facesContext);
- if (_value instanceof TimeZone)
- {
- timeZone = (TimeZone) _value;
- }
- else
- {
- timeZone = TimeZone.getTimeZone(_value.toString());
- }
- converter.setTimeZone(timeZone);
- }
- else
- {
- converter.setTimeZone(TimeZone.getTimeZone(value));
- }
- }
-
- private static void setConverterType(FacesContext facesContext,
- DateTimeConverter converter,
- String value)
- {
- if (value == null) return;
- if (UIComponentTag.isValueReference(value))
- {
- ValueBinding vb = facesContext.getApplication().createValueBinding(value);
- converter.setType((String)vb.getValue(facesContext));
- }
- else
- {
- converter.setType(value);
- }
- }
-
+/*
+ * 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.shared.taglib.core;
+
+import java.util.Locale;
+import java.util.TimeZone;
+
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.DateTimeConverter;
+import javax.faces.webapp.ConverterTag;
+import javax.faces.webapp.UIComponentTag;
+import javax.faces.el.ValueBinding;
+import javax.servlet.jsp.JspException;
+
+import org.apache.myfaces.shared.util.LocaleUtils;
+
+/**
+ * @author Manfred Geiler (latest modification by $Author: schof $)
+ * @version $Revision: 382015 $ $Date: 2006-03-01 14:47:11 +0100 (Wed, 01 Mar 2006) $
+ */
+public class ConvertDateTimeTagBase
+ extends ConverterTag
+{
+ private static final long serialVersionUID = -757757296071312897L;
+ private String _dateStyle = "default"; // the default value as required by the spec (default in this case)
+ private String _locale = null;
+ private String _pattern = null;
+ private String _timeStyle = "default"; // the default value as required by the spec (default in this case)
+ private String _timeZone = null;
+ private String _type = null;
+
+ public void setDateStyle(String dateStyle)
+ {
+ _dateStyle = dateStyle;
+ }
+
+ public void setLocale(String locale)
+ {
+ _locale = locale;
+ }
+
+ public void setPattern(String pattern)
+ {
+ _pattern = pattern;
+ }
+
+ public void setTimeStyle(String timeStyle)
+ {
+ _timeStyle = timeStyle;
+ }
+
+ public void setTimeZone(String timeZone)
+ {
+ _timeZone = timeZone;
+ }
+
+ public void setType(String type)
+ {
+ _type = type;
+ }
+
+ protected Converter createConverter() throws JspException
+ {
+ DateTimeConverter converter = (DateTimeConverter)super.createConverter();
+
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ setConverterDateStyle(facesContext, converter, _dateStyle);
+ setConverterLocale(facesContext, converter, _locale);
+ setConverterPattern(facesContext, converter, _pattern);
+ setConverterTimeStyle(facesContext, converter, _timeStyle);
+ setConverterTimeZone(facesContext, converter, _timeZone);
+ setConverterType(facesContext, converter, _type);
+
+ return converter;
+ }
+
+ protected static void setConverterLocale(FacesContext facesContext,
+ DateTimeConverter converter,
+ String value)
+ {
+ Locale locale = null;
+ Object _value = null;
+
+ if (value == null) return;
+ if (UIComponentTag.isValueReference(value))
+ {
+ ValueBinding vb = facesContext.getApplication().createValueBinding(value);
+ _value = vb.getValue(facesContext);
+ if(_value instanceof Locale)
+ {
+ locale = (Locale) _value;
+ }
+ else
+ {
+ locale = LocaleUtils.converterTagLocaleFromString(_value.toString());
+ }
+ }
+ else
+ {
+ locale = LocaleUtils.converterTagLocaleFromString( value);
+ }
+ converter.setLocale(locale);
+ }
+
+
+ private static void setConverterDateStyle(FacesContext facesContext,
+ DateTimeConverter converter,
+ String value)
+ {
+ if (value == null) return;
+ if (UIComponentTag.isValueReference(value))
+ {
+ ValueBinding vb = facesContext.getApplication().createValueBinding(value);
+ converter.setDateStyle((String)vb.getValue(facesContext));
+ }
+ else
+ {
+ converter.setDateStyle(value);
+ }
+ }
+
+ private static void setConverterPattern(FacesContext facesContext,
+ DateTimeConverter converter,
+ String value)
+ {
+ if (value == null) return;
+ if (UIComponentTag.isValueReference(value))
+ {
+ ValueBinding vb = facesContext.getApplication().createValueBinding(value);
+ converter.setPattern((String)vb.getValue(facesContext));
+ }
+ else
+ {
+ converter.setPattern(value);
+ }
+ }
+
+ private static void setConverterTimeStyle(FacesContext facesContext,
+ DateTimeConverter converter,
+ String value)
+ {
+ if (value == null) return;
+ if (UIComponentTag.isValueReference(value))
+ {
+ ValueBinding vb = facesContext.getApplication().createValueBinding(value);
+ converter.setTimeStyle((String)vb.getValue(facesContext));
+ }
+ else
+ {
+ converter.setTimeStyle(value);
+ }
+ }
+
+ private static void setConverterTimeZone(FacesContext facesContext,
+ DateTimeConverter converter,
+ String value)
+ {
+ if (value == null) return;
+ if (UIComponentTag.isValueReference(value))
+ {
+ ValueBinding vb = facesContext.getApplication().createValueBinding(value);
+ TimeZone timeZone = null;
+ Object _value = vb.getValue(facesContext);
+ if (_value instanceof TimeZone)
+ {
+ timeZone = (TimeZone) _value;
+ }
+ else
+ {
+ timeZone = TimeZone.getTimeZone(_value.toString());
+ }
+ converter.setTimeZone(timeZone);
+ }
+ else
+ {
+ converter.setTimeZone(TimeZone.getTimeZone(value));
+ }
+ }
+
+ private static void setConverterType(FacesContext facesContext,
+ DateTimeConverter converter,
+ String value)
+ {
+ if (value == null) return;
+ if (UIComponentTag.isValueReference(value))
+ {
+ ValueBinding vb = facesContext.getApplication().createValueBinding(value);
+ converter.setType((String)vb.getValue(facesContext));
+ }
+ else
+ {
+ converter.setType(value);
+ }
+ }
+
}
\ No newline at end of file
Propchange: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java?rev=673829&r1=673828&r2=673829&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java Thu Jul 3 14:47:59 2008
@@ -1,97 +1,97 @@
-/*
- * 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.shared.test;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * @see AbstractClassElementTestCase
- * @author Dennis Byrne
- */
-
-public class ClassElementHandler extends DefaultHandler
-{
-
- private boolean clazz ;
- private List elementName = new ArrayList();
- private List className = new ArrayList();
- private StringBuffer buffer ;
-
- public ClassElementHandler(){
-
- elementName.add("component-class");
- elementName.add("tag-class");
- elementName.add("renderer-class");
- elementName.add("validator-class");
- elementName.add("converter-class");
- elementName.add("action-listener");
- elementName.add("navigation-handler");
- elementName.add("variable-resolver");
- elementName.add("property-resolver");
- elementName.add("phase-listener");
-
- }
-
- public void characters(char[] ch, int start, int length)
- throws SAXException
- {
- if (clazz)
- {
- String string = new String(ch, start, length);
- if(string != null)
- {
- buffer.append(string.trim());
- }
- }
- }
-
- public void startElement(
- String ns, String local, String qName, Attributes atts)
- throws SAXException
- {
-
- clazz = elementName.contains(qName);
-
- if(clazz)
- buffer = new StringBuffer();
-
- }
-
- public void endElement(String ns, String local, String qName)
- throws SAXException
- {
-
- if(clazz){
- className.add(buffer.toString());
- clazz = false;
- }
-
- }
-
- public List getClassName()
- {
- return className;
- }
-
-}
+/*
+ * 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.shared.test;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * @see AbstractClassElementTestCase
+ * @author Dennis Byrne
+ */
+
+public class ClassElementHandler extends DefaultHandler
+{
+
+ private boolean clazz ;
+ private List elementName = new ArrayList();
+ private List className = new ArrayList();
+ private StringBuffer buffer ;
+
+ public ClassElementHandler(){
+
+ elementName.add("component-class");
+ elementName.add("tag-class");
+ elementName.add("renderer-class");
+ elementName.add("validator-class");
+ elementName.add("converter-class");
+ elementName.add("action-listener");
+ elementName.add("navigation-handler");
+ elementName.add("variable-resolver");
+ elementName.add("property-resolver");
+ elementName.add("phase-listener");
+
+ }
+
+ public void characters(char[] ch, int start, int length)
+ throws SAXException
+ {
+ if (clazz)
+ {
+ String string = new String(ch, start, length);
+ if(string != null)
+ {
+ buffer.append(string.trim());
+ }
+ }
+ }
+
+ public void startElement(
+ String ns, String local, String qName, Attributes atts)
+ throws SAXException
+ {
+
+ clazz = elementName.contains(qName);
+
+ if(clazz)
+ buffer = new StringBuffer();
+
+ }
+
+ public void endElement(String ns, String local, String qName)
+ throws SAXException
+ {
+
+ if(clazz){
+ className.add(buffer.toString());
+ clazz = false;
+ }
+
+ }
+
+ public List getClassName()
+ {
+ return className;
+ }
+
+}
Propchange: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java?rev=673829&r1=673828&r2=673829&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java Thu Jul 3 14:47:59 2008
@@ -1,56 +1,56 @@
-/*
- * 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.shared.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
-
-/**
- * Tried to deploy v0.4.2 on JBoss 3.2.1 and had a classloading problem again.
- * The problem seemed to be with JspInfo, line 98. We are using an
- * ObjectInputStream Class, which then cannot find the classes to deserialize
- * the input stream. The solution appears to be to subclass ObjectInputStream
- * (eg. CustomInputStream), and specify a different class-loading mechanism.
- *
- * @author Robert Gothan <ro...@funkyjazz.net> (latest modification by $Author: schof $)
- * @version $Revision: 382015 $ $Date: 2006-03-01 08:47:11 -0500 (Wed, 01 Mar 2006) $
- */
-public class MyFacesObjectInputStream
- extends ObjectInputStream
-{
- public MyFacesObjectInputStream(InputStream in) throws IOException
- {
- super(in);
- }
-
- protected Class resolveClass(ObjectStreamClass desc)
- throws ClassNotFoundException, IOException
- {
- try
- {
- return ClassUtils.classForName(desc.getName());
- }
- catch (ClassNotFoundException e)
- {
- return super.resolveClass(desc);
- }
- }
-}
+/*
+ * 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.shared.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+
+/**
+ * Tried to deploy v0.4.2 on JBoss 3.2.1 and had a classloading problem again.
+ * The problem seemed to be with JspInfo, line 98. We are using an
+ * ObjectInputStream Class, which then cannot find the classes to deserialize
+ * the input stream. The solution appears to be to subclass ObjectInputStream
+ * (eg. CustomInputStream), and specify a different class-loading mechanism.
+ *
+ * @author Robert Gothan <ro...@funkyjazz.net> (latest modification by $Author: schof $)
+ * @version $Revision: 382015 $ $Date: 2006-03-01 08:47:11 -0500 (Wed, 01 Mar 2006) $
+ */
+public class MyFacesObjectInputStream
+ extends ObjectInputStream
+{
+ public MyFacesObjectInputStream(InputStream in) throws IOException
+ {
+ super(in);
+ }
+
+ protected Class resolveClass(ObjectStreamClass desc)
+ throws ClassNotFoundException, IOException
+ {
+ try
+ {
+ return ClassUtils.classForName(desc.getName());
+ }
+ catch (ClassNotFoundException e)
+ {
+ return super.resolveClass(desc);
+ }
+ }
+}
Propchange: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java?rev=673829&r1=673828&r2=673829&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java Thu Jul 3 14:47:59 2008
@@ -1,127 +1,127 @@
-/*
- * 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.shared.util;
-
-import java.lang.reflect.Method;
-import java.util.Iterator;
-
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * @author Martin Marinschek (latest modification by $Author: grantsmith $)
- * @version $Revision: 169655 $ $Date: 2005-05-11 18:45:06 +0200 (Mi, 11 Mai 2005) $
- */
-public class RestoreStateUtils
-{
- private static Log log = LogFactory.getLog(RestoreStateUtils.class);
-
- /**
- * Walk the component tree, executing any component-bindings to reattach
- * components to their backing beans.
- * <p>
- * Note that this method effectively breaks encapsulation; instead of
- * asking each component to update itself and its children, this
- * method just reaches into each component. That makes it impossible
- * for any component to customise its behaviour at this point.
- * <p>
- * This has been filed as an issue against the spec. Until this
- * issue is resolved, we'll add a new marker-interface for components
- * to allow them to define their interest in handling children bindings themselves.
- */
- public static void recursivelyHandleComponentReferencesAndSetValid(FacesContext facesContext,
- UIComponent parent)
- {
- recursivelyHandleComponentReferencesAndSetValid(facesContext, parent, false);
- }
-
- public static void recursivelyHandleComponentReferencesAndSetValid(FacesContext facesContext,
- UIComponent parent, boolean forceHandle)
- {
- Method handleBindingsMethod = getBindingMethod(parent);
-
- if(handleBindingsMethod!=null && !forceHandle)
- {
- try
- {
- handleBindingsMethod.invoke(parent,new Object[]{});
- }
- catch (Throwable th)
- {
- log.error("Exception while invoking handleBindings on component with client-id:"
- +parent.getClientId(facesContext),th);
- }
- }
- else
- {
- for (Iterator it = parent.getFacetsAndChildren(); it.hasNext(); )
- {
- UIComponent component = (UIComponent)it.next();
-
- ValueExpression binding = component.getValueExpression("binding"); //TODO: constant
- if (binding != null)
- {
- binding.setValue(facesContext.getELContext(), component);
- }
-
- //This part is not necessary on JSF 1.2
- //if (component instanceof UIInput)
- //{
- // ((UIInput)component).setValid(true);
- //}
-
- recursivelyHandleComponentReferencesAndSetValid(facesContext, component);
- }
- }
- }
-
- /**This is all a hack to work around a spec-bug which will be fixed in JSF2.0
- *
- * @param parent
- * @return true if this component is bindingAware (e.g. aliasBean)
- */
- private static Method getBindingMethod(UIComponent parent)
- {
- Class[] clazzes = parent.getClass().getInterfaces();
-
- for (int i = 0; i < clazzes.length; i++)
- {
- Class clazz = clazzes[i];
-
- if(clazz.getName().indexOf("BindingAware")!=-1)
- {
- try
- {
- return parent.getClass().getMethod("handleBindings",new Class[]{});
- }
- catch (NoSuchMethodException e)
- {
- // return
- }
- }
- }
-
- return null;
- }
-}
+/*
+ * 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.shared.util;
+
+import java.lang.reflect.Method;
+import java.util.Iterator;
+
+import javax.el.ValueExpression;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author Martin Marinschek (latest modification by $Author: grantsmith $)
+ * @version $Revision: 169655 $ $Date: 2005-05-11 18:45:06 +0200 (Mi, 11 Mai 2005) $
+ */
+public class RestoreStateUtils
+{
+ private static Log log = LogFactory.getLog(RestoreStateUtils.class);
+
+ /**
+ * Walk the component tree, executing any component-bindings to reattach
+ * components to their backing beans.
+ * <p>
+ * Note that this method effectively breaks encapsulation; instead of
+ * asking each component to update itself and its children, this
+ * method just reaches into each component. That makes it impossible
+ * for any component to customise its behaviour at this point.
+ * <p>
+ * This has been filed as an issue against the spec. Until this
+ * issue is resolved, we'll add a new marker-interface for components
+ * to allow them to define their interest in handling children bindings themselves.
+ */
+ public static void recursivelyHandleComponentReferencesAndSetValid(FacesContext facesContext,
+ UIComponent parent)
+ {
+ recursivelyHandleComponentReferencesAndSetValid(facesContext, parent, false);
+ }
+
+ public static void recursivelyHandleComponentReferencesAndSetValid(FacesContext facesContext,
+ UIComponent parent, boolean forceHandle)
+ {
+ Method handleBindingsMethod = getBindingMethod(parent);
+
+ if(handleBindingsMethod!=null && !forceHandle)
+ {
+ try
+ {
+ handleBindingsMethod.invoke(parent,new Object[]{});
+ }
+ catch (Throwable th)
+ {
+ log.error("Exception while invoking handleBindings on component with client-id:"
+ +parent.getClientId(facesContext),th);
+ }
+ }
+ else
+ {
+ for (Iterator it = parent.getFacetsAndChildren(); it.hasNext(); )
+ {
+ UIComponent component = (UIComponent)it.next();
+
+ ValueExpression binding = component.getValueExpression("binding"); //TODO: constant
+ if (binding != null)
+ {
+ binding.setValue(facesContext.getELContext(), component);
+ }
+
+ //This part is not necessary on JSF 1.2
+ //if (component instanceof UIInput)
+ //{
+ // ((UIInput)component).setValid(true);
+ //}
+
+ recursivelyHandleComponentReferencesAndSetValid(facesContext, component);
+ }
+ }
+ }
+
+ /**This is all a hack to work around a spec-bug which will be fixed in JSF2.0
+ *
+ * @param parent
+ * @return true if this component is bindingAware (e.g. aliasBean)
+ */
+ private static Method getBindingMethod(UIComponent parent)
+ {
+ Class[] clazzes = parent.getClass().getInterfaces();
+
+ for (int i = 0; i < clazzes.length; i++)
+ {
+ Class clazz = clazzes[i];
+
+ if(clazz.getName().indexOf("BindingAware")!=-1)
+ {
+ try
+ {
+ return parent.getClass().getMethod("handleBindings",new Class[]{});
+ }
+ catch (NoSuchMethodException e)
+ {
+ // return
+ }
+ }
+ }
+
+ return null;
+ }
+}
Propchange: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java
------------------------------------------------------------------------------
svn:eol-style = native