myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bara...@apache.org
Subject svn commit: r544646 [2/2] - in /myfaces: core/branches/jsf12/ core/branches/jsf12/api/src/main/java/javax/faces/context/ core/branches/jsf12/impl/src/main/java/org/apache/myfaces/context/servlet/ core/branches/jsf12/impl/src/test/java/org/apache/myface...
Date Tue, 05 Jun 2007 21:51:29 GMT
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
Tue Jun  5 14:51:27 2007
@@ -76,7 +76,15 @@
     protected boolean hasNewspaperTableSpacer(UIComponent component) {
         return false;
     }
-    
+
+    /**
+     * @param component dataTable
+     * @return whether dataTable has newspaper columns layed out horizontally
+     */
+    protected boolean isNewspaperHorizontalOrientation(UIComponent component) {
+        return false;
+    }
+
     /**
      * @see javax.faces.render.Renderer#getRendersChildren()
      */
@@ -234,6 +242,10 @@
         else
         {
            last = first + rows;
+           if (last > uiData.getRowCount())
+           {
+               last=uiData.getRowCount();
+           }
         }
 
         int newspaperColumns = getNewspaperColumns(component);
@@ -241,20 +253,22 @@
         if((last - first) % newspaperColumns == 0)
             newspaperRows = (last - first) / newspaperColumns;
         else newspaperRows = ((last - first) / newspaperColumns) + 1;
+        boolean newspaperHorizontalOrientation = isNewspaperHorizontalOrientation(component);
 
         // walk through the newspaper rows
         for(int nr = 0; nr < newspaperRows; nr++)
         {
             beforeRow(facesContext, uiData);
 
-            HtmlRendererUtils.writePrettyLineSeparator(facesContext);
-            renderRowStart(facesContext, writer, uiData, styles, nr);
-
             // walk through the newspaper columns
             for(int nc = 0; nc < newspaperColumns; nc++) {
 
                 // the current row in the 'real' table
-                int currentRow = nc * newspaperRows + nr + first;
+            	int currentRow;
+                if (newspaperHorizontalOrientation)
+                    currentRow = nr * newspaperColumns + nc + first;
+                else
+                    currentRow = nc * newspaperRows + nr + first;
                 
                 // if this row is not to be rendered
                 if(currentRow >= last) continue;
@@ -263,9 +277,17 @@
                 uiData.setRowIndex(currentRow);
                 if(!uiData.isRowAvailable()) {
                     log.error("Row is not available. Rowindex = " + currentRow);
-                    return;
+                    break;
                 }
     
+                if (nc == 0) {
+                	// first column in table, start new row
+                    beforeRow(facesContext, uiData);
+
+                    HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+                    renderRowStart(facesContext, writer, uiData, styles, nr);
+                }
+
                 List children = getChildren(component);
                 for (int j = 0, size = getChildCount(component); j < size; j++)
                 {
@@ -315,8 +337,6 @@
      * @param writer the <code>ResponseWriter</code>.
      * @param uiData the <code>UIData</code> being rendered.
      * @param component the <code>UIComponent</code> to render.
-     * @param columnStyleIterator the styleClass of the <code>UIColumn</code>
or <code>null</code> if
-     * there is none.
      * @throws IOException if an exception occurs.
      */
     protected void renderColumnBody(
@@ -341,7 +361,6 @@
      * @param facesContext the <code>FacesContext</code>.
      * @param writer the <code>ResponseWriter</code>.
      * @param uiData the <code>UIData</code> being rendered.
-     * @param rowStyleIterator te styleClass of the row or <code>null</code>
if there is none.
      * @throws IOException if an exceptoin occurs.
      */
     protected void renderRowStart(
@@ -479,6 +498,17 @@
     protected void afterColumnHeaderOrFooter(FacesContext facesContext, UIData uiData, boolean
header, int columnIndex) throws IOException
     {         
     }
+
+    /**
+     * Perform any operations necessary in the TBODY start tag.
+     *
+     * @param facesContext the <code>FacesContext</code>.
+     * @param uiData the <code>UIData</code> being rendered.
+     */
+    protected void inBodyStart(FacesContext facesContext, UIData uiData) throws IOException
+    {
+    }
+
     /**
      * Perform any operations necessary immediately after the TBODY end tag
      * is output.

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
Tue Jun  5 14:51:27 2007
@@ -15,19 +15,12 @@
  */
 package org.apache.myfaces.shared.renderkit.html.util;
 
-import org.apache.myfaces.shared.config.MyfacesConfig;
-import org.apache.myfaces.shared.renderkit.html.HTML;
-import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared.config.MyfacesConfig;
 
 import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
 import javax.servlet.http.HttpSession;
-
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -113,6 +106,14 @@
             "with"
         }));
 
+    /**Don't use this function - except when compatibility with the RI is a must,
+     * as in the name for the clear form parameters script.
+     */
+    public static String getValidJavascriptNameAsInRI(String origIdentifier)
+    {
+        return origIdentifier.replaceAll("-", "\\$_");
+    }
+
     public static String getValidJavascriptName(String s, boolean checkForReservedWord)
     {
         if (checkForReservedWord && RESERVED_WORDS.contains(s))
@@ -222,8 +223,14 @@
             }
         }
 
-        return sb == null ? string : sb.toString();
-        
+        if (sb == null)
+        {
+            return string;
+        }
+        else
+        {
+            return sb.toString();
+        }
     }
 
     public static boolean isJavascriptAllowed(ExternalContext externalContext)
@@ -231,11 +238,19 @@
         MyfacesConfig myfacesConfig = MyfacesConfig.getCurrentInstance(externalContext);
         if (myfacesConfig.isAllowJavascript())
         {
-        	return myfacesConfig.isDetectJavascript() ? isJavascriptDetected(externalContext)
: true;
+            if (myfacesConfig.isDetectJavascript())
+            {
+                return isJavascriptDetected(externalContext);
+            }
+            else
+            {
+                return true;
+            }
+        }
+        else
+        {
+            return false;
         }
-
-        return false;
-        
     }
 
     public static void setJavascriptDetected(HttpSession session, boolean value)
@@ -248,91 +263,6 @@
         //TODO/FIXME (manolito): This info should be better stored in the viewroot component
and not in the session
         Boolean sessionValue = (Boolean)externalContext.getSessionMap().get(JAVASCRIPT_DETECTED);
         return sessionValue != null && sessionValue.booleanValue();
-    }
-
-
-    /**
-     * Adds the hidden form input value assignment that is necessary for the autoscroll
-     * feature to an html link or button onclick attribute.
-     */
-    public static void appendAutoScrollAssignment(StringBuffer onClickValue, String formName)
-    {
-        onClickValue.append("document.forms['").append(formName).append("']");
-        onClickValue.append(".elements['").append(AUTO_SCROLL_PARAM).append("']");
-        onClickValue.append(".value=").append(AUTO_SCROLL_FUNCTION).append(";");
-    }
-
-    /**
-     * Renders the hidden form input that is necessary for the autoscroll feature.
-     */
-    public static void renderAutoScrollHiddenInput(FacesContext facesContext, ResponseWriter
writer) throws IOException
-    {
-        org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils.writePrettyLineSeparator(facesContext);
-        writer.startElement(org.apache.myfaces.shared.renderkit.html.HTML.INPUT_ELEM, null);
-        writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.TYPE_ATTR, "hidden",
null);
-        writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.NAME_ATTR, AUTO_SCROLL_PARAM,
null);
-        writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.INPUT_ELEM);
-        org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils.writePrettyLineSeparator(facesContext);
-    }
-
-    /**
-     * Renders the autoscroll javascript function.
-     */
-    public static void renderAutoScrollFunction(FacesContext facesContext,
-                                                ResponseWriter writer) throws IOException
-    {
-        HtmlRendererUtils.writePrettyLineSeparator(facesContext);
-        writer.startElement(HTML.SCRIPT_ELEM,null);
-        writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_TYPE_ATTR,org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
-
-        StringBuffer script = new StringBuffer();
-
-        script.append("function ");
-        script.append(AUTO_SCROLL_FUNCTION);
-        script.append(" {\n");
-        script.append("    var x = 0; var y = 0;\n");
-        script.append( "    if (self.pageXOffset || self.pageYOffset) {\n"+
-                                   "        x = self.pageXOffset;\n" +
-                                   "        y = self.pageYOffset;\n" +
-                                   "    } else if ((document.documentElement && document.documentElement.scrollLeft)||(document.documentElement
&& document.documentElement.scrollTop)) {\n" +
-                                   "        x = document.documentElement.scrollLeft;\n" +
-                                   "        y = document.documentElement.scrollTop;\n" +
-                                   "    } else if (document.body) {\n" +
-                    "        x = document.body.scrollLeft;\n" +
-                    "        y = document.body.scrollTop;\n" +
-                    "    }\n" +
-                    "    return x + \",\" + y;\n" +
-                     "}\n");
-        ExternalContext externalContext = facesContext.getExternalContext();
-        String oldViewId = getOldViewId(externalContext);
-        if (oldViewId != null && oldViewId.equals(facesContext.getViewRoot().getViewId()))
-        {
-            //ok, we stayed on the same page, so let's scroll it to the former place
-            String scrolling = (String)externalContext.getRequestParameterMap().get(AUTO_SCROLL_PARAM);
-            if (scrolling != null && scrolling.length() > 0)
-            {
-                String x = "0";
-                String y = "0";
-                int comma = scrolling.indexOf(',');
-                if (comma == -1)
-                {
-                    log.warn("Illegal autoscroll request parameter: " + scrolling);
-                }
-                else
-                {
-                    x = scrolling.substring(0, comma);
-                    if (x.equals("undefined")) x = "0";
-                    y = scrolling.substring(comma + 1);
-                    if (y.equals("undefined")) y = "0";
-                }
-                script.append("window.scrollTo(").append(x).append(",").append(y).append(");\n");
-            }
-        }
-
-        writer.writeText(script.toString(),null);
-
-        writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_ELEM);
-        HtmlRendererUtils.writePrettyLineSeparator(facesContext);        
     }
 
 

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java
Tue Jun  5 14:51:27 2007
@@ -15,13 +15,13 @@
  */
 package org.apache.myfaces.shared.taglib;
 
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+
 import javax.el.MethodExpression;
 import javax.el.ValueExpression;
 import javax.faces.component.UIComponent;
 import javax.faces.webapp.UIComponentELTag;
 
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-
 /**
  * @author Manfred Geiler (latest modification by $Author$)
  * @author Bruno Aranda (JSR-252)
@@ -166,6 +166,12 @@
         UIComponentELTagUtils.setLongProperty(component, propName, value, defaultValue);
     }
 
+    @Deprecated
+    protected void setStringProperty(UIComponent component, String propName, String value)
+    {
+        UIComponentTagUtils.setStringProperty(getFacesContext(), component, propName, value);
+    }
+
     protected void setStringProperty(UIComponent component, String propName, ValueExpression
value)
     {
         UIComponentELTagUtils.setStringProperty(component, propName, value);
@@ -176,6 +182,12 @@
         UIComponentELTagUtils.setStringProperty(component, propName, value, defaultValue);
     }
 
+    @Deprecated
+    protected void setBooleanProperty(UIComponent component, String propName, String value)
+    {
+        UIComponentTagUtils.setBooleanProperty(getFacesContext(), component, propName, value);
+    }
+
     protected void setBooleanProperty(UIComponent component, String propName, ValueExpression
value)
     {
         UIComponentELTagUtils.setBooleanProperty(component, propName, value);
@@ -201,9 +213,21 @@
         UIComponentELTagUtils.addValidatorProperty(getFacesContext(), component, value);
     }
 
+    @Deprecated
+    protected void setActionProperty(UIComponent component, String action)
+    {
+        UIComponentTagUtils.setActionProperty(getFacesContext(), component, action);
+    }
+
     protected void setActionProperty(UIComponent component, MethodExpression action)
     {
         UIComponentELTagUtils.setActionProperty(getFacesContext(), component, action);
+    }
+
+    @Deprecated
+    protected void setActionListenerProperty(UIComponent component, String actionListener)
+    {
+        UIComponentTagUtils.setActionListenerProperty(getFacesContext(), component, actionListener);
     }
 
     protected void setActionListenerProperty(UIComponent component, MethodExpression actionListener)

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java
Tue Jun  5 14:51:27 2007
@@ -72,6 +72,13 @@
         _itemLabel = itemLabel;
     }
 
+    @Deprecated
+    protected void setItemValue(String itemValue)
+    {
+        _itemValue = getFacesContext().getApplication().getExpressionFactory().createValueExpression(
+                    getFacesContext().getELContext(),itemValue,String.class);
+    }
+
     public void setItemValue(ValueExpression itemValue)
     {
         _itemValue = itemValue;

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
Tue Jun  5 14:51:27 2007
@@ -15,19 +15,18 @@
  */
 package org.apache.myfaces.shared.util;
 
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import javax.faces.FactoryFinder;
 import javax.faces.application.Application;
 import javax.faces.application.ApplicationFactory;
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 /**
  * Utility class to support multilingual FacesMessages using ResourceBundles.
@@ -247,7 +246,15 @@
      */
     public static FacesMessage getMessage(String bundleBaseName, String messageId, Object
params[])
     {
-        Locale locale = null;
+        return getMessage(bundleBaseName, getCurrentLocale(), messageId, params);
+    }
+
+    /**
+     *
+     * @return  currently applicable Locale for this request.
+     */
+    public static Locale getCurrentLocale() {
+        Locale locale;
         FacesContext context = FacesContext.getCurrentInstance();
         if(context != null && context.getViewRoot() != null)
         {
@@ -258,7 +265,8 @@
         {
             locale = Locale.getDefault();
         }
-        return getMessage(bundleBaseName, locale, messageId, params);
+
+        return locale;
     }
 
     /**
@@ -357,21 +365,20 @@
     {
         if(context == null || messageId == null)
             throw new NullPointerException(" context " + context + " messageId " + messageId);
-        Locale locale = null;
-        if(context != null && context.getViewRoot() != null)
-            locale = context.getViewRoot().getLocale();
-        else
-            locale = Locale.getDefault();
+        Locale locale = getCurrentLocale();
         if(null == locale)
             throw new NullPointerException(" locale " + locale);
         FacesMessage message = getMessage(locale, messageId, params);
         if(message != null)
         {
             return message;
-        } 
-        
-        return getMessage(Locale.getDefault(), messageId, params);
-        
+        } else
+        {
+            // TODO /FIX:  Note that this has fallback behavior to default Locale for message,
+            // but similar behavior above does not.  The methods should probably behave
+            locale = Locale.getDefault();
+            return getMessage(locale, messageId, params);
+        }
     }
 
     private static Application getApplication()

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java
Tue Jun  5 14:51:27 2007
@@ -15,13 +15,12 @@
  */
 package org.apache.myfaces.shared.taglib;
 
-import javax.faces.component.UIComponent;
-import javax.faces.component.html.HtmlInputText;
-
 import junit.framework.Test;
-
 import org.apache.shale.test.base.AbstractJsfTestCase;
 
+import javax.faces.component.UIComponent;
+import javax.faces.component.html.HtmlInputText;
+
 /**
  * TestCase for UIComponentTagUtils
  */
@@ -47,11 +46,11 @@
         }
     };
 
-    public void setUp() {
+    public void setUp() throws Exception {
         super.setUp();
     }
 
-    public void tearDown() {
+    public void tearDown() throws Exception {
         super.tearDown();
     }
 

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
Tue Jun  5 14:51:27 2007
@@ -22,9 +22,8 @@
  * @author Dennis C. Byrne
  */
 
-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.myfaces.shared.util.StateUtils;
 import org.apache.myfaces.shared.util.serial.DefaultSerialFactory;
+import org.apache.shale.test.base.AbstractJsfTestCase;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -46,14 +45,14 @@
     public static final String BASE64_KEY_SIZE_24 = "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIz";
 
 
-    public void setUp()
+    public void setUp() throws Exception
     {
     	super.setUp();
         sensitiveString = "this is my secret";
         externalContext.getApplicationMap().put(StateUtils.SERIAL_FACTORY, new DefaultSerialFactory());
     }
 
-    public void tearDown()
+    public void tearDown() throws Exception
     {
     	super.tearDown();
         sensitiveString = null;

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
Tue Jun  5 14:51:27 2007
@@ -17,12 +17,11 @@
 
 package org.apache.myfaces.shared.util;
 
-import javax.faces.FacesException;
-
 import junit.framework.Test;
-
 import org.apache.shale.test.base.AbstractJsfTestCase;
 
+import javax.faces.FacesException;
+
 /**
  * @author Dennis C. Byrne
  */
@@ -37,7 +36,7 @@
         return null; // keep this method or maven won't run it
     }	
 
-	public void setUp(){
+	public void setUp() throws Exception{
 	
 		super.setUp();
 		

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
Tue Jun  5 14:51:27 2007
@@ -17,12 +17,11 @@
 
 package org.apache.myfaces.shared.util;
 
-import javax.crypto.SecretKey;
-
 import junit.framework.Test;
-
 import org.apache.shale.test.base.AbstractJsfTestCase;
 
+import javax.crypto.SecretKey;
+
 /**
  * @author Dennis C. Byrne
  */
@@ -39,7 +38,7 @@
         return null; // keep this method or maven won't run it
     }
     
-    public void setUp()
+    public void setUp() throws Exception
     {
         super.setUp();
         

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
Tue Jun  5 14:51:27 2007
@@ -18,7 +18,6 @@
 package org.apache.myfaces.shared.util;
 
 import junit.framework.Test;
-
 import org.apache.shale.test.base.AbstractJsfTestCase;
 
 /**
@@ -37,7 +36,7 @@
         return null; // keep this method or maven won't run it
     }
     
-    public void setUp()
+    public void setUp() throws Exception
     {
         super.setUp();
         servletContext.addInitParameter(StateUtils.INIT_SECRET, "shouldn't matter");

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
Tue Jun  5 14:51:27 2007
@@ -16,8 +16,6 @@
 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
@@ -44,7 +42,7 @@
         return null; // keep this method or maven won't run it
     }
 
-    public void setUp()
+    public void setUp() throws Exception
     {
         super.setUp();
 

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
Tue Jun  5 14:51:27 2007
@@ -16,8 +16,6 @@
 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
@@ -43,7 +41,7 @@
         return null; // keep this method or maven won't run it
     }
 
-    public void setUp()
+    public void setUp() throws Exception
     {
         super.setUp();
 

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
Tue Jun  5 14:51:27 2007
@@ -16,8 +16,6 @@
 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
@@ -37,7 +35,7 @@
         return null; // keep this method or maven won't run it
     }
 
-    public void setUp()
+    public void setUp() throws Exception
     {
         super.setUp();
 

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
(original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
Tue Jun  5 14:51:27 2007
@@ -16,8 +16,6 @@
 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
@@ -43,7 +41,7 @@
         return null; // keep this method or maven won't run it
     }
 
-    public void setUp()
+    public void setUp() throws Exception
     {
         super.setUp();
 

Modified: myfaces/shared/branches/3_0_0/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/pom.xml?view=diff&rev=544646&r1=544645&r2=544646
==============================================================================
--- myfaces/shared/branches/3_0_0/pom.xml (original)
+++ myfaces/shared/branches/3_0_0/pom.xml Tue Jun  5 14:51:27 2007
@@ -145,9 +145,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.struts.shale</groupId>
+      <groupId>org.apache.shale</groupId>
       <artifactId>shale-test</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>



Mime
View raw message