myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manol...@apache.org
Subject svn commit: r380686 [5/5] - in /myfaces/shared/trunk: ./ src/main/java/ src/main/java/org/apache/myfaces/component/ src/main/java/org/apache/myfaces/config/ src/main/java/org/apache/myfaces/context/ src/main/java/org/apache/myfaces/el/ src/main/java/or...
Date Fri, 24 Feb 2006 15:19:48 GMT
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/ClassUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/ClassUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/ClassUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import org.apache.commons.el.Coercions;
 import org.apache.commons.el.Logger;

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.11

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/HashMapUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/HashMapUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/HashMapUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import java.util.HashMap;
 import java.util.Map;

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/LocaleUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/LocaleUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/LocaleUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import java.util.Locale;
 import java.util.StringTokenizer;

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/MessageUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/MessageUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/MessageUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java Fri Feb 24 07:19:28 2006
@@ -13,13 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.myfaces.util.ClassUtils;
-
 import javax.faces.application.FacesMessage;
 import javax.faces.application.ApplicationFactory;
 import javax.faces.application.Application;
@@ -194,7 +192,7 @@
         {
             try
             {
-                bundle = ResourceBundle.getBundle(bundleName, locale, ClassUtils.getCurrentLoader(bundleName));
+                bundle = ResourceBundle.getBundle(bundleName, locale, org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(bundleName));
                 summary = bundle.getString(messageId);
             }
             catch (MissingResourceException e) {
@@ -206,7 +204,7 @@
         {
             try
             {
-                bundle = ResourceBundle.getBundle(DEFAULT_BUNDLE, locale, ClassUtils.getCurrentLoader(DEFAULT_BUNDLE));
+                bundle = ResourceBundle.getBundle(DEFAULT_BUNDLE, locale, org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(DEFAULT_BUNDLE));
                 if(bundle == null)
                 {
                     throw new NullPointerException();

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.4

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/NullEnumeration.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/NullEnumeration.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/NullEnumeration.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import java.util.Enumeration;
 

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullIterator.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/NullIterator.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullIterator.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullIterator.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/NullIterator.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/NullIterator.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullIterator.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullIterator.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullIterator.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/NullIterator.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/SelectItemsIterator.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/SelectItemsIterator.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/SelectItemsIterator.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,7 +28,7 @@
 import javax.faces.el.ValueBinding;
 import javax.faces.model.SelectItem;
 
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
 
 /**
  * @author Mathias Broekelmann (latest modification by $Author$)

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StateUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/StateUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StateUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StateUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/StateUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/StateUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StateUtils.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StringUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/StringUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StringUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StringUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/StringUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/StringUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StringUtils.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
+
+import org.apache.myfaces.shared.util.ArrayUtils;
 
 import java.util.ArrayList;
 
@@ -516,7 +518,7 @@
     	int len;
         if (str == null || (len = str.length()) == 0)
         {
-            return ArrayUtils.EMPTY_STRING_ARRAY;
+            return org.apache.myfaces.shared.util.ArrayUtils.EMPTY_STRING_ARRAY;
         }
 
         int lastTokenIndex = 0;

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StringUtils.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.4

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StringUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StringUtils.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/StringUtils.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/_ComponentUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/_ComponentUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/_ComponentUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java
------------------------------------------------------------------------------
    svn:keywords = URL Author Revision Date

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/ActionsMap.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/ActionsMap.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/ActionsMap.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util.el;
+package org.apache.myfaces.shared.util.el;
 
 import java.util.*;
 

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/GenericMap.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/GenericMap.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/GenericMap.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/GenericMap.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/GenericMap.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/GenericMap.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/GenericMap.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util.el;
+package org.apache.myfaces.shared.util.el;
 
 import java.util.Map;
 import java.util.Set;

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/StringMap.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/StringMap.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/StringMap.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/StringMap.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/StringMap.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/StringMap.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/StringMap.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util.el;
+package org.apache.myfaces.shared.util.el;
+
+import org.apache.myfaces.shared.util.el.GenericMap;
 
 /**
  * You can use this class to perform tests.
@@ -25,19 +27,19 @@
  */
 public abstract class StringMap extends GenericMap {
 
-	/**
-	 * This method should return the result of the test.
-	 */
-	public abstract String getString(String testKey);
+    /**
+     * This method should return the result of the test.
+     */
+    public abstract String getString(String testKey);
 
-	public Object getValue(Object testKey){
-		return getString( (String) testKey );
-	}
+    public Object getValue(Object testKey){
+        return getString( (String) testKey );
+    }
 
-	public Object get(Object key) {
-		if( ! (key instanceof String) )
-			return null;
-		return getString( (String)key );
-	}
+    public Object get(Object key) {
+        if( ! (key instanceof String) )
+            return null;
+        return getString( (String)key );
+    }
 }
 

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/TestsMap.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/TestsMap.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/TestsMap.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/TestsMap.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/TestsMap.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/el/TestsMap.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/el/TestsMap.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util.el;
+package org.apache.myfaces.shared.util.el;
+
+import org.apache.myfaces.shared.util.el.GenericMap;
 
 /**
  * You can use this class to perform tests.
@@ -24,24 +26,24 @@
  */
 public abstract class TestsMap extends GenericMap {
 
-	/**
-	 * This method should return the result of the test.
-	 */
-	public abstract boolean getTest(String testKey);
-
-	protected Object getValue(Object testKey){
-		return Boolean.valueOf(getTest( (String) testKey ));
-	}
+    /**
+     * This method should return the result of the test.
+     */
+    public abstract boolean getTest(String testKey);
+
+    protected Object getValue(Object testKey){
+        return Boolean.valueOf(getTest( (String) testKey ));
+    }
 
     public Object get(Object key) {
-		if( ! (key instanceof String) )
-			return null;
-		return Boolean.valueOf(getTest( (String)key ));
-	}
-
-	public Boolean put(String key, Boolean value) {
-		return Boolean.FALSE;
-	}
+        if( ! (key instanceof String) )
+            return null;
+        return Boolean.valueOf(getTest( (String)key ));
+    }
+
+    public Boolean put(String key, Boolean value) {
+        return Boolean.FALSE;
+    }
 }
 
 

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/servlet/SourceCodeServlet.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/servlet/SourceCodeServlet.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/servlet/SourceCodeServlet.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/servlet/SourceCodeServlet.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/servlet/SourceCodeServlet.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/servlet/SourceCodeServlet.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/servlet/SourceCodeServlet.java Fri Feb 24 07:19:28 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.myfaces.util.servlet;
+package org.apache.myfaces.shared.util.servlet;
 
 import javax.servlet.*;
 import javax.servlet.http.*;

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/xml/MyFacesErrorHandler.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/xml/MyFacesErrorHandler.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/xml/MyFacesErrorHandler.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util.xml;
+package org.apache.myfaces.shared.util.xml;
 
 import org.apache.commons.logging.Log;
 import org.xml.sax.ErrorHandler;

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/xml/XmlUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/xml/XmlUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/util/xml/XmlUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util.xml;
+package org.apache.myfaces.shared.util.xml;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileFilter.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/filter/WelcomeFileFilter.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileFilter.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileFilter.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/filter/WelcomeFileFilter.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/filter/WelcomeFileFilter.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileFilter.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.webapp.filter;
+package org.apache.myfaces.shared.webapp.filter;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileFilter.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.7

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileFilter.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileFilter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileHandler.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/filter/WelcomeFileHandler.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileHandler.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileHandler.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/filter/WelcomeFileHandler.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/filter/WelcomeFileHandler.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileHandler.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.webapp.filter;
+package org.apache.myfaces.shared.webapp.filter;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileHandler.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.6

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileHandler.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/filter/WelcomeFileHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/DelegatedFacesServlet.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/DelegatedFacesServlet.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/DelegatedFacesServlet.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/DelegatedFacesServlet.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/DelegatedFacesServlet.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/DelegatedFacesServlet.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/DelegatedFacesServlet.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.webapp.webxml;
+package org.apache.myfaces.shared.webapp.webxml;
 
 public interface DelegatedFacesServlet
 {

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/ServletMapping.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/ServletMapping.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/ServletMapping.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.webapp.webxml;
+package org.apache.myfaces.shared.webapp.webxml;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/WebXml.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/WebXml.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/WebXml.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.webapp.webxml;
+package org.apache.myfaces.shared.webapp.webxml;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,7 +25,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.util.ClassUtils;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)
@@ -86,22 +85,22 @@
                 // </servlet>
                 continue;
             }
-            Class servletClass = ClassUtils.simpleClassForName((String)entry.getValue());
+            Class servletClass = org.apache.myfaces.shared.util.ClassUtils.simpleClassForName((String)entry.getValue());
 //            if (FacesServlet.class.isAssignableFrom(servletClass) ||
 //                    DelegatedFacesServlet.class.isAssignableFrom(servletClass))
 //            {
                 List urlPatterns = (List)_servletMappings.get(servletName);
                 if( urlPatterns != null )
                 {
-	                for (Iterator it2 = urlPatterns.iterator(); it2.hasNext(); )
-	                {
-	                    String urlpattern = (String)it2.next();
-	                    _facesServletMappings.add(new ServletMapping(servletName,
-	                                                                 servletClass,
-	                                                                 urlpattern));
-	                    if (log.isTraceEnabled())
-	                    	log.trace("adding mapping for servlet + " + servletName + " urlpattern = " + urlpattern);
-	                }
+                    for (Iterator it2 = urlPatterns.iterator(); it2.hasNext(); )
+                    {
+                        String urlpattern = (String)it2.next();
+                        _facesServletMappings.add(new org.apache.myfaces.shared.webapp.webxml.ServletMapping(servletName,
+                                                                                                             servletClass,
+                                                                                                             urlpattern));
+                        if (log.isTraceEnabled())
+                            log.trace("adding mapping for servlet + " + servletName + " urlpattern = " + urlpattern);
+                    }
                 }
 //            }
 //            else

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/WebXmlParser.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/WebXmlParser.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/webapp/webxml/WebXmlParser.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.webapp.webxml;
+package org.apache.myfaces.shared.webapp.webxml;
 
-import org.apache.myfaces.util.xml.MyFacesErrorHandler;
-import org.apache.myfaces.util.xml.XmlUtils;
+import org.apache.myfaces.shared.util.xml.MyFacesErrorHandler;
+import org.apache.myfaces.shared.util.xml.XmlUtils;
+import org.apache.myfaces.shared.webapp.webxml.WebXml;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
@@ -61,7 +62,7 @@
 
 
     private ExternalContext _context;
-    private WebXml _webXml;
+    private org.apache.myfaces.shared.webapp.webxml.WebXml _webXml;
 
     public WebXmlParser(ExternalContext context)
     {
@@ -220,7 +221,7 @@
                 }
                 else if (n.getNodeName().equals("servlet-class"))
                 {
-                    servletClass = XmlUtils.getElementText((Element)n).trim();
+                    servletClass = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
                 }
                 else if (n.getNodeName().equals("description") || n.getNodeName().equals("load-on-startup") || n.getNodeName().equals("init-param"))
                 {
@@ -252,11 +253,11 @@
             {
                 if (n.getNodeName().equals("servlet-name"))
                 {
-                    servletName = org.apache.myfaces.util.xml.XmlUtils.getElementText((Element)n);
+                    servletName = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n);
                 }
                 else if (n.getNodeName().equals("url-pattern"))
                 {
-                    urlPattern = org.apache.myfaces.util.xml.XmlUtils.getElementText((Element)n).trim();
+                    urlPattern = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
                 }
                 else
                 {

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.6

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/resources/org/apache/myfaces/shared/renderkit/html/util/AddResource.properties (from r380659, myfaces/shared/trunk/src/main/resources/org/apache/myfaces/renderkit/html/util/AddResource.properties)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/resources/org/apache/myfaces/shared/renderkit/html/util/AddResource.properties?p2=myfaces/shared/trunk/src/main/resources/org/apache/myfaces/shared/renderkit/html/util/AddResource.properties&p1=myfaces/shared/trunk/src/main/resources/org/apache/myfaces/renderkit/html/util/AddResource.properties&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
    (empty)

Propchange: myfaces/shared/trunk/src/main/resources/org/apache/myfaces/shared/renderkit/html/util/AddResource.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/resources/org/apache/myfaces/shared/renderkit/html/util/AddResource.properties
------------------------------------------------------------------------------
    svn:keywords = URL Author Revision Date

Copied: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/renderkit/html/util/ReducedHTMLParserTest.java (from r380659, myfaces/shared/trunk/src/test/java/org/apache/myfaces/renderkit/html/util/ReducedHTMLParserTest.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/renderkit/html/util/ReducedHTMLParserTest.java?p2=myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/renderkit/html/util/ReducedHTMLParserTest.java&p1=myfaces/shared/trunk/src/test/java/org/apache/myfaces/renderkit/html/util/ReducedHTMLParserTest.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/test/java/org/apache/myfaces/renderkit/html/util/ReducedHTMLParserTest.java (original)
+++ myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/renderkit/html/util/ReducedHTMLParserTest.java Fri Feb 24 07:19:28 2006
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
 
 import junit.framework.TestCase;
+import org.apache.myfaces.shared.renderkit.html.util.CallbackListener;
+import org.apache.myfaces.shared.renderkit.html.util.ReducedHTMLParser;
 
 /**
  * Unit test for the ReducedHTMLParser class which detects tags within an HTML document.
@@ -409,9 +411,9 @@
     {
         String s1 = "<head>";
         String s2 = "<script type='text/javascript'>"
-            + "if (1<2) alert('foo');\n"
-            + "if (1>2) alert('bar');\n"
-            + "</script>";
+                    + "if (1<2) alert('foo');\n"
+                    + "if (1>2) alert('bar');\n"
+                    + "</script>";
         String s3 = "</head>";
         String s4 = "<body>";
         String s5 = "</body>";

Copied: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java (from r380659, myfaces/shared/trunk/src/test/java/org/apache/myfaces/taglib/UIComponentTagUtilsTest.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java?p2=myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java&p1=myfaces/shared/trunk/src/test/java/org/apache/myfaces/taglib/UIComponentTagUtilsTest.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/test/java/org/apache/myfaces/taglib/UIComponentTagUtilsTest.java (original)
+++ myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.taglib;
+package org.apache.myfaces.shared.taglib;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.html.HtmlInputText;
@@ -21,6 +21,7 @@
 import junit.framework.Test;
 
 import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.shared.taglib.UIComponentTagUtils;
 
 /**
  * TestCase for UIComponentTagUtils
@@ -28,14 +29,14 @@
 public class UIComponentTagUtilsTest extends AbstractJsfTestCase {
 
     public UIComponentTagUtilsTest(String name) {
-		super(name);
-	}
+        super(name);
+    }
 
     public static Test suite() {
         return null; // keep this method or maven won't run it
     }
-    
-	/**
+
+    /**
      * Simple custom component that counts how many times its
      * getValue method is called.
      */
@@ -48,13 +49,13 @@
     };
 
     public void setUp() {
-    	super.setUp();
+        super.setUp();
     }
-    
+
     public void tearDown() {
-    	super.tearDown();
+        super.tearDown();
     }
-    
+
     /**
      * Test that the setStringProperty util method works as expected.
      */
@@ -63,28 +64,28 @@
         String propName;
         String propValue;
         String oldValue;
-        
+
         // first, set an attribute that doesn't have a corresponding
         // getter on the underlying component..
         propName = "someName";
         propValue = "someValue";
         oldValue = (String) component.getAttributes().get(propName);
         assertNull(oldValue);
-        
+
         UIComponentTagUtils.setStringProperty(facesContext, component, propName, propValue);
-        
+
         oldValue = (String) component.getAttributes().get(propName);
         assertEquals(oldValue, propValue);
-        
+
         // Now set an attribute that does have a corresponding getter on the
         // underlying component.
         propName = "style";
         propValue = "someStyle";
         oldValue = (String) component.getAttributes().get(propName);
         assertNull(oldValue);
-        
-        UIComponentTagUtils.setStringProperty(facesContext, component, propName, propValue);
-        
+
+        org.apache.myfaces.shared.taglib.UIComponentTagUtils.setStringProperty(facesContext, component, propName, propValue);
+
         oldValue = (String) component.getAttributes().get(propName);
         assertEquals(oldValue, propValue);
     }

Propchange: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/FacesContextHelper.java (from r380659, myfaces/shared/trunk/src/test/java/org/apache/myfaces/test/FacesContextHelper.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/FacesContextHelper.java?p2=myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/FacesContextHelper.java&p1=myfaces/shared/trunk/src/test/java/org/apache/myfaces/test/FacesContextHelper.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/test/java/org/apache/myfaces/test/FacesContextHelper.java (original)
+++ myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/FacesContextHelper.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.test;
+package org.apache.myfaces.shared.test;
 
 import javax.faces.context.FacesContext;
 

Propchange: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/FacesContextHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/FacesContextHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/MockResponseWriter.java (from r380659, myfaces/shared/trunk/src/test/java/org/apache/myfaces/test/MockResponseWriter.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/MockResponseWriter.java?p2=myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/MockResponseWriter.java&p1=myfaces/shared/trunk/src/test/java/org/apache/myfaces/test/MockResponseWriter.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/test/java/org/apache/myfaces/test/MockResponseWriter.java (original)
+++ myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/MockResponseWriter.java Fri Feb 24 07:19:28 2006
@@ -13,21 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.test;
+package org.apache.myfaces.shared.test;
 
 import java.io.StringWriter;
 import java.io.Writer;
 
-import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
-
-public class MockResponseWriter extends HtmlResponseWriterImpl {
+public class MockResponseWriter extends org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl {
 
   private static Writer writer = new StringWriter();
-  
+
   public MockResponseWriter() {
     super(writer, null, null);
   }
-  
+
   public String getContent()
   {
     return MockResponseWriter.writer.toString();

Propchange: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/MockResponseWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/test/MockResponseWriter.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java (from r380659, myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/AbstractStateUtilsTest.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java?p2=myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java&p1=myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/AbstractStateUtilsTest.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/AbstractStateUtilsTest.java (original)
+++ myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 /**
  * This TestCase is not meant to be run, it's children are.  
@@ -23,6 +23,7 @@
  */
 
 import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.shared.util.StateUtils;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -77,7 +78,7 @@
     public void testConstruction()
     {
         String constructed = StateUtils.construct(TEST_DATA);
-        Object object = StateUtils.reconstruct(constructed);
+        Object object = org.apache.myfaces.shared.util.StateUtils.reconstruct(constructed);
         assertTrue(TEST_DATA.equals(object));
     }
 

Copied: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java (from r380659, myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java?p2=myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java&p1=myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java (original)
+++ myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -27,8 +27,9 @@
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
-import org.apache.myfaces.test.MockResponseWriter;
-import org.apache.myfaces.test.FacesContextHelper;
+import org.apache.myfaces.shared.test.MockResponseWriter;
+import org.apache.myfaces.shared.test.FacesContextHelper;
+import org.apache.myfaces.shared.util.MessageUtils;
 import org.easymock.MockControl;
 import org.easymock.classextension.MockClassControl;
 
@@ -45,7 +46,7 @@
     private static final String DEFAULT_BUNDLE = "javax.faces.Messages";
 
     /**
-     * Test method for 'org.apache.myfaces.util.MessageUtils.getMessage(Severity, String, Object)'
+     * Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(Severity, String, Object)'
      */
     public void testGetMessageSeverityStringObject()
     {
@@ -60,7 +61,7 @@
     }
 
     /**
-     * Test method for 'org.apache.myfaces.util.MessageUtils.getMessage(Severity, String, Object[])'
+     * Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(Severity, String, Object[])'
      */
     public void testGetMessageSeverityStringObjectArray()
     {
@@ -74,7 +75,7 @@
     }
 
     /**
-     * Test method for 'org.apache.myfaces.util.MessageUtils.getMessage(Severity, String, Object[], FacesContext)'
+     * Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(Severity, String, Object[], FacesContext)'
      */
     public void testGetMessageSeverityStringObjectArrayFacesContext()
     {
@@ -89,11 +90,11 @@
     }
 
     /**
-     * Test method for 'org.apache.myfaces.util.MessageUtils.getMessage(Locale, String, Object[])'
+     * Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(Locale, String, Object[])'
      */
     public void testGetMessageLocaleStringObjectArray()
     {
-        FacesMessage msg = MessageUtils.getMessage(Locale.ENGLISH,
+        FacesMessage msg = org.apache.myfaces.shared.util.MessageUtils.getMessage(Locale.ENGLISH,
                 "javax.faces.component.UIInput.CONVERSION", null);
         assertEquals("Conversion Error", msg.getSummary());
 
@@ -104,7 +105,7 @@
     }
 
     /**
-     * Test method for 'org.apache.myfaces.util.MessageUtils.getMessage(FacesContext, String)'
+     * Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(FacesContext, String)'
      */
     public void testGetMessageFacesContextString()
     {
@@ -118,7 +119,7 @@
     }
 
     /**
-     * Test method for 'org.apache.myfaces.util.MessageUtils.getMessage(FacesContext, String, Object[])'
+     * Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(FacesContext, String, Object[])'
      */
     public void testGetMessageFacesContextStringObjectArray()
     {

Copied: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java (from r380659, myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsAES_CBCTest.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java?p2=myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java&p1=myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsAES_CBCTest.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsAES_CBCTest.java (original)
+++ myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java Fri Feb 24 07:19:28 2006
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import junit.framework.Test;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.AbstractStateUtilsTest;
 
 /**
  * <p>This TestCase uses the Advanced Encryption Standard with
@@ -35,13 +37,13 @@
 {
 
     public StateUtilsAES_CBCTest(String name) {
-		super(name);
-	}
+        super(name);
+    }
 
     public static Test suite() {
         return null; // keep this method or maven won't run it
     }
-    
+
     public void setUp()
     {
         super.setUp();
@@ -49,8 +51,8 @@
         servletContext.addInitParameter(StateUtils.INIT_SECRET, BASE64_KEY_SIZE_24);
         servletContext.addInitParameter(StateUtils.INIT_ALGORITHM, "AES");
         servletContext.addInitParameter(StateUtils.INIT_ALGORITHM_PARAM, "CBC/PKCS5Padding");
-        servletContext.addInitParameter(StateUtils.INIT_ALGORITHM_IV, BASE64_KEY_SIZE_16);
-        
+        servletContext.addInitParameter(org.apache.myfaces.shared.util.StateUtils.INIT_ALGORITHM_IV, BASE64_KEY_SIZE_16);
+
     }
 
 }

Copied: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java (from r380659, myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsBlowfish_ECBTest.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java?p2=myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java&p1=myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsBlowfish_ECBTest.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsBlowfish_ECBTest.java (original)
+++ myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java Fri Feb 24 07:19:28 2006
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import junit.framework.Test;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.AbstractStateUtilsTest;
 
 /**
  * This TestCase uses Blowfish in Electronic CodeBook mode
@@ -34,21 +36,21 @@
 {
 
     public StateUtilsBlowfish_ECBTest(String name) {
-		super(name);
+        super(name);
     }
-    
+
     public static Test suite() {
         return null; // keep this method or maven won't run it
     }
-    
+
     public void setUp()
     {
         super.setUp();
-        
-        servletContext.addInitParameter(StateUtils.INIT_SECRET, BASE64_KEY_SIZE_16);
+
+        servletContext.addInitParameter(org.apache.myfaces.shared.util.StateUtils.INIT_SECRET, BASE64_KEY_SIZE_16);
         servletContext.addInitParameter(StateUtils.INIT_ALGORITHM, "Blowfish");
         servletContext.addInitParameter(StateUtils.INIT_ALGORITHM_PARAM, "ECB/PKCS5Padding");
-        
+
     }
 
 }

Copied: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java (from r380659, myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsDefaultTest.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java?p2=myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java&p1=myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsDefaultTest.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsDefaultTest.java (original)
+++ myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java Fri Feb 24 07:19:28 2006
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import junit.framework.Test;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.AbstractStateUtilsTest;
 
 /**
  * This TestCase uses the the default algorithm/mode/padding of
@@ -28,20 +30,20 @@
 {
 
     public StateUtilsDefaultTest(String name) {
-		super(name);
-	}
+        super(name);
+    }
 
     public static Test suite() {
         return null; // keep this method or maven won't run it
     }
-    
+
     public void setUp()
     {
         super.setUp();
-        
+
         servletContext.addInitParameter(StateUtils.INIT_SECRET, BASE64_KEY_SIZE_8);
         servletContext.addInitParameter(StateUtils.INIT_ALGORITHM, "DES");
-        servletContext.addInitParameter(StateUtils.INIT_ALGORITHM_PARAM, "ECB/PKCS5Padding");
-        
+        servletContext.addInitParameter(org.apache.myfaces.shared.util.StateUtils.INIT_ALGORITHM_PARAM, "ECB/PKCS5Padding");
+
     }
 }

Copied: myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java (from r380659, myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsTripleDES_ECBTest.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java?p2=myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java&p1=myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsTripleDES_ECBTest.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/test/java/org/apache/myfaces/util/StateUtilsTripleDES_ECBTest.java (original)
+++ myfaces/shared/trunk/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java Fri Feb 24 07:19:28 2006
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.util;
+package org.apache.myfaces.shared.util;
 
 import junit.framework.Test;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.AbstractStateUtilsTest;
 
 /**
  * This TestCase uses the 3DES algorithm in Electronic CodeBook mode
@@ -34,21 +36,21 @@
 {
 
     public StateUtilsTripleDES_ECBTest(String name) {
-		super(name);
-	}
+        super(name);
+    }
 
     public static Test suite() {
         return null; // keep this method or maven won't run it
     }
-    
+
     public void setUp()
     {
         super.setUp();
-        
+
         servletContext.addInitParameter(StateUtils.INIT_SECRET, BASE64_KEY_SIZE_24);
-        servletContext.addInitParameter(StateUtils.INIT_ALGORITHM, "DESede");
+        servletContext.addInitParameter(org.apache.myfaces.shared.util.StateUtils.INIT_ALGORITHM, "DESede");
         servletContext.addInitParameter(StateUtils.INIT_ALGORITHM_PARAM, "ECB/PKCS5Padding");
-        
+
     }
 
 }



Mime
View raw message