Author: julien(a)jboss.com Date: 2008-04-02 16:53:03 -0400 (Wed, 02 Apr 2008) New Revision: 10488 Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/ Removed: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/state/ Modified: modules/presentation/trunk/presentation/pom.xml modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client2/PresentationClient.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIModelImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/diff/CreateDiffPhase.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/update/ObjectUpdate.java 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/state/ConstraintViolationException.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/NoSuchStateException.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/StaleStateException.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/StateChangeVetoException.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/StateException.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/navigational/NavigationalStateContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralObject.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralStateContext.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/navigational/NavigationalStateContextImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModel.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralObjectImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java Log: move the state package under o.j.p.presentation Modified: modules/presentation/trunk/presentation/pom.xml =================================================================== --- modules/presentation/trunk/presentation/pom.xml 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/pom.xml 2008-04-02 20:53:03 UTC (rev 10488) @@ -158,9 +158,11 @@ <property name="dependency.gwt-user.jar" value="${maven.dependency.com.google.gwt.gwt-user.jar.path}"/> <property name="dependency.presentation.jar" value="${basedir}/target/presentation-presentation-${project.version}.jar"/> +<!-- <ant antfile="${basedir}/build.xml"> <target name="install"/> </ant> +--> </tasks> </configuration> <goals> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client2/PresentationClient.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client2/PresentationClient.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client2/PresentationClient.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.client2; -import org.jboss.portal.presentation.model2.state.navigational.NavigationalStateContext; +import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; /** * The contract that defines the services that the client provides to the server during a presentation server invocation. Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIModelImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIModelImpl.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIModelImpl.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model2; -import org.jboss.portal.presentation.model2.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.model2.state.navigational.NavigationalStateContext; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; import org.jboss.portal.presentation.model2.UIModel; import org.jboss.portal.presentation.model2.ViewPortContext; import org.jboss.portal.presentation.model2.ViewPortScope; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -23,8 +23,8 @@ package org.jboss.portal.presentation.impl.model2; import org.jboss.portal.presentation.model2.ui.UIObject; -import org.jboss.portal.presentation.model2.state.StateException; -import org.jboss.portal.presentation.model2.state.structural.StructuralObject; +import org.jboss.portal.presentation.state.StateException; +import org.jboss.portal.presentation.state.structural.StructuralObject; import java.util.Map; import java.util.Set; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/diff/CreateDiffPhase.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/diff/CreateDiffPhase.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/diff/CreateDiffPhase.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -26,8 +26,8 @@ import org.jboss.portal.presentation.model2.ViewPortContext; import org.jboss.portal.presentation.model2.ObjectTraversalType; import org.jboss.portal.presentation.impl.model2.ui.UIObjectImpl; -import org.jboss.portal.presentation.model2.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.model2.state.structural.StructuralObject; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.state.structural.StructuralObject; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -23,8 +23,8 @@ package org.jboss.portal.presentation.impl.model2.ui; import org.jboss.portal.presentation.model2.ui.UIObject; -import org.jboss.portal.presentation.model2.state.StateException; -import org.jboss.portal.presentation.model2.state.structural.StructuralObject; +import org.jboss.portal.presentation.state.StateException; +import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.impl.model2.UIObjectRef; import org.jboss.portal.common.reflect.Reflection; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/update/ObjectUpdate.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/update/ObjectUpdate.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/update/ObjectUpdate.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -25,7 +25,7 @@ import org.jboss.portal.presentation.impl.model2.ui.UIObjectImpl; import org.jboss.portal.presentation.impl.model2.UIObjectRef; import org.jboss.portal.presentation.model2.ViewPortContext; -import org.jboss.portal.presentation.model2.state.structural.StructuralObject; +import org.jboss.portal.presentation.state.structural.StructuralObject; import java.util.List; import java.util.HashMap; 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-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server2/PresentationServer.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.server2; -import org.jboss.portal.presentation.model2.state.structural.StructuralStateContext; +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.protocol.ProtocolAction; Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state (from rev 10484, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/state) Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/ConstraintViolationException.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/state/ConstraintViolationException.java 2008-04-02 15:29:09 UTC (rev 10484) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/ConstraintViolationException.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -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.model2.state; +package org.jboss.portal.presentation.state; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/NoSuchStateException.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/state/NoSuchStateException.java 2008-04-02 15:29:09 UTC (rev 10484) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/NoSuchStateException.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -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.model2.state; +package org.jboss.portal.presentation.state; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/StaleStateException.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/state/StaleStateException.java 2008-04-02 15:29:09 UTC (rev 10484) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/StaleStateException.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -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.model2.state; +package org.jboss.portal.presentation.state; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/StateChangeVetoException.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/state/StateChangeVetoException.java 2008-04-02 15:29:09 UTC (rev 10484) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/StateChangeVetoException.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -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.model2.state; +package org.jboss.portal.presentation.state; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/StateException.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/state/StateException.java 2008-04-02 15:29:09 UTC (rev 10484) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/StateException.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -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.model2.state; +package org.jboss.portal.presentation.state; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/navigational/NavigationalStateContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/state/navigational/NavigationalStateContext.java 2008-04-02 15:29:09 UTC (rev 10484) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/navigational/NavigationalStateContext.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -20,9 +20,9 @@ * 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.model2.state.navigational; +package org.jboss.portal.presentation.state.navigational; -import org.jboss.portal.presentation.model2.state.StateException; +import org.jboss.portal.presentation.state.StateException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralObject.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/state/structural/StructuralObject.java 2008-04-02 15:29:09 UTC (rev 10484) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralObject.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -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.model2.state.structural; +package org.jboss.portal.presentation.state.structural; import java.util.Set; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/state/structural/StructuralState.java 2008-04-02 15:29:09 UTC (rev 10484) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -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.model2.state.structural; +package org.jboss.portal.presentation.state.structural; import org.jboss.portal.presentation.model2.ui.UIObject; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralStateContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/state/structural/StructuralStateContext.java 2008-04-02 15:29:09 UTC (rev 10484) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralStateContext.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -20,9 +20,9 @@ * 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.model2.state.structural; +package org.jboss.portal.presentation.state.structural; -import org.jboss.portal.presentation.model2.state.StateException; +import org.jboss.portal.presentation.state.StateException; import java.util.Collection; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockModelTestCase.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockModelTestCase.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -25,12 +25,12 @@ import junit.framework.TestCase; import org.jboss.portal.presentation.model2.ui.UIContext; import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.state.StaleStateException; -import org.jboss.portal.presentation.model2.state.StateException; -import org.jboss.portal.presentation.model2.state.NoSuchStateException; -import org.jboss.portal.presentation.model2.state.structural.StructuralObject; -import org.jboss.portal.presentation.model2.state.structural.StructuralState; -import org.jboss.portal.presentation.model2.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.state.StaleStateException; +import org.jboss.portal.presentation.state.StateException; +import org.jboss.portal.presentation.state.NoSuchStateException; +import org.jboss.portal.presentation.state.structural.StructuralObject; +import org.jboss.portal.presentation.state.structural.StructuralState; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.test.model.state.structural.MockModel; import org.jboss.portal.presentation.test.model.state.structural.MockObject; import org.jboss.portal.presentation.test.model.state.structural.MockException; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/navigational/NavigationalStateContextImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/navigational/NavigationalStateContextImpl.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/navigational/NavigationalStateContextImpl.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model.state.navigational; -import org.jboss.portal.presentation.model2.state.navigational.NavigationalStateContext; -import org.jboss.portal.presentation.model2.state.StateChangeVetoException; -import org.jboss.portal.presentation.model2.state.StateException; +import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; +import org.jboss.portal.presentation.state.StateChangeVetoException; +import org.jboss.portal.presentation.state.StateException; import java.util.Map; import java.util.HashMap; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModel.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModel.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModel.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model.state.structural; -import org.jboss.portal.presentation.model2.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -26,11 +26,11 @@ import org.jboss.portal.presentation.model2.ui.UIObject; import org.jboss.portal.presentation.model2.ui.UIPage; import org.jboss.portal.presentation.model2.ui.UIWindow; -import org.jboss.portal.presentation.model2.state.NoSuchStateException; -import org.jboss.portal.presentation.model2.state.StaleStateException; -import org.jboss.portal.presentation.model2.state.StateException; -import org.jboss.portal.presentation.model2.state.structural.StructuralObject; -import org.jboss.portal.presentation.model2.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.state.NoSuchStateException; +import org.jboss.portal.presentation.state.StaleStateException; +import org.jboss.portal.presentation.state.StateException; +import org.jboss.portal.presentation.state.structural.StructuralObject; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; import java.util.ArrayList; import java.util.HashMap; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -26,7 +26,7 @@ import org.jboss.portal.presentation.model2.ui.UIObject; import org.jboss.portal.presentation.model2.ui.UIPage; import org.jboss.portal.presentation.model2.ui.UIWindow; -import org.jboss.portal.presentation.model2.state.structural.StructuralObject; +import org.jboss.portal.presentation.state.structural.StructuralObject; import java.util.List; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralObjectImpl.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralObjectImpl.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model.state.structural; -import org.jboss.portal.presentation.model2.state.structural.StructuralObject; -import org.jboss.portal.presentation.model2.state.structural.StructuralState; +import org.jboss.portal.presentation.state.structural.StructuralObject; +import org.jboss.portal.presentation.state.structural.StructuralState; import java.util.List; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model.state.structural; -import org.jboss.portal.presentation.model2.state.structural.StructuralState; +import org.jboss.portal.presentation.state.structural.StructuralState; import org.jboss.portal.presentation.model2.ui.UIObject; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -26,7 +26,7 @@ import org.jboss.portal.presentation.test.model.state.structural.MockModel; import org.jboss.portal.presentation.test.model.state.structural.MockModelImpl; import org.jboss.portal.presentation.test.model.state.navigational.NavigationalStateContextImpl; -import org.jboss.portal.presentation.model2.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.impl.model2.UIModelImpl; import junit.framework.TestCase; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java 2008-04-02 20:43:58 UTC (rev 10487) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java 2008-04-02 20:53:03 UTC (rev 10488) @@ -27,7 +27,7 @@ import org.jboss.portal.presentation.test.model.state.structural.MockModel; import org.jboss.portal.presentation.test.model.state.structural.MockModelImpl; import org.jboss.portal.presentation.test.model.state.navigational.NavigationalStateContextImpl; -import org.jboss.portal.presentation.model2.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.impl.model2.UIModelImpl; import java.util.Collection;