gatein SVN: r6850 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-07-08 12:41:40 -0400 (Fri, 08 Jul 2011)
New Revision: 6850
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
Update core and cernel versions
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-08 15:38:37 UTC (rev 6849)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-08 16:41:40 UTC (rev 6850)
@@ -37,8 +37,8 @@
<name>EPP GateIn - Portal - ${project.version}</name>
<properties>
- <org.exoplatform.kernel.version>2.2.8-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.8-GA</org.exoplatform.core.version>
+ <org.exoplatform.kernel.version>2.2.9-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.9-GA</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.1.8-GA</org.exoplatform.ws.version>
<org.exoplatform.jcr.version>1.12.9-GA</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
13 years, 6 months
gatein SVN: r6849 - in portal/branches/api: component and 13 other directories.
by do-not-reply＠jboss.org
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>
13 years, 6 months
gatein SVN: r6848 - portal/branches.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-07-08 10:43:16 -0400 (Fri, 08 Jul 2011)
New Revision: 6848
Added:
portal/branches/api/
Log:
- Created branch for API implementation work.
13 years, 6 months
gatein SVN: r6847 - epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-07-08 09:21:58 -0400 (Fri, 08 Jul 2011)
New Revision: 6847
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
Log:
JBEPP-854 Portlet's context-root cannot contain slashes
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2011-07-08 12:39:42 UTC (rev 6846)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2011-07-08 13:21:58 UTC (rev 6847)
@@ -128,8 +128,7 @@
int indexOfSeparator = applicationState.lastIndexOf("/");
String appName = applicationState.substring(0, indexOfSeparator);
String portletName = applicationState.substring(indexOfSeparator + 1);
- return PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + "./" + appName + "."
- + portletName);
+ return PortletContext.reference(PortletInvoker.LOCAL_PORTLET_INVOKER_ID, PortletContext.createPortletContext(appName, portletName));
}
@Override
13 years, 6 months
gatein SVN: r6846 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-07-08 08:39:42 -0400 (Fri, 08 Jul 2011)
New Revision: 6846
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
JBEPP-996 Upgrade to eXo JCR 1.12.9-GA
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-08 11:34:30 UTC (rev 6845)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-08 12:39:42 UTC (rev 6846)
@@ -40,7 +40,7 @@
<org.exoplatform.kernel.version>2.2.8-GA</org.exoplatform.kernel.version>
<org.exoplatform.core.version>2.3.8-GA</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.1.8-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.9</org.exoplatform.jcr.version>
+ <org.exoplatform.jcr.version>1.12.9-GA</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch04</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
13 years, 6 months
gatein SVN: r6845 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-07-08 07:34:30 -0400 (Fri, 08 Jul 2011)
New Revision: 6845
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
JBEPP-996 Upgrade to eXo JCR 1.12.9
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-08 11:24:36 UTC (rev 6844)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-08 11:34:30 UTC (rev 6845)
@@ -40,7 +40,7 @@
<org.exoplatform.kernel.version>2.2.8-GA</org.exoplatform.kernel.version>
<org.exoplatform.core.version>2.3.8-GA</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.1.8-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.8_CP01</org.exoplatform.jcr.version>
+ <org.exoplatform.jcr.version>1.12.9</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch04</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
13 years, 6 months
gatein SVN: r6844 - in epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf: jcr and 2 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-07-08 07:24:36 -0400 (Fri, 08 Jul 2011)
New Revision: 6844
Added:
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
Log:
JBEPP-987 EPP 5.1.1.DEV02 fails to start against existing DB schema
Duplicate conig.xml
Copied: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml (from rev 6839, epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2011-07-08 11:24:36 UTC (rev 6844)
@@ -0,0 +1,22 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ 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.
+ -->
+
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+</jbosscache>
\ No newline at end of file
13 years, 6 months
gatein SVN: r6843 - in portal/trunk: webui/core/src/main/java/org/exoplatform/webui/form and 1 other directory.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-07-08 05:53:21 -0400 (Fri, 08 Jul 2011)
New Revision: 6843
Modified:
portal/trunk/
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java
Log:
GTNPORTAL-1955: XSS issue in category description
Property changes on: portal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/branch-GTNPORTAL-1872:6327-6594
/portal/branches/branch-GTNPORTAL-1921:6597-6803
/portal/branches/decoupled-webos:6214-6243
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/wsrp-extraction:5828-6031
+ /epp/portal/branches/EPP_5_1_Branch:6841
/portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/branch-GTNPORTAL-1872:6327-6594
/portal/branches/branch-GTNPORTAL-1921:6597-6803
/portal/branches/decoupled-webos:6214-6243
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/wsrp-extraction:5828-6031
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-07-08 09:52:00 UTC (rev 6842)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-07-08 09:53:21 UTC (rev 6843)
@@ -21,6 +21,7 @@
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.commons.serialization.api.annotations.Serialized;
+import org.gatein.common.text.EntityEncoder;
import java.io.Writer;
@@ -41,6 +42,11 @@
*/
private int columns = 30;
+ /**
+ * HTML Entity Encoder
+ */
+ private EntityEncoder entityEncoder = EntityEncoder.FULL;
+
public UIFormTextAreaInput()
{
}
@@ -72,7 +78,7 @@
w.append(" cols=\"").append(String.valueOf(columns)).append("\"");
w.write(">");
if (value != null)
- w.write(value);
+ w.write(entityEncoder.encode(value));
w.write("</textarea>");
if (this.isMandatory())
w.write(" *");
13 years, 6 months
gatein SVN: r6842 - epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-07-08 05:52:00 -0400 (Fri, 08 Jul 2011)
New Revision: 6842
Modified:
epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java
Log:
JBEPP-997
> > XSS issue in category description
Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-07-08 09:44:46 UTC (rev 6841)
+++ epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-07-08 09:52:00 UTC (rev 6842)
@@ -21,6 +21,7 @@
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.commons.serialization.api.annotations.Serialized;
+import org.gatein.common.text.EntityEncoder;
import java.io.Writer;
@@ -41,6 +42,11 @@
*/
private int columns = 30;
+ /**
+ * HTML Entity Encoder
+ */
+ private EntityEncoder entityEncoder = EntityEncoder.FULL;
+
public UIFormTextAreaInput()
{
}
@@ -72,7 +78,7 @@
w.append(" cols=\"").append(String.valueOf(columns)).append("\"");
w.write(">");
if (value != null)
- w.write(value);
+ w.write(entityEncoder.encode(value));
w.write("</textarea>");
if (this.isMandatory())
w.write(" *");
13 years, 6 months
gatein SVN: r6841 - epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-07-08 05:44:46 -0400 (Fri, 08 Jul 2011)
New Revision: 6841
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java
Log:
JBEPP-997
XSS issue in category description
Modified: epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-07-08 07:56:19 UTC (rev 6840)
+++ epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-07-08 09:44:46 UTC (rev 6841)
@@ -21,6 +21,7 @@
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.commons.serialization.api.annotations.Serialized;
+import org.gatein.common.text.EntityEncoder;
import java.io.Writer;
@@ -41,6 +42,11 @@
*/
private int columns = 30;
+ /**
+ * HTML Entity Encoder
+ */
+ private EntityEncoder entityEncoder = EntityEncoder.FULL;
+
public UIFormTextAreaInput()
{
}
@@ -72,7 +78,7 @@
w.append(" cols=\"").append(String.valueOf(columns)).append("\"");
w.write(">");
if (value != null)
- w.write(value);
+ w.write(entityEncoder.encode(value));
w.write("</textarea>");
if (this.isMandatory())
w.write(" *");
13 years, 6 months