myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manol...@apache.org
Subject svn commit: r380693 [7/9] - in /myfaces: core/branches/1_1_2/assembly/ core/branches/1_1_2/impl/ core/branches/1_1_2/impl/src/main/java/org/apache/myfaces/application/ core/branches/1_1_2/impl/src/main/java/org/apache/myfaces/application/jsp/ core/bran...
Date Fri, 24 Feb 2006 15:47:41 GMT
Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyCheckboxTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyCheckboxTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyCheckboxTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyCheckboxTag.java Fri Feb 24 07:47:18 2006
@@ -15,11 +15,11 @@
  */
 package org.apache.myfaces.taglib.html.ext;
 
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectManyCheckbox;
-import org.apache.myfaces.taglib.html.HtmlSelectManyCheckboxTagBase;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.html.HtmlSelectManyCheckboxTagBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java Fri Feb 24 07:47:18 2006
@@ -15,11 +15,11 @@
  */
 package org.apache.myfaces.taglib.html.ext;
 
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectManyListbox;
-import org.apache.myfaces.taglib.html.HtmlSelectListboxTagBase;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.html.HtmlSelectListboxTagBase;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java Fri Feb 24 07:47:18 2006
@@ -15,11 +15,11 @@
  */
 package org.apache.myfaces.taglib.html.ext;
 
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectManyMenu;
-import org.apache.myfaces.taglib.html.HtmlSelectMenuTagBase;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.html.HtmlSelectMenuTagBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneListboxTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneListboxTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneListboxTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneListboxTag.java Fri Feb 24 07:47:18 2006
@@ -15,11 +15,11 @@
  */
 package org.apache.myfaces.taglib.html.ext;
 
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.html.HtmlSelectListboxTagBase;
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectOneListbox;
-import org.apache.myfaces.taglib.html.HtmlSelectListboxTagBase;
-import org.apache.myfaces.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneMenuTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneMenuTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneMenuTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneMenuTag.java Fri Feb 24 07:47:18 2006
@@ -15,11 +15,11 @@
  */
 package org.apache.myfaces.taglib.html.ext;
 
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectOneMenu;
-import org.apache.myfaces.taglib.html.HtmlSelectMenuTagBase;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.html.HtmlSelectMenuTagBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneRadioTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneRadioTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneRadioTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneRadioTag.java Fri Feb 24 07:47:18 2006
@@ -15,11 +15,11 @@
  */
 package org.apache.myfaces.taglib.html.ext;
 
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.html.HtmlSelectOneRadioTagBase;
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectOneRadio;
-import org.apache.myfaces.taglib.html.HtmlSelectOneRadioTagBase;
-import org.apache.myfaces.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckboxRendererCactus.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckboxRendererCactus.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckboxRendererCactus.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckboxRendererCactus.java Fri Feb 24 07:47:18 2006
@@ -35,7 +35,7 @@
 import org.apache.cactus.ServletTestCase;
 import org.apache.cactus.WebRequest;
 import org.apache.cactus.WebResponse;
-import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
 import org.apache.myfaces.renderkit.html.ext.HtmlCheckboxRenderer;
 
 /**
@@ -103,28 +103,28 @@
     {
         // Check the markup produced by the component
         String htmlMarkup = response.getText();
-        String expected = 
-            "<table id=\"test\">" + 
-                "<tr>" + 
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-0\" />" + 
-                            "&#160;Label-0" +
-                        "</label>" + 
-                    "</td>" +
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-1\" />" + 
-                            "&#160;Label-1" +
-                        "</label>" + 
-                    "</td>" +
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" value=\"Value-2\" />" + 
-                            "&#160;Label-2" +
-                        "</label>" + 
-                    "</td>" +
-                "</tr>" +
+        String expected =
+            "<table id=\"test\">" +
+            "<tr>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-0\" />" +
+            "&#160;Label-0" +
+            "</label>" +
+            "</td>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-1\" />" +
+            "&#160;Label-1" +
+            "</label>" +
+            "</td>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" value=\"Value-2\" />" +
+            "&#160;Label-2" +
+            "</label>" +
+            "</td>" +
+            "</tr>" +
             "</table>";
         assertEquals(expected, htmlMarkup);
     }
@@ -156,32 +156,32 @@
     {
         // Check the markup produced by the component
         String htmlMarkup = response.getText();
-        String expected = 
-            "<table id=\"test\">" + 
-                "<tr>" + 
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-0\" />" + 
-                            "&#160;Label-0" +
-                        "</label>" + 
-                    "</td>" +
-                "</tr>" + 
-                "<tr>" + 
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-1\" />" + 
-                            "&#160;Label-1" +
-                        "</label>" + 
-                    "</td>" +
-                "</tr>" + 
-                "<tr>" + 
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" value=\"Value-2\" />" + 
-                            "&#160;Label-2" +
-                        "</label>" + 
-                    "</td>" +
-                "</tr>" +
+        String expected =
+            "<table id=\"test\">" +
+            "<tr>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-0\" />" +
+            "&#160;Label-0" +
+            "</label>" +
+            "</td>" +
+            "</tr>" +
+            "<tr>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-1\" />" +
+            "&#160;Label-1" +
+            "</label>" +
+            "</td>" +
+            "</tr>" +
+            "<tr>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" value=\"Value-2\" />" +
+            "&#160;Label-2" +
+            "</label>" +
+            "</td>" +
+            "</tr>" +
             "</table>";
         assertEquals(expected, htmlMarkup);
     }
@@ -214,45 +214,45 @@
     {
         // Check the markup produced by the component
         String htmlMarkup = response.getText();
-        String expected = 
-            "<table id=\"test\">" + 
-                "<tr>" + 
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-0\" />" + 
-                            "&#160;Label-0" +
-                        "</label>" + 
-                    "</td>" +
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" value=\"Value-2\" />" + 
-                            "&#160;Label-2" +
-                        "</label>" + 
-                    "</td>" +
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" value=\"Value-4\" />" + 
-                            "&#160;Label-4" +
-                        "</label>" + 
-                    "</td>" +
-                "</tr>" + 
-                "<tr>" + 
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-1\" />" + 
-                            "&#160;Label-1" +
-                        "</label>" + 
-                    "</td>" +
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" value=\"Value-3\" />" + 
-                            "&#160;Label-3" +
-                        "</label>" + 
-                    "</td>" +
-                    "<td>" +
-                        // empty cell
-                    "</td>" +
-                "</tr>" +
+        String expected =
+            "<table id=\"test\">" +
+            "<tr>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-0\" />" +
+            "&#160;Label-0" +
+            "</label>" +
+            "</td>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" value=\"Value-2\" />" +
+            "&#160;Label-2" +
+            "</label>" +
+            "</td>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" value=\"Value-4\" />" +
+            "&#160;Label-4" +
+            "</label>" +
+            "</td>" +
+            "</tr>" +
+            "<tr>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-1\" />" +
+            "&#160;Label-1" +
+            "</label>" +
+            "</td>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" value=\"Value-3\" />" +
+            "&#160;Label-3" +
+            "</label>" +
+            "</td>" +
+            "<td>" +
+            // empty cell
+            "</td>" +
+            "</tr>" +
             "</table>";
         assertEquals(expected, htmlMarkup);
     }
@@ -285,47 +285,47 @@
     {
         // Check the markup produced by the component
         String htmlMarkup = response.getText();
-        String expected = 
-            "<table id=\"test\">" + 
-                "<tr>" + 
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-0\" />" + 
-                            "&#160;Label-0" +
-                        "</label>" + 
-                    "</td>" +
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-1\" />" + 
-                            "&#160;Label-1" +
-                        "</label>" + 
-                    "</td>" +
-                "</tr>" + 
-                "<tr>" + 
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" value=\"Value-2\" />" + 
-                            "&#160;Label-2" +
-                        "</label>" + 
-                    "</td>" +
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" value=\"Value-3\" />" + 
-                            "&#160;Label-3" +
-                        "</label>" + 
-                    "</td>" +
-                "</tr>" +
-                "<tr>" + 
-                    "<td>" +
-                        "<label>" +
-                            "<input type=\"checkbox\" name=\"test\" value=\"Value-4\" />" + 
-                            "&#160;Label-4" +
-                        "</label>" + 
-                    "</td>" +
-                    "<td>" +
-                        // empty cell
-                    "</td>" +
-                "</tr>" +
+        String expected =
+            "<table id=\"test\">" +
+            "<tr>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-0\" />" +
+            "&#160;Label-0" +
+            "</label>" +
+            "</td>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" checked=\"checked\" value=\"Value-1\" />" +
+            "&#160;Label-1" +
+            "</label>" +
+            "</td>" +
+            "</tr>" +
+            "<tr>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" value=\"Value-2\" />" +
+            "&#160;Label-2" +
+            "</label>" +
+            "</td>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" value=\"Value-3\" />" +
+            "&#160;Label-3" +
+            "</label>" +
+            "</td>" +
+            "</tr>" +
+            "<tr>" +
+            "<td>" +
+            "<label>" +
+            "<input type=\"checkbox\" name=\"test\" value=\"Value-4\" />" +
+            "&#160;Label-4" +
+            "</label>" +
+            "</td>" +
+            "<td>" +
+            // empty cell
+            "</td>" +
+            "</tr>" +
             "</table>";
         assertEquals(expected, htmlMarkup);
     }

Modified: myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/stylesheet/MockResponseWriter.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/stylesheet/MockResponseWriter.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/stylesheet/MockResponseWriter.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/stylesheet/MockResponseWriter.java Fri Feb 24 07:47:18 2006
@@ -19,16 +19,16 @@
 import java.io.StringWriter;
 import java.io.Writer;
 
-import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
 
 public class MockResponseWriter extends HtmlResponseWriterImpl {
 
   private static Writer writer = new StringWriter();
-  
+
   public MockResponseWriter() {
     super(writer, null, null);
   }
-  
+
   public String getContent()
   {
     return MockResponseWriter.writer.toString();

Modified: myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/AbstractTreeTestCase.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/AbstractTreeTestCase.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/AbstractTreeTestCase.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/AbstractTreeTestCase.java Fri Feb 24 07:47:18 2006
@@ -18,7 +18,7 @@
 
 import org.apache.shale.test.base.AbstractJsfTestCase;
 import org.apache.shale.test.mock.MockResponseWriter;
-import org.apache.myfaces.config.MyfacesConfig;
+import org.apache.myfaces.shared.config.MyfacesConfig;
 
 import java.io.BufferedWriter;
 import java.io.CharArrayWriter;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeRendererTest.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeRendererTest.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeRendererTest.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/HtmlTreeRendererTest.java Fri Feb 24 07:47:18 2006
@@ -16,14 +16,11 @@
 
 package org.apache.myfaces.custom.tree2;
 
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import javax.faces.component.UIComponentBase;
-import javax.faces.context.FacesContext;
-import java.io.IOException;
 import java.util.Stack;
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/UITreeDataTest.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/UITreeDataTest.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/UITreeDataTest.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/custom/tree2/UITreeDataTest.java Fri Feb 24 07:47:18 2006
@@ -17,19 +17,13 @@
 package org.apache.myfaces.custom.tree2;
 
 
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.config.MyfacesConfig;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import javax.faces.event.ActionEvent;
-import javax.faces.component.UIComponentBase;
 import javax.faces.component.html.HtmlCommandLink;
-import javax.faces.context.FacesContext;
-import java.io.IOException;
-import java.util.Stack;
 
 /**
  * Test case for {@link UITreeData}.

Copied: myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/shared/renderkit/html/util/AddResourceTest.java (from r380655, myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java)
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/shared/renderkit/html/util/AddResourceTest.java?p2=myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/shared/renderkit/html/util/AddResourceTest.java&p1=myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java&r1=380655&r2=380693&rev=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/test/java/org/apache/myfaces/shared/renderkit/html/util/AddResourceTest.java Fri Feb 24 07:47:18 2006
@@ -13,26 +13,24 @@
  * 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 java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
+import junit.framework.TestCase;
+import org.apache.myfaces.application.ApplicationFactoryImpl;
+import org.apache.myfaces.context.servlet.ServletFacesContextImpl;
+import org.apache.myfaces.renderkit.RenderKitFactoryImpl;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
+import org.easymock.MockControl;
 
 import javax.faces.FactoryFinder;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import junit.framework.TestCase;
-
-import org.apache.myfaces.application.ApplicationFactoryImpl;
-import org.apache.myfaces.context.servlet.ServletFacesContextImpl;
-import org.apache.myfaces.renderkit.RenderKitFactoryImpl;
-import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
-import org.easymock.MockControl;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
 
 /**
  * Unit test for the AddResource class which can output script, style and inline

Modified: myfaces/tomahawk/branches/1_1_2/examples/blank/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/examples/blank/src/main/webapp/WEB-INF/web.xml?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/examples/blank/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tomahawk/branches/1_1_2/examples/blank/src/main/webapp/WEB-INF/web.xml Fri Feb 24 07:47:18 2006
@@ -108,7 +108,7 @@
   </servlet>
   <servlet>
     <servlet-name>SourceCodeServlet</servlet-name>
-    <servlet-class>org.apache.myfaces.util.servlet.SourceCodeServlet</servlet-class>
+    <servlet-class>SourceCodeServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>Faces Servlet</servlet-name>

Modified: myfaces/tomahawk/branches/1_1_2/examples/simple/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/examples/simple/src/main/webapp/WEB-INF/web.xml?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/examples/simple/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tomahawk/branches/1_1_2/examples/simple/src/main/webapp/WEB-INF/web.xml Fri Feb 24 07:47:18 2006
@@ -108,7 +108,7 @@
   </servlet>
   <servlet>
     <servlet-name>SourceCodeServlet</servlet-name>
-    <servlet-class>org.apache.myfaces.util.servlet.SourceCodeServlet</servlet-class>
+    <servlet-class>SourceCodeServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>Faces Servlet</servlet-name>

Modified: myfaces/tomahawk/branches/1_1_2/examples/tiles/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/examples/tiles/src/main/webapp/WEB-INF/web.xml?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/examples/tiles/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tomahawk/branches/1_1_2/examples/tiles/src/main/webapp/WEB-INF/web.xml Fri Feb 24 07:47:18 2006
@@ -119,7 +119,7 @@
   </servlet>
   <servlet>
     <servlet-name>SourceCodeServlet</servlet-name>
-    <servlet-class>org.apache.myfaces.util.servlet.SourceCodeServlet</servlet-class>
+    <servlet-class>org.apache.myfaces.shared.util.servlet.SourceCodeServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>Faces Servlet</servlet-name>

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/pom.xml?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/pom.xml (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/pom.xml Fri Feb 24 07:47:18 2006
@@ -48,9 +48,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.myfaces.commons</groupId>
-      <artifactId>myfaces-commons</artifactId>
-      <version>1.1.3-SNAPSHOT</version>
+      <groupId>org.apache.myfaces.shared</groupId>
+      <artifactId>myfaces-shared</artifactId>
+      <version>1.1.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java Fri Feb 24 07:47:18 2006
@@ -15,13 +15,13 @@
  */
 package org.apache.myfaces.custom.accordion;
 
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.myfaces.custom.tabbedpane.HtmlPanelTab;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlGroupRenderer;
 
 import javax.faces.component.UIComponent;
@@ -63,7 +63,7 @@
         ResponseWriter writer = context.getResponseWriter();
 
         writer.startElement(HTML.DIV_ELEM, component);
-        writer.writeAttribute(HTML.ID_ATTR,component.getClientId(context),JSFAttr.ID_ATTR);
+        writer.writeAttribute(HTML.ID_ATTR,component.getClientId(context), JSFAttr.ID_ATTR);
         HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.COMMON_PASSTROUGH_ATTRIBUTES);
 
         List childExpanded = panel.getChildExpanded();

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/api/AjaxDecodePhaseListener.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/api/AjaxDecodePhaseListener.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/api/AjaxDecodePhaseListener.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/api/AjaxDecodePhaseListener.java Fri Feb 24 07:47:18 2006
@@ -20,13 +20,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.application.ComponentNotFoundException;
 import org.apache.myfaces.application.jsp.JspStateManagerImpl;
-import org.apache.myfaces.custom.util.ComponentUtils;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
-import org.apache.myfaces.component.ExecuteOnCallback;
-import org.apache.myfaces.component.html.ext.UIComponentPerspective;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
 
-import javax.faces.application.StateManager;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/util/AjaxRendererUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/util/AjaxRendererUtils.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/util/AjaxRendererUtils.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/util/AjaxRendererUtils.java Fri Feb 24 07:47:18 2006
@@ -31,14 +31,14 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.myfaces.custom.ajax.AjaxCallbacks;
 import org.apache.myfaces.custom.prototype.PrototypeResourceLoader;
 import org.apache.myfaces.custom.util.ComponentUtils;
 import org.apache.myfaces.custom.inputAjax.HtmlInputTextAjax;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlMessageRendererBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HtmlMessageRendererBase;
 import org.apache.myfaces.component.html.ext.HtmlMessages;
 
 /**
@@ -320,8 +320,8 @@
         buff.append(", onFailure: ").append(jsNameSpace).append("notifyElementFailure");
         buff.append(
                 "} \n" +
-                        "            );\n" +
-                        "}"
+                "            );\n" +
+                "}"
         );
 
         out.writeText(buff.toString(), null);

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java Fri Feb 24 07:47:18 2006
@@ -15,13 +15,13 @@
  */
 package org.apache.myfaces.custom.autoupdatedatatable;
 
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
 import org.apache.myfaces.custom.prototype.PrototypeResourceLoader;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlTableRenderer;
 
 import javax.faces.application.ViewHandler;
@@ -40,7 +40,7 @@
 public class AutoUpdateDataTableRenderer extends HtmlTableRenderer implements AjaxRenderer{
 
     /**
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
      */
     public void encodeBegin(FacesContext context, UIComponent uiComponent) throws IOException
     {

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/comparetovalidator/CompareToValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/comparetovalidator/CompareToValidator.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/comparetovalidator/CompareToValidator.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/comparetovalidator/CompareToValidator.java Fri Feb 24 07:47:18 2006
@@ -36,8 +36,8 @@
 import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 
-import org.apache.myfaces.util.MessageUtils;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util.MessageUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 /**
  * @author Mike Kienenberger (latest modification by $Author$)
@@ -126,31 +126,31 @@
  * 
  */
 public class CompareToValidator implements Validator, StateHolder {
-	/**
-	 * <p>The standard converter id for this converter.</p>
-	 */
-	public static final String 	VALIDATOR_ID 	   = "org.apache.myfaces.validator.CompareTo";
-
-	/**
-	 * <p>The message identifier of the {@link FacesMessage} to be created if
-	 * the comparison check fails.</p>
-	 */
-	// public static final String COMPARE_TO_MESSAGE_ID = "org.apache.myfaces.CompareTo.INVALID";
-	public static final String COMPARE_TO_MESSAGE_ID = "{0} value <{1}> must be {2} {3} value <{4}>";
-
-	public CompareToValidator(){
-	    super();
-	}
-
-	//the foreign component_id on which the validation is based.
-	protected String _foreignComponentName = null;
-	protected String _operator = null;
-	protected Object _comparator = null;
-	protected String _message = null;
-	protected String _alternateOperatorName = null;
+    /**
+     * <p>The standard converter id for this converter.</p>
+     */
+    public static final String 	VALIDATOR_ID 	   = "org.apache.myfaces.validator.CompareTo";
+
+    /**
+     * <p>The message identifier of the {@link FacesMessage} to be created if
+     * the comparison check fails.</p>
+     */
+    // public static final String COMPARE_TO_MESSAGE_ID = "org.apache.myfaces.CompareTo.INVALID";
+    public static final String COMPARE_TO_MESSAGE_ID = "{0} value <{1}> must be {2} {3} value <{4}>";
+
+    public CompareToValidator(){
+        super();
+    }
+
+    //the foreign component_id on which the validation is based.
+    protected String _foreignComponentName = null;
+    protected String _operator = null;
+    protected Object _comparator = null;
+    protected String _message = null;
+    protected String _alternateOperatorName = null;
 
-	//JSF-Field for StateHolder-IF
-	protected boolean _transient = false;
+    //JSF-Field for StateHolder-IF
+    protected boolean _transient = false;
 
     public static final String OPERATOR_EQUALS = "eq";
     public static final String OPERATOR_NOT_EQUALS = "ne";
@@ -171,7 +171,7 @@
     protected String getOperatorForString(String operatorSpecified)
     {
         String operatorFound = null;
-        
+
         if (OPERATOR_EQUALS.equalsIgnoreCase(operatorSpecified))
             return OPERATOR_EQUALS;
         else if (OPERATOR_NOT_EQUALS.equalsIgnoreCase(operatorSpecified))
@@ -184,7 +184,7 @@
             return OPERATOR_GREATER_THAN_OR_EQUALS;
         else if (OPERATOR_LESS_THAN_OR_EQUALS.equalsIgnoreCase(operatorSpecified))
             return OPERATOR_LESS_THAN_OR_EQUALS;
-        
+
         else if (OPERATOR_EQUALS_ALT.equalsIgnoreCase(operatorSpecified))
             return OPERATOR_EQUALS;
         else if (OPERATOR_NOT_EQUALS_ALT.equalsIgnoreCase(operatorSpecified))
@@ -197,10 +197,10 @@
             return OPERATOR_GREATER_THAN_OR_EQUALS;
         else if (OPERATOR_LESS_THAN_OR_EQUALS_ALT.equalsIgnoreCase(operatorSpecified))
             return OPERATOR_LESS_THAN_OR_EQUALS;
-        
+
         else if (OPERATOR_EQUALS_ALT2.equalsIgnoreCase(operatorSpecified))
             return OPERATOR_EQUALS;
-        
+
         throw new IllegalStateException("Operator has unknown value of '" + operatorSpecified + "'");
     }
 
@@ -218,10 +218,10 @@
             return "greater than or equal";
         else if (OPERATOR_LESS_THAN_OR_EQUALS == operator)
             return "less than or equal";
-        
+
         throw new IllegalStateException("Operator has unknown value of '" + operator + "'");
     }
-    
+
     protected boolean validateOperatorOnComparisonResult(String operator, int result)
     {
         if (OPERATOR_EQUALS == operator)
@@ -236,28 +236,28 @@
             return result >= 0;
         else if (OPERATOR_LESS_THAN_OR_EQUALS == operator)
             return result <= 0;
-        
+
         throw new IllegalStateException("Operator has unknown value of '" + operator + "'");
     }
-    
-	public void validate(
-		FacesContext facesContext,
-		UIComponent uiComponent,
-		Object value)
-		throws ValidatorException {
 
-	    if (facesContext == null) throw new NullPointerException("facesContext");
+    public void validate(
+        FacesContext facesContext,
+        UIComponent uiComponent,
+        Object value)
+        throws ValidatorException {
+
+        if (facesContext == null) throw new NullPointerException("facesContext");
         if (uiComponent == null) throw new NullPointerException("uiComponent");
 
         // Don't perform validation if the value is null
-		if (value == null)
-		{
-		    return;
-		}
-
-		String foreignComponentName = getFor();
-		
-		UIInput foreignComponent = (UIInput) uiComponent.getParent().findComponent(foreignComponentName);
+        if (value == null)
+        {
+            return;
+        }
+
+        String foreignComponentName = getFor();
+
+        UIInput foreignComponent = (UIInput) uiComponent.getParent().findComponent(foreignComponentName);
         if(foreignComponent == null)
             throw new FacesException("Unable to find component '" + foreignComponentName + "' (calling findComponent on component '" + uiComponent.getId() + "')");
 
@@ -278,11 +278,11 @@
         // Don't perform validation if the foreign value is null
         if (null == foreignValue)
         {
-        	return;
+            return;
         }
 
         String operator = getOperatorForString(getOperator());
-        
+
         String alternateOperatorName = getAlternateOperatorName();
         Object[] args = {
                 uiComponent.getId(),
@@ -294,14 +294,14 @@
 
         String message = getMessage();
         if (null == message)  message = COMPARE_TO_MESSAGE_ID;
-        
+
         Comparator comparator = createComparator();
 
         if (null != comparator)
         {
             if (false == validateOperatorOnComparisonResult(operator, comparator.compare(value, foreignValue)))
             {
-            	throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, message, args));
+                throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, message, args));
             }
         }
         else if ( (value instanceof Comparable) && (foreignValue instanceof Comparable) )
@@ -310,7 +310,7 @@
             {
                 if (false == validateOperatorOnComparisonResult(operator, ((Comparable)value).compareTo(foreignValue)))
                 {
-                	throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, message, args));
+                    throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, message, args));
                 }
             }
             catch (RuntimeException exception)
@@ -321,7 +321,7 @@
                 }
                 else
                 {
-                	throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, message + ": " + exception.getLocalizedMessage(), args));
+                    throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, message + ": " + exception.getLocalizedMessage(), args));
                 }
             }
         }
@@ -333,46 +333,46 @@
         {
             throw new ClassCastException(getClassCastExceptionMessage("foreignValue", Comparable.class, foreignValue));
         }
-	}
+    }
+
+    protected String getClassCastExceptionMessage(String name, Class clazz, Object object)
+    {
+        if (null == object)
+            return name + " must be type " + clazz + " but is null" + object.getClass();
+        else return name + " must be type " + clazz + " but is type " + object.getClass();
+    }
 
-	protected String getClassCastExceptionMessage(String name, Class clazz, Object object)
-	{
-	    if (null == object)
-	        return name + " must be type " + clazz + " but is null" + object.getClass();
-	    else return name + " must be type " + clazz + " but is type " + object.getClass();
-	}
-	
-	protected Comparator createComparator()
+    protected Comparator createComparator()
     {
         Object comparator = getComparator();
-        
+
         if (null == comparator)  return null;
-        
+
         if (false == comparator instanceof Comparator)
         {
             throw new ClassCastException(getClassCastExceptionMessage("comparator", Comparator.class, comparator));
         }
-        
+
         return (Comparator)comparator;
     }
 
-	// -------------------------------------------------------- GETTER & SETTER
+    // -------------------------------------------------------- GETTER & SETTER
 
     /**
-	 * @return the foreign component_id, on which a value should be validated
-	 */
-	public String getFor() {
+     * @return the foreign component_id, on which a value should be validated
+     */
+    public String getFor() {
         if (_foreignComponentName != null) return _foreignComponentName;
         ValueBinding vb = getValueBinding("for");
         return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-	}
+    }
 
-	/**
-	 * @param string the foreign component_id, on which a value should be validated
-	 */
-	public void setFor(String string) {
-		_foreignComponentName = string;
-	}
+    /**
+     * @param string the foreign component_id, on which a value should be validated
+     */
+    public void setFor(String string) {
+        _foreignComponentName = string;
+    }
 
     public String getOperator()
     {
@@ -380,7 +380,7 @@
         ValueBinding vb = getValueBinding("operator");
         return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
-    
+
     public void setOperator(String operator)
     {
         this._operator = operator;
@@ -392,7 +392,7 @@
         ValueBinding vb = getValueBinding("comparator");
         return vb != null ? (Comparator)vb.getValue(getFacesContext()) : null;
     }
-    
+
     public void setComparator(Object comparator)
     {
         this._comparator = comparator;
@@ -404,7 +404,7 @@
         ValueBinding vb = getValueBinding("message");
         return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
-    
+
     public void setMessage(String message)
     {
         this._message = message;
@@ -416,48 +416,48 @@
         ValueBinding vb = getValueBinding("alternateOperatorName");
         return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
-    
+
     public void setAlternateOperatorName(String alternateOperatorName)
     {
         this._alternateOperatorName = alternateOperatorName;
     }
 
-	// -------------------------------------------------------- StateholderIF
+    // -------------------------------------------------------- StateholderIF
+
+    public Object saveState(FacesContext context) {
+        if (_transient)  return null;
+
+        Object value[] = new Object[5];
+        value[0] = _foreignComponentName;
+        value[1] = _operator;
+        value[2] = _comparator;
+        value[3] = _message;
+        value[4] = _alternateOperatorName;
+        return value;
+    }
+
+    public void restoreState(FacesContext context, Object state) {
+        if (_transient)  return;
+
+        Object value[] = (Object[])state;
+        _foreignComponentName = (String) value[0];
+        _operator = (String) value[1];
+        _comparator = value[2];
+        _message = (String) value[3];
+        _alternateOperatorName = (String) value[4];
+    }
+
+    public boolean isTransient() {
+        return _transient;
+    }
+
+    public void setTransient(boolean newTransientValue) {
+        _transient = newTransientValue;
+    }
+
+
+    // ---------------- Borrowed to convert foreign submitted values
 
-	public Object saveState(FacesContext context) {
-	    if (_transient)  return null;
-	    
-	    Object value[] = new Object[5];
-		value[0] = _foreignComponentName;
-		value[1] = _operator;
-		value[2] = _comparator;
-		value[3] = _message;
-		value[4] = _alternateOperatorName;
-		return value;
-	}
-
-	public void restoreState(FacesContext context, Object state) {
-	    if (_transient)  return;
-	    
-	    Object value[] = (Object[])state;
-		_foreignComponentName = (String) value[0];
-		_operator = (String) value[1];
-		_comparator = value[2];
-		_message = (String) value[3];
-		_alternateOperatorName = (String) value[4];
-	}
-
-	public boolean isTransient() {
-		return _transient;
-	}
-
-	public void setTransient(boolean newTransientValue) {
-		_transient = newTransientValue;
-	}
-
-	
-	// ---------------- Borrowed to convert foreign submitted values
-	
     protected Renderer getRenderer(FacesContext context, UIComponent foreignComponent)
     {
         if (context == null) throw new NullPointerException("context");
@@ -500,9 +500,9 @@
         }
     }
 
-    
-	// --------------------- borrowed from UIComponentBase ------------
-	
+
+    // --------------------- borrowed from UIComponentBase ------------
+
     private Map _valueBindingMap = null;
 
     public ValueBinding getValueBinding(String name)
@@ -534,10 +534,10 @@
         return FacesContext.getCurrentInstance();
     }
 
-    
-	// --------------------- borrowed and modified from UIInput ------------
 
-	protected Object getConvertedValueNonValid(FacesContext facesContext, UIInput component)
+    // --------------------- borrowed and modified from UIInput ------------
+
+    protected Object getConvertedValueNonValid(FacesContext facesContext, UIInput component)
     {
         Object componentValueObject;
         Object submittedValue = component.getSubmittedValue();

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoInitializerRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoInitializerRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoInitializerRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoInitializerRenderer.java Fri Feb 24 07:47:18 2006
@@ -21,8 +21,8 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
 
 /**
  * Dojointializerrenderer
@@ -97,7 +97,7 @@
 
         encodeJavascript(facesContext, component);
         if (((DojoInitializer) component).getDebugConsole() != null
-                && ((DojoInitializer) component).getDebugConsole().booleanValue())
+            && ((DojoInitializer) component).getDebugConsole().booleanValue())
         {
             DojoUtils.addDebugConsole(facesContext, component);
         }

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoInitializerTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoInitializerTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoInitializerTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoInitializerTag.java Fri Feb 24 07:47:18 2006
@@ -18,7 +18,7 @@
 
 import javax.faces.component.UIComponent;
 
-import org.apache.myfaces.taglib.html.HtmlOutputTextTagBase;
+import org.apache.myfaces.shared.taglib.html.HtmlOutputTextTagBase;
 
 /**
  * Tag for the dojo intializer code
@@ -42,7 +42,7 @@
     String _provide              = null;
     String _debugConsole         = null;
     String _debugAtAllCosts      = null;
-    
+
     public String getComponentType()
     {
         return DojoInitializer.COMPONENT_TYPE;
@@ -91,7 +91,7 @@
         super.setStringProperty(component, "provide", _provide);
         super.setBooleanProperty(component, "debugConsole", _debugConsole);
         super.setBooleanProperty(component, "debugAtAllCosts", _debugAtAllCosts);
-            
+
     }
 
     public void setAllowQueryConfig(String allowQueryConfig)

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoUtils.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoUtils.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoUtils.java Fri Feb 24 07:47:18 2006
@@ -29,9 +29,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
 
 /**
  * Utils class for the dojo infrastructure
@@ -355,7 +355,7 @@
     {
         return "dojo.debug(\"" + stmnt + "\");\n";
     }
-                          
+
     /**
      * helper to write out debug statements
      * this is only a convenience method to reduce the

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/effect/EffectRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/effect/EffectRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/effect/EffectRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/effect/EffectRenderer.java Fri Feb 24 07:47:18 2006
@@ -23,16 +23,14 @@
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.custom.div.Div;
-import org.apache.myfaces.custom.dojo.DojoConfig;
-import org.apache.myfaces.custom.dojo.DojoUtils;
 import org.apache.myfaces.custom.prototype.PrototypeResourceLoader;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
 
 /**
  * Fade field only currently the renderer is implemented and the tag, because we
@@ -46,8 +44,7 @@
  */
 public class EffectRenderer extends HtmlRenderer
 {
-    private static final String DEFAULT_FADE_COLOR = "red";
-    public static final String  RENDERER_TYPE      = "org.apache.myfaces.effect.EffectRenderer";
+    public static final String RENDERER_TYPE = "org.apache.myfaces.effect.EffectRenderer";
 
     /**
      * Encodes any stand-alone javascript functions that are needed. Uses either
@@ -65,29 +62,24 @@
 
         // render javascript function for client-side toggle (it won't be used
         // if user has opted for server-side toggle)
-        String javascriptLocation   = (String) component.getAttributes().get(JSFAttr.JAVASCRIPT_LOCATION);
-        AddResource addResource     = AddResourceFactory.getInstance(context);
-        Boolean fade                = (Boolean) component.getAttributes().get(EffectTag.TAG_PARAM_FADE);
-
+        String javascriptLocation = (String) component.getAttributes().get(JSFAttr.JAVASCRIPT_LOCATION);
+        AddResource addResource = AddResourceFactory.getInstance(context);
         if (javascriptLocation != null)
         {
 
             addResource
                     .addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, javascriptLocation + "/prototype.js");
             addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, javascriptLocation + "/effects.js");
-
-            if (fade != null && fade.booleanValue())
-                DojoUtils.addMainInclude(context, javascriptLocation, new DojoConfig());
+            addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, javascriptLocation + "/fat.js");
         }
         else
         {
 
             addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, PrototypeResourceLoader.class,
-                    "prototype.js");
+                                                "prototype.js");
             addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, PrototypeResourceLoader.class,
-                    "effects.js");
-            if (fade != null && fade.booleanValue())
-                DojoUtils.addMainInclude(context, null, new DojoConfig());
+                                                "effects.js");
+            addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, FATResourceLoader.class, "fat.js");
 
         }
     }
@@ -97,6 +89,8 @@
         return true;
     }
 
+
+
     /**
      * We only need an encodeBeing method because the fade control, does not
      * have any childs
@@ -123,7 +117,7 @@
             return;
         encodeJavascript(context, component);
         super.encodeBegin(context, component);
-
+        prepareFade(component);
         renderEffectsBegin(context, component);
     }
 
@@ -132,20 +126,32 @@
      *
      * @param component
      */
-    private String getFadeColor(UIComponent component)
+    private void prepareFade(UIComponent component)
     {
-       
+        Div theComponent = (Div) component;
         Boolean fade = (Boolean) component.getAttributes().get(EffectTag.TAG_PARAM_FADE);
 
-        if (fade != null && fade.booleanValue())
+        String theStyleClass = theComponent.getStyleClass();
+        if (theStyleClass == null)
+            theStyleClass = "";
+        if (fade != null && fade.booleanValue() && !(theStyleClass.indexOf("fade") != -1))
         {
 
+            if (theStyleClass != null && !theStyleClass.trim().equalsIgnoreCase(""))
+                theStyleClass += ";fade";
+            else
+                theStyleClass = "fade";
+
             String fadeColor = (String) component.getAttributes().get(EffectTag.TAG_PARAM_FADECOLOR);
-            fadeColor = (fadeColor != null) ? fadeColor : DEFAULT_FADE_COLOR;
-            fadeColor = fadeColor.equals("") ? DEFAULT_FADE_COLOR : fadeColor;
-            return fadeColor;
+
+            fadeColor = (fadeColor != null) ? fadeColor : "";
+            fadeColor = fadeColor.replaceAll("#", "");
+            if (fadeColor.length() != 0)
+                fadeColor = "-" + fadeColor;
+
+            theStyleClass += fadeColor;
+            theComponent.setStyleClass(theStyleClass);
         }
-        return null;
     }
 
     public void renderEffectsBegin(FacesContext context, UIComponent component) throws IOException
@@ -153,11 +159,11 @@
 
         // dump all the parameters which affect us into we dont set a central
         // unchecked here to keep the warning level high
-        Boolean squish = (Boolean) component.getAttributes().get(EffectTag.TAG_PARAM_SQUISH);
-        Boolean puff = (Boolean) component.getAttributes().get(EffectTag.TAG_PARAM_PUFF);
-        Boolean scale = (Boolean) component.getAttributes().get(EffectTag.TAG_PARAM_SCALE);
-        Boolean pulsate = (Boolean) component.getAttributes().get(EffectTag.TAG_PARAM_PULSATE);
-        Integer scaleSize = (Integer) component.getAttributes().get(EffectTag.TAG_PARAM_SCALE_SIZE);
+        Boolean squish      = (Boolean) component.getAttributes().get(EffectTag.TAG_PARAM_SQUISH);
+        Boolean puff        = (Boolean) component.getAttributes().get(EffectTag.TAG_PARAM_PUFF);
+        Boolean scale       = (Boolean) component.getAttributes().get(EffectTag.TAG_PARAM_SCALE);
+        Boolean pulsate     = (Boolean) component.getAttributes().get(EffectTag.TAG_PARAM_PULSATE);
+        Integer scaleSize   = (Integer) component.getAttributes().get(EffectTag.TAG_PARAM_SCALE_SIZE);
 
         Div div = (Div) component;
         ResponseWriter writer = context.getResponseWriter();
@@ -201,7 +207,7 @@
         if (scale != null && scale.booleanValue())
         {
             writer.writeAttribute(HTML.ONMOUSEOVER_ATTR, "javascript:new Effect.Scale(this," + scaleSize.toString()
-                    + ");", null);
+                                                         + ");", null);
             writer.writeAttribute(HTML.ONMOUSEOUT_ATTR, "javascript:new Effect.Scale(this,100);", null);
         }
 
@@ -230,22 +236,6 @@
         writer.endElement(HTML.DIV_ELEM);
         HtmlRendererUtils.writePrettyLineSeparator(facesContext);
         super.encodeEnd(facesContext, component);
-        Boolean fade = (Boolean) component.getAttributes().get(EffectTag.TAG_PARAM_FADE);
-        if (fade != null && fade.booleanValue())
-        {
-            writer.startElement(HTML.SCRIPT_ELEM, component);
-            writer.writeAttribute(HTML.TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
-            writer.writeAttribute(HTML.SCRIPT_LANGUAGE_ATTR, HTML.SCRIPT_LANGUAGE_JAVASCRIPT, null);
-            StringBuffer commandBuffer = new StringBuffer(128);
-            commandBuffer.append("dojo.fx.html.colorFadeIn(dojo.byId('");
-            commandBuffer.append(component.getClientId(facesContext));
-            commandBuffer.append("'),'");
-            commandBuffer.append(getFadeColor(component));
-            commandBuffer.append("',800);"); //TODO Add the animationtime as extra param
-            writer.write(commandBuffer.toString());
-            writer.endElement(HTML.SCRIPT_ELEM);
-
-        }
     }
 
 }

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/focus/HtmlFocusRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/focus/HtmlFocusRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/focus/HtmlFocusRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/focus/HtmlFocusRenderer.java Fri Feb 24 07:47:18 2006
@@ -22,8 +22,8 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.Renderer;
 
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 /**
  * @author Rogerio Pereira Araujo (latest modification by $Author$)
@@ -36,23 +36,23 @@
             throws IOException
     {
         RendererUtils.checkParamValidity(facesContext, uiComponent,
-                HtmlFocus.class);
+                                         HtmlFocus.class);
 
         HtmlFocus focus = (HtmlFocus) uiComponent;
-        
+
         UIComponent targetComponent = focus.findUIComponent();
 
-        if(targetComponent != null) 
+        if(targetComponent != null)
         {
-	        String clientId = targetComponent.getClientId(facesContext);
-	        
-	        ResponseWriter writer = facesContext.getResponseWriter();
-	
-	        writer.startElement(HTML.SCRIPT_ELEM, uiComponent);
-	        writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
-	        writer.writeText("document.getElementById('" + clientId + "').focus()", null);
-	        writer.endElement(HTML.SCRIPT_ELEM);
-        }   
+            String clientId = targetComponent.getClientId(facesContext);
+
+            ResponseWriter writer = facesContext.getResponseWriter();
+
+            writer.startElement(HTML.SCRIPT_ELEM, uiComponent);
+            writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
+            writer.writeText("document.getElementById('" + clientId + "').focus()", null);
+            writer.endElement(HTML.SCRIPT_ELEM);
+        }
     }
 
 }

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/focus/HtmlFocusTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/focus/HtmlFocusTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/focus/HtmlFocusTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/focus/HtmlFocusTag.java Fri Feb 24 07:47:18 2006
@@ -17,13 +17,13 @@
 
 import javax.faces.component.UIComponent;
 
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 
 /**
  * @author Rogerio Pereira Araujo (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-public class HtmlFocusTag extends UIComponentTagBase 
+public class HtmlFocusTag extends UIComponentTagBase
 {
     private static final String FOR_ATTR                = "for";
 
@@ -35,7 +35,7 @@
         _for = null;
 
     }
-     
+
     public String getComponentType() {
 
         return HtmlFocus.COMPONENT_TYPE;
@@ -54,7 +54,7 @@
 
         setStringProperty(component, FOR_ATTR, _for);
     }
-   
+
     public void setFor(String aFor)
     {
         _for = aFor;

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/form/HtmlFormRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/form/HtmlFormRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/form/HtmlFormRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/form/HtmlFormRenderer.java Fri Feb 24 07:47:18 2006
@@ -19,7 +19,7 @@
 import javax.faces.context.FacesContext;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.myfaces.renderkit.html.HtmlFormRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlFormRendererBase;
 
 /**
  * @author Mathias Broekelmann (latest modification by $Author$)
@@ -29,7 +29,7 @@
 public class HtmlFormRenderer extends HtmlFormRendererBase
 {
     /**
-     * @see org.apache.myfaces.renderkit.html.HtmlFormRendererBase#getActionUrl(javax.faces.context.FacesContext, javax.faces.component.UIForm)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlFormRendererBase#getActionUrl(javax.faces.context.FacesContext, javax.faces.component.UIForm)
      */
     protected String getActionUrl(FacesContext facesContext, UIForm form)
     {

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/form/HtmlFormTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/form/HtmlFormTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/form/HtmlFormTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/form/HtmlFormTag.java Fri Feb 24 07:47:18 2006
@@ -17,7 +17,7 @@
 
 import javax.faces.component.UIComponent;
 
-import org.apache.myfaces.taglib.html.HtmlFormTagBase;
+import org.apache.myfaces.shared.taglib.html.HtmlFormTagBase;
 
 /**
  * @author Mathias Broekelmann (latest modification by $Author$)
@@ -41,7 +41,7 @@
     }
 
     /**
-     * @see org.apache.myfaces.taglib.html.HtmlFormTagBase#setProperties(javax.faces.component.UIComponent)
+     * @see org.apache.myfaces.shared.taglib.html.HtmlFormTagBase#setProperties(javax.faces.component.UIComponent)
      */
     protected void setProperties(UIComponent component)
     {
@@ -52,7 +52,7 @@
     }
 
     /**
-     * @see org.apache.myfaces.taglib.html.HtmlFormTagBase#release()
+     * @see org.apache.myfaces.shared.taglib.html.HtmlFormTagBase#release()
      */
     public void release()
     {

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamic.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamic.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamic.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamic.java Fri Feb 24 07:47:18 2006
@@ -16,7 +16,7 @@
 package org.apache.myfaces.custom.graphicimagedynamic;
 
 import org.apache.myfaces.component.html.ext.HtmlGraphicImage;
-import org.apache.myfaces.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamicRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamicRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamicRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamicRenderer.java Fri Feb 24 07:47:18 2006
@@ -41,14 +41,14 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.component.html.util.ParameterResourceHandler;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlImageRenderer;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.renderkit.html.util.ResourceLoader;
-import org.apache.myfaces.util.ClassUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceLoader;
+import org.apache.myfaces.shared.util.ClassUtils;
 
 /**
  * @author Sylvain Vieujot
@@ -139,7 +139,7 @@
         writer.startElement(HTML.IMG_ELEM, graphicImageDynamic);
         HtmlRendererUtils.writeIdIfNecessary(writer, graphicImageDynamic, context);
         HtmlRendererUtils.renderHTMLAttributes(writer, graphicImageDynamic,
-                HTML.IMG_PASSTHROUGH_ATTRIBUTES);
+                                               HTML.IMG_PASSTHROUGH_ATTRIBUTES);
 
         Map params = getParameterMap(context, component);
         String width = graphicImageDynamic.getWidth();
@@ -157,7 +157,7 @@
         if (imageRendererClass == null)
         {
             throw new FacesException("No imageRendererClass defined for component "
-                    + component.getId());
+                                     + component.getId());
         }
         params.put(RENDERER_PARAM, imageRendererClass.getName());
 
@@ -194,11 +194,11 @@
     }
 
     /**
-     * @throws IOException 
-     * @see org.apache.myfaces.renderkit.html.util.ResourceLoader#serveResource(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, java.lang.String)
+     * @throws IOException
+     * @see org.apache.myfaces.shared.renderkit.html.util.ResourceLoader#serveResource(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, java.lang.String)
      */
     public void serveResource(ServletContext context, HttpServletRequest request,
-            HttpServletResponse response, String resourceUri) throws IOException
+                              HttpServletResponse response, String resourceUri) throws IOException
     {
         FacesContextFactory facesContextFactory = (FacesContextFactory) FactoryFinder
                 .getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
@@ -206,7 +206,7 @@
                 .getFactory(FactoryFinder.LIFECYCLE_FACTORY);
         Lifecycle lifecycle = lifecycleFactory.getLifecycle(getLifecycleId(context));
         FacesContext facesContext = facesContextFactory.getFacesContext(context, request, response,
-                lifecycle);
+                                                                        lifecycle);
         facesContext.setResponseStream(new ImageResponseStream(response.getOutputStream()));
         try
         {
@@ -222,7 +222,7 @@
                 if (!ImageRenderer.class.isAssignableFrom(rendererClass))
                 {
                     throw new FacesException("Image renderer class [" + rendererValue
-                            + "] does not implement " + ImageRenderer.class.getName());
+                                             + "] does not implement " + ImageRenderer.class.getName());
                 }
                 try
                 {
@@ -232,17 +232,17 @@
                 catch (InstantiationException e)
                 {
                     throw new FacesException("could not instantiate image renderer class "
-                            + rendererValue + " : " + e.getMessage(), e);
+                                             + rendererValue + " : " + e.getMessage(), e);
                 }
                 catch (IllegalAccessException e)
                 {
                     throw new FacesException("could not instantiate image renderer class "
-                            + rendererValue + " : " + e.getMessage(), e);
+                                             + rendererValue + " : " + e.getMessage(), e);
                 }
                 catch (Exception e)
                 {
                     throw new FacesException("could not renderer image "
-                            + rendererValue + " : " + e.getMessage(), e);
+                                             + rendererValue + " : " + e.getMessage(), e);
                 }
             }
             catch (ClassNotFoundException e)
@@ -260,30 +260,30 @@
     protected void renderImage(ImageRenderer imageRenderer, FacesContext facesContext)
             throws Exception
     {
-    		ImageContext imageContext = createImageContext(facesContext);
-    		
-		imageRenderer.setContext(facesContext, imageContext);
-    		
+            ImageContext imageContext = createImageContext(facesContext);
+
+        imageRenderer.setContext(facesContext, imageContext);
+
         HttpServletResponse response = (HttpServletResponse) facesContext.getExternalContext()
                 .getResponse();
-        
-        
+
+
         int contentLength = imageRenderer.getContentLength();
         if( contentLength >0 )
         {
             response.setContentLength(contentLength);
         }
-        
+
         String contentType = imageRenderer.getContentType();
         if (contentType != null && contentType.length() > 0 )
         {
             response.setContentType(contentType);
         }
-        
+
         ResponseStream out = facesContext.getResponseStream();
         try
         {
-        		imageRenderer.renderResource( out );
+                imageRenderer.renderResource( out );
         }
         finally
         {

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlInputTextAjaxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlInputTextAjaxRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlInputTextAjaxRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlInputTextAjaxRenderer.java Fri Feb 24 07:47:18 2006
@@ -16,14 +16,14 @@
 
 package org.apache.myfaces.custom.inputAjax;
 
-import org.apache.myfaces.renderkit.html.HtmlTextRendererBase;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
 import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
 import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectBooleanCheckboxAjaxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectBooleanCheckboxAjaxRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectBooleanCheckboxAjaxRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectBooleanCheckboxAjaxRenderer.java Fri Feb 24 07:47:18 2006
@@ -24,13 +24,13 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
 import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlCheckboxRenderer;
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java Fri Feb 24 07:47:18 2006
@@ -11,12 +11,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
 import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlCheckboxRenderer;
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectOneRadioAjaxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectOneRadioAjaxRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectOneRadioAjaxRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectOneRadioAjaxRenderer.java Fri Feb 24 07:47:18 2006
@@ -17,12 +17,12 @@
 package org.apache.myfaces.custom.inputAjax;
 
 import org.apache.myfaces.renderkit.html.ext.HtmlRadioRenderer;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
 import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
 import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/HtmlOutputTextTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/HtmlOutputTextTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/HtmlOutputTextTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/HtmlOutputTextTag.java Fri Feb 24 07:47:18 2006
@@ -1,6 +1,6 @@
 package org.apache.myfaces.custom.inputsuggestajax;
 
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 import javax.faces.component.UIComponent;
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java Fri Feb 24 07:47:18 2006
@@ -20,13 +20,13 @@
 import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
 import org.apache.myfaces.custom.dojo.DojoUtils;
 import org.apache.myfaces.custom.dojo.DojoConfig;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
 import org.apache.myfaces.renderkit.html.ext.HtmlTextRenderer;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.renderkit.html.util.UnicodeEncoder;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.UnicodeEncoder;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.commons.lang.StringUtils;
 
 import javax.faces.component.UIColumn;



Mime
View raw message