Author: chris.laprun(a)jboss.com Date: 2010-10-02 10:59:33 -0400 (Sat, 02 Oct 2010) New Revision: 4467 Modified: portal/branches/wsrp2-integration/component/wsrp/pom.xml portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/SessionEventListenerAndBroadcaster.java portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java portal/branches/wsrp2-integration/pom.xml Log: - Updated to WSRP Beta01-SNAPSHOT. - Adapted for API changes. Modified: portal/branches/wsrp2-integration/component/wsrp/pom.xml =================================================================== --- portal/branches/wsrp2-integration/component/wsrp/pom.xml 2010-10-02 14:48:30 UTC (rev 4466) +++ portal/branches/wsrp2-integration/component/wsrp/pom.xml 2010-10-02 14:59:33 UTC (rev 4467) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> @@ -125,6 +126,17 @@ <build> <plugins> + <!--<plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/gatein/portal/wsrp/SessionEventListenerAndBroadcaster.java</exclude> + <exclude>org/gatein/portal/wsrp/MOPPortalStructureProvider.java</exclude> + <exclude>org/gatein/portal/wsrp/state/migration/**/*.java</exclude> + </excludes> + </configuration> + </plugin>--> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> Modified: portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java =================================================================== --- portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java 2010-10-02 14:48:30 UTC (rev 4466) +++ portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java 2010-10-02 14:59:33 UTC (rev 4467) @@ -41,7 +41,7 @@ import org.gatein.pc.api.PortletContext; import org.gatein.pc.api.PortletStateType; import org.gatein.pc.api.StatefulPortletContext; -import org.gatein.wsrp.api.PortalStructureProvider; +import org.gatein.wsrp.api.context.ConsumerStructureProvider; import java.util.Collection; import java.util.Collections; @@ -54,7 +54,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public class MOPPortalStructureProvider implements PortalStructureProvider +public class MOPPortalStructureProvider implements ConsumerStructureProvider { private final POMSessionManager pomManager; private Map<String, PageInfo> pageInfos; Modified: portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/SessionEventListenerAndBroadcaster.java =================================================================== --- portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/SessionEventListenerAndBroadcaster.java 2010-10-02 14:48:30 UTC (rev 4466) +++ portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/SessionEventListenerAndBroadcaster.java 2010-10-02 14:59:33 UTC (rev 4467) @@ -26,9 +26,9 @@ import org.exoplatform.container.PortalContainer; import org.exoplatform.services.listener.Event; import org.exoplatform.services.listener.Listener; -import org.gatein.wsrp.api.SessionEvent; -import org.gatein.wsrp.api.SessionEventBroadcaster; -import org.gatein.wsrp.api.SessionEventListener; +import org.gatein.wsrp.api.session.SessionEvent; +import org.gatein.wsrp.api.session.SessionEventBroadcaster; +import org.gatein.wsrp.api.session.SessionEventListener; import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionEvent; Modified: portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java =================================================================== --- portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java 2010-10-02 14:48:30 UTC (rev 4466) +++ portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java 2010-10-02 14:59:33 UTC (rev 4467) @@ -32,7 +32,7 @@ import org.gatein.portal.wsrp.state.migration.mapping.ExportInfoMapping; import org.gatein.portal.wsrp.state.migration.mapping.ExportInfosMapping; import org.gatein.portal.wsrp.state.migration.mapping.ExportedStateMapping; -import org.gatein.wsrp.api.PortalStructureProvider; +import org.gatein.wsrp.api.context.ConsumerStructureProvider; import org.gatein.wsrp.consumer.migration.ExportInfo; import org.gatein.wsrp.consumer.migration.MigrationService; @@ -46,7 +46,7 @@ */ public class JCRMigrationService implements MigrationService, StoresByPathManager<ExportInfo> { - private PortalStructureProvider structureProvider; + private ConsumerStructureProvider structureProvider; private JCRPersister persister; private static final String EXPORT_INFOS_PATH = ExportInfosMapping.NODE_NAME; private int exportInfosCount = -1; @@ -61,12 +61,12 @@ persister.initializeBuilderFor(mappingClasses); } - public PortalStructureProvider getStructureProvider() + public ConsumerStructureProvider getStructureProvider() { return structureProvider; } - public void setStructureProvider(PortalStructureProvider structureProvider) + public void setStructureProvider(ConsumerStructureProvider structureProvider) { ParameterValidation.throwIllegalArgExceptionIfNull(structureProvider, "PortalStructureProvider"); this.structureProvider = structureProvider; Modified: portal/branches/wsrp2-integration/pom.xml =================================================================== --- portal/branches/wsrp2-integration/pom.xml 2010-10-02 14:48:30 UTC (rev 4466) +++ portal/branches/wsrp2-integration/pom.xml 2010-10-02 14:59:33 UTC (rev 4467) @@ -48,7 +48,7 @@ <org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version> <org.gatein.pc.version>2.2.0-Beta04</org.gatein.pc.version> <org.picketlink.idm>1.1.5.GA</org.picketlink.idm> - <org.gatein.wsrp.version>2.0.0-Alpha03</org.gatein.wsrp.version> + <org.gatein.wsrp.version>2.0.0-Beta01-SNAPSHOT</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version>