[gatein-commits] gatein SVN: r6849 - in portal/branches/api: component and 13 other directories.

Author: chris.laprun(a)jboss.com Date: 2011-07-08 11:38:37 -0400 (Fri, 08 Jul 2011) New Revision: 6849 Added: portal/branches/api/component/api-impl/ portal/branches/api/component/api-impl/pom.xml portal/branches/api/component/api-impl/src/ portal/branches/api/component/api-impl/src/main/ portal/branches/api/component/api-impl/src/main/java/ portal/branches/api/component/api-impl/src/main/java/org/ portal/branches/api/component/api-impl/src/main/java/org/gatein/ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java portal/branches/api/component/api-impl/src/test/ portal/branches/api/component/api-impl/src/test/java/ portal/branches/api/web/portal/src/main/webapp/WEB-INF/conf/api/ portal/branches/api/web/portal/src/main/webapp/WEB-INF/conf/api/api-configuration.xml Modified: portal/branches/api/component/pom.xml portal/branches/api/packaging/jboss-as5/pkg/pom.xml portal/branches/api/pom.xml portal/branches/api/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml Log: - GTNPORTAL-1956: Initial commit. Added: portal/branches/api/component/api-impl/pom.xml =================================================================== --- portal/branches/api/component/api-impl/pom.xml (rev 0) +++ portal/branches/api/component/api-impl/pom.xml 2011-07-08 15:38:37 UTC (rev 6849) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/xsd/maven-4.0.0.xsd"> + <parent> + <artifactId>exo.portal.component</artifactId> + <groupId>org.exoplatform.portal</groupId> + <version>3.2.0-M02-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.gatein.portal</groupId> + <artifactId>gatein-api-impl</artifactId> + + <dependencies> + <dependency> + <groupId>org.gatein.portal</groupId> + <artifactId>gatein-api</artifactId> + </dependency> + <!--<dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + <version>1.1</version> + </dependency>--> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>r09</version> + </dependency> + </dependencies> + +</project> \ No newline at end of file Added: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java =================================================================== --- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java (rev 0) +++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-08 15:38:37 UTC (rev 6849) @@ -0,0 +1,162 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.gatein.portal.api.impl; + +import com.google.common.base.Function; +import org.bouncycastle.ocsp.OCSPReqGenerator; +import org.exoplatform.container.ExoContainer; +import org.exoplatform.container.ExoContainerContext; +import org.exoplatform.container.PortalContainer; +import org.exoplatform.container.configuration.ConfigurationManager; +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.portal.mop.navigation.NavigationService; +import org.exoplatform.portal.pom.config.POMSession; +import org.exoplatform.portal.pom.config.POMSessionManager; +import org.gatein.api.GateIn; +import org.gatein.api.IterableResult; +import org.gatein.api.Portal; +import org.gatein.api.id.Id; +import org.gatein.api.id.Identifiable; +import org.gatein.api.navigation.Site; +import org.gatein.mop.api.workspace.ObjectType; +import org.gatein.mop.api.workspace.WorkspaceObject; +import org.picocontainer.Startable; + +import java.util.Collection; +import java.util.Iterator; + +/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */ +public class GateInImpl implements GateIn, Startable +{ + private ExoContainer container; + private POMSessionManager pomSessionManager; + private NavigationService navigationService; + + public GateInImpl(ExoContainerContext context, InitParams params, ConfigurationManager configurationManager) + { + container = context.getContainer(); + } + + public IterableResult<Portal> getPortals() + { + final POMSession session = pomSessionManager.getSession(); + final Collection<org.gatein.mop.api.workspace.Site> sites = session.getWorkspace().getSites(ObjectType.PORTAL_SITE); + return new IterableResult<Portal>() { + private int size = -1; + + public int size() + { + if(size != -1) + { + return size; + } + else + { + size = session.findObjects(ObjectType.PORTAL_SITE, ObjectType.PORTAL_SITE, null, null, 0, 1).hits(); + return size; + } + } + + public boolean contains(Portal portal) + { + return portal != null && session.findObjectById(portal.getId().toString()) != null; + } + + public Iterator<Portal> iterator() + { + return null ; + } + }; + } + + public Portal getPortal(Id<Portal> portalId) + { + final POMSession session = pomSessionManager.getSession(); + WorkspaceObject objectById = session.findObjectById(portalId.toString()); + if (objectById instanceof org.gatein.mop.api.workspace.Site) + { + org.gatein.mop.api.workspace.Site site = (org.gatein.mop.api.workspace.Site)objectById; + if(ObjectType.PORTAL_SITE.equals(site.getObjectType())) + { + return new PortalImpl(site); + } + } + return null; + } + + public Portal getDefaultPortal() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public IterableResult<Site> getSites() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public IterableResult<Site> getGroupSites() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public Site getGroupSite(Id groupId) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public IterableResult<Site> getGroupSites(Id userId) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public IterableResult<Portal> getPortalSites(Id userId) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public Site getDashboard(Id userId) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public <T extends Identifiable> T get(Id<T> id) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public <T extends Site> Site getSite(Id<Site> siteId, Site.Type<T> type) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public void start() + { + pomSessionManager = (POMSessionManager) container.getComponentInstanceOfType(POMSessionManager.class); + navigationService = (NavigationService) container.getComponentInstanceOfType(NavigationService.class); + } + + public void stop() + { + //To change body of implemented methods use File | Settings | File Templates. + } +} Added: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java =================================================================== --- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java (rev 0) +++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java 2011-07-08 15:38:37 UTC (rev 6849) @@ -0,0 +1,104 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.gatein.portal.api.impl; + +import org.gatein.api.Filter; +import org.gatein.api.IterableResult; +import org.gatein.api.Query; +import org.gatein.api.id.Id; +import org.gatein.api.navigation.Navigation; +import org.gatein.api.navigation.Page; +import org.gatein.api.navigation.Site; + +/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */ +public class NavigationImpl implements Navigation +{ + public NavigationImpl(org.gatein.mop.api.workspace.Navigation navigation) + { + } + + public Page getTargetPage() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public void setTargetPage(Page target) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public Site getSite() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public IterableResult<Navigation> getAll() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public int size() + { + return 0; //To change body of implemented methods use File | Settings | File Templates. + } + + public boolean contains(String key) + { + return false; //To change body of implemented methods use File | Settings | File Templates. + } + + public Navigation createAndAdd(String key) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public Navigation get(String key) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public <U extends Navigation> IterableResult<U> getAllWhere(Filter<U> filter) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public <U extends Navigation> IterableResult<U> getAllSatisfying(Query<U> query) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public Id<Navigation> getId() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public String getName() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public String getDisplayName() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } +} Added: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java =================================================================== --- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java (rev 0) +++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java 2011-07-08 15:38:37 UTC (rev 6849) @@ -0,0 +1,88 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.gatein.portal.api.impl; + +import org.gatein.api.Container; +import org.gatein.api.Portal; +import org.gatein.api.content.ContentRegistry; +import org.gatein.api.id.Id; +import org.gatein.api.navigation.Navigation; +import org.gatein.api.navigation.Page; +import org.gatein.api.navigation.Site; +import org.gatein.api.navigation.Targetable; + +/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */ +public class PortalImpl implements Portal +{ + private final org.gatein.mop.api.workspace.Site site; + + public PortalImpl(org.gatein.mop.api.workspace.Site site) + { + this.site = site; + } + + public ContentRegistry getContentRegistry() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public Id<Portal> getId() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public String getName() + { + return site.getName(); + } + + public String getDisplayName() + { + return getName(); // todo: fix me + } + + public Container<String, Page> getPageRegistry() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public Navigation getNavigation() + { + return new NavigationImpl(site.getRootNavigation()); + } + + public Type getType() + { + return Type.PORTAL; + } + + public Navigation createNavigationTo(Targetable node, Navigation parent) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public int getPriority() + { + return 0; //To change body of implemented methods use File | Settings | File Templates. + } +} Modified: portal/branches/api/component/pom.xml =================================================================== --- portal/branches/api/component/pom.xml 2011-07-08 14:43:16 UTC (rev 6848) +++ portal/branches/api/component/pom.xml 2011-07-08 15:38:37 UTC (rev 6849) @@ -45,6 +45,7 @@ <module>scripting</module> <module>management</module> <module>identity</module> + <module>api-impl</module> </modules> </project> Modified: portal/branches/api/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/branches/api/packaging/jboss-as5/pkg/pom.xml 2011-07-08 14:43:16 UTC (rev 6848) +++ portal/branches/api/packaging/jboss-as5/pkg/pom.xml 2011-07-08 15:38:37 UTC (rev 6849) @@ -294,6 +294,16 @@ <artifactId>picketlink-idm-ldap</artifactId> </dependency> + <!-- GateIn API --> + <dependency> + <groupId>org.gatein.portal</groupId> + <artifactId>gatein-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.portal</groupId> + <artifactId>gatein-api-impl</artifactId> + </dependency> + <!-- Gatein common --> <dependency> <groupId>org.gatein.common</groupId> Modified: portal/branches/api/pom.xml =================================================================== --- portal/branches/api/pom.xml 2011-07-08 14:43:16 UTC (rev 6848) +++ portal/branches/api/pom.xml 2011-07-08 15:38:37 UTC (rev 6849) @@ -19,7 +19,8 @@ --> -<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"> <modelVersion>4.0.0</modelVersion> @@ -49,6 +50,7 @@ <org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm> <org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version> <org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version> + <org.gatein.api.version>1.0.0-GA-SNAPSHOT</org.gatein.api.version> <org.slf4j.version>1.5.8</org.slf4j.version> <commons-pool.version>1.5.5</commons-pool.version> <rhino.version>1.6R5</rhino.version> @@ -377,6 +379,18 @@ <version>${org.gatein.wsrp.version}</version> </dependency> + <!-- API --> + <dependency> + <groupId>org.gatein.portal</groupId> + <artifactId>gatein-api</artifactId> + <version>${org.gatein.api.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.portal</groupId> + <artifactId>gatein-api-impl</artifactId> + <version>${project.version}</version> + </dependency> + <!-- GateIn --> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -750,7 +764,7 @@ <scope>test</scope> </dependency> </dependencies> - + <build> <resources> <resource> @@ -829,11 +843,11 @@ <maxmem>1024m</maxmem> </configuration> </plugin> - <plugin> - <groupId>org.jibx</groupId> - <artifactId>maven-jibx-plugin</artifactId> - <version>1.2.2</version> - </plugin> + <plugin> + <groupId>org.jibx</groupId> + <artifactId>maven-jibx-plugin</artifactId> + <version>1.2.2</version> + </plugin> </plugins> </pluginManagement> <plugins> @@ -846,11 +860,12 @@ <phase>compile</phase> <configuration> <tasks> - <copy failonerror="false" todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"> + <copy failonerror="false" + todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"> <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes"> - <include name="**/*_en.properties" /> + <include name="**/*_en.properties"/> </fileset> - <globmapper from="*_en.properties" to="*.properties" /> + <globmapper from="*_en.properties" to="*.properties"/> </copy> </tasks> </configuration> @@ -905,7 +920,7 @@ </property> <property> <name>gatein.test.datasource.password</name> - <value /> + <value/> </property> </systemProperties> </configuration> Added: portal/branches/api/web/portal/src/main/webapp/WEB-INF/conf/api/api-configuration.xml =================================================================== --- portal/branches/api/web/portal/src/main/webapp/WEB-INF/conf/api/api-configuration.xml (rev 0) +++ portal/branches/api/web/portal/src/main/webapp/WEB-INF/conf/api/api-configuration.xml 2011-07-08 15:38:37 UTC (rev 6849) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> + <key>org.gatein.portal.api.GateIn</key> + <type>org.gatein.portal.api.impl.DefaultGateIn</type> + </component> + +</configuration> Modified: portal/branches/api/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/branches/api/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-07-08 14:43:16 UTC (rev 6848) +++ portal/branches/api/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-07-08 15:38:37 UTC (rev 6849) @@ -31,6 +31,7 @@ <import>war:/conf/common/autologin-configuration.xml</import> <import>war:/conf/common/remindpwd-configuration.xml</import> <import>war:/conf/jcr/jcr-configuration.xml</import> + <import>war:/conf/api/api-configuration.xml</import>