You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2011/07/04 17:38:39 UTC
svn commit: r1142719 [3/3] - in
/myfaces/core/branches/2.0.8_shade_prototype: ./ api/ bundle/ impl/
impl/src/main/java/org/apache/myfaces/application/
impl/src/main/java/org/apache/myfaces/application/jsp/
impl/src/main/java/org/apache/myfaces/config/ ...
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java Mon Jul 4 15:38:35 2011
@@ -41,7 +41,7 @@ import javax.faces.view.facelets.TagConf
import javax.faces.view.facelets.TagHandler;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.view.facelets.tag.jsf.ComponentSupport;
/**
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemHandler.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemHandler.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemHandler.java Mon Jul 4 15:38:35 2011
@@ -22,7 +22,7 @@ import javax.faces.view.facelets.Compone
import javax.faces.view.facelets.ComponentHandler;
import javax.faces.view.facelets.MetaRuleset;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
public class SelectItemHandler extends ComponentHandler
{
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java Mon Jul 4 15:38:35 2011
@@ -36,7 +36,7 @@ import javax.faces.view.facelets.TagHand
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.view.facelets.AbstractFaceletContext;
import org.apache.myfaces.view.facelets.FaceletCompositionContext;
import org.apache.myfaces.view.facelets.el.VariableMapperWrapper;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java Mon Jul 4 15:38:35 2011
@@ -33,7 +33,7 @@ import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
/**
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java Mon Jul 4 15:38:35 2011
@@ -21,8 +21,8 @@ package org.apache.myfaces.view.facelets
import java.lang.reflect.Array;
import java.util.Arrays;
-import org.apache.myfaces.shared_impl.util.ClassLoaderUtils;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassLoaderUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
public class ReflectionUtil
{
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java Mon Jul 4 15:38:35 2011
@@ -35,7 +35,7 @@ import javax.servlet.jsp.jstl.core.Confi
import org.apache.myfaces.application.jsp.ServletViewResponseWrapper;
import org.apache.myfaces.renderkit.StateCacheUtils;
-import org.apache.myfaces.shared_impl.view.JspViewDeclarationLanguageBase;
+import org.apache.myfaces.shared.view.JspViewDeclarationLanguageBase;
import org.apache.myfaces.view.facelets.tag.composite.CompositeLibrary;
import org.apache.myfaces.view.facelets.tag.jsf.core.CoreLibrary;
import org.apache.myfaces.view.facelets.tag.jsf.html.HtmlLibrary;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java Mon Jul 4 15:38:35 2011
@@ -27,9 +27,9 @@ import org.apache.myfaces.config.element
import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.context.servlet.StartupFacesContextImpl;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
-import org.apache.myfaces.shared_impl.context.ExceptionHandlerImpl;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.context.ExceptionHandlerImpl;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
import org.apache.myfaces.spi.WebConfigProvider;
import org.apache.myfaces.spi.WebConfigProviderFactory;
import org.apache.myfaces.view.facelets.tag.MetaRulesetImpl;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java Mon Jul 4 15:38:35 2011
@@ -22,7 +22,7 @@ import javax.faces.FacesException;
import javax.servlet.ServletContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.util.ContainerUtils;
/**
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java Mon Jul 4 15:38:35 2011
@@ -31,7 +31,7 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.myfaces.shared_impl.webapp.webxml.DelegatedFacesServlet;
+import org.apache.myfaces.shared.webapp.webxml.DelegatedFacesServlet;
/**
* Derived FacesServlet that can be used for debugging purpose
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java Mon Jul 4 15:38:35 2011
@@ -20,7 +20,7 @@ package org.apache.myfaces.webapp;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.config.annotation.LifecycleProviderFactory;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import javax.faces.FactoryFinder;
import javax.faces.context.ExternalContext;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java Mon Jul 4 15:38:35 2011
@@ -28,8 +28,8 @@ import javax.faces.render.RenderKitFacto
import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.serial.DefaultSerialFactory;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.serial.DefaultSerialFactory;
import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMultipleRequestsTestCase;
import org.apache.myfaces.test.mock.MockRenderKit;
import org.apache.myfaces.test.mock.MockResponseWriter;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java Mon Jul 4 15:38:35 2011
@@ -16,7 +16,7 @@
package org.apache.myfaces.application.jsp;
-//import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+//import org.apache.myfaces.shared.config.MyfacesConfig;
import java.io.BufferedWriter;
import java.io.CharArrayWriter;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java Mon Jul 4 15:38:35 2011
@@ -21,8 +21,8 @@ package org.apache.myfaces.application.j
import static org.apache.myfaces.Assert.assertException;
import org.apache.myfaces.FacesTestCase;
import org.apache.myfaces.TestRunner;
-import org.apache.myfaces.shared_impl.application.InvalidViewIdException;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.application.InvalidViewIdException;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
import static org.easymock.EasyMock.*;
import org.easymock.IAnswer;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java Mon Jul 4 15:38:35 2011
@@ -19,7 +19,7 @@
package org.apache.myfaces.context;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import javax.faces.context.PartialResponseWriter;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java Mon Jul 4 15:38:35 2011
@@ -28,7 +28,7 @@ import javax.faces.component.html.HtmlFo
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockExternalContext;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java Mon Jul 4 15:38:35 2011
@@ -35,7 +35,7 @@ import javax.faces.model.SelectItem;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java Mon Jul 4 15:38:35 2011
@@ -27,7 +27,7 @@ import javax.faces.component.html.HtmlFo
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java Mon Jul 4 15:38:35 2011
@@ -31,7 +31,7 @@ import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockExternalContext;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java Mon Jul 4 15:38:35 2011
@@ -29,8 +29,8 @@ import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java Mon Jul 4 15:38:35 2011
@@ -23,8 +23,8 @@ import javax.faces.component.behavior.Aj
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
-import org.apache.myfaces.shared_impl.util.FastWriter;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.util.FastWriter;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.config.ConfigParser;
import org.junit.Assert;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java Mon Jul 4 15:38:35 2011
@@ -23,8 +23,8 @@ import javax.faces.component.behavior.Aj
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.component.html.HtmlBody;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.junit.Assert;
@@ -41,7 +41,7 @@ public class HtmlBodyClientBehaviorRende
{
super.setUp();
attrs = (HtmlRenderedClientEventAttr[])
- org.apache.myfaces.shared_impl.util.ArrayUtils.concat(
+ org.apache.myfaces.shared.util.ArrayUtils.concat(
HtmlClientEventAttributesUtil.generateClientBehaviorEventAttrs(),
new HtmlRenderedClientEventAttr[]{
new HtmlRenderedClientEventAttr(HTML.ONLOAD_ATTR, ClientBehaviorEvents.LOAD),
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java Mon Jul 4 15:38:35 2011
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.renderkit.html.behavior;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
@@ -48,7 +48,7 @@ public class HtmlClientEventAttributesUt
public static HtmlRenderedClientEventAttr[] generateClientBehaviorInputEventAttrs()
{
return (HtmlRenderedClientEventAttr[])
- org.apache.myfaces.shared_impl.util.ArrayUtils.concat(
+ org.apache.myfaces.shared.util.ArrayUtils.concat(
generateClientBehaviorEventAttrs(),
new HtmlRenderedClientEventAttr[]{
new HtmlRenderedClientEventAttr(HTML.ONBLUR_ATTR, ClientBehaviorEvents.BLUR),
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandButtonClientBehaviorRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandButtonClientBehaviorRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandButtonClientBehaviorRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandButtonClientBehaviorRendererTest.java Mon Jul 4 15:38:35 2011
@@ -23,9 +23,9 @@ import javax.faces.component.html.HtmlCo
import javax.faces.component.html.HtmlOutcomeTargetButton;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandLinkClientBehaviorRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandLinkClientBehaviorRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandLinkClientBehaviorRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandLinkClientBehaviorRendererTest.java Mon Jul 4 15:38:35 2011
@@ -23,9 +23,9 @@ import javax.faces.component.html.HtmlCo
import javax.faces.component.html.HtmlForm;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetButtonClientBehaviorRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetButtonClientBehaviorRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetButtonClientBehaviorRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetButtonClientBehaviorRendererTest.java Mon Jul 4 15:38:35 2011
@@ -22,9 +22,9 @@ import javax.faces.component.UIComponent
import javax.faces.component.html.HtmlOutcomeTargetButton;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetLinkClientBehaviorRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetLinkClientBehaviorRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetLinkClientBehaviorRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetLinkClientBehaviorRendererTest.java Mon Jul 4 15:38:35 2011
@@ -23,9 +23,9 @@ import javax.faces.component.html.HtmlOu
import javax.faces.component.html.HtmlOutputLink;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLabelClientBehaviorRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLabelClientBehaviorRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLabelClientBehaviorRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLabelClientBehaviorRendererTest.java Mon Jul 4 15:38:35 2011
@@ -22,9 +22,9 @@ import javax.faces.component.UIComponent
import javax.faces.component.html.HtmlOutputLabel;
import javax.faces.component.html.HtmlPanelGrid;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLinkClientBehaviorRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLinkClientBehaviorRendererTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLinkClientBehaviorRendererTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLinkClientBehaviorRendererTest.java Mon Jul 4 15:38:35 2011
@@ -21,9 +21,9 @@ package org.apache.myfaces.renderkit.htm
import javax.faces.component.UIComponent;
import javax.faces.component.html.HtmlOutputLink;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java Mon Jul 4 15:38:35 2011
@@ -26,7 +26,7 @@ import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
import org.apache.myfaces.renderkit.html.HtmlTextRenderer;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockFacesContext12;
import org.apache.myfaces.test.mock.MockResponseWriter;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java Mon Jul 4 15:38:35 2011
@@ -26,7 +26,7 @@ import javax.xml.parsers.SAXParserFactor
import junit.framework.TestCase;
-import org.apache.myfaces.shared_impl.test.ClassElementHandler;
+import org.apache.myfaces.shared.test.ClassElementHandler;
/**
* This test makes sure all of our components, tags, renderers, validators, converters, action listeners, phase
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java Mon Jul 4 15:38:35 2011
@@ -48,8 +48,8 @@ import org.apache.myfaces.config.element
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
import org.apache.myfaces.context.PartialViewContextFactoryImpl;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMultipleRequestsTestCase;
import org.apache.myfaces.test.el.MockExpressionFactory;
import org.apache.myfaces.test.mock.MockExternalContext;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java Mon Jul 4 15:38:35 2011
@@ -31,8 +31,8 @@ import org.apache.myfaces.config.impl.di
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
import org.apache.myfaces.config.element.FacesConfig;
import org.apache.myfaces.context.PartialViewContextFactoryImpl;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMockTestCase;
import org.apache.myfaces.test.el.MockExpressionFactory;
import org.apache.myfaces.test.mock.MockPropertyResolver;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsClientSideTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsClientSideTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsClientSideTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsClientSideTest.java Mon Jul 4 15:38:35 2011
@@ -25,8 +25,8 @@ import javax.faces.render.ResponseStateM
import org.apache.myfaces.application.StateManagerImpl;
import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.serial.DefaultSerialFactory;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.serial.DefaultSerialFactory;
import org.apache.myfaces.test.mock.MockRenderKit;
import org.junit.Test;
import org.testng.Assert;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java Mon Jul 4 15:38:35 2011
@@ -25,8 +25,8 @@ import javax.faces.render.ResponseStateM
import org.apache.myfaces.application.StateManagerImpl;
import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.serial.DefaultSerialFactory;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.serial.DefaultSerialFactory;
import org.apache.myfaces.test.mock.MockRenderKit;
import org.junit.Test;
import org.testng.Assert;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java Mon Jul 4 15:38:35 2011
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets
import java.io.File;
import java.net.URL;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.view.facelets.FaceletTestCase;
import org.apache.myfaces.view.facelets.tag.TagLibrary;
import org.junit.Assert;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockResourceHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockResourceHandlerSupport.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockResourceHandlerSupport.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockResourceHandlerSupport.java Mon Jul 4 15:38:35 2011
@@ -19,8 +19,8 @@
package org.apache.myfaces.view.facelets.mock;
import org.apache.myfaces.application.DefaultResourceHandlerSupport;
-import org.apache.myfaces.shared_impl.resource.ClassLoaderResourceLoader;
-import org.apache.myfaces.shared_impl.resource.ResourceLoader;
+import org.apache.myfaces.shared.resource.ClassLoaderResourceLoader;
+import org.apache.myfaces.shared.resource.ResourceLoader;
/**
* Redirect resource request to the directory where the test class is,
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataTestCase.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataTestCase.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataTestCase.java Mon Jul 4 15:38:35 2011
@@ -34,8 +34,8 @@ import javax.faces.context.ResponseWrite
import javax.faces.view.ViewMetadata;
import org.apache.myfaces.application.ViewHandlerImpl;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
import org.apache.myfaces.view.facelets.FaceletTestCase;
import org.apache.myfaces.view.facelets.bean.HelloWorld;
import org.junit.Assert;
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CifTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CifTestCase.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CifTestCase.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CifTestCase.java Mon Jul 4 15:38:35 2011
@@ -24,7 +24,7 @@ import javax.faces.application.StateMana
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.view.facelets.FaceletTestCase;
import org.apache.myfaces.view.facelets.bean.Employee;
import org.junit.Assert;
Modified: myfaces/core/branches/2.0.8_shade_prototype/implee6/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/implee6/pom.xml?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/implee6/pom.xml (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/implee6/pom.xml Mon Jul 4 15:38:35 2011
@@ -49,10 +49,10 @@
<artifactId>myfaces-api</artifactId>
</dependency>
- <!-- we can use myfaces-shared-impl, but we cannot use myfaces-impl (cyclic dependency) -->
+ <!-- we can use myfaces-shared-core, but we cannot use myfaces-impl (cyclic dependency) -->
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
+ <artifactId>myfaces-shared-core</artifactId>
</dependency>
<!-- in this module we need Servlet 3.0 (instead of 2.5) -->
Modified: myfaces/core/branches/2.0.8_shade_prototype/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java Mon Jul 4 15:38:35 2011
@@ -53,7 +53,7 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRegistration;
import javax.servlet.annotation.HandlesTypes;
-import org.apache.myfaces.shared_impl.webapp.webxml.DelegatedFacesServlet;
+import org.apache.myfaces.shared.webapp.webxml.DelegatedFacesServlet;
/**
* This class is called by any Java EE 6 complaint container at startup.
Modified: myfaces/core/branches/2.0.8_shade_prototype/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/pom.xml?rev=1142719&r1=1142718&r2=1142719&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/pom.xml (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/pom.xml Mon Jul 4 15:38:35 2011
@@ -248,12 +248,11 @@
<version>${project.version}</version>
</dependency>
- <!-- myfaces-shared-impl (will be packed together with myfaces-impl) -->
+ <!-- myfaces-shared-core (will be repackaged and packed together with myfaces-impl) -->
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
+ <artifactId>myfaces-shared-core</artifactId>
<version>${myfaces-shared.version}</version>
- <scope>provided</scope>
</dependency>
<!-- myfaces-impl-ee6 (will be packed together with myfaces-impl by shade-plugin) -->