You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2006/08/01 19:44:01 UTC
svn commit: r427657 [3/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/trunk...
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java Tue Aug 1 10:43:28 2006
@@ -1,105 +1,105 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.myfaces.config;
-
-import java.io.ByteArrayInputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
-import org.apache.shale.test.base.AbstractJsfTestCase;
-
-public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
-{
-
- private Log log = LogFactory.getLog(FacesConfigValidatorTestCase.class);
- private FacesConfigDispenser dispenser;
- private FacesConfigUnmarshaller unmarshaller;
-
- public FacesConfigValidatorTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(FacesConfigValidatorTestCase.class); // keep this method or maven won't run it
- }
-
- public void setUp()
- {
-
- super.setUp();
-
- dispenser = new DigesterFacesConfigDispenserImpl();
- unmarshaller = new DigesterFacesConfigUnmarshallerImpl(externalContext);
- try
- {
- ByteArrayInputStream bais = new ByteArrayInputStream(testFacesConfig.getBytes());
- dispenser.feed(unmarshaller.getFacesConfig(bais, null));
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- }
-
- public void testVerifyExistence(){
-
- Iterator managedBeans = dispenser.getManagedBeans();
- Iterator navRules = dispenser.getNavigationRules();
-
- List list = FacesConfigValidator.validate(managedBeans, navRules, "C:/somePath/");
-
- int expected = 3;
-
- assertTrue(list.size() + " should equal " + expected, list.size() == expected);
-
- }
-
- private static final String testFacesConfig =
- "<?xml version='1.0' encoding='UTF-8'?>" +
- "<!DOCTYPE faces-config PUBLIC " +
- "\"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN\" " +
- "\"http://java.sun.com/dtd/web-facesconfig_1_1.dtd\">" +
- "<faces-config>" +
- "<navigation-rule>" +
- " <from-view-id>/doesNotExist.jsp</from-view-id>" +
- " <navigation-case>" +
- " <from-outcome>doesNotMatter</from-outcome>" +
- " <to-view-id>/doesNotExist2.jsp</to-view-id>" +
- " </navigation-case>" +
- "</navigation-rule>" +
- "<managed-bean>" +
- " <managed-bean-name>exist</managed-bean-name>" +
- " <managed-bean-class>org.apache.myfaces.config.FacesConfigValidatorTestCase</managed-bean-class>" +
- " <managed-bean-scope>request</managed-bean-scope>" +
- "</managed-bean>" +
- "<managed-bean>" +
- " <managed-bean-name>nonExist</managed-bean-name>" +
- " <managed-bean-class>org.apache.myfaces.config.NonExist</managed-bean-class>" +
- " <managed-bean-scope>request</managed-bean-scope>" +
- "</managed-bean>" +
- "</faces-config>";
-}
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.myfaces.config;
+
+import java.io.ByteArrayInputStream;
+import java.util.Iterator;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
+import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
+import org.apache.shale.test.base.AbstractJsfTestCase;
+
+public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
+{
+
+ private Log log = LogFactory.getLog(FacesConfigValidatorTestCase.class);
+ private FacesConfigDispenser dispenser;
+ private FacesConfigUnmarshaller unmarshaller;
+
+ public FacesConfigValidatorTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() {
+ return new TestSuite(FacesConfigValidatorTestCase.class); // keep this method or maven won't run it
+ }
+
+ public void setUp()
+ {
+
+ super.setUp();
+
+ dispenser = new DigesterFacesConfigDispenserImpl();
+ unmarshaller = new DigesterFacesConfigUnmarshallerImpl(externalContext);
+ try
+ {
+ ByteArrayInputStream bais = new ByteArrayInputStream(testFacesConfig.getBytes());
+ dispenser.feed(unmarshaller.getFacesConfig(bais, null));
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ }
+
+ public void testVerifyExistence(){
+
+ Iterator managedBeans = dispenser.getManagedBeans();
+ Iterator navRules = dispenser.getNavigationRules();
+
+ List list = FacesConfigValidator.validate(managedBeans, navRules, "C:/somePath/");
+
+ int expected = 3;
+
+ assertTrue(list.size() + " should equal " + expected, list.size() == expected);
+
+ }
+
+ private static final String testFacesConfig =
+ "<?xml version='1.0' encoding='UTF-8'?>" +
+ "<!DOCTYPE faces-config PUBLIC " +
+ "\"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN\" " +
+ "\"http://java.sun.com/dtd/web-facesconfig_1_1.dtd\">" +
+ "<faces-config>" +
+ "<navigation-rule>" +
+ " <from-view-id>/doesNotExist.jsp</from-view-id>" +
+ " <navigation-case>" +
+ " <from-outcome>doesNotMatter</from-outcome>" +
+ " <to-view-id>/doesNotExist2.jsp</to-view-id>" +
+ " </navigation-case>" +
+ "</navigation-rule>" +
+ "<managed-bean>" +
+ " <managed-bean-name>exist</managed-bean-name>" +
+ " <managed-bean-class>org.apache.myfaces.config.FacesConfigValidatorTestCase</managed-bean-class>" +
+ " <managed-bean-scope>request</managed-bean-scope>" +
+ "</managed-bean>" +
+ "<managed-bean>" +
+ " <managed-bean-name>nonExist</managed-bean-name>" +
+ " <managed-bean-class>org.apache.myfaces.config.NonExist</managed-bean-class>" +
+ " <managed-bean-scope>request</managed-bean-scope>" +
+ "</managed-bean>" +
+ "</faces-config>";
+}
Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/MangedBeanExample.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/MangedBeanExample.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/MangedBeanExample.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/MangedBeanExample.java Tue Aug 1 10:43:28 2006
@@ -1,58 +1,58 @@
-package org.apache.myfaces.config;
-
-/**
- * @author Dennis C. Byrne
- */
-
-import java.util.List;
-import java.util.Map;
-
-public class MangedBeanExample {
-
- private String managedProperty ;
- private List managedList;
- private List writeOnlyList;
- private Map managedMap;
- private Map writeOnlyMap;
-
- public List getManagedList() {
- return managedList;
- }
-
- public void setManagedList(List managedList) {
- this.managedList = managedList;
- }
-
- public String getManagedProperty() {
- return managedProperty;
- }
-
- public void setManagedProperty(String managedProperty) {
- this.managedProperty = managedProperty;
- }
-
- public Map getManagedMap() {
- return managedMap;
- }
-
- public void setManagedMap(Map managedMap) {
- this.managedMap = managedMap;
- }
-
- public void setWriteOnlyList(List writeOnlyList) {
- this.writeOnlyList = writeOnlyList;
- }
-
- public void setWriteOnlyMap(Map writeOnlyMap) {
- this.writeOnlyMap = writeOnlyMap;
- }
-
- public Map getHiddenWriteOnlyMap() {
- return writeOnlyMap;
- }
-
- public List getHiddenWriteOnlyList() {
- return writeOnlyList;
- }
-
-}
+package org.apache.myfaces.config;
+
+/**
+ * @author Dennis C. Byrne
+ */
+
+import java.util.List;
+import java.util.Map;
+
+public class MangedBeanExample {
+
+ private String managedProperty ;
+ private List managedList;
+ private List writeOnlyList;
+ private Map managedMap;
+ private Map writeOnlyMap;
+
+ public List getManagedList() {
+ return managedList;
+ }
+
+ public void setManagedList(List managedList) {
+ this.managedList = managedList;
+ }
+
+ public String getManagedProperty() {
+ return managedProperty;
+ }
+
+ public void setManagedProperty(String managedProperty) {
+ this.managedProperty = managedProperty;
+ }
+
+ public Map getManagedMap() {
+ return managedMap;
+ }
+
+ public void setManagedMap(Map managedMap) {
+ this.managedMap = managedMap;
+ }
+
+ public void setWriteOnlyList(List writeOnlyList) {
+ this.writeOnlyList = writeOnlyList;
+ }
+
+ public void setWriteOnlyMap(Map writeOnlyMap) {
+ this.writeOnlyMap = writeOnlyMap;
+ }
+
+ public Map getHiddenWriteOnlyMap() {
+ return writeOnlyMap;
+ }
+
+ public List getHiddenWriteOnlyList() {
+ return writeOnlyList;
+ }
+
+}
Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/MangedBeanExample.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/Myfaces889TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/Myfaces889TestCase.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/Myfaces889TestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/Myfaces889TestCase.java Tue Aug 1 10:43:28 2006
@@ -1,98 +1,98 @@
-package org.apache.myfaces.config;
-
-/**
- * http://issues.apache.org/jira/browse/MYFACES-889?page=all
- *
- * @author Dennis C. Byrne
- */
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class Myfaces889TestCase extends AbstractManagedBeanBuilderTestCase {
-
- private static Log log = LogFactory.getLog(Myfaces889TestCase.class);
-
- public void testWriteOnlyMap(){
- assertTrue(example != null);
- log.debug("managed bean successfully created");
-
- Map writeOnlyMap = example.getHiddenWriteOnlyMap();
-
- assertTrue(writeOnlyMap != null);
- log.debug("managed map is not null");
-
- scrutinizeMap(writeOnlyMap);
- }
-
- public void testManagedMap(){
- assertTrue(example != null);
- log.debug("managed bean successfully created");
-
- Map managedMap = example.getManagedMap();
-
- assertTrue(managedMap != null);
- log.debug("managed map is not null");
-
- scrutinizeMap(managedMap);
- }
-
- private void scrutinizeMap(Map map){
- assertTrue(map.size() == 3);
- log.debug("managed map has the correct size " + map.size());
-
- for(int i = 0; i < map.size(); i++){
- String entry = (String) map.get(i + "");
- String config = (String) MANAGED_MAP.get(i + "");
- log.debug("looking @ " + config + " and " + entry);
- assertTrue(config.equals(entry));
- }
-
- }
-
- public void testManagedList(){
- assertTrue(example != null);
- log.debug("managed bean successfully created");
-
- List managedList = example.getManagedList();
-
- scrutinizeList(managedList);
- }
-
- public void testWriteOnlyList(){
- assertTrue(example != null);
- log.debug("managed bean successfully created");
-
- List writeOnlyList = example.getHiddenWriteOnlyList();
-
- scrutinizeList(writeOnlyList);
- }
-
- private void scrutinizeList(List list){
- assertTrue(list != null);
- log.debug("managed list is not null " + list.size());
- assertTrue(list.size() == 3);
- log.debug("managed list has the correct size " + list.size());
-
- for(int i = 0 ; i < list.size(); i++){
- String entry = (String) list.get(i);
- String config = (String) MANAGED_LIST.get(i);
- log.debug("looking @ " + config + " and " + entry);
- assertTrue(config.equals(entry));
- }
- }
-
- public void testManagedProperty(){
- assertTrue(example != null);
- log.debug("managed bean successfully created");
-
- String managedPropertyValue = example.getManagedProperty();
-
- assertTrue(INJECTED_VALUE.equals(managedPropertyValue));
- log.debug("managed property String has the correct value ");
- }
-
-}
+package org.apache.myfaces.config;
+
+/**
+ * http://issues.apache.org/jira/browse/MYFACES-889?page=all
+ *
+ * @author Dennis C. Byrne
+ */
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class Myfaces889TestCase extends AbstractManagedBeanBuilderTestCase {
+
+ private static Log log = LogFactory.getLog(Myfaces889TestCase.class);
+
+ public void testWriteOnlyMap(){
+ assertTrue(example != null);
+ log.debug("managed bean successfully created");
+
+ Map writeOnlyMap = example.getHiddenWriteOnlyMap();
+
+ assertTrue(writeOnlyMap != null);
+ log.debug("managed map is not null");
+
+ scrutinizeMap(writeOnlyMap);
+ }
+
+ public void testManagedMap(){
+ assertTrue(example != null);
+ log.debug("managed bean successfully created");
+
+ Map managedMap = example.getManagedMap();
+
+ assertTrue(managedMap != null);
+ log.debug("managed map is not null");
+
+ scrutinizeMap(managedMap);
+ }
+
+ private void scrutinizeMap(Map map){
+ assertTrue(map.size() == 3);
+ log.debug("managed map has the correct size " + map.size());
+
+ for(int i = 0; i < map.size(); i++){
+ String entry = (String) map.get(i + "");
+ String config = (String) MANAGED_MAP.get(i + "");
+ log.debug("looking @ " + config + " and " + entry);
+ assertTrue(config.equals(entry));
+ }
+
+ }
+
+ public void testManagedList(){
+ assertTrue(example != null);
+ log.debug("managed bean successfully created");
+
+ List managedList = example.getManagedList();
+
+ scrutinizeList(managedList);
+ }
+
+ public void testWriteOnlyList(){
+ assertTrue(example != null);
+ log.debug("managed bean successfully created");
+
+ List writeOnlyList = example.getHiddenWriteOnlyList();
+
+ scrutinizeList(writeOnlyList);
+ }
+
+ private void scrutinizeList(List list){
+ assertTrue(list != null);
+ log.debug("managed list is not null " + list.size());
+ assertTrue(list.size() == 3);
+ log.debug("managed list has the correct size " + list.size());
+
+ for(int i = 0 ; i < list.size(); i++){
+ String entry = (String) list.get(i);
+ String config = (String) MANAGED_LIST.get(i);
+ log.debug("looking @ " + config + " and " + entry);
+ assertTrue(config.equals(entry));
+ }
+ }
+
+ public void testManagedProperty(){
+ assertTrue(example != null);
+ log.debug("managed bean successfully created");
+
+ String managedPropertyValue = example.getManagedProperty();
+
+ assertTrue(INJECTED_VALUE.equals(managedPropertyValue));
+ log.debug("managed property String has the correct value ");
+ }
+
+}
Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/Myfaces889TestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/DummyBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/TestConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/ValueBindingImplCactus.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/lifecycle/InstrumentingPhaseListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/lifecycle/LifecycleImplCactus.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java Tue Aug 1 10:43:28 2006
@@ -1,118 +1,118 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.myfaces.test;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared_impl.test.ClassElementHandler;
-
-import junit.framework.TestCase;
-
-/**
- * This test makes sure all of our components, tags, renderers,
- * validators, converters, action listeners, phase listeners and
- * core implementation classes are in the build.
- *
- * This class has been copy and pasted into both tomahawk and core
- * in order to avoid a compile scoped dependency on junit in shared.
- *
- * @see ClassElementHandler
- * @author Dennis Byrne
- */
-
-public abstract class AbstractClassElementTestCase extends TestCase
-{
-
- private Log log = LogFactory.getLog(AbstractClassElementTestCase.class);
-
- protected List resource = new ArrayList();
- private List className = new ArrayList();
-
- protected void setUp() throws Exception
- {
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setValidating(false);
- factory.setNamespaceAware(false);
-
- SAXParser parser = factory.newSAXParser();
- ClassElementHandler handler = new ClassElementHandler();
-
- Iterator iterator = resource.iterator();
-
- while(iterator.hasNext()){
-
- String resourceName = (String) iterator.next();
-
- InputStream is = getClass().getClassLoader()
- .getResourceAsStream(resourceName);
-
- if(is == null)
- is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourceName);
-
- if(is == null)
- throw new Exception("Could not locate resource :" + resourceName);
-
- parser.parse(is, handler);
-
- }
-
- className.addAll(handler.getClassName());
-
- }
-
- public void testClassPath(){
-
- int i = 0;
- for( ; i < className.size() ; i++){
-
- String clazz = (String) className.get(i);
-
- try
- {
- Class c1 = getClass().getClassLoader().loadClass(clazz);
-
- }
- catch (ClassNotFoundException e)
- {
-
- try{
-
- Class c2 = Thread.currentThread().getContextClassLoader().loadClass(clazz);
-
- }catch(ClassNotFoundException e2){
-
- assertFalse("Could not load " + clazz, true);
-
- }
-
- }
-
- }
-
- log.debug(( i + 1 ) + " class found ");
-
- }
-
-}
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.myfaces.test;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared_impl.test.ClassElementHandler;
+
+import junit.framework.TestCase;
+
+/**
+ * This test makes sure all of our components, tags, renderers,
+ * validators, converters, action listeners, phase listeners and
+ * core implementation classes are in the build.
+ *
+ * This class has been copy and pasted into both tomahawk and core
+ * in order to avoid a compile scoped dependency on junit in shared.
+ *
+ * @see ClassElementHandler
+ * @author Dennis Byrne
+ */
+
+public abstract class AbstractClassElementTestCase extends TestCase
+{
+
+ private Log log = LogFactory.getLog(AbstractClassElementTestCase.class);
+
+ protected List resource = new ArrayList();
+ private List className = new ArrayList();
+
+ protected void setUp() throws Exception
+ {
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setValidating(false);
+ factory.setNamespaceAware(false);
+
+ SAXParser parser = factory.newSAXParser();
+ ClassElementHandler handler = new ClassElementHandler();
+
+ Iterator iterator = resource.iterator();
+
+ while(iterator.hasNext()){
+
+ String resourceName = (String) iterator.next();
+
+ InputStream is = getClass().getClassLoader()
+ .getResourceAsStream(resourceName);
+
+ if(is == null)
+ is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourceName);
+
+ if(is == null)
+ throw new Exception("Could not locate resource :" + resourceName);
+
+ parser.parse(is, handler);
+
+ }
+
+ className.addAll(handler.getClassName());
+
+ }
+
+ public void testClassPath(){
+
+ int i = 0;
+ for( ; i < className.size() ; i++){
+
+ String clazz = (String) className.get(i);
+
+ try
+ {
+ Class c1 = getClass().getClassLoader().loadClass(clazz);
+
+ }
+ catch (ClassNotFoundException e)
+ {
+
+ try{
+
+ Class c2 = Thread.currentThread().getContextClassLoader().loadClass(clazz);
+
+ }catch(ClassNotFoundException e2){
+
+ assertFalse("Could not load " + clazz, true);
+
+ }
+
+ }
+
+ }
+
+ log.debug(( i + 1 ) + " class found ");
+
+ }
+
+}
Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java Tue Aug 1 10:43:28 2006
@@ -1,34 +1,34 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.myfaces.test;
-
-/**
- * @author Dennis Byrne
- */
-
-public class ImplClassElementTestCase extends AbstractClassElementTestCase
-{
-
- public ImplClassElementTestCase(){
-
- resource.add("META-INF/myfaces_html.tld");
- resource.add("META-INF/myfaces_core.tld");
- resource.add("org/apache/myfaces/resource/standard-faces-config.xml");
-
- }
-
-}
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.myfaces.test;
+
+/**
+ * @author Dennis Byrne
+ */
+
+public class ImplClassElementTestCase extends AbstractClassElementTestCase
+{
+
+ public ImplClassElementTestCase(){
+
+ resource.add("META-INF/myfaces_html.tld");
+ resource.add("META-INF/myfaces_core.tld");
+ resource.add("org/apache/myfaces/resource/standard-faces-config.xml");
+
+ }
+
+}
Propchange: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/maven/trunk/tobago-site-skin/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/tobago-site-skin/pom.xml?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/maven/trunk/tobago-site-skin/pom.xml (original)
+++ myfaces/maven/trunk/tobago-site-skin/pom.xml Tue Aug 1 10:43:28 2006
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Copyright 2002-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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <version>1.0.5-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>MyFaces Tobago Site Skin</name>
- <groupId>org.apache.myfaces.maven</groupId>
- <artifactId>tobago-site-skin</artifactId>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/maven/trunk/tobago-site-skin</connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/myfaces/maven/trunk/tobago-site-skin</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/maven/trunk/tobago-site-skin</url>
- </scm>
-
- <distributionManagement>
- <repository>
- <id>apache-maven</id>
- <name>Apache Maven Repository</name>
- <url>scpexe://people.apache.org/www/www.apache.org/dist/maven-repository</url>
- </repository>
- <snapshotRepository>
- <uniqueVersion>false</uniqueVersion>
- <id>apache-maven-snapshots</id>
- <name>Apache Maven Snapshot Repository</name>
- <url>scpexe://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Copyright 2002-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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <version>1.0.5-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>MyFaces Tobago Site Skin</name>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <artifactId>tobago-site-skin</artifactId>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/maven/trunk/tobago-site-skin</connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/myfaces/maven/trunk/tobago-site-skin</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/maven/trunk/tobago-site-skin</url>
+ </scm>
+
+ <distributionManagement>
+ <repository>
+ <id>apache-maven</id>
+ <name>Apache Maven Repository</name>
+ <url>scpexe://people.apache.org/www/www.apache.org/dist/maven-repository</url>
+ </repository>
+ <snapshotRepository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>scpexe://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
Propchange: myfaces/maven/trunk/tobago-site-skin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/maven/trunk/wagon-maven-plugin/src/main/java/org/apache/myfaces/wagon/WagonMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java Tue Aug 1 10:43:28 2006
@@ -1,6 +1,6 @@
-package org.apache.myfaces.shared.component;
-
-public interface BindingAware
-{
- public void handleBindings();
-}
+package org.apache.myfaces.shared.component;
+
+public interface BindingAware
+{
+ public void handleBindings();
+}
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java Tue Aug 1 10:43:28 2006
@@ -1,44 +1,44 @@
-/*
- * 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.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);
-}
+/*
+ * 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.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/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/EscapeCapable.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/ExecuteOnCallback.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/ExecuteOnCallback.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/ExecuteOnCallback.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/ExecuteOnCallback.java Tue Aug 1 10:43:28 2006
@@ -1,34 +1,34 @@
-/*
- * 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.shared.component;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
-/**
- * With findComponent - you get a component, but this component might
- * not be prepared to actually have the correct context information. This
- * is important for e.g. DataTables. They'll need to prepare the component
- * with the current row-state to make sure that the method is executed
- * correctly.
- *
- * @author Martin Marinschek (latest modification by $Author: grantsmith $)
- * @deprecated will be moved to tomahawk later
- */
-public interface ExecuteOnCallback
-{
- Object execute(FacesContext context, UIComponent component);
-}
+/*
+ * 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.shared.component;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+/**
+ * With findComponent - you get a component, but this component might
+ * not be prepared to actually have the correct context information. This
+ * is important for e.g. DataTables. They'll need to prepare the component
+ * with the current row-state to make sure that the method is executed
+ * correctly.
+ *
+ * @author Martin Marinschek (latest modification by $Author: grantsmith $)
+ * @deprecated will be moved to tomahawk later
+ */
+public interface ExecuteOnCallback
+{
+ Object execute(FacesContext context, UIComponent component);
+}
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/ExecuteOnCallback.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java Tue Aug 1 10:43:28 2006
@@ -1,82 +1,82 @@
-/*
- * 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.shared.renderkit.html;
-
-import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.renderkit.html.HTML;
-
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
-import java.io.IOException;
-
-/**
- * @author Martin Marinschek
- * @version $Revision: $ $Date: $
- * <p/>
- * $Log: $
- */
-public class HtmlGroupRendererBase
- extends HtmlRenderer
-{
- 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;
-
- if(component.getId()!=null && !component.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
- {
- span = true;
-
- writer.startElement(org.apache.myfaces.shared.renderkit.html.HTML.SPAN_ELEM, component);
-
- HtmlRendererUtils.writeIdIfNecessary(writer, component, context);
-
- HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.COMMON_PASSTROUGH_ATTRIBUTES);
- }
- else
- {
- span=HtmlRendererUtils.renderHTMLAttributesWithOptionalStartElement(writer,
- component,
- HTML.SPAN_ELEM,
- HTML.COMMON_PASSTROUGH_ATTRIBUTES);
- }
-
- RendererUtils.renderChildren(context, component);
- if (span)
- {
- writer.endElement(HTML.SPAN_ELEM);
- }
- }
-
-}
+/*
+ * 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.shared.renderkit.html;
+
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
+import java.io.IOException;
+
+/**
+ * @author Martin Marinschek
+ * @version $Revision: $ $Date: $
+ * <p/>
+ * $Log: $
+ */
+public class HtmlGroupRendererBase
+ extends HtmlRenderer
+{
+ 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;
+
+ if(component.getId()!=null && !component.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
+ {
+ span = true;
+
+ writer.startElement(org.apache.myfaces.shared.renderkit.html.HTML.SPAN_ELEM, component);
+
+ HtmlRendererUtils.writeIdIfNecessary(writer, component, context);
+
+ HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.COMMON_PASSTROUGH_ATTRIBUTES);
+ }
+ else
+ {
+ span=HtmlRendererUtils.renderHTMLAttributesWithOptionalStartElement(writer,
+ component,
+ HTML.SPAN_ELEM,
+ HTML.COMMON_PASSTROUGH_ATTRIBUTES);
+ }
+
+ RendererUtils.renderChildren(context, component);
+ if (span)
+ {
+ writer.endElement(HTML.SPAN_ELEM);
+ }
+ }
+
+}
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java Tue Aug 1 10:43:28 2006
@@ -1,82 +1,82 @@
-/*
- * 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.shared.renderkit.html;
-
-import java.io.IOException;
-
-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 org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-import org.apache.myfaces.shared.renderkit.html.HTML;
-
-
-/**
- * @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);
- }
-
- if ((url != null) && (url.length() > 0))
- {
- writer.startElement(HTML.IMG_ELEM, uiComponent);
-
- HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
-
- String src = facesContext.getApplication()
- .getViewHandler().getResourceURL(facesContext, url);
- writer.writeURIAttribute(HTML.SRC_ATTR,
- facesContext.getExternalContext().encodeResourceURL(src),
- null);
-
- HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.IMG_PASSTHROUGH_ATTRIBUTES);
-
- writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.IMG_ELEM);
- }
- else
- {
- if (log.isWarnEnabled()) log.warn("Graphic with id " + uiComponent.getClientId(facesContext) + " has no value (url).");
- }
- }
-
-}
+/*
+ * 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.shared.renderkit.html;
+
+import java.io.IOException;
+
+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 org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+
+
+/**
+ * @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);
+ }
+
+ if ((url != null) && (url.length() > 0))
+ {
+ writer.startElement(HTML.IMG_ELEM, uiComponent);
+
+ HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
+
+ String src = facesContext.getApplication()
+ .getViewHandler().getResourceURL(facesContext, url);
+ writer.writeURIAttribute(HTML.SRC_ATTR,
+ facesContext.getExternalContext().encodeResourceURL(src),
+ null);
+
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.IMG_PASSTHROUGH_ATTRIBUTES);
+
+ writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.IMG_ELEM);
+ }
+ else
+ {
+ if (log.isWarnEnabled()) log.warn("Graphic with id " + uiComponent.getClientId(facesContext) + " has no value (url).");
+ }
+ }
+
+}
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java Tue Aug 1 10:43:28 2006
@@ -1,210 +1,210 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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.el.ValueBinding;
-import javax.faces.webapp.ConverterTag;
-import javax.faces.webapp.UIComponentTag;
-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);
- }
- }
-
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+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.el.ValueBinding;
+import javax.faces.webapp.ConverterTag;
+import javax.faces.webapp.UIComponentTag;
+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);
+ }
+ }
+
}
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java Tue Aug 1 10:43:28 2006
@@ -1,79 +1,79 @@
-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;
- }
-
-}
+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/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java Tue Aug 1 10:43:28 2006
@@ -1,53 +1,53 @@
-/*
- * 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.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);
- }
- }
-}
+/*
+ * 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.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/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java
------------------------------------------------------------------------------
svn:eol-style = native