gatein SVN: r962 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-07 07:30:18 -0500 (Mon, 07 Dec 2009)
New Revision: 962
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
Log:
Resource bundles aren't stored in DB by default
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2009-12-07 12:11:50 UTC (rev 961)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2009-12-07 12:30:18 UTC (rev 962)
@@ -60,7 +60,7 @@
</values-param>
<values-param>
<name>init.resources</name>
- <description>Store the following resources into the db for the first launch </description>
+ <description>Initiate the following resources during the first launch</description>
<value>locale.portal.expression</value>
<value>locale.portal.services</value>
<value>locale.portal.webui</value>
16 years, 4 months
- 1
- 0
gatein SVN: r961 - in portal/trunk/component/test: core/src/main/java/org/exoplatform/component/test and 13 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-12-07 07:11:50 -0500 (Mon, 07 Dec 2009)
New Revision: 961
Added:
portal/trunk/component/test/core/src/test/java/org/exoplatform/component/test/
portal/trunk/component/test/core/src/test/java/org/exoplatform/component/test/BootstrapTestCase.java
portal/trunk/component/test/core/src/test/java/org/exoplatform/component/test/CustomService.java
portal/trunk/component/test/core/src/test/resources/conf/
portal/trunk/component/test/core/src/test/resources/conf/test-configuration.xml
portal/trunk/component/test/jcr/src/test/
portal/trunk/component/test/jcr/src/test/java/
portal/trunk/component/test/jcr/src/test/java/org/
portal/trunk/component/test/jcr/src/test/java/org/exoplatform/
portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/
portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/
portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/
portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java
portal/trunk/component/test/jcr/src/test/resources/
Modified:
portal/trunk/component/test/core/pom.xml
portal/trunk/component/test/core/src/main/java/org/exoplatform/component/test/GateInTestClassLoader.java
portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml
portal/trunk/component/test/core/src/main/resources/conf/root-configuration.xml
Log:
- unit test the component test to validate they work
- added logging
Modified: portal/trunk/component/test/core/pom.xml
===================================================================
--- portal/trunk/component/test/core/pom.xml 2009-12-07 10:49:28 UTC (rev 960)
+++ portal/trunk/component/test/core/pom.xml 2009-12-07 12:11:50 UTC (rev 961)
@@ -33,6 +33,12 @@
<dependencies>
<dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ <version>${org.gatein.common.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -46,10 +52,34 @@
<dependency>
<groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.common</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.container</artifactId>
<version>${org.exoplatform.kernel.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
<build>
Modified: portal/trunk/component/test/core/src/main/java/org/exoplatform/component/test/GateInTestClassLoader.java
===================================================================
--- portal/trunk/component/test/core/src/main/java/org/exoplatform/component/test/GateInTestClassLoader.java 2009-12-07 10:49:28 UTC (rev 960)
+++ portal/trunk/component/test/core/src/main/java/org/exoplatform/component/test/GateInTestClassLoader.java 2009-12-07 12:11:50 UTC (rev 961)
@@ -18,9 +18,10 @@
*/
package org.exoplatform.component.test;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -50,6 +51,9 @@
/** . */
private final Set<String> portalConfigPaths;
+ /** . */
+ private Logger log = LoggerFactory.getLogger(AbstractGateInTest.class);
+
public GateInTestClassLoader(ClassLoader parent, Set<String> rootConfigPaths, Set<String> portalConfigPaths)
{
super(parent);
@@ -62,14 +66,15 @@
@Override
public Enumeration<URL> getResources(String name) throws IOException
{
- System.out.println("name = " + name);
if ("conf/configuration.xml".equals(name))
{
- return getURLs(rootConfigPaths);
+ log.info("About to load root configuration");
+ return getResourceURLs(rootConfigPaths);
}
else if ("conf/portal/configuration.xml".equals(name))
{
- return getURLs(portalConfigPaths);
+ log.info("About to load portal configuration");
+ return getResourceURLs(portalConfigPaths);
}
else if ("conf/portal/test-configuration.xml".equals(name))
{
@@ -81,12 +86,14 @@
}
}
- private Enumeration<URL> getURLs(Set<String> paths) throws IOException
+ private Enumeration<URL> getResourceURLs(Set<String> paths) throws IOException
{
ArrayList<URL> urls = new ArrayList<URL>();
for (String path : paths)
{
- urls.addAll(Collections.list(super.getResources(path)));
+ ArrayList<URL> resourceURLs = Collections.list(super.getResources(path));
+ log.info("Want to load for resource named " + path + " the urls " + resourceURLs);
+ urls.addAll(resourceURLs);
}
return Collections.enumeration(urls);
}
Modified: portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml
===================================================================
--- portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml 2009-12-07 10:49:28 UTC (rev 960)
+++ portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml 2009-12-07 12:11:50 UTC (rev 961)
@@ -24,4 +24,46 @@
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ <component>
+ <key>org.exoplatform.services.naming.InitialContextInitializer</key>
+ <type>org.exoplatform.services.naming.InitialContextInitializer</type>
+ <init-params>
+ <properties-param>
+ <name>default-properties</name>
+ <description>Default initial context properties</description>
+ </properties-param>
+ </init-params>
+ </component>
+
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>jdbcexo</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+ <property name="url" value="jdbc:hsqldb:file:../temp/data/exodb"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
</configuration>
Modified: portal/trunk/component/test/core/src/main/resources/conf/root-configuration.xml
===================================================================
--- portal/trunk/component/test/core/src/main/resources/conf/root-configuration.xml 2009-12-07 10:49:28 UTC (rev 960)
+++ portal/trunk/component/test/core/src/main/resources/conf/root-configuration.xml 2009-12-07 12:11:50 UTC (rev 961)
@@ -28,46 +28,4 @@
<type>org.exoplatform.container.definition.PortalContainerConfig</type>
</component>
- <component>
- <key>org.exoplatform.services.naming.InitialContextInitializer</key>
- <type>org.exoplatform.services.naming.InitialContextInitializer</type>
- <init-params>
- <properties-param>
- <name>default-properties</name>
- <description>Default initial context properties</description>
- </properties-param>
- </init-params>
- </component>
-
- <external-component-plugins>
- <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
- <component-plugin>
- <name>bind.datasource</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
- <value>jdbcexo</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.sql.DataSource</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
- </value-param>
- <properties-param>
- <name>ref-addresses</name>
- <description>ref-addresses</description>
- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
- <property name="url" value="jdbc:hsqldb:file:../temp/data/exodb"/>
- <property name="username" value="sa"/>
- <property name="password" value=""/>
- </properties-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-
</configuration>
Added: portal/trunk/component/test/core/src/test/java/org/exoplatform/component/test/BootstrapTestCase.java
===================================================================
--- portal/trunk/component/test/core/src/test/java/org/exoplatform/component/test/BootstrapTestCase.java (rev 0)
+++ portal/trunk/component/test/core/src/test/java/org/exoplatform/component/test/BootstrapTestCase.java 2009-12-07 12:11:50 UTC (rev 961)
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+package org.exoplatform.component.test;
+
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.services.naming.InitialContextInitializer;
+
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+@ConfiguredBy({
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/jcr/jcr-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-configuration.xml")
+})
+public class BootstrapTestCase extends AbstractGateInTest
+{
+
+ public void testBoot()
+ {
+ PortalContainer container = PortalContainer.getInstance();
+ CustomService testService = (CustomService)container.getComponentInstanceOfType(CustomService.class);
+ assertNotNull(testService);
+ }
+
+ public void testDataSource() throws Exception
+ {
+ PortalContainer container = PortalContainer.getInstance();
+ container.getComponentInstanceOfType(InitialContextInitializer.class);
+ DataSource ds = (DataSource)new InitialContext().lookup("jdbcexo");
+ assertNotNull(ds);
+ }
+}
Added: portal/trunk/component/test/core/src/test/java/org/exoplatform/component/test/CustomService.java
===================================================================
--- portal/trunk/component/test/core/src/test/java/org/exoplatform/component/test/CustomService.java (rev 0)
+++ portal/trunk/component/test/core/src/test/java/org/exoplatform/component/test/CustomService.java 2009-12-07 12:11:50 UTC (rev 961)
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+package org.exoplatform.component.test;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class CustomService
+{
+}
Added: portal/trunk/component/test/core/src/test/resources/conf/test-configuration.xml
===================================================================
--- portal/trunk/component/test/core/src/test/resources/conf/test-configuration.xml (rev 0)
+++ portal/trunk/component/test/core/src/test/resources/conf/test-configuration.xml 2009-12-07 12:11:50 UTC (rev 961)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+ <component>
+ <type>org.exoplatform.component.test.CustomService</type>
+ </component>
+
+</configuration>
Added: portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java
===================================================================
--- portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java (rev 0)
+++ portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java 2009-12-07 12:11:50 UTC (rev 961)
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+package org.exoplatform.component.test.jcr;
+
+import org.exoplatform.component.test.AbstractGateInTest;
+import org.exoplatform.component.test.ConfigurationUnit;
+import org.exoplatform.component.test.ConfiguredBy;
+import org.exoplatform.component.test.ContainerScope;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.services.jcr.RepositoryService;
+import org.exoplatform.services.jcr.core.ManageableRepository;
+
+import javax.jcr.Session;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/jcr/jcr-configuration.xml")})
+public class BootstrapTestCase extends AbstractGateInTest
+{
+
+ public void testWorkspace() throws Exception
+ {
+ PortalContainer container = PortalContainer.getInstance();
+ RepositoryService repos = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
+ assertNotNull(repos);
+ ManageableRepository repo = repos.getDefaultRepository();
+ assertNotNull(repo);
+ Session session = repo.getSystemSession("portal-test");
+ assertNotNull(session);
+ session.logout();
+ }
+}
16 years, 4 months
- 1
- 0
gatein SVN: r960 - in portal/trunk/component: web/src/main/java/org/exoplatform/web and 4 other directories.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-12-07 05:49:28 -0500 (Mon, 07 Dec 2009)
New Revision: 960
Added:
portal/trunk/component/web/src/main/java/org/exoplatform/web/resource/
portal/trunk/component/web/src/main/java/org/exoplatform/web/resource/config/
portal/trunk/component/web/src/main/java/org/exoplatform/web/resource/config/xml/
portal/trunk/component/web/src/main/java/org/exoplatform/web/resource/config/xml/GateinResource.java
Removed:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/GateinResource.java
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/AbstractTaskXMLBinding.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java
Log:
GTNPORTAL-360: Refactor Java code in Skin/Javascript service 's deployer
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/AbstractTaskXMLBinding.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/AbstractTaskXMLBinding.java 2009-12-07 10:41:38 UTC (rev 959)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/AbstractTaskXMLBinding.java 2009-12-07 10:49:28 UTC (rev 960)
@@ -23,6 +23,7 @@
import org.exoplatform.portal.resource.config.tasks.PortalSkinTask;
import org.exoplatform.portal.resource.config.tasks.PortletSkinTask;
import org.exoplatform.portal.resource.config.tasks.ThemeTask;
+import org.exoplatform.web.resource.config.xml.GateinResource;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
Deleted: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/GateinResource.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/GateinResource.java 2009-12-07 10:41:38 UTC (rev 959)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/GateinResource.java 2009-12-07 10:49:28 UTC (rev 960)
@@ -1,64 +0,0 @@
-/**
- * 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.
- */
-
-package org.exoplatform.portal.resource.config.xml;
-
-/**
- *
- * Created by eXoPlatform SAS
- *
- * Author: Minh Hoang TO - hoang281283(a)gmail.com
- *
- * Sep 17, 2009
- */
-public interface GateinResource
-{
-
- final public static String SKIN_DEF_TAG = "skin-def";
-
- final public static String SKIN_NAME_TAG = "skin-name";
-
- final public static String SKIN_MODULE_TAG = "skin-module";
-
- final public static String PORTAl_SKIN_TAG = "portal-skin";
-
- final public static String PORTLET_SKIN_TAG = "portlet-skin";
-
- final public static String PORTLET_NAME_TAG = "portlet-name";
-
- final public static String APPLICATION_NAME_TAG = "application-name";
-
- final public static String CSS_PATH_TAG = "css-path";
-
- final public static String WINDOW_STYLE_TAG = "window-style";
-
- final public static String STYLE_NAME_TAG = "style-name";
-
- final public static String STYLE_THEME_TAG = "style-theme";
-
- final public static String THEME_NAME_TAG = "theme-name";
-
- final public static String JAVA_SCRIPT_TAG = "javascript";
-
- final public static String JAVA_SCRIPT_PARAM = "param";
-
- final public static String JAVA_SCRIPT_MODULE = "js-module";
-
- final public static String JAVA_SCRIPT_PATH = "js-path";
-}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java 2009-12-07 10:41:38 UTC (rev 959)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java 2009-12-07 10:49:28 UTC (rev 960)
@@ -21,6 +21,7 @@
import org.exoplatform.portal.resource.SkinService;
import org.exoplatform.portal.resource.config.tasks.AbstractSkinTask;
+import org.exoplatform.web.resource.config.xml.GateinResource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java 2009-12-07 10:41:38 UTC (rev 959)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java 2009-12-07 10:49:28 UTC (rev 960)
@@ -26,6 +26,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.exoplatform.web.resource.config.xml.GateinResource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -68,9 +69,7 @@
{
List<JavascriptTask> tasks = new ArrayList<JavascriptTask>();
Element element = document.getDocumentElement();
- // NodeList nodes =
- // element.getElementsByTagName(GateinResource.JAVA_SCRIPT_TAG);
- NodeList nodes = element.getElementsByTagName("javascript");
+ NodeList nodes = element.getElementsByTagName(GateinResource.JAVA_SCRIPT_TAG);
int length = nodes.getLength();
for (int i = 0; i < length; i++)
{
@@ -85,23 +84,22 @@
private static JavascriptTask xmlToTask(Element element)
{
- // if(!GateinResource.JAVA_SCRIPT_TAG.equals(element.getTagName())){
- if (!"javascript".equals(element.getTagName()))
+ if (!GateinResource.JAVA_SCRIPT_TAG.equals(element.getTagName()))
{
return null;
}
try
{
JavascriptTask task = new JavascriptTask();
- // NodeList nodes =
- // element.getElementsByTagName(GateinResource.JAVA_SCRIPT_PARAM);
- NodeList nodes = element.getElementsByTagName("param");
+ NodeList nodes = element.getElementsByTagName(GateinResource.JAVA_SCRIPT_PARAM);
int length = nodes.getLength();
for (int i = 0; i < length; i++)
{
Element param_ele = (Element)nodes.item(i);
- String js_module = param_ele.getElementsByTagName("js-module").item(0).getFirstChild().getNodeValue();
- String js_path = param_ele.getElementsByTagName("js-path").item(0).getFirstChild().getNodeValue();
+ String js_module =
+ param_ele.getElementsByTagName(GateinResource.JAVA_SCRIPT_MODULE).item(0).getFirstChild().getNodeValue();
+ String js_path =
+ param_ele.getElementsByTagName(GateinResource.JAVA_SCRIPT_PATH).item(0).getFirstChild().getNodeValue();
task.addJSKey(js_module, js_path);
}
return task;
Added: portal/trunk/component/web/src/main/java/org/exoplatform/web/resource/config/xml/GateinResource.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/resource/config/xml/GateinResource.java (rev 0)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/resource/config/xml/GateinResource.java 2009-12-07 10:49:28 UTC (rev 960)
@@ -0,0 +1,64 @@
+/**
+ * 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.
+ */
+
+package org.exoplatform.web.resource.config.xml;
+
+/**
+ *
+ * Created by eXoPlatform SAS
+ *
+ * Author: Minh Hoang TO - hoang281283(a)gmail.com
+ *
+ * Sep 17, 2009
+ */
+public interface GateinResource
+{
+
+ final public static String SKIN_DEF_TAG = "skin-def";
+
+ final public static String SKIN_NAME_TAG = "skin-name";
+
+ final public static String SKIN_MODULE_TAG = "skin-module";
+
+ final public static String PORTAl_SKIN_TAG = "portal-skin";
+
+ final public static String PORTLET_SKIN_TAG = "portlet-skin";
+
+ final public static String PORTLET_NAME_TAG = "portlet-name";
+
+ final public static String APPLICATION_NAME_TAG = "application-name";
+
+ final public static String CSS_PATH_TAG = "css-path";
+
+ final public static String WINDOW_STYLE_TAG = "window-style";
+
+ final public static String STYLE_NAME_TAG = "style-name";
+
+ final public static String STYLE_THEME_TAG = "style-theme";
+
+ final public static String THEME_NAME_TAG = "theme-name";
+
+ final public static String JAVA_SCRIPT_TAG = "javascript";
+
+ final public static String JAVA_SCRIPT_PARAM = "param";
+
+ final public static String JAVA_SCRIPT_MODULE = "js-module";
+
+ final public static String JAVA_SCRIPT_PATH = "js-path";
+}
16 years, 4 months
- 1
- 0
gatein SVN: r959 - in portal/trunk: portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-12-07 05:41:38 -0500 (Mon, 07 Dec 2009)
New Revision: 959
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/applicationregistry/component/SampleGadget.groovy
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java
Log:
fix issues with gadget creation in the gadget registry service
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2009-12-07 06:36:13 UTC (rev 958)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2009-12-07 10:41:38 UTC (rev 959)
@@ -20,6 +20,8 @@
import org.chromattic.api.Chromattic;
import org.chromattic.api.ChromatticSession;
+import org.chromattic.ntdef.NTFile;
+import org.chromattic.ntdef.Resource;
import org.exoplatform.application.gadget.Gadget;
import org.exoplatform.application.gadget.GadgetRegistryService;
import org.exoplatform.application.registry.impl.ApplicationRegistryChromatticLifeCycle;
@@ -171,7 +173,28 @@
//
if (def == null)
{
- throw new IllegalArgumentException("No such gadget " + gadget.getName());
+ def = registry.addGadget(gadget.getName());
+ if (gadget.isLocal())
+ {
+ def.setLocal(true);
+ LocalGadgetData data = (LocalGadgetData)def.getData();
+ String fileName = gadget.getName() + ".xml";
+ data.setFileName(fileName);
+ data.getResources().createFile(fileName, new Resource(
+ "application.xml",
+ "UTF-8",
+ ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+ "<Module><ModulePrefs title=\"\" />" +
+ "<Content type=\"html\"> <![CDATA[]]>" +
+ "</Content>" +
+ "</Module>").getBytes("UTF-8")));
+ }
+ else
+ {
+ def.setLocal(false);
+ RemoteGadgetData data = (RemoteGadgetData)def.getData();
+ data.setURL(gadget.getUrl());
+ }
}
//
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java 2009-12-07 06:36:13 UTC (rev 958)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java 2009-12-07 10:41:38 UTC (rev 959)
@@ -18,6 +18,10 @@
*/
package org.exoplatform.application.gadget.impl;
+import org.apache.shindig.common.uri.Uri;
+import org.apache.shindig.gadgets.spec.GadgetSpec;
+import org.apache.shindig.gadgets.spec.ModulePrefs;
+import org.chromattic.ntdef.Resource;
import org.exoplatform.application.gadget.Gadget;
import org.exoplatform.application.gadget.GadgetRegistryService;
import org.exoplatform.application.gadget.Source;
@@ -85,18 +89,31 @@
}
//
- GadgetDefinition def = gadgetRegistryService.getRegistry().getGadget(gadget.getName());
+ GadgetRegistry registry = gadgetRegistryService.getRegistry();
//
- if (def == null)
- {
- throw new IllegalStateException("No such gadget " + gadget.getName());
- }
+ GadgetDefinition def = registry.getGadget(gadget.getName());
//
GadgetData data = def.getData();
if (data instanceof LocalGadgetData)
{
+ GadgetSpec spec = new GadgetSpec(Uri.parse("http://www.gatein.org"), source.getTextContent());
+ ModulePrefs prefs = spec.getModulePrefs();
+
+ //
+ String description = prefs.getDescription();
+ String thumbnail = prefs.getThumbnail().toString();
+ String title = getGadgetTitle(prefs, gadget.getName());
+ String referenceURL = prefs.getTitleUrl().toString();
+
+ // Update state from XML
+ def.setDescription(description);
+ def.setThumbnail(thumbnail); // Do something better than that
+ def.setTitle(title);
+ def.setReferenceURL(referenceURL);
+
+ // Save text content
LocalGadgetData localData = (LocalGadgetData)data;
localData.setSource(source.getTextContent());
}
@@ -106,8 +123,20 @@
}
}
+ private String getGadgetTitle(ModulePrefs prefs, String defaultValue)
+ {
+ String title = prefs.getDirectoryTitle();
+ if (title == null || title.trim().length() < 1)
+ {
+ title = prefs.getTitle();
+ }
+ if (title == null || title.trim().length() < 1)
+ {
+ return defaultValue;
+ }
+ return title;
+ }
-
public void removeSource(String sourcePath) throws Exception
{
// No op
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2009-12-07 06:36:13 UTC (rev 958)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2009-12-07 10:41:38 UTC (rev 959)
@@ -168,6 +168,23 @@
}
}
+ // If gadget is null we need to create it first
+ if (gadget == null)
+ {
+ gadget = new Gadget();
+ gadget.setName("CHANGME");
+
+ // Those data will be taken from the gadget XML anyway
+ gadget.setDescription("");
+ gadget.setThumbnail("");
+ gadget.setLocal(true);
+ gadget.setTitle("");
+ gadget.setReferenceUrl("");
+
+ // Save gadget with empty data first
+ service.saveGadget(gadget);
+ }
+
//
Source source = new Source(fileName, "application/xml");
source.setTextContent(text);
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/applicationregistry/component/SampleGadget.groovy
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/applicationregistry/component/SampleGadget.groovy 2009-12-07 06:36:13 UTC (rev 958)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/uiconf/applicationregistry/component/SampleGadget.groovy 2009-12-07 10:41:38 UTC (rev 959)
@@ -19,7 +19,7 @@
String sample = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"+
"<Module>" +
- "<ModulePrefs title=\"hello world example\" />" +
+ "<ModulePrefs title=\"hello world example\" description=\"The hello world gadget.\"/>" +
"<Content type=\"html\">" +
" <![CDATA[" +
" Hello, world!" +
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java 2009-12-07 06:36:13 UTC (rev 958)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java 2009-12-07 10:41:38 UTC (rev 959)
@@ -46,12 +46,12 @@
*/
public class GadgetUtil
{
- static final public GadgetApplication toGadgetApplication(Gadget model)
+ static public GadgetApplication toGadgetApplication(Gadget model)
{
return new GadgetApplication(model.getName(), model.getUrl(), model.isLocal());
}
- static final public Gadget toGadget(String name, String path, boolean isLocal) throws Exception
+ static public Gadget toGadget(String name, String path, boolean isLocal) throws Exception
{
Gadget gadget = new Gadget();
gadget.setName(name);
@@ -79,7 +79,7 @@
*
* @return the string represents metadata of gadget application
*/
- static final public String fetchGagdetMetadata(String urlStr)
+ public static String fetchGagdetMetadata(String urlStr)
{
String result = null;
@@ -127,7 +127,7 @@
* @throws JSONException if can't create jsonObject from metadata
*/
@SuppressWarnings("unchecked")
- static final public Map<String, String> getMapMetadata(String url) throws JSONException
+ static public Map<String, String> getMapMetadata(String url) throws JSONException
{
Map<String, String> mapMetaData = new HashMap<String, String>();
String metadata = fetchGagdetMetadata(url);
@@ -142,7 +142,7 @@
return mapMetaData;
}
- static final public String reproduceUrl(String path, boolean isLocal)
+ static public String reproduceUrl(String path, boolean isLocal)
{
if (isLocal)
{
@@ -151,12 +151,12 @@
return path;
}
- static final public String getViewPath(String uri)
+ static public String getViewPath(String uri)
{
return getLocalHostBase() + "/" + PortalContainer.getCurrentRestContextName() + "/" + uri;
}
- static final public String getEditPath(String uri)
+ static public String getEditPath(String uri)
{
return getLocalHostBase() + "/" + PortalContainer.getCurrentRestContextName() + "/private/" + uri;
}
@@ -225,7 +225,7 @@
return hostName.substring(0, index);
}
- static final private String getHostName()
+ static private String getHostName()
{
ExoContainer container = ExoContainerContext.getCurrentContainer();
GadgetRegistryService gadgetService =
@@ -233,7 +233,7 @@
return gadgetService.getHostName();
}
- static final private String getLocalHostName()
+ static private String getLocalHostName()
{
PortalRequestContext pContext = Util.getPortalRequestContext();
StringBuffer requestUrl = pContext.getRequest().getRequestURL();
16 years, 4 months
- 1
- 0
gatein SVN: r958 - in portal/trunk/docs/user-guide/en/modules: account and 5 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2009-12-07 01:36:13 -0500 (Mon, 07 Dec 2009)
New Revision: 958
Modified:
portal/trunk/docs/user-guide/en/modules/Account.xml
portal/trunk/docs/user-guide/en/modules/Further_Documentation.xml
portal/trunk/docs/user-guide/en/modules/GadgetsAdmin.xml
portal/trunk/docs/user-guide/en/modules/Integration.xml
portal/trunk/docs/user-guide/en/modules/Introduction.xml
portal/trunk/docs/user-guide/en/modules/Language.xml
portal/trunk/docs/user-guide/en/modules/Portal.xml
portal/trunk/docs/user-guide/en/modules/PortletsUser.xml
portal/trunk/docs/user-guide/en/modules/Terms.xml
portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml
portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml
portal/trunk/docs/user-guide/en/modules/account/Change_User_Password.xml
portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml
portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml
portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml
portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml
portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml
portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml
portal/trunk/docs/user-guide/en/modules/language/Internationalization_Portlet.xml
portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml
portal/trunk/docs/user-guide/en/modules/language/Right_To_Left_Support_(RTL).xml
portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml
portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml
portal/trunk/docs/user-guide/en/modules/portal/Create_a_New_Portal.xml
portal/trunk/docs/user-guide/en/modules/portal/Drag_and_Drop_the_Page_Body.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml
portal/trunk/docs/user-guide/en/modules/portal/Page_Creation_Wizard.xml
portal/trunk/docs/user-guide/en/modules/portal/Switching_between_Portals.xml
portal/trunk/docs/user-guide/en/modules/portal/Toolbar.xml
portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml
portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml
portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml
portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml
portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml
portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml
portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml
portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml
Log:
first commit of structural edit
Modified: portal/trunk/docs/user-guide/en/modules/Account.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Account.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/Account.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<chapter id="chap-User_Guide-Account">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Account</title>
+ --><title>Accounts</title>
<xi:include href="account/Register_New_Accounts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="account/Change_User_Password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="account/Change_Account_Settings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: portal/trunk/docs/user-guide/en/modules/Further_Documentation.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Further_Documentation.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/Further_Documentation.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<chapter id="chap-User_Guide-Further_Documentation">
- <!--
+<chapter id="chap-User_Guide-Futher_Documentation">
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,11 +21,9 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Futher Documentation</title>
-
+ --><title>Futher Documentation</title>
<para>
Further documentation about using and configuring the GateIn Portal can be found in the GateIn Portal Install Guide or the GateIn Portal Reference Guide which are hosted at <ulink type="http" url="www.redhat.com/docs">www.redhat.com/docs</ulink>.
</para>
-
</chapter>
Modified: portal/trunk/docs/user-guide/en/modules/GadgetsAdmin.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/GadgetsAdmin.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/GadgetsAdmin.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<chapter id="chap-User_Guide-Gadgets_Administration">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Gadgets Administration</title>
+ --><title>Gadgets Administration</title>
<xi:include href="gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="gadgetsAdmin/Import_Portlets_and_Gadgets.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="gadgetsAdmin/Manage_Portlets_and_Gadgets.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: portal/trunk/docs/user-guide/en/modules/Integration.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Integration.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/Integration.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -1,4 +1,8 @@
-<!--
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+<chapter id="chap-User_Guide-Integration">
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -17,19 +21,13 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.4//EN" "http://www.oasis-open.org/docbook/sgml/4.4/docbookx.dtd">
-<chapter>
-<title>Integration</title>
-
-TODO
-
-<!--
+ --><title>Integration</title>
+ TODO <!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration/Use_an_Existing_Portlet_Application.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration/Package_Gadgets.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration/JSF1_2_JBossPortletBridge_Richfaces.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration/JSF1_1_MyFaces_Spring.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration/Changing_GateIn_URL.xml" />
- -->
-</chapter>
\ No newline at end of file
+ -->
+</chapter>
+
Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Introduction.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/Introduction.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<chapter id="chap-User_Guide-Introduction">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,10 +21,10 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Introduction</title>
+ --><title>Introduction</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Frontpage.png" format="PNG" scalefit="1" />
+ <imagedata fileref="images/Frontpage.png" format="PNG" scalefit="1" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -38,7 +38,7 @@
GateIn project homepage. GateIn 3.0 is the community project that Enterprise Portal Platform 5.0 is based on. <ulink url="http://www.gatein.org">www.gatein.org</ulink>
</para>
</listitem>
-<!-- <listitem>
+ <!-- <listitem>
<para>
GateIn videos. Various video clips created by the GateIn community leads that provide a guide to the usage and features of the GateIn portal, many of wh <ulink url="http://www.jboss.org/gatein/videos.html">www.jboss.org/gatein/videos.html</ulink>
</para>
@@ -52,7 +52,7 @@
<para>
GateIn downloads: <ulink url="http://www.jboss.org/gatein/downloads.html">www.jboss.org/gatein/downloads.html</ulink>
</para>
- </listitem> -->
+ </listitem> -->
</itemizedlist>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/Language.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Language.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/Language.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<chapter id="chap-User_Guide-Language_administration">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Language administration</title>
+ --><title>Language administration</title>
<xi:include href="language/Change_Interface_Language.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="language/Right_To_Left_Support_(RTL).xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="language/Multi-Language_Navigation_Nodes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: portal/trunk/docs/user-guide/en/modules/Portal.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Portal.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/Portal.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<chapter id="chap-User_Guide-Portal_Administration">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,16 +21,15 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Portal Administration</title>
-
-<!-- xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="portal/User_Workspace.xml" /> -->
+ --><title>Portal Administration</title>
+ <!-- xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="portal/User_Workspace.xml" /> -->
<xi:include href="portal/Toolbar.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portal/User_Management.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portal/Manage_Permission.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portal/Change_Portal_Skins.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portal/Manage_Page_Navigation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-<!-- <xi:include href="portal/Manage_Navigation_Nodes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portal/Change_Node_Order.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> To be includeed in Reference Guide-->
+<!-- <xi:include href="portal/Manage_Navigation_Nodes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="portal/Change_Node_Order.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> To be included in Reference Guide -->
<xi:include href="portal/Manage_Pages.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portal/Page_Creation_Wizard.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portal/Drag_and_Drop_the_Page_Body.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: portal/trunk/docs/user-guide/en/modules/PortletsUser.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/PortletsUser.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/PortletsUser.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<chapter id="chap-User_Guide-Portlets">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Portlets</title>
+ --><title>Portlets</title>
<xi:include href="portletsUser/Functional_Portlets.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portletsUser/Interface_Portlets.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portletsUser/Dashboard_Portlet.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: portal/trunk/docs/user-guide/en/modules/Terms.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Terms.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/Terms.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<chapter id="chap-User_Guide-Terms">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,15 +21,15 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Terms</title>
+ --><title>Terms</title>
<xi:include href="terms/Portal_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="terms/Portlet_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="terms/Navigation_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="terms/Gadget_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="terms/Public_mode_and_Private_mode.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="terms/Permission_levels.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Deprecated
+ <!-- Deprecated
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="terms/Workspace_concept.xml" />
- --><xi:include href="terms/Toolbar_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ --><xi:include href="terms/Toolbar_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
Modified: portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Account_and_Password_Retrieval">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,77 +21,87 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Account and Password Retrieval</title>
+ --><title>Account and Password Retrieval</title>
<para>
This feature is really useful when you forget your account or password by recovering it quickly through following simple steps:
</para>
- <para>
- 1. Show the form that guides you step by step in recovering your User name/ Password by clicking the link 'Forget your User Name/Password?' beneath the <emphasis role="bold">Password</emphasis> field of the <emphasis role="bold">Sign in</emphasis> form.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/SignIn1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <para>
- This form offers two options to select:
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Forgot1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <itemizedlist>
- <listitem>
+ <procedure>
+ <step>
<para>
- <emphasis role="bold">Forgot my password</emphasis> : If you forget your password, you need to select this option.
+ Show the form that guides you step by step in recovering your User name/ Password by clicking the link 'Forget your User Name/Password?' beneath the <emphasis role="bold">Password</emphasis> field of the <emphasis role="bold">Sign in</emphasis> form.
</para>
- </listitem>
- <listitem>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/SignIn1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
<para>
- <emphasis role="bold">Forgot my username</emphasis> : If you forget your username, you need to select this option.
+ This form offers two options to select:
</para>
- </listitem>
- </itemizedlist>
- <para>
- 2. Select one of two options in this form.
- </para>
- <para>
- 3. Click the <emphasis role="bold">Next</emphasis> button to go to the next step:
- </para>
- <itemizedlist>
- <listitem>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Forgot1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis role="bold">Forgot my password</emphasis> : If you forget your password, you need to select this option.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">Forgot my username</emphasis> : If you forget your username, you need to select this option.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
<para>
- If you selected <emphasis role="bold">Forgot my password</emphasis> option:
+ Select one of two options in this form.
</para>
- </listitem>
- </itemizedlist>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/ForgotUserName1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <itemizedlist>
- <listitem>
+ </step>
+ <step>
<para>
- If you selected <emphasis role="bold">Forgot my username</emphasis> option:
+ Click the <emphasis role="bold">Next</emphasis> button to go to the next step:
</para>
- </listitem>
- </itemizedlist>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/ForgotEmail1.png" format="PNG" />
- </imageobject>
- </mediaobject>
+ <itemizedlist>
+ <listitem>
+ <para>
+ If you selected <emphasis role="bold">Forgot my password</emphasis> option:
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/ForgotUserName1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ <listitem>
+ <para>
+ If you selected <emphasis role="bold">Forgot my username</emphasis> option:
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/ForgotEmail1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ Enter a value in the field of this form.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Send</emphasis> button to send the entered values.
+ </para>
+ </step>
+ </procedure>
<para>
- 4. Enter a value in the field of this form.
+ After your information has been sent, you will be received an email with your User name/ Password in your email address that you registered.
</para>
- <para>
- 5. Click the <emphasis role="bold">Send</emphasis> button to send the entered values.
- </para>
- <para>
- After information is sent, you will be received an email with your User name/ Password in your email address that you registered.
- </para>
<itemizedlist>
<listitem>
<para>
Modified: portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Change_Account_Settings">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,11 +21,11 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Change Account Settings</title>
- <!-- <para>
+ --><title>Change Account Settings</title>
+ <!-- <para>
There are two ways to change the account information:
</para>
- <title>The 1^st^ way</title> -->
+ <title>The 1^st^ way</title> -->
<para>
All users can follow this guides to change your account information.
</para>
@@ -42,45 +42,65 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/AccountProfiles3.png" format="PNG" />
+ <imagedata fileref="images/AccountProfiles3.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
If you want to change your <emphasis role="bold">Account Profiles</emphasis> :
</para>
+ <procedure>
+ <step>
+ <para>
+ Select the <emphasis role="bold">Account Profiles</emphasis> tab. It will display your current basic information.
+ </para>
+ </step>
+ <step>
+ <para>
+ Your <emphasis role="bold">User Name</emphasis> can not be changed. You can change these fields: <emphasis role="bold">First Name</emphasis> , <emphasis role="bold">Last Name</emphasis> and <emphasis role="bold">Email</emphasis> .
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Save</emphasis> button to accept changes.
+ </para>
+ </step>
+ </procedure>
<para>
- 1. Select the <emphasis role="bold">Account Profiles</emphasis> tab. It will display your current basic information.
- </para>
- <para>
- 2. Your <emphasis role="bold">User Name</emphasis> can not be changed. You can change these fields: <emphasis role="bold">First Name</emphasis> , <emphasis role="bold">Last Name</emphasis> and <emphasis role="bold">Email</emphasis> .
- </para>
- <para>
- 3. Click the <emphasis role="bold">Save</emphasis> button to accept changes.
- </para>
- <para>
If you want to change your <emphasis role="bold">Password</emphasis> :
</para>
- <para>
- 1. Select the <emphasis role="bold">Change Password</emphasis> tab, it will display a form:
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/ChangePassword.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <para>
- 2. Input your current password to identify that you are the owner of this account.
- </para>
- <para>
- 3. Input your new password, it must have at least 6 characters
- </para>
- <para>
- 4. Reinput your password in the <emphasis role="bold">Confirm New Password</emphasis> field.
- </para>
- <para>
- 5. Click the <emphasis role="bold">Save</emphasis> button to accept changes.
- </para>
- <!--
+ <procedure>
+ <step>
+ <para>
+ Select the <emphasis role="bold">Change Password</emphasis> tab, it will display a form:
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/ChangePassword.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Input your current password to identify that you are the owner of this account.
+ </para>
+ </step>
+ <step>
+ <para>
+ Input your new password, it must have at least 6 characters
+ </para>
+ </step>
+ <step>
+ <para>
+ Reinput your password in the <emphasis role="bold">Confirm New Password</emphasis> field.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Save</emphasis> button to accept changes.
+ </para>
+ </step>
+ </procedure>
+ <!--
<section>
<title>The 2^nd^ way</title>
@@ -91,7 +111,7 @@
Go to
<emphasis role="bold">GateIn Start</emphasis>
-> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Account Settings</emphasis></para><mediaobject><imageobject><imagedata fileref="images/ChangeLanguage3.png" format="PNG"></imagedata></imageobject></mediaobject><para>It will also open the <emphasis role="bold">Account Profiles</emphasis> form.</para><mediaobject><imageobject><imagedata fileref="images/AccountProfiles1.png" format="PNG"></imagedata></imageobject></mediaobject><para>You can change your information in the <emphasis role="bold">Account Profiles</emphasis> tab and the <emphasis role="bold">Change Password</emphasis> tab as the same as the first way.</para>
- </section> -->
+ </section> -->
</section>
Modified: portal/trunk/docs/user-guide/en/modules/account/Change_User_Password.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Change_User_Password.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/account/Change_User_Password.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Changing_Password">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,18 +21,18 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Changing Password</title>
+ --><title>Changing Password</title>
<para>
TODO
</para>
- <!--
+ <!--
<title>Change User Password</title>
<para>This video shows you how to change the user password step by
step:</para>
<itemizedlist>
<listitem>changepasswordexo.swf</listitem>
</itemizedlist>
- -->
+ -->
</section>
Modified: portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Register_New_Accounts">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,30 +21,30 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Register New Accounts</title>
+ --><title>Register New Accounts</title>
<para>
- If you are a visitor of GateIn Portal, you only may read news or take some normal actions. Thus to access and get more actions, you should register and contact with administrators to get more permissions!
+ If you are a visitor to a portal built with &PRODUCT;, you only may read news or take some normal actions. Thus to access and get more actions, you should register and contact with administrators to get more permissions!
</para>
<para>
- GateIn Portal supports users to register a new account by themselves quickly and easily. Just by completing the steps below, you will have a new account that helps you access more pages and take more actions in GateIn Portal:
+ &PRODUCT; supports users to register a new account by themselves quickly and easily. Just by completing the steps below, you will have a new account that helps you access more pages and take more actions in &PRODUCT;:
</para>
- <orderedlist>
- <listitem>
+ <procedure>
+ <step>
<para>
Go to a portal by typing the URL in the address bar (e.g: http://localhost:8080/portal).
<mediaobject>
<imageobject>
- <imagedata fileref="images/Frontpage.png" format="PNG" />
+ <imagedata fileref="images/Frontpage.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Click <emphasis role="bold">Register</emphasis> on the Navigation bar. The Register page will appear:
<mediaobject>
<imageobject>
- <imagedata fileref="images/AccountSetting.png" format="PNG" />
+ <imagedata fileref="images/AccountSetting.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
@@ -115,31 +115,31 @@
</tbody>
</tgroup>
</informaltable>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Fill in the form.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Click the magnifying glass icon !images/magnifyIcon.png! to search and check if the chosen username is available.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Input values in the <emphasis role="bold">User Profile</emphasis> tab, include: Profile information, Home information, Business information. These fields are not required.
</para>
<para>
- GateIn Portal facilitates users with 4 commonly used languagues: English, French, Vietnamese and Arabic in the <emphasis role="bold">Language</emphasis> field. You can select one of these languages to work with.
+ &PRODUCT; facilitates users with 4 commonly used languagues: English, French, Vietnamese and Arabic in the <emphasis role="bold">Language</emphasis> field. You can select one of these languages to work with.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/UserProfile.png" format="PNG" />
+ <imagedata fileref="images/UserProfile.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Click <emphasis role="bold">Save</emphasis> to register a new account or <emphasis role="bold">Reset</emphasis> to refresh all entered values. There will be an alert message and you can not add a new account if one of these cases occurs:
</para>
@@ -170,8 +170,8 @@
</para>
</listitem>
</itemizedlist>
- </listitem>
- </orderedlist>
+ </step>
+ </procedure>
<para>
After adding a new account, you should either contact the administrator to get more permissions or you are only a visitor user.
<note>
Modified: portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Remember_User_Account">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,27 +21,35 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Remember User Account</title>
+ --><title>Remember User Account</title>
<para>
- This feature allows users to return to the GateIn Portal and be automatically authenticated based on the value of a cookie provided by the browser. Thus users do not have to perform an explicit authentication again.
+ This feature allows users to return to the &PRODUCT; and be automatically authenticated based on the value of a cookie provided by the browser. Thus users do not have to perform an explicit authentication again.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/RememberMe2.6.png" format="PNG" />
+ <imagedata fileref="images/RememberMe2.6.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
+ <procedure>
+ <step>
+ <para>
+ Input your registered <emphasis role="bold">User name</emphasis> and <emphasis role="bold">Password</emphasis> .
+ </para>
+ </step>
+ <step>
+ <para>
+ Select the <emphasis role="bold">Remember My Login</emphasis> check box when logging in &PRODUCT; at the first time.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Sign in</emphasis> button to sign in the portal.
+ </para>
+ </step>
+ </procedure>
<para>
- 1. Input your registered <emphasis role="bold">User name</emphasis> and <emphasis role="bold">Password</emphasis> .
+ You must remember to close your browser without signing out (as signing out will delete the cookie). The next time, you can automatically sign in the portal without signing in again with your first/last name welcome.
</para>
- <para>
- 2. Select the <emphasis role="bold">Remember My Login</emphasis> check box when logging in GateIn Portal at the first time.
- </para>
- <para>
- 3. Click the <emphasis role="bold">Sign in</emphasis> button to sign in the portal.
- </para>
- <para>
- You must remember escaping the browser without signing out. The next time, you can automatically sign in the portal without signing in again with your first/last name welcome.
- </para>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Sign_In_and_Sign_Out">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,129 +21,146 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Sign In and Sign Out</title>
- <section id="sect-User_Guide-Sign_In_and_Sign_Out-Sign_In">
- <title>Sign In</title>
+ --><title>Sign In and Sign Out</title>
+
<para>
- After registering your account, you can easily sign in GateIn Portal to go into your private mode:
+ After registering your account, you can easily sign in to &PRODUCT; to go into your private mode:
</para>
- <para>
- 1. Go to a Portal in the public mode by inputting URL in the address bar (e.g: http://localhost:8080/portal)
- </para>
- <para>
- 2. Click the <emphasis role="bold">Sign in</emphasis> link at the top right of a page if you are current in the Classic portal. The <emphasis role="bold">Sign in</emphasis> form appears:
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/SignIn2.6.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <para>
- 3. Input your registered <emphasis role="bold">User name</emphasis> and <emphasis role="bold">Password</emphasis> .
- </para>
- <para>
- 2. Select the <emphasis role="bold">Remember My Login</emphasis> check box when you sign in GateIn Portal at the first time if you want to automatically return to GateIn Portal without signing in again. You can see <xref linkend="sect-User_Guide-Remember_User_Account" /> for more details.
- </para>
- <para>
- 3.Click the <emphasis role="bold">Sign in</emphasis> button to accept or <emphasis role="bold">Discard</emphasis> to escape the <emphasis role="bold">Sign in</emphasis> form.
- </para>
- <para>
- Details:
- </para>
- <informaltable colsep="0" frame="none" rowsep="0">
- <tgroup cols="2">
- <colspec align="center"></colspec>
- <colspec align="center"></colspec>
- <tbody>
- <row>
- <entry>
- <emphasis role="bold"> Field </emphasis>
- </entry>
- <entry>
- <emphasis role="bold"> Description </emphasis>
- </entry>
- </row>
- <row>
- <entry>
- User name
- </entry>
- <entry>
- The registered user name.
- </entry>
- </row>
- <row>
- <entry>
- Password
- </entry>
- <entry>
- The registered password.
- </entry>
- </row>
- <row>
- <entry>
- Remember My Login
- </entry>
- <entry>
- This option allows users to return to GateIn Portal and be automatically authenticated based on the value of a cookie provided by the browser. Thus users do not have to perform an explicit authentication again.
- </entry>
- </row>
- <row>
- <entry>
- Forgot your User Name/Password?
- </entry>
- <entry>
- To follow some steps to get the forgotten user name or password. Please refer [Portal:Account and Password Retrieval] for more details.
- </entry>
- </row>
- <row>
- <entry>
- Sign in
- </entry>
- <entry>
- To sign into GateIn Portal with user name and password.
- </entry>
- </row>
- <row>
- <entry>
- Discard
- </entry>
- <entry>
- To close the *Sign In* form.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- <para>
- In case, <emphasis role="bold">User Name</emphasis> does not exist or the inputted User name/Password is invalid, there will be an alert message requires you to input the right value. To login again, you click the <emphasis role="bold">OK</emphasis> button on the alert message and enter <emphasis role="bold">User Name</emphasis> and <emphasis role="bold">Password</emphasis> again.
- </para>
- <para>
- After signing in, you will be redirected to the authenticated homepage:
- </para>
- <para>
- After signing in, you will be redirected to the authenticated homepage and welcomed with your full First Name and Last Name:
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/PortalHome.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
+ <procedure>
+ <title>Sign In</title>
+ <step>
+ <para>
+ Go to a Portal in the public mode by inputting URL in the address bar (e.g: http://localhost:8080/portal)
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Sign in</emphasis> link at the top right of a page if you are current in the Classic portal. The <emphasis role="bold">Sign in</emphasis> form appears:
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/SignIn2.6.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Input your registered <emphasis role="bold">User name</emphasis> and <emphasis role="bold">Password</emphasis> .
+ </para>
+ </step>
+ <step>
+ <para>
+ Select the <emphasis role="bold">Remember My Login</emphasis> check box when you sign in &PRODUCT; at the first time if you want to automatically return to &PRODUCT; without signing in again. You can see <xref linkend="sect-User_Guide-Remember_User_Account" /> for more details.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Sign in</emphasis> button to accept or <emphasis role="bold">Discard</emphasis> to escape the <emphasis role="bold">Sign in</emphasis> form.
+ </para>
+ </step>
+ <step>
+ <para>
+ Details:
+ </para>
+ <informaltable colsep="0" frame="none" rowsep="0">
+ <tgroup cols="2">
+ <colspec align="center"></colspec>
+ <colspec align="center"></colspec>
+ <tbody>
+ <row>
+ <entry>
+ <emphasis role="bold"> Field </emphasis>
+ </entry>
+ <entry>
+ <emphasis role="bold"> Description </emphasis>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ User name
+ </entry>
+ <entry>
+ The registered user name.
+ </entry>
+ </row>
+ <row>
+ <entry>
+ Password
+ </entry>
+ <entry>
+ The registered password.
+ </entry>
+ </row>
+ <row>
+ <entry>
+ Remember My Login
+ </entry>
+ <entry>
+ This option allows users to return to &PRODUCT; and be automatically authenticated based on the value of a cookie provided by the browser. Thus users do not have to perform an explicit authentication again.
+ </entry>
+ </row>
+ <row>
+ <entry>
+ Forgot your User Name/Password?
+ </entry>
+ <entry>
+ To follow some steps to get the forgotten user name or password. Please refer [Portal:Account and Password Retrieval] for more details.
+ </entry>
+ </row>
+ <row>
+ <entry>
+ Sign in
+ </entry>
+ <entry>
+ To sign into &PRODUCT; with user name and password.
+ </entry>
+ </row>
+ <row>
+ <entry>
+ Discard
+ </entry>
+ <entry>
+ To close the *Sign In* form.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ <para>
+ In case, <emphasis role="bold">User Name</emphasis> does not exist or the inputted User name/Password is invalid, there will be an alert message requires you to input the right value. To login again, you click the <emphasis role="bold">OK</emphasis> button on the alert message and enter <emphasis role="bold">User Name</emphasis> and <emphasis role="bold">Password</emphasis> again.
+ </para>
+ <para>
+ After signing in, you will be redirected to the authenticated homepage:
+ </para>
+ <para>
+ After signing in, you will be redirected to the authenticated homepage and welcomed with your full First Name and Last Name:
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/PortalHome.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ </procedure>
- <section id="sect-User_Guide-Sign_In_and_Sign_Out-Sign_Out">
+ <procedure>
<title>Sign Out</title>
- <para>
- This function lets you get back to the anonymous portal. It ends your current portal session.
- </para>
- <para>
- In the upper left corner of the screen, click <emphasis role="bold">Sign out</emphasis> :
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/SignOut.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
+ <step>
+ <para>
+ This function lets you get back to the anonymous portal. It ends your current portal session.
+ </para>
+ </step>
+ <step>
+ <para>
+ In the upper left corner of the screen, click <emphasis role="bold">Sign out</emphasis> :
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/SignOut.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ </procedure>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Import_Portlets_and_Gadgets">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Import Portlets and Gadgets</title>
+ --><title>Import Portlets and Gadgets</title>
<para>
This convenient feature that helps you import default portlets/gadgets automatically in different categories and these portlets/gadgets will be listed on the left pane.
</para>
@@ -37,7 +37,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Org1.png" format="PNG" />
+ <imagedata fileref="images/Org1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -45,7 +45,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/local.png" format="PNG" />
+ <imagedata fileref="images/local.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
Modified: portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Manage_Gadgets_in_User_Workspace">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Manage Gadgets in User Workspace</title>
+ --><title>Manage Gadgets in User Workspace</title>
<orderedlist numeration="arabic">
<listitem>
<para>
@@ -50,7 +50,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/GadgetManagement.png" format="PNG" />
+ <imagedata fileref="images/GadgetManagement.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -101,7 +101,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/GadgetManagement1.png" format="PNG" />
+ <imagedata fileref="images/GadgetManagement1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -118,7 +118,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/UserWorkspace1.png" format="PNG" />
+ <imagedata fileref="images/UserWorkspace1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -126,7 +126,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/AddApplication.png" format="PNG" />
+ <imagedata fileref="images/AddApplication.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
Modified: portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Manage_Portlets_and_Gadgets">
- <!--
+ <!--
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
@@ -16,7 +16,7 @@
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.
- --><title>Manage Portlets and Gadgets</title>
+ --><title>Manage Portlets and Gadgets</title>
<section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Introduction">
<title>Introduction</title>
<para>
@@ -36,7 +36,7 @@
1. Open a form to add a new category on the right pane by clicking the <emphasis role="bold">Add Category</emphasis> button on the action bar:
<mediaobject>
<imageobject>
- <imagedata fileref="images/AddCategory1.png" format="PNG" />
+ <imagedata fileref="images/AddCategory1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
@@ -90,7 +90,7 @@
<title>{info} This access permission enters the game whenever a user creates or modifies a page. In that moment the user only can see and use portlets in those categories on which he or she has access permission (defined by groups and memberships). {info}</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Permission2.png" format="PNG" />
+ <imagedata fileref="images/Permission2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</figure>
@@ -140,7 +140,7 @@
1. Click the "add" icon!images/AddIcon.png! on the title bar of a category to which you want to add portlets. An interface will appear in the right pane as you can see below:
<mediaobject>
<imageobject>
- <imagedata fileref="images/AddPortlet2.png" format="PNG" />
+ <imagedata fileref="images/AddPortlet2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<informaltable colsep="0" frame="none" rowsep="0">
@@ -196,7 +196,7 @@
1. Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Page Navigations</emphasis> -> select <emphasis role="bold">Administration</emphasis> --> <emphasis role="bold">Application Registry</emphasis>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PortletPermission.png" format="PNG" />
+ <imagedata fileref="images/PortletPermission.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
@@ -231,7 +231,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Portlet.png" format="PNG" />
+ <imagedata fileref="images/Portlet.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<informaltable colsep="0" frame="none" rowsep="0">
@@ -281,7 +281,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Gadgetnew.png" format="PNG" />
+ <imagedata fileref="images/Gadgetnew.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -296,7 +296,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/AddGadgetnew.png" format="PNG" />
+ <imagedata fileref="images/AddGadgetnew.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -314,7 +314,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/CreateGadget1.png" format="PNG" />
+ <imagedata fileref="images/CreateGadget1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -331,7 +331,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/ActionGadget.png" format="PNG" />
+ <imagedata fileref="images/ActionGadget.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
@@ -346,7 +346,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Add.png" format="PNG" />
+ <imagedata fileref="images/Add.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -354,7 +354,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Add3.png" format="PNG" />
+ <imagedata fileref="images/Add3.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -373,7 +373,7 @@
1. Click the edit icon!images/EditGadget.png! . It will display a dialog:
<mediaobject>
<imageobject>
- <imagedata fileref="images/Source.png" format="PNG" />
+ <imagedata fileref="images/Source.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
Modified: portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Change_Interface_Language">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Change Interface Language</title>
+ --><title>Change Interface Language</title>
<para>
GateIn Portal provides users with the most familiar interface language to work with and perform all actions efficiently. The priority of the interface language is 1. User's language 2. Browser's language 3. Portal 's language. Thus to display your prefer language, you should pay attention to this order to change the language type appropriately.
</para>
@@ -80,7 +80,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/InterfaceLanguage.png" format="PNG" />
+ <imagedata fileref="images/InterfaceLanguage.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -103,7 +103,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/InterfaceLanguage2.6.png" format="PNG" />
+ <imagedata fileref="images/InterfaceLanguage2.6.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -135,7 +135,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/InterfaceLanguage.png" format="PNG" />
+ <imagedata fileref="images/InterfaceLanguage.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
Modified: portal/trunk/docs/user-guide/en/modules/language/Internationalization_Portlet.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/language/Internationalization_Portlet.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/language/Internationalization_Portlet.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Internationalization_Portlet">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,13 +21,13 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Internationalization Portlet</title>
+ --><title>Internationalization Portlet</title>
<para>
This portlet is used to define a word or a phrase of the current language to an expected language. The form of this portlet is like:
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Inter2.png" format="PNG" />
+ <imagedata fileref="images/Inter2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -40,7 +40,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/ResourceData1.png" format="PNG" />
+ <imagedata fileref="images/ResourceData1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<informaltable colsep="0" frame="none" rowsep="0">
@@ -98,7 +98,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Resource2.png" format="PNG" />
+ <imagedata fileref="images/Resource2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
@@ -117,7 +117,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Resource3.png" format="PNG" />
+ <imagedata fileref="images/Resource3.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
Modified: portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Multi_Language_Navigation_Nodes">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Multi-Language Navigation Nodes</title>
+ --><title>Multi-Language Navigation Nodes</title>
<section id="sect-User_Guide-Multi_Language_Navigation_Nodes-Overview">
<title>Overview</title>
<para>
@@ -67,7 +67,7 @@
3. At step 1, continue as usual, but enter a resource key in the <emphasis role="bold">Display Name</emphasis> field.
<mediaobject>
<imageobject>
- <imagedata fileref="images/PageWizard.png" format="PNG" />
+ <imagedata fileref="images/PageWizard.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
@@ -132,7 +132,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Internal2.png" format="PNG" />
+ <imagedata fileref="images/Internal2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -200,7 +200,7 @@
</itemizedlist>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PageWizard.png" format="PNG" />
+ <imagedata fileref="images/PageWizard.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<itemizedlist>
@@ -217,7 +217,7 @@
</itemizedlist>
<mediaobject>
<imageobject>
- <imagedata fileref="images/AAANavi.png" format="PNG" />
+ <imagedata fileref="images/AAANavi.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<itemizedlist>
@@ -234,7 +234,7 @@
</itemizedlist>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Search.png" format="PNG" />
+ <imagedata fileref="images/Search.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<itemizedlist>
@@ -246,7 +246,7 @@
</itemizedlist>
<mediaobject>
<imageobject>
- <imagedata fileref="images/ResourceData1.png" format="PNG" />
+ <imagedata fileref="images/ResourceData1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<itemizedlist>
@@ -258,7 +258,7 @@
</itemizedlist>
<mediaobject>
<imageobject>
- <imagedata fileref="images/AfterEdit1.png" format="PNG" />
+ <imagedata fileref="images/AfterEdit1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<itemizedlist>
@@ -280,7 +280,7 @@
</itemizedlist>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Nouvel.png" format="PNG" />
+ <imagedata fileref="images/Nouvel.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/language/Right_To_Left_Support_(RTL).xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/language/Right_To_Left_Support_(RTL).xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/language/Right_To_Left_Support_(RTL).xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-RTL_Support_Right_To_Left">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>RTL Support (Right To Left)</title>
+ --><title>RTL Support (Right To Left)</title>
<para>
GateIn Portal supports RTL (Right to Left) to meet the demand of Arabian customers who want to use the Portal by their own language for more convenient and easy to use. When you change from other languages to Arabic or set the displaying language as Arabic, the displaying on Portal will be changed to Right to Left (RTL) direction because Arabian usually read from Right to Left.
</para>
@@ -30,14 +30,14 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/HomePage2.png" format="PNG" />
+ <imagedata fileref="images/HomePage2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<section id="sect-User_Guide-RTL_Support_Right_To_Left-The_Account_Portlet">
<title>The Account Portlet</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/NewAccount3.png" format="PNG" />
+ <imagedata fileref="images/NewAccount3.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
@@ -46,7 +46,7 @@
<title>The Application Registry Portlet</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/ApplicationRegistry2.png" format="PNG" />
+ <imagedata fileref="images/ApplicationRegistry2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
@@ -64,7 +64,7 @@
<title>The Organization Portlet:</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Organization5.png" format="PNG" />
+ <imagedata fileref="images/Organization5.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
@@ -73,7 +73,7 @@
<title>The User Workspace</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/UserWorkspace2.png" format="PNG" />
+ <imagedata fileref="images/UserWorkspace2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Change_Node_Order">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Change Node Order</title>
+ --><title>Change Node Order</title>
<para>
You can easily change the position of node on the navigation bar on their own convenient order by following these steps:
</para>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Change_Portal_Skins">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,82 +21,73 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Change Portal Skins</title>
- <section id="sect-User_Guide-Change_Portal_Skins-Overview">
- <title>Overview</title>
+ --><title>Change Portal Skins</title>
<para>
GateIn Portal skins are graphic styles that help users display an attractive user interface. Each skin has its own characteristics with different backgrounds, icons, etc. In order to be user-friendly and flexible in use, users are allowed to change their skins without having edit rights on the portal.
</para>
<para>
skin switch that takes only effect on the user's current session until he signs out. You can change the skin permanently or temporarily.
</para>
- </section>
-
- <section id="sect-User_Guide-Change_Portal_Skins-Change_the_skin_permanently">
- <title>Change the skin permanently</title>
- <orderedlist>
+ <itemizedlist>
<listitem>
<para>
- 1. Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis> --> <emphasis role="bold">Edit Current portal</emphasis>
+ <xref linkend="User_Guide-Change_Portal_Skins-Change_the_skin_temporarily"/>
</para>
</listitem>
<listitem>
<para>
- 2. Click the edit icon!images/EditIcon.png! to edit portal properties.
+ <xref linkend="User_Guide-Change_Portal_Skins-Change_the_skin_permanently"/>
</para>
</listitem>
+ </itemizedlist>
+
+ <variablelist>
+ <varlistentry id="User_Guide-Change_Portal_Skins-Change_the_skin_temporarily">
+ <term>Change the skin temporarily</term>
<listitem>
<para>
- 3. In the <emphasis role="bold">Portal Setting</emphasis> tab: select one skin type in the <emphasis role="bold">Skin</emphasis> list field to change and display a skin.
+ Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Skin Settings</emphasis>.
</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Skin1.png" format="PNG" />
- </imageobject>
- </mediaobject>
</listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-Change_Portal_Skins-Change_the_skin_permanently">
+ <term>Change the skin permanently</term>
<listitem>
- <para>
- 4. Click <emphasis role="bold">Save</emphasis> and <emphasis role="bold">Finish</emphasis> icon !images/Finish1.png! so that the modification can take effect.
- </para>
+ <procedure>
+ <step>
+ <para>
+ Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis> --> <emphasis role="bold">Edit Current portal</emphasis>
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the edit icon!images/EditIcon.png! to edit portal properties.
+ </para>
+ </step>
+ <step>
+ <para>
+ In the <emphasis role="bold">Portal Setting</emphasis> tab: select one skin type in the <emphasis role="bold">Skin</emphasis> list field to change and display a skin.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Skin1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Click <emphasis role="bold">Save</emphasis> and <emphasis role="bold">Finish</emphasis> icon !images/Finish1.png! so that the modification can take effect.
+ </para>
+ </step>
+ </procedure>
</listitem>
- </orderedlist>
- <para>
- For Portal 2.6
- </para>
- <orderedlist>
- <listitem>
- <para>
- 1. Click <emphasis role="bold">Edit Inline</emphasis> on the Toolbar. The <emphasis role="bold">Edit Inline Composer</emphasis> will appear.
- </para>
- </listitem>
- <listitem>
- <para>
- 2. Click <emphasis role="bold">Portal Properties</emphasis> to edit portal's properties.
- </para>
- </listitem>
- <listitem>
- <para>
- 3. In the <emphasis role="bold">Portal Setting</emphasis> tab: select one skin type in the <emphasis role="bold">Skin</emphasis> list field to change and display a skin.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/PortalSet.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </listitem>
- <listitem>
- <para>
- 4. Click <emphasis role="bold">Save</emphasis> and the !images/DiskIcon.png! icon so that the modification can take effect.
- </para>
- </listitem>
- </orderedlist>
- </section>
+ </varlistentry>
+ </variablelist>
- <section id="sect-User_Guide-Change_Portal_Skins-Change_the_skin_temporarily">
- <title>Change the skin temporarily</title>
+<!-- <section >
+ <title></title>
<para>
- 1. Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Skin Settings</emphasis>.
+ 1.
</para>
<para>
For GateIn Portal 2.6
@@ -104,7 +95,7 @@
<orderedlist>
<listitem>
<para>
- 1. Go to <emphasis role="bold">GateIn</emphasis> on the Toolbar --> click <emphasis role="bold">Change Skin</emphasis>.
+ 1. Go to <emphasis role="bold">GateIn</emphasis> on the Toolbar > click <emphasis role="bold">Change Skin</emphasis>.
</para>
<para>
The <emphasis role="bold">Skin Setting</emphasis> form is displayed with a list of all supported skins. The left pane contains the skin list and the right pane is used to display the template of the selected skin.
@@ -121,12 +112,12 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/SkinSet1.png" format="PNG" />
+ <imagedata fileref="images/SkinSet1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</listitem>
</orderedlist>
- </section>
+ </section> -->
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Create_a_New_Portal.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Create_a_New_Portal.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Create_a_New_Portal.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Create_a_New_Portal">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Create a New Portal</title>
+ --><title>Create a New Portal</title>
<para>
Creating a new portal requires you to have a special permission that only an administrator can give you. You need follow these guides to create a new portal.
</para>
@@ -37,7 +37,7 @@
Click the <emphasis role="bold">Add New Portal</emphasis> button. By default, the <emphasis role="bold">Create New Portal</emphasis> form is shown with the <emphasis role="bold">Portal Templates</emphasis> tab.
<mediaobject>
<imageobject>
- <imagedata fileref="images/PortalTemplate2.6.png" format="PNG" />
+ <imagedata fileref="images/PortalTemplate2.6.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
@@ -45,7 +45,7 @@
By default, Portal template is Classic. Select the <emphasis role="bold">Portal Setting</emphasis> tab.
<mediaobject>
<imageobject>
- <imagedata fileref="images/PortalSetting2.5.png" format="PNG" />
+ <imagedata fileref="images/PortalSetting2.5.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Drag_and_Drop_the_Page_Body.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Drag_and_Drop_the_Page_Body.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Drag_and_Drop_the_Page_Body.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Drag_and_Drop_the_Page_Body">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Drag and Drop the Page Body</title>
+ --><title>Drag and Drop the Page Body</title>
<para>
You can easily drag and drop page body to the specific place where you want to in the page by following guides:
</para>
@@ -30,7 +30,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/DragPage1.png" format="PNG" />
+ <imagedata fileref="images/DragPage1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -38,7 +38,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/DragPage3.png" format="PNG" />
+ <imagedata fileref="images/DragPage3.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Manage_Navigation_Nodes">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Manage Navigation Nodes</title>
+ --><title>Manage Navigation Nodes</title>
<section id="sect-User_Guide-Manage_Navigation_Nodes-Overview">
<title>Overview</title>
<para>
@@ -45,7 +45,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/AddNode4.png" format="PNG" />
+ <imagedata fileref="images/AddNode4.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -128,7 +128,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PageSelector.png" format="PNG" />
+ <imagedata fileref="images/PageSelector.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<informaltable colsep="0" frame="none" rowsep="0">
@@ -176,7 +176,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/SelectPage1.png" format="PNG" />
+ <imagedata fileref="images/SelectPage1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<orderedlist numeration="arabic">
@@ -258,7 +258,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PageNodeSetting.png" format="PNG" />
+ <imagedata fileref="images/PageNodeSetting.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -266,7 +266,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PageSelector6.png" format="PNG" />
+ <imagedata fileref="images/PageSelector6.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -343,7 +343,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/ManagePage2.png" format="PNG" />
+ <imagedata fileref="images/ManagePage2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</listitem>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Manage_Page_Navigation">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,13 +21,11 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Manage Page Navigation</title>
- <section id="sect-User_Guide-Manage_Page_Navigation-Overview">
- <title>Overview</title>
+ --><title>Manage Page Navigation</title>
<para>
- In order to understand clearly about what the navigation is and navigation types that GateIn Portal supports, please refer the <xref linkend="sect-User_Guide-Navigation_concept" /> page.
+ In order to understand clearly about what the navigation is and navigation types that GateIn Portal supports, please refer the <xref linkend="sect-User_Guide-Navigation" /> page.
</para>
- </section>
+
<section id="sect-User_Guide-Manage_Page_Navigation-Portals_page_navigation">
<title>Portal's page navigation</title>
@@ -70,7 +68,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/EditPortalNavigation2.png" format="PNG" />
+ <imagedata fileref="images/EditPortalNavigation2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -125,7 +123,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/EditGroupNavigation2.png" format="PNG" />
+ <imagedata fileref="images/EditGroupNavigation2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Manage_Pages">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Manage Pages</title>
+ --><title>Manage Pages</title>
<para>
Only by using one page list can users add, edit, delete and view quickly and easily which pages you like to. Following these guides to manage pages:
</para>
@@ -35,7 +35,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/ManagePage.png" format="PNG" />
+ <imagedata fileref="images/ManagePage.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -48,7 +48,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/ManagePage2.6.png" format="PNG" />
+ <imagedata fileref="images/ManagePage2.6.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -98,7 +98,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PageSetting.png" format="PNG" />
+ <imagedata fileref="images/PageSetting.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<informaltable colsep="0" frame="none" rowsep="0">
@@ -182,7 +182,7 @@
</itemizedlist>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PageSetting1.png" format="PNG" />
+ <imagedata fileref="images/PageSetting1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<itemizedlist>
@@ -194,7 +194,7 @@
</itemizedlist>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PermissionSetting1.png" format="PNG" />
+ <imagedata fileref="images/PermissionSetting1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<itemizedlist>
@@ -233,7 +233,7 @@
</itemizedlist>
<mediaobject>
<imageobject>
- <imagedata fileref="images/EditPermission1.png" format="PNG" />
+ <imagedata fileref="images/EditPermission1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<itemizedlist>
@@ -245,7 +245,7 @@
</itemizedlist>
<mediaobject>
<imageobject>
- <imagedata fileref="images/EditPermission2.png" format="PNG" />
+ <imagedata fileref="images/EditPermission2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</listitem>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Manage_Permission">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Manage Permission</title>
+ --><title>Manage Permission</title>
<para>
Permissions play an important part in accessing and performing actions in the Portal. Depending on permissions assigned by an administrator, users can either access or edit portals, pages and portlets. GateIn Portal have applied several permission levels:
</para>
@@ -50,53 +50,60 @@
<para>
You have to set permission for new portals as well as existing portals:
</para>
- <itemizedlist>
- <listitem>
- <para>
- For new portals: on the Toolbar select <emphasis role="bold">Site</emphasis> then click on the <emphasis role="bold">Add New Portal</emphasis> button, select the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Access Permission Setting</emphasis> sub tab.
+ <variablelist>
+ <varlistentry>
+ <term>New Portals</term>
+ <listitem>
+ <para>
+ On the Toolbar select <emphasis role="bold">Site</emphasis> then click on the <emphasis role="bold">Add New Portal</emphasis> button, select the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Access Permission Setting</emphasis> sub tab.
+ </para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Access2.6.png" format="PNG" />
+ <imagedata fileref="images/Access2.6.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- </para>
- </listitem>
- <listitem>
- <para>
- For existing portals: on the Toolbar click <emphasis role="bold">Site Editor</emphasis> then <emphasis role="bold">Edit Page</emphasis> . Click on <emphasis role="bold">View Page properties</emphasis> then select the <emphasis role="bold">Permission Setting</emphasis> tab.
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Existing Portals</term>
+ <listitem>
+ <para>
+ On the Toolbar click <emphasis role="bold">Site Editor</emphasis> then <emphasis role="bold">Edit Page</emphasis> . Click on <emphasis role="bold">View Page properties</emphasis> then select the <emphasis role="bold">Permission Setting</emphasis> tab.
+ </para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PortalPermission.png" format="PNG" />
+ <imagedata fileref="images/PortalPermission.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- </para>
- </listitem>
- </itemizedlist>
+
+ </listitem>
+ </varlistentry>
+ </variablelist>
<para>
If you do not want everyone to access the Portal, do not select the <emphasis role="bold">Make it public</emphasis> check box and you have to select group by group. Do as follows:
- <itemizedlist>
- <listitem>
+ </para>
+ <procedure>
+ <step>
<para>
Click the <emphasis role="bold">Add Permission</emphasis> button.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Select the group you want to add on the left and then select a membership type on the right. In the membership types list, means allowing any membership type.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
After selecting a membership type, the selected permission is displayed in the access permission list. Each time, you only can select one group with one membership type. If you want to add more, click <emphasis role="bold">Add Permission</emphasis> and select again.
<mediaobject>
<imageobject>
- <imagedata fileref="images/PermissionSetting2.png" format="PNG" />
+ <imagedata fileref="images/PermissionSetting2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
- </listitem>
- </itemizedlist>
- </para>
+ </step>
+ </procedure>
</section>
<section id="sect-User_Guide-Manage_Permission-Set_the_Edit_Permission_on_a_Portal">
@@ -104,9 +111,8 @@
<para>
Only users who are in the portal editor group can edit that portal. Access rights can be given to several groups but edit rights can only be given to a group with a membership type (or every membership type by select ). To assign an edit permission to a user, you must add him to the editor group of the respective portal.
</para>
- <para>
- <orderedlist>
- <listitem>
+ <procedure>
+ <step>
<para>
Use one of these following paths to assign permissions on a portal:
<itemizedlist>
@@ -125,33 +131,32 @@
</itemizedlist>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Edit2.6.png" format="PNG" />
+ <imagedata fileref="images/Edit2.6.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Click <emphasis role="bold">Select Permission</emphasis> to choose a group.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Select a group and a membership type (select if you want to assign all membership types for the selected group). After selecting the membership from the right, the selected information is displayed.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
- 4. Click on the <emphasis role="bold">Save</emphasis> button to accept.
+ Click on the <emphasis role="bold">Save</emphasis> button to accept.
<mediaobject>
<imageobject>
- <imagedata fileref="images/PermissionSetting1.png" format="PNG" />
+ <imagedata fileref="images/PermissionSetting1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
- </listitem>
- </orderedlist>
- </para>
+ </step>
+ </procedure>
</section>
<section id="sect-User_Guide-Manage_Permission-Initialize_a_Permission_on_a_Page">
@@ -217,23 +222,23 @@
<para>
If you allow anyone to access the page tick on <emphasis role="bold">Make it public</emphasis> , otherwise, you have to select the groups one by one.
</para>
- <itemizedlist>
- <listitem>
+ <procedure>
+ <step>
<para>
Click the <emphasis role="bold">Add Permission</emphasis> button
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Select a group you want to add on the left and then select a membership type on the right. In a membership types list, means allowing any membership type.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
After selecting a membership type, the selected permission is displayed in the access right list. Each time, you can only select one group with one membership type. If you want to add more, click the <emphasis role="bold">Add Permission</emphasis> button and select again.
</para>
- </listitem>
- </itemizedlist>
+ </step>
+ </procedure>
</section>
<section id="sect-User_Guide-Manage_Permission-Set_the_Edit_Permission_on_a_Page">
@@ -241,9 +246,8 @@
<para>
Only users who are in the page's editor group can edit it. The access right can be set for several groups but the edit right only can be set for one single group. To give a user the edit permission, you must add him to the editors group of that page.
</para>
- <para>
- <orderedlist>
- <listitem>
+ <procedure>
+ <step>
<para>
<itemizedlist>
<listitem>
@@ -258,52 +262,52 @@
</listitem>
</itemizedlist>
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Click the <emphasis role="bold">Select Permission</emphasis> button to set new or change another group.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Select a group with a membership type (select if you want all membership types in a selected group)
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
After selecting a specific membership from the right, the selected information is displayed.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Click the <emphasis role="bold">Save</emphasis> button to accept.
</para>
- </listitem>
- </orderedlist>
- </para>
+ </step>
+ </procedure>
</section>
<section id="sect-User_Guide-Manage_Permission-Set_the_Access_Permission_on_a_Portlet">
<title>Set the Access Permission on a Portlet</title>
<para>
Follow these below steps to set access permission on a portlet:
- <orderedlist>
- <listitem>
+ </para>
+ <procedure>
+ <step>
<para>
Select <emphasis role="bold">Group</emphasis> --> <emphasis role="bold">Administration</emphasis> --> <emphasis role="bold">Application Registry</emphasis> on the navigation bar
<mediaobject>
<imageobject>
- <imagedata fileref="images/Application1.png" format="PNG" />
+ <imagedata fileref="images/Application1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Select a category on the left pane that includes the portlet you want to set right. Then all portlets of the selected category are listed immediately and detail information of each portlet is displayed on the right pane.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
To set permissions for a portlet:
<itemizedlist>
@@ -319,9 +323,8 @@
</listitem>
</itemizedlist>
</para>
- </listitem>
- </orderedlist>
- </para>
+ </step>
+ </procedure>
</section>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Manage_Portals">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Manage Portals</title>
+ --><title>Manage Portals</title>
<para>
You can easily manage a portal by editing or deleting it.
</para>
@@ -35,7 +35,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/EditCurrentPortal.png" format="PNG" />
+ <imagedata fileref="images/EditCurrentPortal.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<informaltable colsep="0" frame="none" rowsep="0">
@@ -141,7 +141,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/EditPortal.png" format="PNG" />
+ <imagedata fileref="images/EditPortal.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</listitem>
@@ -151,7 +151,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/EditPortal2.6New.png" format="PNG" />
+ <imagedata fileref="images/EditPortal2.6New.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</listitem>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Page_Creation_Wizard.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Page_Creation_Wizard.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Page_Creation_Wizard.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Page_Creation_Wizard">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Page Creation Wizard</title>
+ --><title>Page Creation Wizard</title>
<para>
Only by following there simple steps can you create a page quickly by using a wizard and publish this page on the Navigation bar:
</para>
@@ -38,7 +38,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Welcome.png" format="PNG" />
+ <imagedata fileref="images/Welcome.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</listitem>
@@ -48,7 +48,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Wizard1.png" format="PNG" />
+ <imagedata fileref="images/Wizard1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
@@ -71,7 +71,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Pagewizard1.png" format="PNG" />
+ <imagedata fileref="images/Pagewizard1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<informaltable colsep="0" frame="none" rowsep="0">
@@ -161,7 +161,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PageWizard2.png" format="PNG" />
+ <imagedata fileref="images/PageWizard2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</listitem>
@@ -176,7 +176,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PageWizard3.png" format="PNG" />
+ <imagedata fileref="images/PageWizard3.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<informaltable colsep="0" frame="none" rowsep="0">
@@ -237,7 +237,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Step32.6.png" format="PNG" />
+ <imagedata fileref="images/Step32.6.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Switching_between_Portals.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Switching_between_Portals.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Switching_between_Portals.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Switching_between_Portals">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Switching between Portals</title>
+ --><title>Switching between Portals</title>
<para>
GateIn Portal allows users to switch between Portals simply and easily. You can use another portals such as gateway, starting site if you are given the appropriate permissions by the administrators.
</para>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Toolbar.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Toolbar.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/Toolbar.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Toolbar">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,90 +21,100 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Toolbar</title>
+ --><title>Toolbar</title>
<para>
The convenient Toolbar helps users and administrators to manipulate all actions quickly.
</para>
- <section id="sect-User_Guide-Toolbar-User_Actions_in_the_Toolbar">
+
+ <section>
<title>User Actions in the Toolbar</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/exo2.6.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <para>
- You can change language, change skin and sign out from GateIn Portal.
- </para>
+
+ <variablelist>
+ <varlistentry>
+ <term>Dashboard</term>
+ <listitem>
+ <para>
+ You can change language, change skin and sign out from GateIn Portal.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/exo2.6.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Site</term>
+ <listitem>
+ <para>
+ It shows all different sites available in GateIn Portal allows users to directly edit the navigation tree.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Site2.6.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Group</term>
+ <listitem>
+ <para>
+ Users can easily see and access pages in GateIn Portal.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/GroupPortal2.6.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
- <section id="sect-User_Guide-Toolbar-Dashboard">
- <title>Dashboard</title>
- <para>
- Stuff Goes Here?
- </para>
- </section>
-
- <section id="sect-User_Guide-Toolbar-Site">
- <title>Site</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Site2.6.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <para>
- It shows all different sites available in GateIn Portal allows users to directly edit the navigation tree.
- </para>
- </section>
-
- <section id="sect-User_Guide-Toolbar-Group">
- <title>Group</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/GroupPortal2.6.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <para>
- Users can easily see and access pages in GateIn Portal.
- </para>
- </section>
-
- <section id="sect-User_Guide-Toolbar-Administration_Actions_in_the_Toolbar">
+ <section>
<title>Administration Actions in the Toolbar</title>
- <para>
- Stuff Goes Here?
- </para>
+
+ <variablelist>
+ <varlistentry>
+ <term>Editor</term>
+ <listitem>
+ <para>
+ You easily edit a page or add a new page
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Edit.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Administrator</term>
+ <listitem>
+ <para>
+ You can add or edit pages to the current portal, manage details for othe rportals or create new portals.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Admin2.6.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Edit Inline</term>
+ <listitem>
+ <para>
+ With the Edit Inline Composer popup that consists of two tabs: Applications and Containers, it is convenient for a user to select the component that he wants and to drag and drop it to the page.
+ </para>
+ <para>
+ You also quickly edit, delete portlets in a page, change portal's properties or switch the view mode.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
-
- <section id="sect-User_Guide-Toolbar-Editor">
- <title>Editor</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Edit.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <para>
- You easily edit a page or add a new page
- </para>
- </section>
-
- <section id="sect-User_Guide-Toolbar-Administrator">
- <title>Administrator</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Admin2.6.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-Toolbar-Edit_Inline">
- <title>Edit Inline</title>
- <para>
- With the Edit Inline Composer popup that consists of two tabs: Applications and Containers, it is convenient for a user to select the component that he wants and to drag and drop it to the page.
- </para>
- <para>
- You also quickly edit, delete portlets in a page, change portal's properties or switch the view mode.
- </para>
- </section>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<section id="sect-User_Guide-User_Management">
- <!--
+<section id="sect-User_Guide-User_management">
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,7 +21,7 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>User Management</title>
+ --><title>User management</title>
<para>
It is so difficult to manage and set permissions for a great number of registered users in a system. To solve this problem, GateIn Portal helps Administrators manage users, groups and memberships easily as well as effectively.
</para>
@@ -30,410 +30,500 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/UserManage.png" format="PNG" />
+ <imagedata fileref="images/UserManage.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- <section id="sect-User_Guide-User_Management-Manage_Users">
- <title>Manage Users</title>
- <para>
- Select the <emphasis role="bold">User Management</emphasis> tab in the <emphasis role="bold">Organization</emphasis> form. By default, it will show all existing registered users. With <emphasis role="bold">User Management</emphasis> , you can see all existing registered users, and also search, edit, delete them. For each user, you can see his groups and his memberships (roles) in these groups. You can not add users to a group but you can remove them from the group.
- </para>
+ <section>
+ <title>Management processes:</title>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Manage_users"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Search_a_user"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Edit_a_user"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Delete_a_user"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Manage_groups"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Add_a_new_group"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Edit-a-group"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Add_a_new_user_to_the_group"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Edit_the_user_membership_in_a_group"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Delete_a_group"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Manage_memberships"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Add_a_new_membership_type"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="User_Guide-User_Management-Edit_a_membership_type"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="sect-User_Guide-User_Management-Delete_a_membership_type"/>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+
+ <variablelist>
+ <varlistentry id="User_Guide-User_Management-Manage_users">
+ <term>Manage users</term>
+ <listitem>
+ <para>
+ Select the <emphasis role="bold">User Management</emphasis> tab in the <emphasis role="bold">Organization</emphasis> form. By default, it will show all existing registered users. With <emphasis role="bold">User Management</emphasis> , you can see all existing registered users, and also search, edit, delete them. For each user, you can see his groups and his memberships (roles) in these groups. You can not add users to a group but you can remove them from the group.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Search_a_user">
+ <term>Search a user</term>
+ <listitem>
+ <para>
+ The Administrator can search users by user name, first name, last name or email address.
+ </para>
+ <procedure>
+ <step>
+ <para>
+ Type the search term related to the user that you want to search. You do not need to enter an exact term.
+ </para>
+ </step>
+ <step>
+ <para>
+ Select the field in which you would like to search
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/SearchUser.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Click the magnifying glass icon!images/SearchIcon.png! to perform searching. It will return a searching result in form.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Edit_a_user">
+ <term>Edit a user</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ Click the edit icon!images/EditIcon.png! corresponding to the user that you want to edit.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Demo1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Select the <emphasis role="bold">Account Info</emphasis> tab to view and change the essential user information.
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ The <emphasis role="bold">User Name</emphasis> field can not be changed, other fields <emphasis role="bold">First Name</emphasis> , <emphasis role="bold">Last Name</emphasis> , <emphasis role="bold">Email Address</emphasis> can be changed.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The <emphasis role="bold">Change Password</emphasis> option allows making a new password for this user when he/she forgets his/her password. When the <emphasis role="bold">Change Password</emphasis> option is unchecked, <emphasis role="bold">New Password</emphasis> and <emphasis role="bold">Confirm Password</emphasis> are hidden. Passwords must contain at least 6 characters (letters, numbers and punctuation marks).
+ </para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ Select the <emphasis role="bold">User Profile</emphasis> tab to view and change profile information. The <emphasis role="bold">Language</emphasis> field is used to set the display language of that user.
+ </para>
+ </step>
+ <step>
+ <para>
+ Select the <emphasis role="bold">User Membership</emphasis> tab to see user's information in groups.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Demo3.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ <itemizedlist>
+ <listitem>
+ <para>
+ The <emphasis role="bold">User Membership</emphasis> tab indicates to which group the selected user belongs. In the above figure, the user "demo" is a member of two groups: "guests" and "users". The parent group of both is "platform".
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ To remove the user from a group, click the trash can icon!images/DeleteIcon.png! on the row you want.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Save</emphasis> button to accept changes.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Delete_a_user">
+ <term>Delete a user</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ In the <emphasis role="bold">User Management</emphasis> form: Click the trash can icon !images/DeleteIcon.png! corresponding to the user that you want to delete.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">OK</emphasis> button in the confirmation message to confirm or the <emphasis role="bold">Cancel</emphasis> button to quit without deleting anything.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Manage_groups">
+ <term>Manage groups</term>
+ <listitem>
+ <para>
+ Select the <emphasis role="bold">Group Management</emphasis> tab in the <emphasis role="bold">Organization</emphasis> form.
+ </para>
+ <para>
+ By default, all existing groups will be displayed on the left pane. This tab is used to add new, edit or delete a group. The right pane shows information about the selected group including information about the members in the specific group and a small form to add a new user to a group.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/GroupManage.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Add_a_new_group">
+ <term>Add a New Group</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ Choose the path to create a new group by selecting the groups from list on the left pane or clicking the arrow icon !images/ArrowIcon.png! if you want to create a group in a higher level. The selected path is displayed in the path bar.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Admin1.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Add New Group</emphasis> icon. The <emphasis role="bold">Add New Group</emphasis> form will be displayed on the right pane:
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/AddGroup.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ <informaltable colsep="0" frame="none" rowsep="0">
+ <tgroup cols="2">
+ <colspec align="center"></colspec>
+ <colspec align="center"></colspec>
+ <tbody>
+ <row>
+ <entry>
+ <emphasis role="bold"> Name </emphasis>
+ </entry>
+ <entry>
+ <emphasis role="bold"> Description </emphasis>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ Group Name
+ </entry>
+ <entry>
+ The name of the new group. This field is required and any length from 3 to 30 characters is allowed.
+ </entry>
+ </row>
+ <row>
+ <entry>
+ Label
+ </entry>
+ <entry>
+ The display name of the group. Any length from 3 to 30 characters is allowed.
+ </entry>
+ </row>
+ <row>
+ <entry>
+ Description
+ </entry>
+ <entry>
+ The description about the group. Any length from 3 to 30 characters is allowed.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </step>
+ <step>
+ <para>
+ Fill in the required fields. Only alpha, digit and underscore characters are allowed for the <emphasis role="bold">Group Name</emphasis> field and it must be unique.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Save</emphasis> button to accept entered values or the <emphasis role="bold">Cancel</emphasis> button to quit.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Edit-a-group">
+ <term>Edit a group</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ Select the path to the group you want to edit by selecting the groups from list on the left pane.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the edit icon!images/EditIcon1.png! to show the <emphasis role="bold">Edit Group</emphasis> form of the selected group. This form is identical with the <emphasis role="bold">New Group</emphasis> form.
+ </para>
+ </step>
+ <step>
+ <para>
+ You can not change the Group Name. Make changes for a <emphasis role="bold">Label</emphasis> or a <emphasis role="bold">Description</emphasis> field and then click the <emphasis role="bold">Save</emphasis> button to accept changes or the <emphasis role="bold">Cancel</emphasis> button to cancel changes and return to the <emphasis role="bold">Group Info</emphasis> form.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Add_a_new_user_to_the_group">
+ <term>Add a new user to the group</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ Select the path to the group you want to edit by selecting the groups from the list on the left pane. The Group's information is displayed including the user list and a form which allows to add a new user.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/AddMember1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Enter the exact user name of the user that you want to add to the selected group or you can enter some characters if you are not sure about the exact spelling.
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Click the magnifying glass icon!images/MagnifyIcon.png! to select users.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ After clicking the magnifying icon!images/MagnifyIcon.png! , there will be a list of all existing users :
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/SelectUser.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ <listitem>
+ <para>
+ Select the check box of the user (s) that you would like to add to the group.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ After clicking the <emphasis role="bold">Add</emphasis> button you will see the complete user name(s) in the <emphasis role="bold">Add member</emphasis> form.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ Select the membership for the user in a group from memberships list. The refresh icon!images/RefreshIcon.png! can be used to update the memberships list in case there are any changes.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Save</emphasis> button to accept adding the selected user to a specific group with the selected membership type.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Edit_the_user_membership_in_a_group">
+ <term>Edit the user membership in a group</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ Click the edit icon!images/EditIcon.png! corresponding to a specific user with a membership in the <emphasis role="bold">Group Info</emphasis> table to open the <emphasis role="bold">Edit Membership</emphasis> form :
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/EditMember1.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Change the membership of the selected user by selecting another value in the <emphasis role="bold">Membership</emphasis> field.
+ </para>
+ </step>
+ <step>
+ <para>
+ Complete editing the selected user by clicking the <emphasis role="bold">Save</emphasis> button.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Delete_a_group">
+ <term>Delete a group</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ Select the path to the group you want to delete by selecting the groups from list on the left pane.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the trash can !images/DeleteIcon.png! icon in order to delete.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">OK</emphasis> button on the confirmation message to accept or the <emphasis role="bold">Cancel</emphasis> button to quit without deleting.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Manage_memberships">
+ <term>Manage memberships</term>
+ <listitem>
+ <para>
+ The roles of an user in the specific group are managed in <emphasis role="bold">Membership Management</emphasis> form. Currently there are three membership types: Manager, Member and Validator. By default, Manager has the highest rights in a group. You can add new, edit or delete a membership type. Select the <emphasis role="bold">Membership Management</emphasis> tab in the <emphasis role="bold">Organization</emphasis> portlet. There will be a membership type list and a form to add new/edit:
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/MembershipManage1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Add_a_new_membership_type">
+ <term>Add a new membership type</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ In the <emphasis role="bold">Add/Edit Membership</emphasis> form at the bottom, the input value for the membership name field (required) and the description field (optional). Only letters, digits, dots, dashes and underscores are allowed for the membership name.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Save</emphasis> button to accept adding the new membership or click <emphasis role="bold">Reset</emphasis> button to clear the entered values.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="User_Guide-User_Management-Edit_a_membership_type">
+ <term>Edit a membership type</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ Click the edit icon!images/EditIcon.png! in the row of the membership type you want to edit. The selected Membership type information is displayed in the Add/Edit Membership form.
+ </para>
+ </step>
+ <step>
+ <para>
+ Make changes in this form.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click <emphasis role="bold">Save</emphasis> to accept changes.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="sect-User_Guide-User_Management-Delete_a_membership_type">
+ <term>Delete a membership type</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ Click the trash can icon in the row of the membership type that you want to delete.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">OK</emphasis> button in the confirmation message to accept the deletion.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
-
- <section id="sect-User_Guide-User_Management-Search_a_user">
- <title>Search a user</title>
- <para>
- The Administrator can search users by user name, first name, last name or email address.
- </para>
- <orderedlist>
- <listitem>
- <para>
- 1. Type the search term related to the user that you want to search. You do not need to enter an exact term.
- </para>
- </listitem>
- <listitem>
- <para>
- 2. Select the field in which you would like to search
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/SearchUser.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </listitem>
- <listitem>
- <para>
- 3. Click the magnifying glass icon!images/SearchIcon.png! to perform searching. It will return a searching result in form.
- </para>
- </listitem>
- </orderedlist>
- </section>
-
- <section id="sect-User_Guide-User_Management-Edit_a_user">
- <title>Edit a user</title>
- <orderedlist>
- <listitem>
- <para>
- 1. Click the edit icon!images/EditIcon.png! corresponding to the user that you want to edit.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Demo1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </listitem>
- <listitem>
- <para>
- 2. Select the <emphasis role="bold">Account Info</emphasis> tab to view and change the essential user information .
- </para>
- <itemizedlist>
- <listitem>
- <para>
- The <emphasis role="bold">User Name</emphasis> field can not be changed, other fields <emphasis role="bold">First Name</emphasis> , <emphasis role="bold">Last Name</emphasis> , <emphasis role="bold">Email Address</emphasis> can be changed.
- </para>
- </listitem>
- <listitem>
- <para>
- The <emphasis role="bold">Change Password</emphasis> option allows making a new password for this user when he/she forgets his/her password. When the <emphasis role="bold">Change Password</emphasis> option is unchecked, <emphasis role="bold">New Password</emphasis> and <emphasis role="bold">Confirm Password</emphasis> are hidden. Passwords must contain at least 6 characters (letters, numbers and punctuation marks).
- </para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <para>
- 3. Select the <emphasis role="bold">User Profile</emphasis> tab to view and change profile information. The <emphasis role="bold">Language</emphasis> field is used to set the display language of that user.
- </para>
- </listitem>
- <listitem>
- <para>
- 4. Select the <emphasis role="bold">User Membership</emphasis> tab to see user's information in groups.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Demo3.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <itemizedlist>
- <listitem>
- <para>
- The <emphasis role="bold">User Membership</emphasis> tab indicates to which group the selected user belongs. In the above figure, the user "demo" is a member of two groups: "guests" and "users". The parent group of both is "platform".
- </para>
- </listitem>
- <listitem>
- <para>
- To remove the user from a group, click the trash can icon!images/DeleteIcon.png! on the row you want.
- </para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <para>
- 5. Click the <emphasis role="bold">Save</emphasis> button to accept changes.
- </para>
- </listitem>
- </orderedlist>
- </section>
-
- <section id="sect-User_Guide-User_Management-Delete_a_user">
- <title>Delete a user</title>
- <orderedlist>
- <listitem>
- <para>
- 1. In the <emphasis role="bold">User Management</emphasis> form: Click the trash can icon !images/DeleteIcon.png! corresponding to the user that you want to delete.
- </para>
- </listitem>
- <listitem>
- <para>
- 2. Click the <emphasis role="bold">OK</emphasis> button in the confirmation message to confirm or the <emphasis role="bold">Cancel</emphasis> button to quit without deleting anything.
- </para>
- </listitem>
- </orderedlist>
- </section>
-
- <section id="sect-User_Guide-User_Management-Manage_Groups">
- <title>Manage Groups</title>
- <para>
- Select the <emphasis role="bold">Group Management</emphasis> tab in the <emphasis role="bold">Organization</emphasis> form.
- </para>
- <para>
- By default, all existing groups will be displayed on the left pane. This tab is used to add new, edit or delete a group. The right pane shows information about the selected group including information about the members in the specific group and a small form to add a new user to a group.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/GroupManage.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-User_Management-Add_a_new_group">
- <title>Add a new group</title>
- <orderedlist>
- <listitem>
- <para>
- 1. Choose the path to create a new group by selecting the groups from list on the left pane or clicking the arrow icon !images/ArrowIcon.png! if you want to create a group in a higher level. The selected path is displayed in the path bar.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Admin1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </listitem>
- <listitem>
- <para>
- 2. Click the <emphasis role="bold">Add New Group</emphasis> icon. The <emphasis role="bold">Add New Group</emphasis> form will be displayed on the right pane:
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/AddGroup.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <informaltable colsep="0" frame="none" rowsep="0">
- <tgroup cols="2">
- <colspec align="center"></colspec>
- <colspec align="center"></colspec>
- <tbody>
- <row>
- <entry>
- <emphasis role="bold"> Name </emphasis>
- </entry>
- <entry>
- <emphasis role="bold"> Description </emphasis>
- </entry>
- </row>
- <row>
- <entry>
- Group Name
- </entry>
- <entry>
- The name of the new group. This field is required and any length from 3 to 30 characters is allowed.
- </entry>
- </row>
- <row>
- <entry>
- Label
- </entry>
- <entry>
- The display name of the group. Any length from 3 to 30 characters is allowed.
- </entry>
- </row>
- <row>
- <entry>
- Description
- </entry>
- <entry>
- The description about the group. Any length from 3 to 30 characters is allowed.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </listitem>
- <listitem>
- <para>
- 3. Fill in the required fields. Only alpha, digit and underscore characters are allowed for the <emphasis role="bold">Group Name</emphasis> field and it must be unique.
- </para>
- </listitem>
- <listitem>
- <para>
- 4. Click the <emphasis role="bold">Save</emphasis> button to accept entered values or the <emphasis role="bold">Cancel</emphasis> button to quit.
- </para>
- </listitem>
- </orderedlist>
- </section>
-
- <section id="sect-User_Guide-User_Management-Edit_a_group">
- <title>Edit a group</title>
- <orderedlist>
- <listitem>
- <para>
- 1. Select the path to the group you want to edit by selecting the groups from list on the left pane.
- </para>
- </listitem>
- <listitem>
- <para>
- 2. Click the edit icon!images/EditIcon1.png! to show the <emphasis role="bold">Edit Group</emphasis> form of the selected group. This form is identical with the <emphasis role="bold">New Group</emphasis> form.
- </para>
- </listitem>
- <listitem>
- <para>
- 3. You can not change the Group Name. Make changes for a <emphasis role="bold">Label</emphasis> or a <emphasis role="bold">Description</emphasis> field and then click the <emphasis role="bold">Save</emphasis> button to accept changes or the <emphasis role="bold">Cancel</emphasis> button to cancel changes and return to the <emphasis role="bold">Group Info</emphasis> form.
- </para>
- </listitem>
- </orderedlist>
- </section>
-
- <section id="sect-User_Guide-User_Management-Add_a_new_user_to_the_group">
- <title>Add a new user to the group</title>
- <orderedlist>
- <listitem>
- <para>
- 1. Select the path to the group you want to edit by selecting the groups from the list on the left pane. The Group's information is displayed including the user list and a form which allows to add a new user.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/AddMember1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </listitem>
- <listitem>
- <para>
- 2. Enter the exact user name of the user that you want to add to the selected group or you can enter some characters if you are not sure about the exact spelling.
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Click the magnifying glass icon!images/MagnifyIcon.png! to select users.
- </para>
- </listitem>
- <listitem>
- <para>
- After clicking the magnifying icon!images/MagnifyIcon.png! , there will be a list of all existing users :
- </para>
- </listitem>
- </itemizedlist>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/SelectUser.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <itemizedlist>
- <listitem>
- <para>
- Select the check box of the user (s) that you would like to add to the group.
- </para>
- </listitem>
- <listitem>
- <para>
- After clicking the <emphasis role="bold">Add</emphasis> button you will see the complete user name(s) in the <emphasis role="bold">Add member</emphasis> form.
- </para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <para>
- 3. Select the membership for the user in a group from memberships list. The refresh icon!images/RefreshIcon.png! can be used to update the memberships list in case there are any changes.
- </para>
- </listitem>
- <listitem>
- <para>
- 4. Click the <emphasis role="bold">Save</emphasis> button to accept adding the selected user to a specific group with the selected membership type.
- </para>
- </listitem>
- </orderedlist>
- </section>
-
- <section id="sect-User_Guide-User_Management-Edit_the_User_Membership_in_a_Group">
- <title>Edit the User Membership in a Group</title>
- <orderedlist>
- <listitem>
- <para>
- 1. Click the edit icon!images/EditIcon.png! corresponding to a specific user with a membership in the <emphasis role="bold">Group Info</emphasis> table to open the <emphasis role="bold">Edit Membership</emphasis> form :
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/EditMember1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </listitem>
- <listitem>
- <para>
- 2. Change the membership of the selected user by selecting another value in the <emphasis role="bold">Membership</emphasis> field.
- </para>
- </listitem>
- <listitem>
- <para>
- 3. Complete editing the selected user by clicking the <emphasis role="bold">Save</emphasis> button.
- </para>
- </listitem>
- </orderedlist>
- </section>
-
- <section id="sect-User_Guide-User_Management-Delete_a_group">
- <title>Delete a group</title>
- <orderedlist>
- <listitem>
- <para>
- 1. Select the path to the group you want to delete by selecting the groups from list on the left pane.
- </para>
- </listitem>
- <listitem>
- <para>
- 2.Click the trash can !images/DeleteIcon.png! icon in order to delete.
- </para>
- </listitem>
- <listitem>
- <para>
- 3.Click the <emphasis role="bold">OK</emphasis> button on the confirmation message to accept or the <emphasis role="bold">Cancel</emphasis> button to quit without deleting.
- </para>
- </listitem>
- </orderedlist>
- </section>
-
- <section id="sect-User_Guide-User_Management-Manage_Memberships">
- <title>Manage Memberships</title>
- <para>
- The roles of an user in the specific group are managed in <emphasis role="bold">Membership Management</emphasis> form. Currently there are three membership types: Manager, Member and Validator. By default, Manager has the highest rights in a group. You can add new, edit or delete a membership type. Select the <emphasis role="bold">Membership Management</emphasis> tab in the <emphasis role="bold">Organization</emphasis> portlet. There will be a membership type list and a form to add new/edit:
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/MembershipManage1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-User_Management-Add_a_new_Membership_type">
- <title>Add a new Membership type</title>
- <orderedlist>
- <listitem>
- <para>
- 1. In the <emphasis role="bold">Add/Edit Membership</emphasis> form at the bottom, the input value for the membership name field (required) and the description field (optional). Only letters, digits, dots, dashes and underscores are allowed for the membership name.
- </para>
- </listitem>
- <listitem>
- <para>
- 2.Click the <emphasis role="bold">Save</emphasis> button to accept adding the new membership or click <emphasis role="bold">Reset</emphasis> button to clear the entered values.
- </para>
- </listitem>
- </orderedlist>
- </section>
-
- <section id="sect-User_Guide-User_Management-Edit_a_Membership_type">
- <title>Edit a Membership type</title>
- <orderedlist>
- <listitem>
- <para>
- 1. Click the edit icon!images/EditIcon.png! in the row of the membership type you want to edit. The selected Membership type information is displayed in the Add/Edit Membership form.
- </para>
- </listitem>
- <listitem>
- <para>
- 2. Make changes in this form.
- </para>
- </listitem>
- <listitem>
- <para>
- 3. Click <emphasis role="bold">Save</emphasis> to accept changes.
- </para>
- </listitem>
- </orderedlist>
- </section>
-
- <section id="sect-User_Guide-User_Management-Delete_a_Membership_type.">
- <title>Delete a Membership type.</title>
- <orderedlist>
- <listitem>
- <para>
- 1. Click the trash can icon in the row of the membership type that you want to delete.
- </para>
- </listitem>
- <listitem>
- <para>
- 2. Click the <emphasis role="bold">OK</emphasis> button in the confirmation message to accept the deletion.
- </para>
- </listitem>
- </orderedlist>
- </section>
-
</section>
-
-
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Dashboard_Portlet">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,91 +21,123 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Dashboard Portlet</title>
- <section id="sect-User_Guide-Dashboard_Portlet-Overview">
- <title>Overview</title>
+ --><title>Dashboard Portlet</title>
+ <para>
+ The Dashboard portlet is used for hosting mini applications known as gadgets. The Dashboard uses a variety of graphical effects for displaying, opening and using gadgets. Gadgets can be moved around, rearranged, deleted and created. More than one instance of the same gadget can be opened at the same time and each instance of the same gadget can have different settings. The gadgets instances are as independent as different portlets instances.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Dashboard1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+
+
+ <section id="sect-User_Guide-Dashboard_Portlet-Using_the_Dashboard_Workspace">
+ <title>Using the Dashboard Workspace</title>
<para>
- The Dashboard portlet is used for hosting mini applications known as gadgets. The Dashboard uses a variety of graphical effects for displaying, opening and using gadgets. Gadgets can be moved around, rearranged, deleted and created. More than one instance of the same gadget can be opened at the same time, each instance of the very same gadget can have different settings. The gadgets instances are as independent as different portlets instances.
- </para>
- <para>
- This portlet includes two parts :
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Dashboard1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-Dashboard_Portlet-Open_the_Dashboard_Workspace">
- <title>Open the Dashboard Workspace</title>
- <para>
Click on <emphasis role="bold">Add Gadgets</emphasis> to open the Dashboard Workspace.
</para>
<para>
- A popup window that lists all gadgets appears. By default, there are four gadgets but you can add more.
+ A popup window listing all available gadgets appears. There are four gadgets built into &PRODUCT; by default however you can add many more.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Dash2.png" format="PNG" />
+ <imagedata fileref="images/Dash2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- <itemizedlist>
- <listitem>
- <para>
- <emphasis role="bold">Calculator</emphasis> : This is a cool calculator for your page. This mini application lets you perform most of the basic arithmetic operations. This gadget also offers cool skins to make your page more alive.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Calendar</emphasis> : A cool calendar to keep track of date. You also can switch easily between daily, monthly and yearly view and change the skin as you like.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Todo</emphasis> : This mini application helps you to organize your everyday work. It is designed to keep track of your tasks in a convenient and transparent way. You can highlight tasks by using different colors.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis role="bold">RSS Reader</emphasis> : This gadget lets you get a sneak preview of your favorite feeds around the web. You can have the latest news, the latest posts from your favorite blogs, latest email... all in one gadget.
- </para>
- </listitem>
- </itemizedlist>
- <para>
- A space used to contain and organize gadgets by dragging from the popup window and drop them into this space.
- </para>
- </section>
-
- <section id="sect-User_Guide-Dashboard_Portlet-Display_Gadgets">
- <title>Display Gadgets</title>
- <para>
- Moreover, you can change the number of columns to create in this space.
- </para>
- <para>
- <orderedlist>
+ <variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets">
+ <title>Default Gadgets:</title>
+ <varlistentry>
+ <term>Calendar</term>
<listitem>
<para>
- Click on <emphasis role="bold">Group Editor</emphasis> : <emphasis role="bold">Edit Page</emphasis>
+ The calendar gadget allows users to switch easily between daily, monthly and yearly view and, again, is customizable to match your portal's theme.
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Calendar.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
</listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>ToDo</term>
<listitem>
<para>
- Click on <emphasis role="bold">Edit Portlet</emphasis> . It will show a dialog to change the number of columns to display gadgets.
+ This application helps you organize your day and work group. It is designed to keep track of your tasks in a convenient and transparent way. Tasks can be highlighted with different colors.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Column.png" format="PNG" />
+ <imagedata fileref="images/Todo.png" format="PNG" />
</imageobject>
</mediaobject>
</listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Calculator</term>
<listitem>
<para>
- Change the number of columns and click the <emphasis role="bold">Save</emphasis> button to accept changing.
+ This mini-application lets you perform most basic arithmetic operations and can be themed to match the rest of your portal.
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Calculator.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
</listitem>
- </orderedlist>
+ </varlistentry>
+ <varlistentry>
+ <term>RSS Reader</term>
+ <listitem>
+ <para>
+ An RSS reader, or aggregator, collates content from various, user-specified feed sources and displays them in one location. This content can include, but isn't limited to, news headlines, blog posts or email. The RSS Reader gadget displays this content in a single window on your Portal page.
+ </para>
+ <!-- <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/RSS.png" format="PNG"></imagedata>
+ </imageobject>
+ </mediaobject> -->
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>More Gadgets</term>
+ <listitem>
+ <para>
+ Further gadgets can be obtained from the <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> site. EPP is compatible with any gadget available here.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </section>
+
+ <section id="sect-User_Guide-Dashboard_Portlet-Display_Gadgets">
+ <title>Display Gadgets</title>
+ <para>
+ You can change the number of columns to create in this space.
</para>
+ <procedure>
+ <step>
+ <para>
+ Click on <emphasis role="bold">Site Editor</emphasis> : <emphasis role="bold">Edit Page</emphasis>
+ </para>
+ </step>
+ <step>
+ <para>
+ Click on <emphasis role="bold">Edit Portlet</emphasis> . It will show a dialog to change the number of columns to display gadgets.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Column.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Change the number of columns and click the <emphasis role="bold">Save</emphasis> button to accept changing.
+ </para>
+ </step>
+ </procedure>
+
</section>
<section id="sect-User_Guide-Dashboard_Portlet-Add_Gadgets">
@@ -116,49 +148,48 @@
<para>
Open the popup to add gadges
</para>
- <para>
- <orderedlist>
- <listitem>
+ <procedure>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Add Gadgets</emphasis> link
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Dashboard1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </para>
+ </step>
+ <step>
+ <para>
+ dialog to add a new gadget will appear :
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/EnterLink.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </para>
+ </step>
+ <step>
+ <para>
+ Enter a link (a .xml or .rss) in a text box on the left pane.
+ </para>
+ <note>
+ <title>Note</title>
<para>
- Click the <emphasis role="bold">Add Gadgets</emphasis> link
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Dashboard1.png" format="PNG" />
- </imageobject>
- </mediaobject>
+ If you enter a .rss file or a link that generate rss format (for example: http://feeds.feedburner.com/gatein), a new rss gadget reader will be created in the dashboard.
</para>
- </listitem>
- <listitem>
- <para>
- dialog to add a new gadget will appear :
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/EnterLink.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </para>
- </listitem>
- <listitem>
- <para>
- Enter a link (a .xml or .rss) in a text box on the left pane.
- </para>
- <note>
- <title>Note</title>
- <para>
- If you enter a .rss file or a link that generate rss format (for example: http://feeds.feedburner.com/gatein), a new rss gadget reader will be created in the dashboard.
- </para>
- </note>
- <para>
- Remote gadgets can be only created using the .xml file format which s the standard gadget format.
- </para>
- </listitem>
- <listitem>
- <para>
- Click on the + icon to add a new gadget to the gadget list beneath.
- </para>
- </listitem>
- </orderedlist>
- </para>
+ </note>
+ <para>
+ Remote gadgets can be only created using the .xml file format which s the standard gadget format.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click on the + icon to add a new gadget to the gadget list beneath.
+ </para>
+ </step>
+ </procedure>
+
</section>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-FCK_Portlet">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,70 +21,72 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>FCK Portlet</title>
- <section id="sect-User_Guide-FCK_Portlet-Overview">
- <title>Overview</title>
- <para>
- GateIn Portal provides users with FCK portlet used as a lightweight text editor in the web pages. All its common used functions (like Word editor) such as writing, formatting text, creating tables, inserting links or picture, etc.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/FCK1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <para>
- FCK portlet also consists of some main elements:
- </para>
- </section>
-
- <section id="sect-User_Guide-FCK_Portlet-Toolbar">
- <title>Toolbar</title>
- <para>
- The area at the top of the editor which contains many different buttons. You will use these buttons to activate the program functions.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/ToolBar1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-FCK_Portlet-Editing_Area">
- <title>Editing Area</title>
- <para>
- This area is under the toolbar. This area allows typing your text and format document.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/EditingArea1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-FCK_Portlet-Context_menu">
- <title>Context menu</title>
- <para>
- It is a menu with the functions that will appear when you right click anywhere in the space of editing area or an existing object.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/ContextMenu1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-FCK_Portlet-Dialogs">
- <title>Dialogs</title>
- <para>
- Small windows appear when some of the functions are activated, it is used to provide the necessary information to accomplish that functions. For an example: To insert a link, you need to open <emphasis role="bold">Link</emphasis> dialog by clicking!images/LinkIcon.png! icon on the Tool bar :
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Link.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
+ --><title>FCK Portlet</title>
+ <para>
+ GateIn Portal provides users with FCK portlet used as a lightweight text editor in the web pages. All its common used functions (like Word editor) such as writing, formatting text, creating tables, inserting links or picture, etc.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/FCK1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ <para>
+ FCK portlet also consists of some main elements:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>Toolbar</term>
+ <listitem>
+ <para>
+ The area at the top of the editor which contains many different buttons. You will use these buttons to activate the program functions.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/ToolBar1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Editing Area</term>
+ <listitem>
+ <para>
+ This area is under the toolbar. This area allows typing your text and format document.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/EditingArea1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Context menu</term>
+ <listitem>
+ <para>
+ It is a menu with the functions that will appear when you right click anywhere in the space of editing area or an existing object.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/ContextMenu1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Dialogs</term>
+ <listitem>
+ <para>
+ Small windows appear when some of the functions are activated, it is used to provide the necessary information to accomplish that functions. For an example: To insert a link, you need to open <emphasis role="bold">Link</emphasis> dialog by clicking!images/LinkIcon.png! icon on the Tool bar :
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Link.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Functional_Portlets">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,98 +21,104 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Functional Portlets</title>
- <section id="sect-User_Guide-Functional_Portlets-Overview">
- <title>Overview</title>
- <para>
- Portlets are pluggable user interface components that are managed and displayed in a portal. Functional Portlets support all functions of a Portal. GateIn Portal provides users with the following portlets:
- </para>
- </section>
-
- <section id="sect-User_Guide-Functional_Portlets-Account_Portlet">
- <title>Account Portlet</title>
- <para>
- This Portlet allows users to register a new account. Moreover, it also used to support users to choose a preferred language for displaying the Portal interface.
- </para>
- <mediaobject>
+ --><title>Functional Portlets</title>
+ <para>
+ Portlets are pluggable user interface components that are managed and displayed within a portal. Functional Portlets support all functions of a Portal. Enterprise Portal Platform 5.0 provides the following portlets by default:
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term>Account Portlet</term>
+ <listitem>
+ <para>
+ This Portlet allows users to register a new account and choose a preferred language for displaying the Portal interface.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Account.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Organization Portlet</term>
+ <listitem>
+ <para>
+ This Portlet is used to manage user information, groups of users and groups memberships.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/OrganizationPortlet1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Application Registry Portlet</term>
+ <listitem>
+ <para>
+ This Portlet is used to manage different application categories. You can add, edit, set permissions and delete a category and its applications.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/ApplicationRegistry.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Internationalization Portlet</term>
+ <listitem>
+ <para>
+ This Portlet is used to translate a word or a phrase from the current language to another language.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/InternationalizationPortlet1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Administration Toolbar Portlet</term>
+ <listitem>
+ <para>
+ This Portlet supports administration actions in &PRODUCT;.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Administration.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Star Toolbar Portlet</term>
+ <listitem>
+ <para>
+ The Star Toolbar Portlet is used to change language and skin of the portal or to sign out.
+ </para>
+ <!-- <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/StarPortlet.png" format="PNG"></imagedata>
+ </imageobject>
+ </mediaobject> -->
+ </listitem>
+ </varlistentry>
+ <!--<varlistentry>
+ <term>User Toolbar Portlet</term>
+ <listitem>
+ <para>
+ This Portlet supports all user actions in &PRODUCT;.
+ </para>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/Account.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-Functional_Portlets-Organization_Portlet">
- <title>Organization Portlet</title>
- <para>
- This Portlet is used to manage user information, groups of users and memberships.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/OrganizationPortlet1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-Functional_Portlets-Application_Registry_Portlet">
- <title>Application Registry Portlet</title>
- <para>
- This Portlet is used to manage different application categories. You can add, edit, set permissions, delete a category and its applications.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/ApplicationRegistry.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-Functional_Portlets-Internationalization_Portlet">
- <title>Internationalization Portlet</title>
- <para>
- This Portlet is used to define a word or a phrase of a current language to an expected language.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/InternationalizationPortlet1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-Functional_Portlets-Administration_Toolbar_Portlet">
- <title>Administration Toolbar Portlet</title>
- <para>
- This Portlet supports administration actions in GateIn Portal.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Administration.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-Functional_Portlets-Star_Toolbar_Portlet">
- <title>Star Toolbar Portlet</title>
- <para>
- The Star Toolbar Portlet helps users to change language, change skin or sign out GateIn Portal.
- </para>
- <!--
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/StarPortlet.png" format="PNG"></imagedata>
- </imageobject>
- </mediaobject>
- --><!--
- <section>
- <title>User Toolbar Portlet</title>
- </section>
- <para>This Portlet supports all user actions in GateIn Portal.</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/UserToolbar.png" format="PNG"></imagedata>
- </imageobject>
- </mediaobject>
- -->
- </section>
-
+ <imagedata fileref="images/UserToolbar.png" format="PNG"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry> -->
+ </variablelist>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Interface_Portlets">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,167 +21,172 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Interface Portlets</title>
+ --><title>Interface Portlets</title>
<para>
- These Portlets constitute the interface of the Portal. GateIn Portal consists of the following Interface Portlets:
+ The Interface Portlets are the face of the Portal. They provide the means for users to interact with the portal. &PRODUCT; consists of the following Interface Portlets:
</para>
- <section id="sect-User_Guide-Interface_Portlets-Banner_Portlet">
- <title>Banner Portlet</title>
- <para>
- This Portlet is considered as the welcome gateway of a Portal. It contains the organization's slogan, logo, icon, button, etc.
- </para>
- <!--
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/BannerPortlet.png" format="PNG"></imagedata>
- </imageobject>
- </mediaobject>
- -->
- </section>
-
- <section id="sect-User_Guide-Interface_Portlets-Breadcumbs_Portlet">
- <title>Breadcumbs Portlet</title>
- <para>
- This Portlet is used to display the path of the selected page from Navigation.
- </para>
- <!--
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Breadcumbs.png" format="PNG"></imagedata>
- </imageobject>
- </mediaobject>
- -->
- </section>
-
- <!--
- <section> <title>Console Portlet</title> <para>This Portlet is used as
- console to run Java Script commands.</para> <mediaobject>
- <imageobject> <imagedata fileref="images/Console.png"
- format="PNG"></imagedata> </imageobject> </mediaobject> </section>
- -->
- <section id="sect-User_Guide-Interface_Portlets-Footer_Portlet">
- <title>Footer Portlet</title>
- <para>
- This Portlet provides the footer for a site. Footer can be a text, images that are displayed at the bottom of a web site. It provides information about author/institutional sponsor, revision date, copyright, comments form, and navigational links.
- </para>
- <!--
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Footer.png" format="PNG"></imagedata>
- </imageobject>
- </mediaobject>
- -->
- </section>
-
- <section id="sect-User_Guide-Interface_Portlets-HomePage_Portlet">
- <title>HomePage Portlet</title>
- <para>
- This Portlet is used to provide a home page for a portal. The home page is a main page displayed firstly when you visit the site.
- </para>
- <!--
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/PortletHome2.png" format="PNG"></imagedata>
- </imageobject>
- </mediaobject>
- -->
- </section>
-
- <section id="sect-User_Guide-Interface_Portlets-Iframe_Portlet">
- <title>Iframe Portlet</title>
- <para>
- This Portlet is used to create IFrame elements for a site. Iframe is a HTML element which can embed a document into a HTML document. So embedded data is displayed inside a sub window of browser window.
- </para>
- <!--
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/IFrame.png" format="PNG"></imagedata>
- </imageobject>
- </mediaobject>
- -->
- </section>
-
- <section id="sect-User_Guide-Interface_Portlets-Navigation_Portlet">
- <title>Navigation Portlet</title>
- <para>
- This Portlet provides a navigation bar. A navigation likes a menu that helps users to visualize the structure of a site and provide links to quickly move from page to page.
- </para>
- <!--
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/NavigationPortlet.png" format="PNG"></imagedata>
- </imageobject>
- </mediaobject>
- -->
- </section>
-
- <section id="sect-User_Guide-Interface_Portlets-Sitemap_Portlet">
- <title>Sitemap Portlet</title>
- <para>
- This Portlet is used to provide a site map page of a web site. It lists pages on a website, typically organized in hierarchical fashion.
- </para>
- <!--
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/SiteMap3.png" format="PNG"></imagedata>
- </imageobject>
- </mediaobject>
- -->
- </section>
-
- <section id="sect-User_Guide-Interface_Portlets-Web_Explorer_Portlet">
- <title>Web Explorer Portlet</title>
- <para>
- This Portlet provides web-browser for users. It allows users to connect to other sites over Internet.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/WebExplorer1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </section>
-
- <section id="sect-User_Guide-Interface_Portlets-Dashboard_Portlet">
- <title>Dashboard Portlet</title>
- <para>
- This portlet is used for hosting mini - applications known as gadgets. The dashboard uses a variety of graphical effects for displaying, opening, and using gadgets.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Dashboard1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <para>
- See more details in <xref linkend="sect-User_Guide-Dashboard_Portlet" />
- </para>
- </section>
-
- <section id="sect-User_Guide-Interface_Portlets-Gadget_Wrapper_Portlet">
- <title>Gadget Wrapper Portlet</title>
- <para>
- This Portlet allows users to view a gadget in canvas mode.
+
+ <variablelist>
+ <varlistentry>
+ <term>Banner Portlet</term>
+ <listitem>
+ <para>
+ This Portlet is considered as the welcome gateway of a Portal. It contains the organization's slogan, logo, icon, button, etc.
+ </para>
+ <!-- <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/BannerPortlet.png" format="PNG"></imagedata>
+ </imageobject>
+ </mediaobject> -->
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>HomePage Portlet</term>
+ <listitem>
+ <para>
+ This Portlet is used to provide the home page for a portal. The home page is the first page displayed when you visit the site.
+ </para>
+ <!-- <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/PortletHome2.png" format="PNG"></imagedata>
+ </imageobject>
+ </mediaobject> -->
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Navigation Portlet</term>
+ <listitem>
+ <para>
+ This Portlet provides a navigation bar. A navigation likes a menu that helps users to visualize the structure of a site and provide links to quickly move from page to page.
+ </para>
+ <!-- <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/NavigationPortlet.png" format="PNG"></imagedata>
+ </imageobject>
+ </mediaobject> -->
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Sitemap Portlet</term>
+ <listitem>
+ <para>
+ This Portlet is used to provide a site map page of a web site. It lists pages on a website, typically organized in hierarchical fashion.
+ </para>
+ <!-- <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/SiteMap3.png" format="PNG"></imagedata>
+ </imageobject>
+ </mediaobject> -->
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Breadcumbs Portlet</term>
+ <listitem>
+ <para>
+ This Portlet displays the 'path' the user has taken from the home page to arrive at the currrent page.
+ </para>
+ <!-- <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Breadcumbs.png" format="PNG"></imagedata>
+ </imageobject>
+ </mediaobject> -->
+ </listitem>
+ </varlistentry>
+<!-- <varlistentry>
+ <term>Console Portlet</term>
+ <listitem>
+ <para>
+ This Portlet is used as console to run Java Script commands.
+ </para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/GadgetWrapper.png" format="PNG" />
+ <imagedata fileref="images/Console.png" format="PNG"></imagedata>
</imageobject>
</mediaobject>
- </para>
- </section>
-
- <section id="sect-User_Guide-Interface_Portlets-FCK_editor_Portlet">
- <title>FCK editor Portlet</title>
- <para>
- All its common used functions (like Word editor) such as writing, formatting text, creating tables, inserting links or picture, etc.
- </para>
- <mediaobject>
+ </listitem>
+ </varlistentry> -->
+ <varlistentry>
+ <term>Dashboard Portlet</term>
+ <listitem>
+ <para>
+ This portlet is used for hosting mini-applications known as gadgets. The dashboard uses a variety of graphical effects for displaying, opening, and using gadgets.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Dashboard1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ <para>
+ Refer to <xref linkend="sect-User_Guide-Dashboard_Portlet" /> or <xref linkend="chap-User_Guide-Gadgets_Administration" /> for more information.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Iframe Portlet</term>
+ <listitem>
+ <para>
+ This Portlet is used to create inline frames (IFrame) elements for a site. An Iframe is a HTML element which can embed another document into a parent HTML document. By using IFrames, embedded data is displayed inside a sub-window of browser.
+ </para>
+ <!-- <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/IFrame.png" format="PNG"></imagedata>
+ </imageobject>
+ </mediaobject> -->
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Web Explorer Portlet</term>
+ <listitem>
+ <para>
+ This Portlet provides web-browser and allows users to connect to external websites from within the portal.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/WebExplorer1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Gadget Wrapper Portlet</term>
+ <listitem>
+ <para>
+ This Portlet allows users to view a gadget in canvas mode.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/GadgetWrapper.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>FCK Editor Portlet</term>
+ <listitem>
+ <para>
+ Use this portlet for common tasks such as writing and formatting text, creating tables and inserting links or pictures.
+ </para>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/FCK1.png" format="PNG" />
+ <imagedata fileref="images/FCK1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- <para>
- See more details in <xref linkend="sect-User_Guide-FCK_Portlet" />
- </para>
- </section>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Footer Portlet</term>
+ <listitem>
+ <para>
+ This Portlet provides the footer for a site. This footer provides information or links about the site's author/institutional sponsor, the date of the last revision made to the site, copyright information, comments form and navigational links.
+ </para>
+ <!-- <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Footer.png" format="PNG"></imagedata>
+ </imageobject>
+ </mediaobject> -->
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<section id="sect-User_Guide-Gadget_concept">
- <!--
+<section id="sect-User_Guide-Gadgets">
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,55 +21,13 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Gadget</title>
+ --><title>Gadgets</title>
<para>
- A gadget is a mini web application that a portal user can to their web page. EPP provides some useful gadgets such as:
+ A gadget is a mini web application that a portal user can add to their web page. Some useful gadgets that are packaged by default with &PRODUCT;:
</para>
- <formalpara>
- <title>Calculator</title>
- <para>
- This mini-application lets you perform most basic arithmetic operations and can be themed to match the rest of your portal.
- </para>
- </formalpara>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Calculator.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <formalpara>
- <title>Calendar</title>
- <para>
- The calendar gadget allows users to switch easily between daily, monthly and yearly view and, again, is customizable to match your portal's theme.
- </para>
- </formalpara>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Calendar.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <formalpara>
- <title>Todo</title>
- <para>
- This application helps you organize your day and work group. It is designed to keep track of your tasks in a convenient and transparent way. Tasks can be highlighted with different colors.
- </para>
- </formalpara>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Todo.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <formalpara>
- <title>RSS Reader</title>
- <para>
- An RSS reader, or aggregator, collates content from various, user-specified feed sources and displays them in one location. This content can include, but isn't limited to, news headlines, blog posts or email. The RSS Reader gadget displays this content in a single window on your Portal page.
- </para>
- </formalpara>
- <!--
- <mediaobject> <imageobject> <imagedata fileref="images/RSS.png"
- format="PNG"></imagedata> </imageobject> </mediaobject>
- -->
+
<para>
- Further gadgets can be obtained from the <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> site. EPP is compatible with any gadget available here.
+ See the <emphasis role="bold">Default Gadgets</emphasis> section of <xref linkend="sect-User_Guide-Dashboard_Portlet-Using_the_Dashboard_Workspace" /> for more information about these gadgets.
</para>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<section id="sect-User_Guide-Navigation_concept">
- <!--
+<section id="sect-User_Guide-Navigation">
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,28 +21,40 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Navigation</title>
+ --><title>Navigation</title>
<para>
- Portal navigations are menus that list hyperlinks to other parts of a Portal. They can help users to visualize the structure of a site. The navigation menus in EPP 5.0 are located in a bar across the top of the 'Home' page. There are three navigation types:
+ Portal navigations are menus that list hyperlinks to other parts of a Portal. They can help users to visualize the structure of a site. The navigation menus in EPP 5.0 are located in a bar across the top of the 'Home' page.
</para>
- <formalpara>
- <title>Site</title>
- <para>
- This navigation links to separate sites of the main Portal. Each site has only one navigation and it is automatically created when the site is created. This functionality allows different sites to administer some Portal aspects, such as portlets, individually while maintaining other content standaradized with the parent Portal.
- </para>
- </formalpara>
- <formalpara>
- <title>Group</title>
- <para>
- The content of this navigation differs depending on the type of account logged in. For user accounts the Groups navigation holds personal links set up by the user. For management accounts, it keeps the links to pages for registered Portal users as well as adminisrative tasks and personal links. In the administrator account, the navigation adds further management abilities such as Internationalization and community management.
- </para>
- </formalpara>
- <formalpara>
- <title>Dashboard</title>
- <para>
- Each user has own navigation 'Dashboard' that houses links and portlets (or gadgets) that the user has selected. A user's navigation is created automatically when user is registered. This navigation only can be deleted when the user is deleted.
- </para>
- </formalpara>
+ <para>
+ There are three navigation types.
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>Site</term>
+ <listitem>
+ <para>
+ This navigation links to separate sites of the main Portal. Each site has only one navigation and it is automatically created when the site is created. This functionality allows different sites to administer some Portal aspects, such as portlets, individually while maintaining other content standaradized with the parent Portal.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Group</term>
+ <listitem>
+ <para>
+ The content of this navigation differs depending on the type of account logged in. For user accounts the Groups navigation holds personal links set up by the user. For management accounts, it keeps the links to pages for registered Portal users as well as adminisrative tasks and personal links. In the administrator account, the navigation adds further management abilities such as Internationalization and community management.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Dashboard</term>
+ <listitem>
+ <para>
+ Each user has own navigation 'Dashboard' that houses links and portlets (or gadgets) that the user has selected. A user's navigation is created automatically when user is registered. This navigation only can be deleted when the user is deleted.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<section id="sect-User_Guide-Permission_levels">
- <!--
+<section id="sect-User_Guide-Permissions">
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,42 +21,107 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Permission levels</title>
+ --><title>Permissions</title>
<para>
- There are two permission types:
+ Permission settings control what users can and cannot do within the portal and are set by portal administrators.
</para>
- <itemizedlist>
- <listitem>
- <para>
- <emphasis role="bold">Access Permission</emphasis> : allows users to use (see a page content, drag and drop portlets into pages, sign in). The access permission can be set for a list of groups.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Edit Permission</emphasis> : allows users to change (change portal or page information, delete portals or pages). The edit permission is set for only one group at the same time.
- </para>
- </listitem>
- </itemizedlist>
<para>
- There are several permission levels:
+ There are two permission <emphasis role="bold">types</emphasis>:
</para>
- <itemizedlist>
- <listitem>
- <para>
- <emphasis role="bold">Portal</emphasis> : The portal includes all pages, pages only can be accessed if the user has also access to the Portal.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Page</emphasis> : You can restrict the access permission to single pages. Users can change page information (properties, layout) if they have the edit permission.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Portlet</emphasis> : When users create a page, they need to drag and drop portlets into a page to create the page content. Some portlets are only used for administrators, some are used for individual needs of a group thus you have to set the appropriate access permission.
- </para>
- </listitem>
- </itemizedlist>
+
+ <variablelist>
+ <varlistentry>
+ <term>Access</term>
+ <listitem>
+ <para>
+ This allows users to use (see a page content, drag and drop portlets into pages, sign in). The access permission can be set for a list of groups.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Edit</term>
+ <listitem>
+ <para>
+ Allows users to change (change portal or page information, delete portals or pages). The edit permission is set for only one group at the same time.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>
+ There are several permission <emphasis role="bold"> levels</emphasis> used in EPP 5.0:
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term>Portal</term>
+ <listitem>
+ <para>
+ The portal permission level includes all pages, pages only can be accessed if the user has also access to the Portal.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Page</term>
+ <listitem>
+ <para>
+ The page permission level restricts the access permission to single pages. Users can change page information (properties, layout) if they have the edit permission.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Portlet</term>
+ <listitem>
+ <para>
+ The portlet permission level allows users create a page, they need to drag and drop portlets into a page to create the page content. Some portlets are only used for administrators, some are used for individual needs of a group thus you have to set the appropriate access permission.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+<!-- <section id="sect-User_Guide-Permissions-Permission_Types">
+ <title>Permission Types</title>
+ <para>
+ There are two permission <emphasis role="bold">types</emphasis>:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis role="bold">Access</emphasis>: This allows users to use (see a page content, drag and drop portlets into pages, sign in). The access permission can be set for a list of groups.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">Edit</emphasis>: allows users to change (change portal or page information, delete portals or pages). The edit permission is set for only one group at the same time.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section id="sect-User_Guide-Permissions-Permission_Levels">
+ <title>Permission Levels</title>
+ <para>
+ There are several permission <emphasis role="bold"> levels</emphasis> used in EPP 5.0:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis role="bold">Portal</emphasis>: The portal permission level includes all pages, pages only can be accessed if the user has also access to the Portal.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">Page</emphasis>: The page permission level restricts the access permission to single pages. Users can change page information (properties, layout) if they have the edit permission.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">Portlet</emphasis>: The portlet permission level allows users create a page, they need to drag and drop portlets into a page to create the page content. Some portlets are only used for administrators, some are used for individual needs of a group thus you have to set the appropriate access permission.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section> -->
+
</section>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<section id="sect-User_Guide-Portal_concept">
- <!--
+<section id="sect-User_Guide-Portal">
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,28 +21,35 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Portal</title>
- <para>
- The Enterprise Portal Platform is a web-based application that provides users with personalized User Interface (UI). This UI allows users to easily perform actions such as searching applications or information and communicating with other users.
- </para>
- <para>
- The Portal provides a graphical aggregation of enterprise content and business applications with flexible management and personalization options.
- </para>
- <para>
- Portal has two main components:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Portal Engine: The engine renders and runs pages, navigations and preferences.
- </para>
- </listitem>
- <listitem>
- <para>
- WebUI Framework: a Web framework tailored for easy screen composition and Ajax support in Portal environment.
- </para>
- </listitem>
- </itemizedlist>
+ --><title>Portal</title>
+ <para>
+ &PRODUCT; is a web-based application that provides users with personalized User Interface (UI). This UI allows users to easily perform actions such as searching applications or information and communicating with other users.
+ </para>
+ <para>
+ The Portal provides a graphical aggregation of enterprise content and business applications with flexible management and personalization options.
+ </para>
+ <para>
+ Portal has two main components:
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term>Portal Engine</term>
+ <listitem>
+ <para>
+ The engine renders and runs pages, navigations and preferences.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>WebUI Framework</term>
+ <listitem>
+ <para>
+ The WebUI (User Interface) Framework is tailored for easy screen composition and Ajax support in Portal environment.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<section id="sect-User_Guide-Portlet_concept">
- <!--
+<section id="sect-User_Guide-Portlet">
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,13 +21,13 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Portlet</title>
- <para>
- A portlet is a small, self-contained web application. Portlet interface components are managed and displayed within a Portal. Typically, a portal page is displayed as a collection of non-overlapping portlet windows, with each portlet window displaying a different portlet. Hence a portlet (or collection of portlets) resembles a web-based application hosted in a portal. Portlets can be configured to generated differing content.
- </para>
- <para>
- EPP has a number of standard portlets that can be plugged into any portal.
- </para>
+ --><title>Portlet</title>
+ <para>
+ A portlet is a small, self-contained web application. Portlet interface components are managed and displayed within a Portal. Typically, a portal page is displayed as a collection of non-overlapping portlet windows, with each portlet window displaying a different portlet. Hence a portlet (or collection of portlets) resembles a web-based application hosted in a portal. Portlets can be configured to generated differing content.
+ </para>
+ <para>
+ EPP has a number of standard portlets that can be plugged into any portal.
+ </para>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<section id="sect-User_Guide-Public_mode_and_private_mode">
- <!--
+<section id="sect-User_Guide-Modes">
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,22 +21,28 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Public mode and private mode</title>
+ --><title>Modes</title>
<para>
- Enterprise Portal Platform 5.0 has two modes:
+ &PRODUCT; has two <emphasis role="bold">modes</emphasis>:
</para>
- <formalpara>
- <title>Public</title>
+ <variablelist>
+ <varlistentry>
+ <term>Public</term>
+ <listitem>
<para>
This mode is for guest users who are not registered with the Portal. It does not require a log in and restricts the visitor to the public pages in the portal. Visitors can register an account to gain access to the restricted pages. After being registered, they can use the Private mode but must still contact the Portal administrator to get more rights or a group manager to become a member and gain access a group.
</para>
- </formalpara>
- <formalpara>
- <title>Private</title>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Private</term>
+ <listitem>
<para>
This mode is for registered users. Users set a username and password during registration which they can use to sign in. This mode allows users more site privileges. Registered users can manage private resources (creating, editing or deleting private pages), "borrow" pages from other users by creating hyperlinks and change the language for individual needs.
</para>
- </formalpara>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2009-12-07 06:29:45 UTC (rev 957)
+++ portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2009-12-07 06:36:13 UTC (rev 958)
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="sect-User_Guide-Toolbar_concept">
- <!--
+ <!--
Copyright (C) 2009 eXo Platform SAS.
@@ -21,15 +21,21 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Toolbar concept</title>
+ --><title>Toolbar concept</title>
<para>
- This is a specific bar that contains all user and administration actions for the purpose of helping users and the administrator access and perform actions easily, quickly and effectively. You can see this Toolbar in GateIn Portal as below:
+ This bar contains all user and administration actions. It helps users and the administrator access and perform actions easily, quickly and effectively. You can see this toolbar as it appears in the Portal below:
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Toolbar.png" format="PNG" />
+ <imagedata fileref="images/Toolbar.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
+ <para>
+ In this image you can see the three Navigations referred to in <xref linkend="sect-User_Guide-Navigation" /> as well as the main Menu button (on the far left of the toolbar) and the name of the current user (on the far right).
+ </para>
+ <para>
+ In this example the current user is the site administrator, hence the extra "Site Editor" menu.
+ </para>
</section>
16 years, 4 months
- 1
- 0
gatein SVN: r957 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide: en-US and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2009-12-07 01:29:45 -0500 (Mon, 07 Dec 2009)
New Revision: 957
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/publican.cfg
Log:
first commit of structural edit
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml 2009-12-07 02:40:48 UTC (rev 956)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml 2009-12-07 06:29:45 UTC (rev 957)
@@ -7,7 +7,7 @@
<surname>Mumford</surname>
<affiliation>
<orgname>Red Hat</orgname>
- <orgdiv>ECS</orgdiv>
+ <orgdiv>Engineering Content Services</orgdiv>
</affiliation>
<email>smumford(a)redhat.com</email>
</author>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml 2009-12-07 02:40:48 UTC (rev 956)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml 2009-12-07 06:29:45 UTC (rev 957)
@@ -3,7 +3,7 @@
]>
<bookinfo id="book-User_Guide-User_Guide">
<title>User Guide</title>
- <subtitle>A User Guide for the Enterprise Portal Platform</subtitle>
+ <subtitle>A User Guide for Enterprise Portal Platform 5.0</subtitle>
<productname>Enterprise Portal Platform</productname>
<productnumber>5.0</productnumber>
<edition>1</edition>
@@ -11,7 +11,7 @@
<abstract>
<para>
This document provides an easy to follow guide to the functions and
-options available in the EPP 5.0 GateIn product. It is intended to
+options available in &PRODUCT;. It is intended to
be accessible and useful to both experienced and novice portal
users.
</para>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml 2009-12-07 02:40:48 UTC (rev 956)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml 2009-12-07 06:29:45 UTC (rev 957)
@@ -19,7 +19,6 @@
</simplelist>
</revdescription>
</revision>
-
<revision>
<revnumber>0</revnumber>
<date>Tue Nov 17 2009</date>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent 2009-12-07 02:40:48 UTC (rev 956)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent 2009-12-07 06:29:45 UTC (rev 957)
@@ -1,4 +1,4 @@
-<!ENTITY PRODUCT "GateIn_Portal">
-<!ENTITY BOOKID "User_Guide">
+<!ENTITY PRODUCT "Enterprise Portal Platform 5.0">
+<!ENTITY BOOKID "User Guide">
<!ENTITY YEAR "2009">
<!ENTITY HOLDER "Red Hat, Inc">
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/publican.cfg
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/publican.cfg 2009-12-07 02:40:48 UTC (rev 956)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/publican.cfg 2009-12-07 06:29:45 UTC (rev 957)
@@ -4,5 +4,7 @@
xml_lang: en-US
type: Book
brand: RedHat
+chunk_section_depth: 1
+chunk_first: 1
debug:1
16 years, 4 months
- 1
- 0
gatein SVN: r956 - in portal/trunk: web/portal/src/main/webapp/groovy/portal/webui/application and 3 other directories.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-12-06 21:40:48 -0500 (Sun, 06 Dec 2009)
New Revision: 956
Modified:
portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java
Log:
GTNPORTAL-353: Should not update MaskWorkspace while in edit mode of portlet
Modified: portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java
===================================================================
--- portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java 2009-12-06 21:43:03 UTC (rev 955)
+++ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java 2009-12-07 02:40:48 UTC (rev 956)
@@ -19,6 +19,8 @@
package org.exoplatform.dashboard.webui.component;
+import org.exoplatform.portal.webui.util.Util;
+import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.application.portlet.PortletRequestContext;
@@ -99,12 +101,6 @@
throw new MessageException(new ApplicationMessage("NumberFormatValidator.msg.Invalid-number", args));
}
- // if (totalCols < 1 || totalCols > MAX_COLUMNS) {
- // uiInput.setValue(lastValue);
- // throw new MessageException(new ApplicationMessage(
- // "NumberInRangeValidator.msg.Invalid-number", args));
- // }
-
uiInput = uiForm.getUIStringInput(DashboardParent.ISPRIVATE);
pref.setValue(DashboardParent.ISPRIVATE, uiInput.getValue());
@@ -115,7 +111,8 @@
((UIContainer)uiForm.getParent()).getChild(UIDashboard.class).getChild(UIDashboardContainer.class);
uiDashboardContainer.setColumns(totalCols);
uiDashboardContainer.save();
- pcontext.setApplicationMode(PortletMode.VIEW);
+ if (Util.getUIPortalApplication().getModeState() == UIPortalApplication.NORMAL_MODE)
+ pcontext.setApplicationMode(PortletMode.VIEW);
}
}
}
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2009-12-06 21:43:03 UTC (rev 955)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2009-12-07 02:40:48 UTC (rev 956)
@@ -241,7 +241,7 @@
<div class="MiddleDecoratorLeft">
<div class="MiddleDecoratorRight">
<div class="MiddleDecoratorCenter">
- <div id="${portletId}" style="width: 100%">
+ <div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>" style="width: 100%">
<div class="PORTLET-FRAGMENT UIResizableBlock UIApplication" style="width: 100%; height: $windowHeight;">
<% if(windowState != WindowState.MINIMIZED) out.println(portletContent) %>
</div>
@@ -276,7 +276,7 @@
cssStyle += "height: "+ windowHeight +";";
cssStyle += "\"";
%>
- <div id="${portletId}">
+ <div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>">
<div class="PORTLET-FRAGMENT" ${cssStyle}>
<% out.println(portletContent); %>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl 2009-12-06 21:43:03 UTC (rev 955)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl 2009-12-07 02:40:48 UTC (rev 956)
@@ -65,12 +65,14 @@
%>
<div class="UITabContent" style="display: $display;">
<div id="<%=uicomponent.getUIPortlet().getId()%>">
+ <div class="PORTLET-FRAGMENT">
<%= uicomponent.getEditModeContent() %>
<%
- String strExec = "eXo.core.DOMUtil.removeElement('VIEW-" + uicomponent.getUIPortlet().getId() + "');";
- rcontext.getJavascriptManager().addCustomizedOnLoadScript(strExec);
+ //String strExec = "eXo.core.DOMUtil.removeElement('" + uicomponent.getUIPortlet().getId() + "');";
+ //rcontext.getJavascriptManager().addCustomizedOnLoadScript(strExec);
%>
</div>
+ </div>
</div>
<%}%>
<%uiform.begin()%>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2009-12-06 21:43:03 UTC (rev 955)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2009-12-07 02:40:48 UTC (rev 956)
@@ -94,20 +94,15 @@
import java.util.UUID;
/** May 19, 2006 */
-@ComponentConfig(
- lifecycle = UIPortletLifecycle.class,
- template = "system:/groovy/portal/webui/application/UIPortlet.gtmpl",
- events = {
- @EventConfig(listeners = RenderActionListener.class),
- @EventConfig(listeners = ChangePortletModeActionListener.class),
- @EventConfig(listeners = ChangeWindowStateActionListener.class),
- @EventConfig(listeners = DeleteComponentActionListener.class, confirm = "UIPortlet.deletePortlet"),
- @EventConfig(listeners = EditPortletActionListener.class),
- @EventConfig(phase = Phase.PROCESS, listeners = ProcessActionActionListener.class),
- @EventConfig(phase = Phase.PROCESS, listeners = ServeResourceActionListener.class),
- @EventConfig(phase = Phase.PROCESS, listeners = ProcessEventsActionListener.class)
- }
-)
+@ComponentConfig(lifecycle = UIPortletLifecycle.class, template = "system:/groovy/portal/webui/application/UIPortlet.gtmpl", events = {
+ @EventConfig(listeners = RenderActionListener.class),
+ @EventConfig(listeners = ChangePortletModeActionListener.class),
+ @EventConfig(listeners = ChangeWindowStateActionListener.class),
+ @EventConfig(listeners = DeleteComponentActionListener.class, confirm = "UIPortlet.deletePortlet"),
+ @EventConfig(listeners = EditPortletActionListener.class),
+ @EventConfig(phase = Phase.PROCESS, listeners = ProcessActionActionListener.class),
+ @EventConfig(phase = Phase.PROCESS, listeners = ServeResourceActionListener.class),
+ @EventConfig(phase = Phase.PROCESS, listeners = ProcessEventsActionListener.class)})
public class UIPortlet<S, C extends Serializable> extends UIApplication
{
@@ -140,18 +135,25 @@
private String applicationId;
private String theme_;
+
private String portletStyle;
+
private boolean showPortletMode = true;
private PortletMode currentPortletMode_ = PortletMode.VIEW;
+
private WindowState currentWindowState_ = WindowState.NORMAL;
private List<String> supportModes_;
private List<QName> supportedProcessingEvents_;
+
private List<QName> supportedPublishingEvents_;
+
private List<String> supportedPublicParams_;
+
private boolean portletInPortal_ = true;
+
private StateString navigationalState;
public UIPortlet()
@@ -474,7 +476,8 @@
return false;
}
- Map<QName, EventInfo> consumedEvents = (Map<QName, EventInfo>)portlet.getInfo().getEventing().getConsumedEvents();
+ Map<QName, EventInfo> consumedEvents =
+ (Map<QName, EventInfo>)portlet.getInfo().getEventing().getConsumedEvents();
if (consumedEvents == null)
{
@@ -497,41 +500,42 @@
return false;
}
- public boolean supportsPublishingEvent (QName name)
+ public boolean supportsPublishingEvent(QName name)
{
- if (supportedPublishingEvents_ == null)
- {
- org.gatein.pc.api.Portlet portlet = getProducedOfferedPortlet();
+ if (supportedPublishingEvents_ == null)
+ {
+ org.gatein.pc.api.Portlet portlet = getProducedOfferedPortlet();
- if (portlet == null)
- {
- log.info("Could not find portlet with ID : " + producerOfferedPortletContext.getId());
- return false;
- }
+ if (portlet == null)
+ {
+ log.info("Could not find portlet with ID : " + producerOfferedPortletContext.getId());
+ return false;
+ }
- Map<QName, EventInfo> producedEvents = (Map<QName, EventInfo>)portlet.getInfo().getEventing().getProducedEvents();
+ Map<QName, EventInfo> producedEvents =
+ (Map<QName, EventInfo>)portlet.getInfo().getEventing().getProducedEvents();
- if (producedEvents == null)
- {
- return false;
- }
+ if (producedEvents == null)
+ {
+ return false;
+ }
- supportedPublishingEvents_ = new ArrayList<QName>(producedEvents.keySet());
- }
-
- for (Iterator<QName> iter = supportedPublishingEvents_.iterator(); iter.hasNext();)
- {
- QName eventName = iter.next();
- if (eventName.equals(name))
- {
- log.info("The Portlet " + producerOfferedPortletContext + " supports producing the event : " + name);
- return true;
- }
- }
- log.info("The portlet " + producerOfferedPortletContext + " doesn't support producing the event : " + name);
- return false;
+ supportedPublishingEvents_ = new ArrayList<QName>(producedEvents.keySet());
+ }
+
+ for (Iterator<QName> iter = supportedPublishingEvents_.iterator(); iter.hasNext();)
+ {
+ QName eventName = iter.next();
+ if (eventName.equals(name))
+ {
+ log.info("The Portlet " + producerOfferedPortletContext + " supports producing the event : " + name);
+ return true;
+ }
+ }
+ log.info("The portlet " + producerOfferedPortletContext + " doesn't support producing the event : " + name);
+ return false;
}
-
+
/**
* Tells, according to the info located in portlet.xml, wether this portlet supports the public render parameter
* given as a method argument
@@ -549,7 +553,8 @@
}
//
- Collection<ParameterInfo> parameters = (Collection<ParameterInfo>)producedOfferedPortlet.getInfo().getNavigation().getPublicParameters();
+ Collection<ParameterInfo> parameters =
+ (Collection<ParameterInfo>)producedOfferedPortlet.getInfo().getNavigation().getPublicParameters();
supportedPublicParams_ = new ArrayList<String>();
for (ParameterInfo parameter : parameters)
{
@@ -564,7 +569,8 @@
{
if (log.isDebugEnabled())
{
- log.debug("The Portlet " + producerOfferedPortletContext.getId() + " supports the public render parameter : " + supportedPublicParam);
+ log.debug("The Portlet " + producerOfferedPortletContext.getId()
+ + " supports the public render parameter : " + supportedPublicParam);
}
return true;
}
@@ -643,7 +649,8 @@
actionInvocation.setForm(allParams);
actionInvocation.setRequestContext(new AbstractRequestContext(servletRequest));
- String interactionState = servletRequest.getParameter(ExoPortletInvocationContext.INTERACTION_STATE_PARAM_NAME);
+ String interactionState =
+ servletRequest.getParameter(ExoPortletInvocationContext.INTERACTION_STATE_PARAM_NAME);
if (interactionState != null)
{
actionInvocation.setInteractionState(StateString.create(interactionState));
@@ -739,12 +746,12 @@
}
invocation.setInstanceContext(instanceContext);
-
invocation.setServerContext(new AbstractServerContext(servletRequest, prc.getResponse()));
//TODO: ExoUserContext impl not tested
invocation.setUserContext(new ExoUserContext(servletRequest, userProfile));
invocation.setWindowContext(new ExoWindowContext(storageName));
- invocation.setPortalContext(new AbstractPortalContext(Collections.singletonMap("javax.portlet.markup.head.element.support", "true")));
+ invocation.setPortalContext(new AbstractPortalContext(Collections.singletonMap(
+ "javax.portlet.markup.head.element.support", "true")));
invocation.setSecurityContext(new AbstractSecurityContext(servletRequest));
//
@@ -762,7 +769,8 @@
PortletInvoker portletInvoker = getApplicationComponent(PortletInvoker.class);
// Get marshalled version
- StatefulPortletContext<C> updatedCtx = (StatefulPortletContext<C>)portletInvoker.setProperties(portletContext, changes);
+ StatefulPortletContext<C> updatedCtx =
+ (StatefulPortletContext<C>)portletInvoker.setProperties(portletContext, changes);
//
C updateState = updatedCtx.getState();
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2009-12-06 21:43:03 UTC (rev 955)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2009-12-07 02:40:48 UTC (rev 956)
@@ -744,6 +744,7 @@
UIPortletForm uiPortletForm = uiMaskWS.createUIComponent(UIPortletForm.class, null, null);
uiPortletForm.setValues(uiPortlet);
uiMaskWS.setWindowSize(800, -1);
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS);
}
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2009-12-06 21:43:03 UTC (rev 955)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2009-12-07 02:40:48 UTC (rev 956)
@@ -46,6 +46,7 @@
import java.util.HashMap;
import java.util.Map;
+import javax.portlet.PortletMode;
import javax.portlet.WindowState;
/**
@@ -170,7 +171,7 @@
else
{
int portalMode = Util.getUIPortalApplication().getModeState();
- if (portalMode % 2 == 0)
+ if (portalMode % 2 == 0 || uicomponent.getCurrentPortletMode().equals(PortletMode.EDIT))
{
PortletInvocationResponse response = uicomponent.invoke(renderInvocation);
if (response instanceof FragmentResponse)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java 2009-12-06 21:43:03 UTC (rev 955)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java 2009-12-07 02:40:48 UTC (rev 956)
@@ -24,7 +24,6 @@
import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.core.UIComponentDecorator;
import org.exoplatform.webui.event.Event;
-import org.exoplatform.webui.event.Event.Phase;
import org.exoplatform.webui.event.EventListener;
import org.exoplatform.webui.event.Event.Phase;
@@ -79,7 +78,7 @@
public void setUpdated(boolean bln)
{
- this.isUpdated = bln;
+// this.isUpdated = bln;
}
public <T extends UIComponent> T createUIComponent(Class<T> clazz, String configId, String id) throws Exception
16 years, 4 months
- 1
- 0
gatein SVN: r955 - in portal/trunk/component/test: organization and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-12-06 16:43:03 -0500 (Sun, 06 Dec 2009)
New Revision: 955
Added:
portal/trunk/component/test/organization/
portal/trunk/component/test/organization/pom.xml
portal/trunk/component/test/organization/src/
portal/trunk/component/test/organization/src/main/
portal/trunk/component/test/organization/src/main/java/
portal/trunk/component/test/organization/src/main/resources/
Modified:
portal/trunk/component/test/pom.xml
Log:
add empty organization test module
Added: portal/trunk/component/test/organization/pom.xml
===================================================================
--- portal/trunk/component/test/organization/pom.xml (rev 0)
+++ portal/trunk/component/test/organization/pom.xml 2009-12-06 21:43:03 UTC (rev 955)
@@ -0,0 +1,51 @@
+<!--
+ ~ 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.
+ -->
+
+<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.test</artifactId>
+ <version>3.0.0-Beta04-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.portal.component.test.organization</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn Portal Component Core Test Organization</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.core</artifactId>
+ <version>3.0.0-Beta04-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Modified: portal/trunk/component/test/pom.xml
===================================================================
--- portal/trunk/component/test/pom.xml 2009-12-06 21:39:10 UTC (rev 954)
+++ portal/trunk/component/test/pom.xml 2009-12-06 21:43:03 UTC (rev 955)
@@ -33,6 +33,7 @@
<modules>
<module>core</module>
<module>jcr</module>
+ <module>organization</module>
</modules>
</project>
16 years, 4 months
- 1
- 0
gatein SVN: r954 - in portal/trunk: component/common/src/main/java and 11 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-12-06 16:39:10 -0500 (Sun, 06 Dec 2009)
New Revision: 954
Added:
portal/trunk/component/test/core/
portal/trunk/component/test/core/pom.xml
portal/trunk/component/test/core/src/
portal/trunk/component/test/jcr/
portal/trunk/component/test/jcr/pom.xml
portal/trunk/component/test/jcr/src/
portal/trunk/component/test/jcr/src/main/
portal/trunk/component/test/jcr/src/main/java/
portal/trunk/component/test/jcr/src/main/resources/
portal/trunk/component/test/jcr/src/main/resources/conf/
portal/trunk/component/test/jcr/src/main/resources/conf/jcr/
portal/trunk/component/test/jcr/src/main/resources/conf/jcr/jcr-configuration.xml
portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml
Removed:
portal/trunk/component/common/src/main/java/conf/
portal/trunk/component/test/core/src/main/resources/conf/jcr/
portal/trunk/component/test/core/src/test/java/org/exoplatform/component/test/
portal/trunk/component/test/src/
Modified:
portal/trunk/component/common/pom.xml
portal/trunk/component/test/pom.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml
Log:
split the test configuration into units to have a finer granularity
Modified: portal/trunk/component/common/pom.xml
===================================================================
--- portal/trunk/component/common/pom.xml 2009-12-06 21:03:39 UTC (rev 953)
+++ portal/trunk/component/common/pom.xml 2009-12-06 21:39:10 UTC (rev 954)
@@ -64,12 +64,19 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.test</artifactId>
+ <artifactId>exo.portal.component.test.core</artifactId>
<version>3.0.0-Beta04-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.jcr</artifactId>
+ <version>3.0.0-Beta04-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Copied: portal/trunk/component/test/core/pom.xml (from rev 953, portal/trunk/component/test/pom.xml)
===================================================================
--- portal/trunk/component/test/core/pom.xml (rev 0)
+++ portal/trunk/component/test/core/pom.xml 2009-12-06 21:39:10 UTC (rev 954)
@@ -0,0 +1,63 @@
+<!--
+ ~ 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.
+ -->
+
+<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.test</artifactId>
+ <version>3.0.0-Beta04-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.portal.component.test.core</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn Portal Component Core Test</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Copied: portal/trunk/component/test/core/src (from rev 953, portal/trunk/component/test/src)
Added: portal/trunk/component/test/jcr/pom.xml
===================================================================
--- portal/trunk/component/test/jcr/pom.xml (rev 0)
+++ portal/trunk/component/test/jcr/pom.xml 2009-12-06 21:39:10 UTC (rev 954)
@@ -0,0 +1,68 @@
+<!--
+ ~ 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.
+ -->
+
+<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.test</artifactId>
+ <version>3.0.0-Beta04-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.portal.component.test.jcr</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn Portal Component Core Test JCR</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.core</artifactId>
+ <version>3.0.0-Beta04-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.ext</artifactId>
+ <version>${org.exoplatform.jcr.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.organization.jdbc</artifactId>
+ <version>${org.exoplatform.core.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Added: portal/trunk/component/test/jcr/src/main/resources/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/trunk/component/test/jcr/src/main/resources/conf/jcr/jcr-configuration.xml (rev 0)
+++ portal/trunk/component/test/jcr/src/main/resources/conf/jcr/jcr-configuration.xml 2009-12-06 21:39:10 UTC (rev 954)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
+<configuration
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+ <component>
+ <key>org.exoplatform.services.idgenerator.IDGeneratorService</key>
+ <type>org.exoplatform.services.idgenerator.impl.IDGeneratorServiceImpl</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.security.IdentityRegistry</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.document.DocumentReaderService</key>
+ <type>org.exoplatform.services.document.impl.DocumentReaderServiceImpl</type>
+ <component-plugins>
+ <component-plugin>
+ <name>pdf.document.reader</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.PDFDocumentReader</type>
+ <description>to read the pdf inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.types</name>
+ <description>description</description>
+ <value>application/pdf</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerMSWord</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.MSWordDocumentReader</type>
+ <description>to read the ms word inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesMSWord</name>
+ <description>description</description>
+ <value>application/msword</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerMSExcel</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.MSExcelDocumentReader</type>
+ <description>to read the ms excel inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesMSExcel</name>
+ <description>description</description>
+ <value>application/excel</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerMSOutlook</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.MSOutlookDocumentReader</type>
+ <description>to read the ms outlook inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesMSOutlook</name>
+ <description>description</description>
+ <value>application/vnd.ms-outlook</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>PPTdocument.reader</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.PPTDocumentReader</type>
+ <description>to read the ms ppt inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesPPT</name>
+ <description>description</description>
+ <value>application/ppt</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerHTML</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.HTMLDocumentReader</type>
+ <description>to read the html inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesHTML</name>
+ <description>description</description>
+ <value>text/html</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerXML</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.XMLDocumentReader</type>
+ <description>to read the xml inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesXML</name>
+ <description>description</description>
+ <value>text/xml</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>TPdocument.reader</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.TextPlainDocumentReader</type>
+ <description>to read the plain text inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesTextPlain</name>
+ <description>description</description>
+ <value>text/plain</value>
+ </values-param>
+ <!-- values-param>
+ <name>defaultEncoding</name>
+ <description>description</description>
+ <value>UTF-8</value>
+ </values-param -->
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerOO</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.OpenOfficeDocumentReader</type>
+ <description>to read the OO inputstream</description>
+ </component-plugin>
+
+ </component-plugins>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
+ <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
+ <init-params>
+ <value-param>
+ <name>conf-path</name>
+ <description>JCR configuration file</description>
+ <value>jar:/conf/jcr/repository-configuration.xml</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.RepositoryService</key>
+ <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type>
+ </component>
+
+</configuration>
Added: portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml (rev 0)
+++ portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml 2009-12-06 21:39:10 UTC (rev 954)
@@ -0,0 +1,129 @@
+<!--
+ ~ 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.
+ -->
+
+<repository-service default-repository="repository">
+ <repositories>
+ <repository name="repository" system-workspace="system" default-workspace="portal-test">
+ <security-domain>gatein-domain</security-domain>
+ <access-control>optional</access-control>
+ <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
+
+ <!-- System -->
+ <workspaces>
+ <workspace name="system">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcexo"/>
+ <property name="dialect" value="hsqldb"/>
+ <property name="multi-db" value="false"/>
+ <property name="update-storage" value="true"/>
+ <property name="max-buffer-size" value="204800"/>
+ <property name="swap-directory" value="../temp/swap/system"/>
+ </properties>
+ <value-storages>
+ <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <properties>
+ <property name="path" value="../temp/values/system"/>
+ </properties>
+ <filters>
+ <filter property-type="Binary"/>
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ </properties>
+ </initializer>
+ <cache enabled="true">
+ <properties>
+ <property name="max-size" value="20000"/>
+ <property name="live-time" value="30000"/>
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="../temp/jcrlucenedb/system"/>
+ </properties>
+ </query-handler>
+ <lock-manager>
+ <time-out>15m</time-out><!-- 15min -->
+ <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
+ <properties>
+ <property name="path" value="../temp/lock/system"/>
+ </properties>
+ </persister>
+ </lock-manager>
+ </workspace>
+
+ <!-- Portal system data -->
+ <workspace name="portal-test">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcexo"/>
+ <property name="dialect" value="hsqldb"/>
+ <property name="multi-db" value="false"/>
+ <property name="update-storage" value="true"/>
+ <property name="max-buffer-size" value="204800"/>
+ <property name="swap-directory" value="../temp/swap/portal-test"/>
+ </properties>
+ <value-storages>
+ <value-storage id="portal-test" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <properties>
+ <property name="path" value="../temp/values/portal-test"/>
+ </properties>
+ <filters>
+ <filter property-type="Binary"/>
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured"/>
+ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ </properties>
+ </initializer>
+ <cache enabled="true">
+ <properties>
+ <property name="max-size" value="20000"/>
+ <property name="live-time" value="30000"/>
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="../temp/jcrlucenedb/portal-test"/>
+ </properties>
+ </query-handler>
+ <lock-manager>
+ <time-out>15m</time-out><!-- 15min -->
+ <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
+ <properties>
+ <property name="path" value="../temp/lock/portal-test"/>
+ </properties>
+ </persister>
+ </lock-manager>
+ </workspace>
+
+ </workspaces>
+ </repository>
+ </repositories>
+</repository-service>
Modified: portal/trunk/component/test/pom.xml
===================================================================
--- portal/trunk/component/test/pom.xml 2009-12-06 21:03:39 UTC (rev 953)
+++ portal/trunk/component/test/pom.xml 2009-12-06 21:39:10 UTC (rev 954)
@@ -18,60 +18,21 @@
-->
<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>
- <version>3.0.0-Beta04-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>exo.portal.component.test</artifactId>
- <packaging>jar</packaging>
- <name>GateIn Portal Component Test</name>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
+ <parent>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component</artifactId>
+ <version>3.0.0-Beta04-SNAPSHOT</version>
+ </parent>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.portal.component.test</artifactId>
+ <packaging>pom</packaging>
+ <name>GateIn Portal Test Component</name>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.commons</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
+ <modules>
+ <module>core</module>
+ <module>jcr</module>
+ </modules>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.container</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.component.ext</artifactId>
- <version>${org.exoplatform.jcr.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.organization.jdbc</artifactId>
- <version>${org.exoplatform.core.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- </build>
-
</project>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2009-12-06 21:03:39 UTC (rev 953)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2009-12-06 21:39:10 UTC (rev 954)
@@ -101,4 +101,9 @@
</object-param>
</init-params>
</component>
+
+ <component>
+ <key>org.exoplatform.commons.chromattic.ChromatticManager</key>
+ <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
+ </component>
</configuration>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml 2009-12-06 21:03:39 UTC (rev 953)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/security-configuration.xml 2009-12-06 21:39:10 UTC (rev 954)
@@ -39,54 +39,4 @@
</init-params>
</component>
- <component>
- <key>org.exoplatform.web.security.security.CookieTokenService</key>
- <type>org.exoplatform.web.security.security.CookieTokenService</type>
- <init-params>
- <values-param>
- <name>service.configuration</name>
- <value>jcr-token</value>
- <value>7</value>
- <value>DAY</value>
- </values-param>
- </init-params>
- </component>
-
- <component>
- <key>org.exoplatform.web.security.security.TransientTokenService</key>
- <type>org.exoplatform.web.security.security.TransientTokenService</type>
- <init-params>
- <values-param>
- <name>service.configuration</name>
- <value>memory-token</value>
- <value>1</value>
- <value>MINUTE</value>
- </values-param>
- </init-params>
- </component>
-
- <external-component-plugins>
- <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
- <component-plugin>
- <name>chromattic</name>
- <set-method>addLifeCycle</set-method>
- <type>org.exoplatform.portal.pom.config.MOPChromatticLifeCycle</type>
- <init-params>
- <value-param>
- <name>name</name>
- <value>token</value>
- </value-param>
- <value-param>
- <name>workspace-name</name>
- <value>portal-work</value>
- </value-param>
- <values-param>
- <name>entities</name>
- <value>org.exoplatform.web.security.security.TokenContainer</value>
- <value>org.exoplatform.web.security.security.TokenEntry</value>
- </values-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-
</configuration>
16 years, 4 months
- 1
- 0
gatein SVN: r953 - in portal/trunk/component: common and 21 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-12-06 16:03:39 -0500 (Sun, 06 Dec 2009)
New Revision: 953
Added:
portal/trunk/component/common/src/test/resources/conf/test-configuration.xml
portal/trunk/component/test/
portal/trunk/component/test/pom.xml
portal/trunk/component/test/src/
portal/trunk/component/test/src/main/
portal/trunk/component/test/src/main/java/
portal/trunk/component/test/src/main/java/org/
portal/trunk/component/test/src/main/java/org/exoplatform/
portal/trunk/component/test/src/main/java/org/exoplatform/component/
portal/trunk/component/test/src/main/java/org/exoplatform/component/test/
portal/trunk/component/test/src/main/java/org/exoplatform/component/test/AbstractGateInTest.java
portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ConfigurationUnit.java
portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ConfiguredBy.java
portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ContainerScope.java
portal/trunk/component/test/src/main/java/org/exoplatform/component/test/GateInTestClassLoader.java
portal/trunk/component/test/src/main/java/org/exoplatform/component/test/package-info.java
portal/trunk/component/test/src/main/resources/
portal/trunk/component/test/src/main/resources/conf/
portal/trunk/component/test/src/main/resources/conf/jcr/
portal/trunk/component/test/src/main/resources/conf/jcr/jcr-configuration.xml
portal/trunk/component/test/src/main/resources/conf/jcr/repository-configuration.xml
portal/trunk/component/test/src/main/resources/conf/portal-configuration.xml
portal/trunk/component/test/src/main/resources/conf/root-configuration.xml
portal/trunk/component/test/src/test/
portal/trunk/component/test/src/test/java/
portal/trunk/component/test/src/test/java/org/
portal/trunk/component/test/src/test/java/org/exoplatform/
portal/trunk/component/test/src/test/java/org/exoplatform/component/
portal/trunk/component/test/src/test/java/org/exoplatform/component/test/
portal/trunk/component/test/src/test/java/org/exoplatform/component/test/TestSomething.java
portal/trunk/component/test/src/test/resources/
Removed:
portal/trunk/component/common/src/main/java/conf/portal/
portal/trunk/component/common/src/test/resources/conf/portal/
Modified:
portal/trunk/component/common/pom.xml
portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java
portal/trunk/component/pom.xml
portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml
Log:
- initial effort for rationalizing the unit test configuration
Modified: portal/trunk/component/common/pom.xml
===================================================================
--- portal/trunk/component/common/pom.xml 2009-12-06 17:47:33 UTC (rev 952)
+++ portal/trunk/component/common/pom.xml 2009-12-06 21:03:39 UTC (rev 953)
@@ -30,6 +30,7 @@
<packaging>jar</packaging>
<name>GateIn Portal Component Common</name>
<dependencies>
+
<dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.commons</artifactId>
@@ -60,7 +61,15 @@
<artifactId>chromattic.spi</artifactId>
<version>${version.chromattic}</version>
</dependency>
+
<dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test</artifactId>
+ <version>3.0.0-Beta04-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java
===================================================================
--- portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2009-12-06 17:47:33 UTC (rev 952)
+++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2009-12-06 21:03:39 UTC (rev 953)
@@ -18,9 +18,12 @@
*/
package org.exoplatform.commons.chromattic;
-import junit.framework.TestCase;
import org.chromattic.api.Chromattic;
import org.chromattic.api.ChromatticSession;
+import org.exoplatform.component.test.AbstractGateInTest;
+import org.exoplatform.component.test.ConfigurationUnit;
+import org.exoplatform.component.test.ConfiguredBy;
+import org.exoplatform.component.test.ContainerScope;
import org.exoplatform.container.PortalContainer;
import javax.jcr.Session;
@@ -30,7 +33,11 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class ChromatticIntegrationTestCase extends TestCase
+@ConfiguredBy({
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/jcr/jcr-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-configuration.xml")
+})
+public class ChromatticIntegrationTestCase extends AbstractGateInTest
{
/** . */
@@ -56,7 +63,7 @@
public void testConfiguratorInitialized() throws Exception
{
assertNotNull(testLF);
- assertEquals("test", testLF.getWorkspaceName());
+ assertEquals("portal-test", testLF.getWorkspaceName());
assertNotNull(testLF.getChromattic());
assertSame(chromatticManager, testLF.getManager());
}
@@ -114,11 +121,11 @@
{
ChromatticSession session = testLF.getChromattic().openSession();
FooEntity foo = session.create(FooEntity.class);
- assertEquals("test", foo.getWorkspace());
+ assertEquals("portal-test", foo.getWorkspace());
jcrSession = session.getJCRSession();
assertTrue(jcrSession.isLive());
Workspace workspace = jcrSession.getWorkspace();
- assertEquals("test", workspace.getName());
+ assertEquals("portal-test", workspace.getName());
session.close();
assertTrue(jcrSession.isLive());
@@ -159,13 +166,13 @@
// Check how chromattic see the session
FooEntity foo = session.create(FooEntity.class);
- assertEquals("test", foo.getWorkspace());
+ assertEquals("portal-test", foo.getWorkspace());
// Check related JCR session
jcrSession = session.getJCRSession();
assertTrue(jcrSession.isLive());
Workspace workspace = jcrSession.getWorkspace();
- assertEquals("test", workspace.getName());
+ assertEquals("portal-test", workspace.getName());
// Closing chromattic session should not close the underlying JCR session
session.close();
Added: portal/trunk/component/common/src/test/resources/conf/test-configuration.xml
===================================================================
--- portal/trunk/component/common/src/test/resources/conf/test-configuration.xml (rev 0)
+++ portal/trunk/component/common/src/test/resources/conf/test-configuration.xml 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ <component>
+ <key>org.exoplatform.commons.chromattic.ChromatticManager</key>
+ <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
+ </component>
+ <external-component-plugins>
+ <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
+ <component-plugin>
+ <name>chromattic</name>
+ <set-method>addLifeCycle</set-method>
+ <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
+ <init-params>
+ <value-param>
+ <name>name</name>
+ <value>test</value>
+ </value-param>
+ <value-param>
+ <name>workspace-name</name>
+ <value>portal-test</value>
+ </value-param>
+ <values-param>
+ <name>entities</name>
+ <value>org.exoplatform.commons.chromattic.FooEntity</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+</configuration>
Modified: portal/trunk/component/pom.xml
===================================================================
--- portal/trunk/component/pom.xml 2009-12-06 17:47:33 UTC (rev 952)
+++ portal/trunk/component/pom.xml 2009-12-06 21:03:39 UTC (rev 953)
@@ -35,6 +35,7 @@
<name>GateIn Portal Component</name>
<modules>
+ <module>test</module>
<module>common</module>
<module>pc</module>
<module>xml-parser</module>
Modified: portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml
===================================================================
--- portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml 2009-12-06 17:47:33 UTC (rev 952)
+++ portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml 2009-12-06 21:03:39 UTC (rev 953)
@@ -24,6 +24,10 @@
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ <component>
+ <key>org.exoplatform.commons.chromattic.ChromatticManager</key>
+ <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
+ </component>
<component>
<key>org.exoplatform.portal.pom.config.POMSessionManager</key>
Added: portal/trunk/component/test/pom.xml
===================================================================
--- portal/trunk/component/test/pom.xml (rev 0)
+++ portal/trunk/component/test/pom.xml 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,77 @@
+<!--
+ ~ 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.
+ -->
+
+<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>
+ <version>3.0.0-Beta04-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.portal.component.test</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn Portal Component Test</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.ext</artifactId>
+ <version>${org.exoplatform.jcr.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.organization.jdbc</artifactId>
+ <version>${org.exoplatform.core.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Added: portal/trunk/component/test/src/main/java/org/exoplatform/component/test/AbstractGateInTest.java
===================================================================
--- portal/trunk/component/test/src/main/java/org/exoplatform/component/test/AbstractGateInTest.java (rev 0)
+++ portal/trunk/component/test/src/main/java/org/exoplatform/component/test/AbstractGateInTest.java 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ */
+package org.exoplatform.component.test;
+
+import junit.framework.TestCase;
+
+import java.util.EnumMap;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * An abstract test that takes care of running the unit tests with the semantic described by the
+ * {#link GateInTestClassLoader}.
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public abstract class AbstractGateInTest extends TestCase
+{
+
+ protected AbstractGateInTest()
+ {
+ }
+
+ protected AbstractGateInTest(String name)
+ {
+ super(name);
+ }
+
+ @Override
+ public void runBare() throws Throwable
+ {
+ ClassLoader realClassLoader = Thread.currentThread().getContextClassLoader();
+
+ //
+ Set<String> rootConfigPaths = new HashSet<String>();
+ rootConfigPaths.add("conf/root-configuration.xml");
+
+ //
+ Set<String> portalConfigPaths = new HashSet<String>();
+ portalConfigPaths.add("conf/portal-configuration.xml");
+
+ //
+ EnumMap<ContainerScope, Set<String>> configs = new EnumMap<ContainerScope, Set<String>>(ContainerScope.class);
+ configs.put(ContainerScope.ROOT, rootConfigPaths);
+ configs.put(ContainerScope.PORTAL, portalConfigPaths);
+
+ //
+ ConfiguredBy cfBy = getClass().getAnnotation(ConfiguredBy.class);
+ if (cfBy != null)
+ {
+ for (ConfigurationUnit src : cfBy.value())
+ {
+ configs.get(src.scope()).add(src.path());
+ }
+ }
+
+ //
+ try
+ {
+ ClassLoader testClassLoader = new GateInTestClassLoader(realClassLoader, rootConfigPaths, portalConfigPaths);
+ Thread.currentThread().setContextClassLoader(testClassLoader);
+ super.runBare();
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(realClassLoader);
+ }
+ }
+}
Added: portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ConfigurationUnit.java
===================================================================
--- portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ConfigurationUnit.java (rev 0)
+++ portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ConfigurationUnit.java 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+package org.exoplatform.component.test;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Describe a configuration unit that targets a container scoped by the {@link org.exoplatform.component.test.ContainerScope}
+ * type. The path value is the absolute path that will be used to retrieve the configuration file via the
+ * {@link ClassLoader#getResources(String)} mechanism therefore the format is described by this mechanisme.
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+(a)Target(ElementType.TYPE)
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface ConfigurationUnit
+{
+ /**
+ * The container scope.
+ *
+ * @return the container scope
+ */
+ ContainerScope scope();
+
+ /**
+ * The configuration path.
+ *
+ * @return the configuration path
+ */
+ String path();
+
+}
Added: portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ConfiguredBy.java
===================================================================
--- portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ConfiguredBy.java (rev 0)
+++ portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ConfiguredBy.java 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+package org.exoplatform.component.test;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a unit test extending the {@link org.exoplatform.component.test.AbstractGateInTest} to provide
+ * the various configuration unit relevant for executing the unit test.
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+(a)Target(ElementType.TYPE)
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface ConfiguredBy
+{
+
+ /**
+ * Returns the various relevant configuration units.
+ *
+ * @return the configuration units
+ */
+ ConfigurationUnit[] value();
+
+}
Added: portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ContainerScope.java
===================================================================
--- portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ContainerScope.java (rev 0)
+++ portal/trunk/component/test/src/main/java/org/exoplatform/component/test/ContainerScope.java 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+package org.exoplatform.component.test;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public enum ContainerScope
+{
+
+ ROOT, PORTAL
+
+}
Added: portal/trunk/component/test/src/main/java/org/exoplatform/component/test/GateInTestClassLoader.java
===================================================================
--- portal/trunk/component/test/src/main/java/org/exoplatform/component/test/GateInTestClassLoader.java (rev 0)
+++ portal/trunk/component/test/src/main/java/org/exoplatform/component/test/GateInTestClassLoader.java 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+package org.exoplatform.component.test;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Set;
+import java.util.Vector;
+
+/**
+ * The GateIn test classloader overrides the <code>getResources(String)</code> method to filter the resources
+ * returned by the parent classloader in the following manner:
+ * <ul>
+ * <li>The loading of the <code>conf/configuration.xml</code> resource is replaced by the the configuration units
+ * scoped at {@link org.exoplatform.component.test.ContainerScope#ROOT}.</li>
+ * <li>The loading of the <code>conf/portal/configuration.xml</code> resource is replaced by the the configuration units
+ * scoped at {@link org.exoplatform.component.test.ContainerScope#PORTAL}.</li>
+ * </ul>
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public final class GateInTestClassLoader extends ClassLoader
+{
+
+ /** . */
+ private final Set<String> rootConfigPaths;
+
+ /** . */
+ private final Set<String> portalConfigPaths;
+
+ public GateInTestClassLoader(ClassLoader parent, Set<String> rootConfigPaths, Set<String> portalConfigPaths)
+ {
+ super(parent);
+
+ //
+ this.rootConfigPaths = rootConfigPaths;
+ this.portalConfigPaths = portalConfigPaths;
+ }
+
+ @Override
+ public Enumeration<URL> getResources(String name) throws IOException
+ {
+ System.out.println("name = " + name);
+ if ("conf/configuration.xml".equals(name))
+ {
+ return getURLs(rootConfigPaths);
+ }
+ else if ("conf/portal/configuration.xml".equals(name))
+ {
+ return getURLs(portalConfigPaths);
+ }
+ else if ("conf/portal/test-configuration.xml".equals(name))
+ {
+ return new Vector<URL>().elements();
+ }
+ else
+ {
+ return super.getResources(name);
+ }
+ }
+
+ private Enumeration<URL> getURLs(Set<String> paths) throws IOException
+ {
+ ArrayList<URL> urls = new ArrayList<URL>();
+ for (String path : paths)
+ {
+ urls.addAll(Collections.list(super.getResources(path)));
+ }
+ return Collections.enumeration(urls);
+ }
+}
Added: portal/trunk/component/test/src/main/java/org/exoplatform/component/test/package-info.java
===================================================================
--- portal/trunk/component/test/src/main/java/org/exoplatform/component/test/package-info.java (rev 0)
+++ portal/trunk/component/test/src/main/java/org/exoplatform/component/test/package-info.java 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,4 @@
+/**
+ * The component provides a test infrastructure for various test of the GateIn components.
+ */
+package org.exoplatform.component.test;
Added: portal/trunk/component/test/src/main/resources/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/trunk/component/test/src/main/resources/conf/jcr/jcr-configuration.xml (rev 0)
+++ portal/trunk/component/test/src/main/resources/conf/jcr/jcr-configuration.xml 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
+<configuration
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+ <component>
+ <key>org.exoplatform.services.idgenerator.IDGeneratorService</key>
+ <type>org.exoplatform.services.idgenerator.impl.IDGeneratorServiceImpl</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.security.IdentityRegistry</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.document.DocumentReaderService</key>
+ <type>org.exoplatform.services.document.impl.DocumentReaderServiceImpl</type>
+ <component-plugins>
+ <component-plugin>
+ <name>pdf.document.reader</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.PDFDocumentReader</type>
+ <description>to read the pdf inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.types</name>
+ <description>description</description>
+ <value>application/pdf</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerMSWord</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.MSWordDocumentReader</type>
+ <description>to read the ms word inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesMSWord</name>
+ <description>description</description>
+ <value>application/msword</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerMSExcel</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.MSExcelDocumentReader</type>
+ <description>to read the ms excel inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesMSExcel</name>
+ <description>description</description>
+ <value>application/excel</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerMSOutlook</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.MSOutlookDocumentReader</type>
+ <description>to read the ms outlook inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesMSOutlook</name>
+ <description>description</description>
+ <value>application/vnd.ms-outlook</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>PPTdocument.reader</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.PPTDocumentReader</type>
+ <description>to read the ms ppt inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesPPT</name>
+ <description>description</description>
+ <value>application/ppt</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerHTML</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.HTMLDocumentReader</type>
+ <description>to read the html inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesHTML</name>
+ <description>description</description>
+ <value>text/html</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerXML</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.XMLDocumentReader</type>
+ <description>to read the xml inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesXML</name>
+ <description>description</description>
+ <value>text/xml</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>TPdocument.reader</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.TextPlainDocumentReader</type>
+ <description>to read the plain text inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesTextPlain</name>
+ <description>description</description>
+ <value>text/plain</value>
+ </values-param>
+ <!-- values-param>
+ <name>defaultEncoding</name>
+ <description>description</description>
+ <value>UTF-8</value>
+ </values-param -->
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerOO</name>
+ <set-method>addDocumentReader</set-method>
+ <type>org.exoplatform.services.document.impl.OpenOfficeDocumentReader</type>
+ <description>to read the OO inputstream</description>
+ </component-plugin>
+
+ </component-plugins>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
+ <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
+ <init-params>
+ <value-param>
+ <name>conf-path</name>
+ <description>JCR configuration file</description>
+ <value>jar:/conf/jcr/repository-configuration.xml</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.RepositoryService</key>
+ <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type>
+ </component>
+
+</configuration>
Added: portal/trunk/component/test/src/main/resources/conf/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/component/test/src/main/resources/conf/jcr/repository-configuration.xml (rev 0)
+++ portal/trunk/component/test/src/main/resources/conf/jcr/repository-configuration.xml 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,129 @@
+<!--
+ ~ 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.
+ -->
+
+<repository-service default-repository="repository">
+ <repositories>
+ <repository name="repository" system-workspace="system" default-workspace="portal-test">
+ <security-domain>gatein-domain</security-domain>
+ <access-control>optional</access-control>
+ <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
+
+ <!-- System -->
+ <workspaces>
+ <workspace name="system">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcexo"/>
+ <property name="dialect" value="hsqldb"/>
+ <property name="multi-db" value="false"/>
+ <property name="update-storage" value="true"/>
+ <property name="max-buffer-size" value="204800"/>
+ <property name="swap-directory" value="../temp/swap/system"/>
+ </properties>
+ <value-storages>
+ <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <properties>
+ <property name="path" value="../temp/values/system"/>
+ </properties>
+ <filters>
+ <filter property-type="Binary"/>
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ </properties>
+ </initializer>
+ <cache enabled="true">
+ <properties>
+ <property name="max-size" value="20000"/>
+ <property name="live-time" value="30000"/>
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="../temp/jcrlucenedb/system"/>
+ </properties>
+ </query-handler>
+ <lock-manager>
+ <time-out>15m</time-out><!-- 15min -->
+ <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
+ <properties>
+ <property name="path" value="../temp/lock/system"/>
+ </properties>
+ </persister>
+ </lock-manager>
+ </workspace>
+
+ <!-- Portal system data -->
+ <workspace name="portal-test">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcexo"/>
+ <property name="dialect" value="hsqldb"/>
+ <property name="multi-db" value="false"/>
+ <property name="update-storage" value="true"/>
+ <property name="max-buffer-size" value="204800"/>
+ <property name="swap-directory" value="../temp/swap/portal-test"/>
+ </properties>
+ <value-storages>
+ <value-storage id="portal-test" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <properties>
+ <property name="path" value="../temp/values/portal-test"/>
+ </properties>
+ <filters>
+ <filter property-type="Binary"/>
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured"/>
+ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ </properties>
+ </initializer>
+ <cache enabled="true">
+ <properties>
+ <property name="max-size" value="20000"/>
+ <property name="live-time" value="30000"/>
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="../temp/jcrlucenedb/portal-test"/>
+ </properties>
+ </query-handler>
+ <lock-manager>
+ <time-out>15m</time-out><!-- 15min -->
+ <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
+ <properties>
+ <property name="path" value="../temp/lock/portal-test"/>
+ </properties>
+ </persister>
+ </lock-manager>
+ </workspace>
+
+ </workspaces>
+ </repository>
+ </repositories>
+</repository-service>
Added: portal/trunk/component/test/src/main/resources/conf/portal-configuration.xml
===================================================================
--- portal/trunk/component/test/src/main/resources/conf/portal-configuration.xml (rev 0)
+++ portal/trunk/component/test/src/main/resources/conf/portal-configuration.xml 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+</configuration>
Added: portal/trunk/component/test/src/main/resources/conf/root-configuration.xml
===================================================================
--- portal/trunk/component/test/src/main/resources/conf/root-configuration.xml (rev 0)
+++ portal/trunk/component/test/src/main/resources/conf/root-configuration.xml 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+ <component>
+ <type>org.exoplatform.container.definition.PortalContainerConfig</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.naming.InitialContextInitializer</key>
+ <type>org.exoplatform.services.naming.InitialContextInitializer</type>
+ <init-params>
+ <properties-param>
+ <name>default-properties</name>
+ <description>Default initial context properties</description>
+ </properties-param>
+ </init-params>
+ </component>
+
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>jdbcexo</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+ <property name="url" value="jdbc:hsqldb:file:../temp/data/exodb"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
+</configuration>
Added: portal/trunk/component/test/src/test/java/org/exoplatform/component/test/TestSomething.java
===================================================================
--- portal/trunk/component/test/src/test/java/org/exoplatform/component/test/TestSomething.java (rev 0)
+++ portal/trunk/component/test/src/test/java/org/exoplatform/component/test/TestSomething.java 2009-12-06 21:03:39 UTC (rev 953)
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+package org.exoplatform.component.test;
+
+import org.exoplatform.container.PortalContainer;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+@ConfiguredBy(@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/jcr/jcr-configuration.xml"))
+public class TestSomething extends AbstractGateInTest
+{
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ }
+
+ public void testFoo() throws Exception
+ {
+
+ long t1 = System.currentTimeMillis();
+ PortalContainer container = PortalContainer.getInstance();
+ long t2 = System.currentTimeMillis();
+ System.out.println("container = " + container);
+ System.out.println("t = " + (t2 - t1));
+
+ }
+}
16 years, 4 months
- 1
- 0