Author: sohil.shah(a)jboss.com Date: 2008-04-17 17:52:02 -0400 (Thu, 17 Apr 2008) New Revision: 10627 Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/ Removed: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client2/ Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationServerContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/PresentationClient.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server2/PresentationServer.java Log: refactored client2 package to client Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java 2008-04-17 21:43:34 UTC (rev 10626) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java 2008-04-17 21:52:02 UTC (rev 10627) @@ -33,7 +33,7 @@ import org.jboss.portal.presentation.protocol.ErrorResponse; import org.jboss.portal.presentation.protocol.ShowUIObjectResponse; import org.jboss.portal.presentation.model.content.WindowContent; -import org.jboss.portal.presentation.client2.PresentationClient; +import org.jboss.portal.presentation.client.PresentationClient; import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; import org.jboss.portal.presentation.impl.state.structural.StructuralNode; import org.jboss.portal.presentation.impl.state.structural.WindowNode; Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-04-17 21:43:34 UTC (rev 10626) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-04-17 21:52:02 UTC (rev 10627) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.classic; -import org.jboss.portal.presentation.client2.PresentationClient; +import org.jboss.portal.presentation.client.PresentationClient; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.classic.model.DefaultPageViewPortScope; Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationServerContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationServerContext.java 2008-04-17 21:43:34 UTC (rev 10626) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationServerContext.java 2008-04-17 21:52:02 UTC (rev 10627) @@ -26,7 +26,7 @@ import org.jboss.portal.web.ServletContainer; import org.jboss.portal.web.RequestDispatchCallback; import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.presentation.client2.PresentationClient; +import org.jboss.portal.presentation.client.PresentationClient; import javax.servlet.ServletContext; Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client (from rev 10626, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client2) Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/PresentationClient.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client2/PresentationClient.java 2008-04-17 21:43:34 UTC (rev 10626) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/PresentationClient.java 2008-04-17 21:52:02 UTC (rev 10627) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ -package org.jboss.portal.presentation.client2; +package org.jboss.portal.presentation.client; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; import org.jboss.portal.presentation.protocol.ProtocolAction; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server2/PresentationServer.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server2/PresentationServer.java 2008-04-17 21:43:34 UTC (rev 10626) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server2/PresentationServer.java 2008-04-17 21:52:02 UTC (rev 10627) @@ -24,7 +24,7 @@ import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.model.content.WindowContent; -import org.jboss.portal.presentation.client2.PresentationClient; +import org.jboss.portal.presentation.client.PresentationClient; import org.jboss.portal.presentation.protocol.ProtocolAction; /**