Author: julien(a)jboss.com Date: 2008-06-08 10:08:18 -0400 (Sun, 08 Jun 2008) New Revision: 10943 Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/ Modified: modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/PresentationServerImpl.java modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/PortalNodeAdapter.java modules/presentation/trunk/portal/src/test/java/org/jboss/portal/presentation/portal/model/StructuralStateContextTestCase.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralObjectImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralStateContextImpl.java Log: move the structural adapter to the presentation package Modified: modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml 2008-06-07 21:22:25 UTC (rev 10942) +++ modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml 2008-06-08 14:08:18 UTC (rev 10943) @@ -142,7 +142,7 @@ </constructor> </bean> - <bean name="StructuralStateContext" class="org.jboss.portal.presentation.portal.model.structural.StructuralStateContextImpl"> + <bean name="StructuralStateContext" class="org.jboss.portal.presentation.impl.state.structural.adapter.StructuralStateContextImpl"> <constructor> <parameter><inject bean="PortalNodeAdapter"/></parameter> </constructor> Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/PresentationServerImpl.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/PresentationServerImpl.java 2008-06-07 21:22:25 UTC (rev 10942) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/PresentationServerImpl.java 2008-06-08 14:08:18 UTC (rev 10943) @@ -28,7 +28,7 @@ import org.jboss.portal.presentation.portal.model.object.PageNode; import org.jboss.portal.presentation.portal.model.object.PortalNodeManager; import org.jboss.portal.presentation.portal.model.layout.ObjectElement; -import org.jboss.portal.presentation.portal.model.structural.StructuralAdapter; +import org.jboss.portal.presentation.impl.state.structural.adapter.StructuralAdapter; import org.jboss.portal.presentation.portal.content.protocol.ContentAction; import org.jboss.portal.presentation.portal.content.ContentHandlerRegistry; import org.jboss.portal.presentation.portal.content.ContentHandler; Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/PortalNodeAdapter.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/PortalNodeAdapter.java 2008-06-07 21:22:25 UTC (rev 10942) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/PortalNodeAdapter.java 2008-06-08 14:08:18 UTC (rev 10943) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.portal.model.object; -import org.jboss.portal.presentation.portal.model.structural.StructuralAdapter; +import org.jboss.portal.presentation.impl.state.structural.adapter.StructuralAdapter; import org.jboss.portal.presentation.portal.model.layout.LayoutStructure; import org.jboss.portal.presentation.portal.model.layout.LayoutElement; import org.jboss.portal.presentation.portal.model.layout.StructureElement; Modified: modules/presentation/trunk/portal/src/test/java/org/jboss/portal/presentation/portal/model/StructuralStateContextTestCase.java =================================================================== --- modules/presentation/trunk/portal/src/test/java/org/jboss/portal/presentation/portal/model/StructuralStateContextTestCase.java 2008-06-07 21:22:25 UTC (rev 10942) +++ modules/presentation/trunk/portal/src/test/java/org/jboss/portal/presentation/portal/model/StructuralStateContextTestCase.java 2008-06-08 14:08:18 UTC (rev 10943) @@ -28,8 +28,8 @@ import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.test.model.AbstractModelTestCase; -import org.jboss.portal.presentation.portal.model.structural.StructuralStateContextImpl; -import org.jboss.portal.presentation.portal.model.structural.StructuralAdapter; +import org.jboss.portal.presentation.impl.state.structural.adapter.StructuralStateContextImpl; +import org.jboss.portal.presentation.impl.state.structural.adapter.StructuralAdapter; import org.jboss.portal.presentation.portal.model.layout.LayoutStore; import org.jboss.portal.presentation.portal.model.object.ContextNode; import org.jboss.portal.presentation.portal.model.object.PageNode; Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter (from rev 10942, modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/structural) Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/structural/StructuralAdapter.java 2008-06-07 21:22:25 UTC (rev 10942) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java 2008-06-08 14:08:18 UTC (rev 10943) @@ -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.portal.model.structural; +package org.jboss.portal.presentation.impl.state.structural.adapter; import org.jboss.portal.presentation.model.ui.UIObject; import org.jboss.portal.presentation.state.structural.StructuralState; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralObjectImpl.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/structural/StructuralObjectImpl.java 2008-06-07 21:22:25 UTC (rev 10942) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralObjectImpl.java 2008-06-08 14:08:18 UTC (rev 10943) @@ -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.portal.model.structural; +package org.jboss.portal.presentation.impl.state.structural.adapter; import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.structural.StructuralState; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralStateContextImpl.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/structural/StructuralStateContextImpl.java 2008-06-07 21:22:25 UTC (rev 10942) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralStateContextImpl.java 2008-06-08 14:08:18 UTC (rev 10943) @@ -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.portal.model.structural; +package org.jboss.portal.presentation.impl.state.structural.adapter; import org.jboss.portal.presentation.state.NoSuchStateException; import org.jboss.portal.presentation.state.StaleStateException;