[gatein-commits] gatein SVN: r1116 - in portal/branches/wsrp-integration: component/identity/src/main/java/org/exoplatform/services/organization/idm and 18 other directories.

Author: chris.laprun(a)jboss.com Date: 2009-12-21 21:43:32 -0500 (Mon, 21 Dec 2009) New Revision: 1116 Modified: portal/branches/wsrp-integration/README.txt portal/branches/wsrp-integration/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java portal/branches/wsrp-integration/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java portal/branches/wsrp-integration/component/web/pom.xml portal/branches/wsrp-integration/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java portal/branches/wsrp-integration/docs/reference-guide/en/modules/Introduction.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/Introduction.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/Terms.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/portal/Manage_Permission.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Navigation_concept.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Permission_levels.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Portal_concept.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Portlet_concept.xml portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Toolbar_concept.xml portal/branches/wsrp-integration/examples/portlets/jsfhellouser/ portal/branches/wsrp-integration/examples/portlets/jsphellouser/ portal/branches/wsrp-integration/examples/portlets/simplesthelloworld/ portal/branches/wsrp-integration/packaging/pkg/pom.xml portal/branches/wsrp-integration/pom.xml portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_fr.properties portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DOMUtil.js portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop.js portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop2.js portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java Log: - Merged trunk changes from revision 1078 to 1114. Modified: portal/branches/wsrp-integration/README.txt =================================================================== --- portal/branches/wsrp-integration/README.txt 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/README.txt 2009-12-22 02:43:32 UTC (rev 1116) @@ -7,9 +7,13 @@ * COMPILATION ***************** -* mvn install -Dgatein.checkout.dir=//Full Path to the the root of gatein portal sourcess -For example: mvn install -Dgatein.checkout.dir=$PWD on Linux - +* mvn install +For example: mvn install + +Note: If you run "mvn install" twice in a row without cleaning, one test will +fail. To workaround this issue you will need to delete the test data located +here: component/portal/target/temp/ + ********************** * MAVEN CONFIGURATION: ********************** @@ -28,13 +32,11 @@ * PACKAGING: ***************** -* mvn install -Ppkg-tomcat -Dgatein.checkout.dir=//Full Path to the the root of gatein portal sources +* mvn install -Ppkg-tomcat ** Creates a Tomcat delivery in packaging/pkg/target/tomcat/ -** Creates compressed archives in packaging/pkg/target/target -* mvn install -Ppkg-jbossas -Dgatein.checkout.dir=//Full Path to the the root of gatein portal sources +* mvn install -Ppkg-jbossas ** Creates a JBossAS delivery in packaging/pkg/target/jboss/ -** Creates compressed archives in packaging/pkg/target/target ***************** * STARTING: @@ -43,25 +45,4 @@ * On JBoss: go to the jboss directory (or unzip the archive in your favorite location) and execute 'bin/run.sh start' ('bin/run.bat start' on Windows) * Go to http://localhost:8080/portal to see the homepage of the portal. That's it. - -****************** -* ADDITIONAL INFO: -****************** -Portal packaging tooling: -* An embedded version of exobuild (exo packaging tooling) is pom embbed and autorun with the install goal -* http://svn.exoplatform.org/projects/utils/exopackage/ for the sources - -Process: -1/ Tomcat or JBossAS packaging are done during the "mvn install" process of -the "packaging" module -2/ exopackage-x.x.x is downloaded from maven -4/ product and module for this version are stored in the current project, and -found by exopackage during the run -5/ a maven-exec-plugin calls exobuild from maven with the right parameters -6/ Deliveries is in the target directory - -************** -* WHAT'S NEXT -************** -The exobuild tooling will be ported in a maven plugin with no more .js files, or replaced by a pure maven configuration. -This work will be done before GateIn final version + Modified: portal/branches/wsrp-integration/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java =================================================================== --- portal/branches/wsrp-integration/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java 2009-12-22 02:43:32 UTC (rev 1116) @@ -429,7 +429,6 @@ attrs = attrsList.toArray(attrs); - //getIdentitySession().getAttributesManager().addAttributes(jbidGroup, attrs); getIdentitySession().getAttributesManager().updateAttributes(jbidGroup, attrs); } Modified: portal/branches/wsrp-integration/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java =================================================================== --- portal/branches/wsrp-integration/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java 2009-12-22 02:43:32 UTC (rev 1116) @@ -198,15 +198,21 @@ /* Create a child group with name: Group1 */ Group groupChild1 = groupHandler_.createGroupInstance(); groupChild1.setGroupName(Group1); + groupChild1.setLabel("Group1 Label"); groupHandler_.addChild(groupParent, groupChild1, true); + + assertEquals(groupHandler_.findGroupById(groupChild1.getId()).getLabel(), "Group1 Label"); + groupChild1 = groupHandler_.findGroupById(groupChild1.getId()); assertEquals(groupChild1.getParentId(), groupParent.getId()); assertEquals("Expect group child's name is: ", Group1, groupChild1.getGroupName()); /* Update groupChild's information */ - groupChild1.setLabel("GroupRenamed"); + groupChild1.setLabel("Group1 Label renamed"); groupChild1.setDescription("new description "); groupHandler_.saveGroup(groupChild1, true); - assertEquals(groupHandler_.findGroupById(groupChild1.getId()).getLabel(), "GroupRenamed"); + + assertEquals(groupHandler_.findGroupById(groupChild1.getId()).getLabel(), "Group1 Label renamed"); + /* Create a group child with name is: Group2 */ Group groupChild2 = groupHandler_.createGroupInstance(); groupChild2.setGroupName(Group2); Modified: portal/branches/wsrp-integration/component/web/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/web/pom.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/component/web/pom.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -19,78 +19,83 @@ --> -<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> +<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.web</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component Web</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.web</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component Web</name> - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> - <dependencies> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - </dependency> + <dependencies> + <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> - </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.common</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.resources</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.apt</artifactId> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.scripting</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.scripting</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-gadgets</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <type>jar</type> - </dependency> - - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <type>jar</type> - </dependency> - </dependencies> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <type>jar</type> + </dependency> + + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <type>jar</type> + </dependency> + </dependencies> </project> Modified: portal/branches/wsrp-integration/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java =================================================================== --- portal/branches/wsrp-integration/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java 2009-12-22 02:43:32 UTC (rev 1116) @@ -24,17 +24,17 @@ import org.exoplatform.container.PortalContainer; import org.exoplatform.container.RootContainer; import org.exoplatform.container.RootContainer.PortalContainerPostInitTask; +import org.exoplatform.container.util.EnvSpecific; import org.exoplatform.container.web.AbstractHttpSessionListener; import org.exoplatform.services.listener.ListenerService; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; -import java.util.EventObject; - import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.http.HttpSessionEvent; +import java.util.EventObject; /** * This class is used to broadcast any "HttpEvent" to allow the rest of the platform to be notified @@ -180,7 +180,17 @@ } } }; - RootContainer.getInstance().addInitTask(event.getServletContext(), task); + ServletContext ctx = event.getServletContext(); + try + { + EnvSpecific.initThreadEnv(ctx); + RootContainer.getInstance().addInitTask(event.getServletContext(), task); + } + finally + { + EnvSpecific.cleanupThreadEnv(ctx); + } + } /** Modified: portal/branches/wsrp-integration/docs/reference-guide/en/modules/Introduction.xml =================================================================== --- portal/branches/wsrp-integration/docs/reference-guide/en/modules/Introduction.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/reference-guide/en/modules/Introduction.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -28,7 +28,7 @@ </imageobject> </mediaobject> <para> - Enterprise Portal Platform 5.0 comes from a merge of two mature projects; the JBoss Portal and the eXo Portal. It takes the best of both into a single new project. The aim is to provide both an intuitive portal to use as-is and a portal framework to build upon depending on your needs. + GateIn comes from a merge of two mature projects; the JBoss Portal and the eXo Portal. It takes the best of both into a single new project. The aim is to provide both an intuitive portal to use as-is and a portal framework to build upon depending on your needs. </para> <section id="sect-Reference_Guide-Introduction-Links"> <title>Links</title> Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/Introduction.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/Introduction.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/Introduction.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -2,42 +2,29 @@ <!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. - - 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. - - --><title>Introduction</title> + <title>Introduction</title> + <para> + GateIn is a merge of two mature projects; the JBoss Portal and the eXo Portal. It takes the best of both offerings and incorporates them into a single new project. The aim is to provide an intuitive portal for as-is use and a framework to build upon depending on your needs. + </para> <mediaobject> <imageobject> <imagedata fileref="images/Frontpage.png" format="PNG" scalefit="1" width="444" /> </imageobject> </mediaobject> - <para> - Enterprise Portal Platform (<acronym>EPP</acronym>) 5.0 is a merge of two mature projects; the JBoss Portal and the eXo Portal. It takes the best of both offerings and incorporates them into a single new project. The aim is to provide an intuitive portal for as-is use and a framework to build upon depending on your needs. - </para> <section id="sect-User_Guide-Introduction-Links"> <title>Links</title> <itemizedlist> <listitem> <para> - 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> + 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"></ulink> </para> </listitem> + <listitem> + <para> + Further documentation about the Red Hat &PRODUCT; and other Red Hat products can be found at <ulink type="http" url="www.redhat.com/docs"></ulink> + </para> + </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/... Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/Terms.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/Terms.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/Terms.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -24,12 +24,13 @@ --><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/Toolbar_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 -<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 xmlns:xi="http://www.w3.org/2001/XInclude" href="terms/Workspace_concept.xml" />--> + </chapter> Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -23,6 +23,36 @@ Portlets and gadgets are organized in different categories. Each category contains one or several portlets or gadgets. You can also mix portlets and gadgets into one category. By default all gadgets are placed in the <emphasis>ExoGadgets</emphasis> category. </para> + <section id="sect-User_Guide-Dashboard_Portlet-Display_Gadgets"> + <title>Display Gadgets</title> + <para> + You can change the number of columns available in the Dashboard Portlet. + </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> button (which is displayed a pencil icon when you mouse-over the portlet in edit mode). 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 the changes. + </para> + </step> + </procedure> + + </section> + <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Add_a_new_Category"> <title>Add a new Category</title> <para> Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/portal/Manage_Permission.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/portal/Manage_Permission.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/portal/Manage_Permission.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -1,7 +1,7 @@ <?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-Manage_Permission"> +<section id="sect-User_Guide-Manage_Permissions"> <!-- 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 Permissions</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> Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -103,55 +103,25 @@ <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. + Further gadgets can be obtained from the <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> site. &PRODUCT; is compatible with most of the gadgets 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"> <title>Add Gadgets</title> <para> - You can also add more gadgets, do as follows: + To add more gadgets, do the following: </para> <para> - Open the popup to add gadges + Open the popup to add gadgets </para> <procedure> <step> <para> - Click the <emphasis role="bold">Add Gadgets</emphasis> link + While in the Dashboard portlet, click the <emphasis role="bold">Add Gadgets</emphasis> link <mediaobject> <imageobject> <imagedata fileref="images/Dashboard1.png" format="PNG" width="444" /> @@ -161,7 +131,7 @@ </step> <step> <para> - dialog to add a new gadget will appear : + The Dashboard Workspace dialog appear : <mediaobject> <imageobject> <imagedata fileref="images/EnterLink.png" format="PNG" /> @@ -171,21 +141,21 @@ </step> <step> <para> - Enter a link (a .xml or .rss) in a text box on the left pane. + Enter a link (a .xml or .rss) in the text box above the gadgets list. </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. + If you enter an .rss file or a link that generate an RSS feed (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. + Remote gadgets can be only created using the .xml file format (which is the standard gadget format). </para> </step> <step> <para> - Click on the + icon to add a new gadget to the gadget list beneath. + Click on the + icon to add a new gadget to the gadget list. </para> </step> </procedure> Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -23,7 +23,7 @@ --><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. + &PRODUCT; provides users with a portlet for the FCK Editor; a <ulink type="http" url="http://en.wikipedia.org/wiki/WYSIWYG">WYSIWYG</ulink... text editor that can be embedded in HTML web pages. FCK Editor offers users many of the commonly used word-processor functions such as writing, formatting text, creating tables, inserting links or pictures and more. </para> <mediaobject> <imageobject> @@ -31,14 +31,14 @@ </imageobject> </mediaobject> <para> - FCK portlet also consists of some main elements: + The main elements of the FCK portlet are: </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. + The area at the top of the editor which, like a desktop word-processsor, contains buttons used to perform various functions. </para> <mediaobject> <imageobject> @@ -51,7 +51,7 @@ <term>Editing Area</term> <listitem> <para> - This area is under the toolbar. This area allows typing your text and format document. + This is the main pane of the text editor portlet. It is where you type, view and format your text. </para> <mediaobject> <imageobject> @@ -64,7 +64,7 @@ <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. + A context menu is the program-specific right-click menu. It allows users to perform functions based on the context of where they clicked in the application. In the FCK Editor, context options include items like 'cut', 'copy' and 'paste'. </para> <mediaobject> <imageobject> @@ -74,11 +74,14 @@ </listitem> </varlistentry> <varlistentry> - <term>Dialogs</term> + <term>Dialogues</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 : + In the FCK Editor, as in most programs, small windows called 'dialogues' may appear when some of the functions are activated. They provide the necessary information to accomplish those functions. </para> + <para> + For an example: To insert a link into your document, you click the <emphasis role="bold">Link</emphasis> icon in the Toolbar. This will open a dialogue to allow you to input necessary information about the link: + </para> <mediaobject> <imageobject> <imagedata fileref="images/Link.png" format="PNG" /> Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -31,7 +31,7 @@ <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. + This Portlet is considered the welcome gateway of a Portal. It contains the organization's slogan, logo, and icons etc. </para> <!-- <mediaobject> <imageobject> @@ -57,7 +57,7 @@ <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. + This Portlet provides a navigation bar. A is 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> Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Navigation_concept.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Navigation_concept.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Navigation_concept.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -33,7 +33,7 @@ <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. + 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 individually, such as portlets, while maintaining other content standardized with the parent Portal. </para> </listitem> </varlistentry> @@ -41,7 +41,7 @@ <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. + 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 administrative tasks and personal links. In the administrator account, the navigation adds further management abilities such as Internationalization and community management. </para> </listitem> </varlistentry> @@ -53,8 +53,20 @@ </para> </listitem> </varlistentry> - </variablelist> + <para> + When logged in as an Administrator, a fourth navigation appears in the Toolbar: + </para> + <variablelist> + <varlistentry> + <term>Site Editor</term> + <listitem> + <para> + This navigation contains links to add a new page to the portal, to edit a page or to change the portal's layout. Administrators can use these links to manage the portal. + </para> + </listitem> + </varlistentry> + </variablelist> </section> Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Permission_levels.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Permission_levels.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Permission_levels.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -26,7 +26,7 @@ Permission settings control what users can and cannot do within the portal and are set by portal administrators. </para> <para> - There are two permission <emphasis role="bold">types</emphasis>: + Permission <emphasis role="bold">types</emphasis> dictate <emphasis>what</emphasis> a user can do within the portal. There are two permission types used in &PRODUCT;: </para> <variablelist> @@ -34,7 +34,7 @@ <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. + This permission type allows users to utilize portal content, that is; sign in, rearrange portlets, etc. This permission can be set for multiple member groups. </para> </listitem> </varlistentry> @@ -42,14 +42,14 @@ <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. + This permission type allows users to change portal content. This includes actions such as changing page information, deleting pages etc. The <emphasis>edit</emphasis> permission is set for only one group at a time. </para> </listitem> </varlistentry> </variablelist> <para> - There are several permission <emphasis role="bold"> levels</emphasis> used in EPP 5.0: + Permission <emphasis role="bold"> levels</emphasis> dictate <emphasis>where</emphasis> in the portal the user's permission type applies. There are three permission levels: </para> <variablelist> @@ -57,7 +57,7 @@ <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. + The portal permission level includes all pages within the portal. Therefore, a user with the <emphasis role="bold">access</emphasis> permission type can view (but not edit) all the pages within the portal. A user with <emphasis role="bold">edit</emphasis> permission at the portal level, can change any page in the portal. </para> </listitem> </varlistentry> @@ -65,7 +65,7 @@ <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. + The page permission level restricts the user to particular pages. Users are only able to see and/or edit (depending on their permission <emphasis role="bold">type</emphasis>) pages they have been given access to. </para> </listitem> </varlistentry> @@ -73,55 +73,15 @@ <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. + The portlet permission level allows users create a page by dragging and dropping portlets into a page. Some portlets are only used for administrators while some are used for individuals thus administrators have to set the appropriate access permissions. </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> --> - + <para> + Permission <emphasis role="bold">types</emphasis> and <emphasis role="bold">levels</emphasis> can be used to effectively control who can do what within the portal. For more information on setting permissions refer to <xref linkend="sect-User_Guide-Manage_Permissions"/> + </para> </section> Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Portal_concept.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Portal_concept.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Portal_concept.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -23,7 +23,7 @@ --><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. + &PRODUCT; is a web-based application that provides users with personalized User Interface (UI). This interface allows users to easily search applications or information or communicating with other users. </para> <para> The Portal provides a graphical aggregation of enterprise content and business applications with flexible management and personalization options. @@ -45,7 +45,7 @@ <term>WebUI Framework</term> <listitem> <para> - The WebUI (User Interface) Framework is tailored for easy screen composition and Ajax support in Portal environment. + The WebUI Framework has <ulink type="http" url="http://www.xul.fr/en-xml-ajax.html">AJAX</ulink> support and is designed for easy screen composition. </para> </listitem> </varlistentry> Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Portlet_concept.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Portlet_concept.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Portlet_concept.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -23,10 +23,10 @@ --><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. + A portlet is a small, self-contained web application. Portlet interface components are managed and displayed within a Portal. Typically, a <emphasis>portal</emphasis> page is displayed as a collection of non-overlapping <emphasis>portlet</emphasis> 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. </para> <para> - EPP has a number of standard portlets that can be plugged into any portal. + Portlets can be configured to generated differing content and &PRODUCT; has a number of default portlets that can be plugged into any portal. </para> </section> Modified: portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Toolbar_concept.xml =================================================================== --- portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -1,7 +1,7 @@ <?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-Toolbar_concept"> +<section id="sect-User_Guide-Toolbar-Concept"> <!-- Copyright (C) 2009 eXo Platform SAS. @@ -21,9 +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>Toolbar concept</title> + --><title>Toolbar</title> <para> - 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: + 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 the toolbar below as it appears in the Portal: </para> <mediaobject> <imageobject> Property changes on: portal/branches/wsrp-integration/examples/portlets/jsfhellouser ___________________________________________________________________ Name: svn:ignore + target Property changes on: portal/branches/wsrp-integration/examples/portlets/jsphellouser ___________________________________________________________________ Name: svn:ignore + target Property changes on: portal/branches/wsrp-integration/examples/portlets/simplesthelloworld ___________________________________________________________________ Name: svn:ignore + target Modified: portal/branches/wsrp-integration/packaging/pkg/pom.xml =================================================================== --- portal/branches/wsrp-integration/packaging/pkg/pom.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/packaging/pkg/pom.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -38,7 +38,7 @@ <groupId>org.gatein.tools</groupId> <artifactId>packager</artifactId> <type>zip</type> - <version>1.0.0-Beta04</version> + <version>1.0.0-Beta05</version> </dependency> <dependency> @@ -355,5 +355,208 @@ </plugins> </build> </profile> + <profile> + <id>pkg-tomcat-tests</id> + <build> + <finalName>GateIn-${project.version}</finalName> + <plugins> + <!-- Ensure your environment is correctly setup --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>tomcat-check-environment-ready</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>exo.projects.directory.dependencies</property> + <message>"You must define the property exo.projects.directory.dependencies to give the path to the directory where you store your applications servers"</message> + </requireProperty> + <requireProperty> + <property>exo.projects.app.tomcat.version</property> + <message>"You must define the property exo.projects.app.tomcat.version to give the name of the directory where is stored tomcat"</message> + </requireProperty> + <requireFilesExist> + <files> + <file>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}/</file> + </files> + <message>"The following Tomcat directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}"</message> + </requireFilesExist> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> + <!-- run exo build --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>tomcat-packaging</id> + <phase>package</phase> + <configuration> + <executable>java</executable> + <workingDirectory>${basedir}</workingDirectory> + <arguments> + <argument>-Dexo.package.home=${basedir}/target/packager</argument> + <argument>-Dexo.current.dir=${basedir}</argument> + <argument>-Dexo.base.dir=${exo.projects.directory.base}</argument> + <argument>-Dexo.conf.dir=${basedir}/target/packager-conf</argument> + <argument>-Dexo.working.dir=${gatein.working.dir}/</argument> + <!--argument>-Dexo.src.dir=NONE</argument--> + <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install --> + <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument> + <argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument> + <argument>-Dexo.m2.home=${maven.home}</argument> + <argument>-Xshare:auto</argument> + <argument>-Xms128m</argument> + <argument>-Xmx512m</argument> + <argument>-classpath</argument> + <argument>${basedir}/target/packager/lib/js.jar</argument> + <argument>org.mozilla.javascript.tools.shell.Main</argument> + <argument>${basedir}/target/packager/javascript/eXo/eXo.js</argument> + <argument>exobuild</argument> + <argument>--product=portal</argument> + <argument>--deploy=tomcat</argument> + <argument>--integration-test</argument> + </arguments> + </configuration> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + </plugin> +<!-- + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>tomcat-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/tomcat-zip.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> +--> + </plugins> + </build> + + </profile> + <profile> + <id>pkg-jbossas-tests</id> + <build> + <finalName>GateIn-${project.version}</finalName> + <plugins> + <!-- Ensure your environment is correctly setup --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>jbossas-check-environment-ready</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>exo.projects.directory.dependencies</property> + <message>"You must define the property exo.projects.directory.dependencies to give the path to the directory where you store your applications servers"</message> + </requireProperty> + <requireProperty> + <property>exo.projects.app.jboss.version</property> + <message>"You must define the property exo.projects.app.jboss.version to give the name of the directory where is stored JBossAS"</message> + </requireProperty> + <requireFilesExist> + <files> + <file>${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}/</file> + </files> + <message>"The following JBossAS directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}"</message> + </requireFilesExist> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> + <!-- run exo buils --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>jbossas-packaging</id> + <phase>package</phase> + <configuration> + <executable>java</executable> + <workingDirectory>${basedir}</workingDirectory> + <arguments> + <argument>-Dexo.package.home=${basedir}/target/packager</argument> + <argument>-Dexo.current.dir=${basedir}</argument> + <argument>-Dexo.base.dir=${exo.projects.directory.base}</argument> + <argument>-Dexo.conf.dir=${basedir}/target/packager-conf</argument> + <argument>-Dexo.working.dir=${gatein.working.dir}</argument> + <!--argument>-Dexo.src.dir=NONE</argument--> + <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install --> + <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2... + <argument>-Dclean.server=${exo.projects.app.jboss.version}</argument> + <argument>-Dexo.m2.home=${maven.home}</argument> + <argument>-Xshare:auto</argument> + <argument>-Xms128m</argument> + <argument>-Xmx512m</argument> + <argument>-classpath</argument> + <argument>${basedir}/target/packager/lib/js.jar</argument> + <argument>org.mozilla.javascript.tools.shell.Main</argument> + <argument>${basedir}/target/packager/javascript/eXo/eXo.js</argument> + <argument>exobuild</argument> + <argument>--product=portal</argument> + <argument>--deploy=jbossear</argument> + <argument>--integration-test</argument> + </arguments> + </configuration> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + </plugin> +<!-- + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>jbossas-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/jbossear-zip.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> +--> + </plugins> + </build> + </profile> </profiles> </project> Modified: portal/branches/wsrp-integration/pom.xml =================================================================== --- portal/branches/wsrp-integration/pom.xml 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/pom.xml 2009-12-22 02:43:32 UTC (rev 1116) @@ -45,7 +45,7 @@ <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>SNAPSHOT-r790473</org.shindig.version> <org.gatein.common.version>2.0.0-CR02</org.gatein.common.version> - <org.gatein.wci.version>2.0.0-CR01</org.gatein.wci.version> + <org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version> <org.gatein.pc.version>2.1.0-CR01</org.gatein.pc.version> <org.picketlink.idm>1.0.0.CR1</org.picketlink.idm> <org.gatein.wsrp.version>1.0.0-Beta03-SNAPSHOT</org.gatein.wsrp.version> Modified: portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties =================================================================== --- portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties 2009-12-22 02:43:32 UTC (rev 1116) @@ -35,7 +35,7 @@ UIHomePagePortlet.Label.Title=Try GateIn 3.0 with one of these user accounts: UIHomePagePortlet.Label.Intro=The new version comes with a revolutionary user interface<br/>Classic and WebOS Desktop Layouts<br/> Drag and Drop Features. Create Page Wizard<br/>And many more... -UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 3</div> +UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 4</div> UIHomePagePortlet.Label.Username=Username: UIHomePagePortlet.Label.Password=Password: Modified: portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties =================================================================== --- portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties 2009-12-22 02:43:32 UTC (rev 1116) @@ -35,7 +35,7 @@ UIHomePagePortlet.Label.Title=Prueba GateIn 3.0 con uno de los siguientes usuarios: UIHomePagePortlet.Label.Intro=La nueva versi\u00f3n viene con un interfaz de usuario revolucionario<br/>Layouts Cl\u00e1sico y Escritorio WebOS <br/> Funcionalidad Drag and Drop. Asistente de Creaci\u00f3n de P\u00e1gina<br/>Y mucho m\u00e1s... -UIHomePagePortlet.Label.Slogan=Lo mejor de eXo y JBoss Portal<div>GateIn 3.0 Beta 3</div> +UIHomePagePortlet.Label.Slogan=Lo mejor de eXo y JBoss Portal<div>GateIn 3.0 Beta 4</div> UIHomePagePortlet.Label.Username=Usuario: UIHomePagePortlet.Label.Password=Contrase\u00f1a: Modified: portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_fr.properties =================================================================== --- portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_fr.properties 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_fr.properties 2009-12-22 02:43:32 UTC (rev 1116) @@ -32,6 +32,6 @@ UIHomePagePortlet.Label.Title=Try GateIn 3.0 with one of these user accounts: UIHomePagePortlet.Label.Intro=New version comes with a revolutionary user interface<br/>Classic and WebOS Desktop Layouts<br/> Drag and Drop Layouts. Create Pages Wizard<br/>And many more... -UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 3</div> +UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 4</div> UIHomePagePortlet.Label.Username=Username: UIHomePagePortlet.Label.Password=Password: Modified: portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties =================================================================== --- portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties 2009-12-22 02:43:32 UTC (rev 1116) @@ -15,6 +15,6 @@ UIHomePagePortlet.Label.Title=Используйте GateIn 3.0 с одной из учётных записей: UIHomePagePortlet.Label.Intro=Новая версия представляет революционно новый пользовательский интерфейс<br/>Класический и WebOS макеты<br/> Поддержка перетаскивания. Мастера создания страниц<br/>И многое другое... -UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 3</div> +UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 4</div> UIHomePagePortlet.Label.Username=Имя: UIHomePagePortlet.Label.Password=Пароль: Modified: portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties =================================================================== --- portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties 2009-12-22 02:43:32 UTC (rev 1116) @@ -16,6 +16,6 @@ UIHomePagePortlet.Label.Title=Спробуй GateIn 3.0 з користувачем серед таких облікових записів: UIHomePagePortlet.Label.Intro=Нова версія з прогресивним інтерфейсом користувача<br/>схема класичного та WebOS робочого столу<br/> Можливість "Перетягни-відпусти". Wizard-створювач сторінок<br/>Та багато іншого... -UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 3</div> +UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 4</div> UIHomePagePortlet.Label.Username=Ім'я користувача: UIHomePagePortlet.Label.Password=Пароль: Modified: portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DOMUtil.js =================================================================== --- portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DOMUtil.js 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DOMUtil.js 2009-12-22 02:43:32 UTC (rev 1116) @@ -235,6 +235,17 @@ return null ; } ; /** + * Returns true if root has obj as a ancestor + */ +DOMUtil.prototype.hasAncestor= function(root, obj) { + var prtEle = root.parentNode ; + while (prtEle) { + if(prtEle == obj) return true; + prtEle = prtEle.parentNode; + } + return false ; +} ; +/** * Returns true if root has obj as a descendant */ DOMUtil.prototype.hasDescendant= function(root, obj) { Modified: portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop.js =================================================================== --- portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop.js 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop.js 2009-12-22 02:43:32 UTC (rev 1116) @@ -64,6 +64,7 @@ var dndEvent = this.dndEvent = new DragDropEvent(clickObject, dragObject) ; document.onmousemove = this.onMouseMove ; document.onmouseup = this.onDrop ; + document.onmouseout = this.onCancel ; document.onkeypress = this.onKeyPressEvt ; if(this.initCallback != null) { @@ -115,6 +116,10 @@ eXo.core.DragDrop.destroy() ; } ; +DragDrop.prototype.onCancel = function(evt) { + if(eXo.core.DragDrop.cancelCallback) eXo.core.DragDrop.cancelCallback(eXo.core.DragDrop.dndEvent); +} ; + DragDrop.prototype.destroy = function() { if(this.destroyCallback != null) { this.destroyCallback(this.dndEvent) ; @@ -122,6 +127,7 @@ document.onmousemove = null ; document.onmouseup = null ; + document.onmouseout = null ; document.onkeypress = null ; this.dndEvent = null ; Modified: portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop2.js =================================================================== --- portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop2.js 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop2.js 2009-12-22 02:43:32 UTC (rev 1116) @@ -49,6 +49,7 @@ o.root.onDragStart(x, y, o.lastMouseX, o.lastMouseY, e); document.onmousemove = eXo.core.DragDrop2.drag; document.onmouseup = eXo.core.DragDrop2.end; + document.onmouseout = eXo.core.DragDrop2.cancel; return false; }, @@ -76,11 +77,16 @@ e = eXo.core.DragDrop2.fixE(e); document.onmousemove = null; document.onmouseup = null; + document.onmouseout = null; eXo.core.DragDrop2.obj.root.onDragEnd( parseInt(eXo.core.DragDrop2.obj.root.style["left"]), parseInt(eXo.core.DragDrop2.obj.root.style["top"]), e.clientX, e.clientY); eXo.core.DragDrop2.obj = null; }, + cancel : function(e) { + if(eXo.core.DragDrop2.obj.root.onCancel) eXo.core.DragDrop2.obj.root.onCancel(e); + }, + fixE : function(e) { if (typeof e == 'undefined') e = window.event; if (typeof e.layerX == 'undefined') e.layerX = e.offsetX; Modified: portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js =================================================================== --- portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2009-12-22 02:43:32 UTC (rev 1116) @@ -222,11 +222,6 @@ /*Set properties for drag object */ eXo.portal.PortalDragDrop.setDragObjectProperties(dragObject, tdElementList, "column", dndEvent.backupMouseEvent) ; } - //when dragObject out of page - if ((Browser.findPosY(dragObject) < 0) || (Browser.findPosX(dragObject) + 64 > eXo.core.Browser.getBrowserWidth())) { - DragDrop.dropCallback(dndEvent); - document.onmousemove = null; - } } } ; @@ -248,20 +243,26 @@ eXo.portal.isInDragging = false; eXo.portal.UIPortal.changeComposerSaveButton(); - } + }; + DragDrop.cancelCallback = function(dndEvent) { + if(Browser.browserType == "ie" && Browser.findMouseYInClient(dndEvent.backupMouseEvent) < 0) { + DragDrop.onDrop(dndEvent.backupMouseEvent); + } + }; + var clickObject = this; var componentBlock = DOMUtil.findAncestorByClass(clickObject, "UIComponentBlock") ; if(componentBlock != null) { var dragBlock = eXo.portal.UIPortal.findUIComponentOf(componentBlock) ; - DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(), clickObject, dragBlock, e) ; + DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(dragBlock), clickObject, dragBlock, e) ; } else { var dragBlock = DOMUtil.findAncestorByClass(clickObject, "DragObjectPortlet") ; if(dragBlock) { - DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(), clickObject, dragBlock, e) ; + DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(dragBlock), clickObject, dragBlock, e) ; } else { - DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(), clickObject, clickObject, e) ; + DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(dragBlock), clickObject, clickObject, e) ; } } }; @@ -310,7 +311,7 @@ }; /* Find components in dropable target */ -PortalDragDrop.prototype.findDropableTargets = function() { +PortalDragDrop.prototype.findDropableTargets = function(dragBlock) { var dropableTargets = new Array() ; var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ; var uiPortal = eXo.core.DOMUtil.findFirstDescendantByClass(uiWorkingWorkspace, "div", "UIPortal") ; @@ -323,6 +324,7 @@ if(uiPage) dropableTargets.push(uiPage) ; } for(var i = 0; i < uiContainers.length; i++) { + if (eXo.core.DOMUtil.hasAncestor(uiContainers[i], dragBlock)) continue; dropableTargets.push(uiContainers[i]) ; } return dropableTargets ; @@ -337,12 +339,10 @@ var deltaBottom = mouseY - (Math.round(browserHeight/6)) ; if(deltaTop > 0) { document.documentElement.scrollTop += deltaTop - 5 ; -// if(!dragObject.isComponent) dragObject.style.top = parseInt(dragObject.style.top) + (deltaTop -5) + "px"; } if(deltaBottom < 0 && document.documentElement.scrollTop > 0) { document.documentElement.scrollTop += deltaBottom ; -// if(!dragObject.isComponent) dragObject.style.top = parseInt(dragObject.style.top) + deltaBottom + "px"; } }; Modified: portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js =================================================================== --- portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2009-12-22 02:43:32 UTC (rev 1116) @@ -98,7 +98,7 @@ } else { newLayer.parentNode.style.width = width + "px"; var normalBlock = DOMUtil.findFirstChildByClass(portlet, "div", "NormalContainerBlock"); - DOMUtil.replaceClass(normalBlock, "NormalContainerBlock", "OverContainerBlock"); + if(normalBlock) DOMUtil.replaceClass(normalBlock, "NormalContainerBlock", "OverContainerBlock"); } newLayer.parentNode.style.top = -height + "px"; editBlock.style.display = "block"; @@ -106,15 +106,18 @@ editBlock.style.display = "none"; if(!DOMUtil.hasClass(portlet, "UIPortlet")) { var normalBlock = DOMUtil.findFirstChildByClass(portlet, "div", "OverContainerBlock"); - DOMUtil.replaceClass(normalBlock, "OverContainerBlock", "NormalContainerBlock"); + if(normalBlock) DOMUtil.replaceClass(normalBlock, "OverContainerBlock", "NormalContainerBlock"); } } // Don't displat portlet control when View Container var controlPortlet = DOMUtil.findFirstDescendantByClass(editBlock, "div", "CONTROL-PORTLET"); - controlPortlet.style.display = "block"; - if (controlPortlet != null && eXo.portal.portalMode == 4) { + if (controlPortlet) { + if(eXo.portal.portalMode == 4) { controlPortlet.style.display = "none"; + } else { + controlPortlet.style.display = "block"; + } } }; Modified: portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js =================================================================== --- portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2009-12-22 02:43:32 UTC (rev 1116) @@ -251,7 +251,14 @@ uiTarget = eXo.core.DOMUtil.findFirstDescendantByClass(portletFragment, "div", "UITarget"); } uiDashboard.targetObj = uiDashboard.currCol = uiDashboard.compId = null; - } + } + + + dragObj.onCancel = function(e){ + if(eXo.core.Browser.browserType == "ie" && eXo.core.Browser.findMouseYInClient() < 0) { + eXo.core.DragDrop2.end(e); + } + } }, onLoad : function(windowId, canEdit) { Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2009-12-22 02:21:07 UTC (rev 1115) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2009-12-22 02:43:32 UTC (rev 1116) @@ -48,8 +48,8 @@ import org.exoplatform.webui.core.model.SelectItemCategory; import org.exoplatform.webui.core.model.SelectItemOption; 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; import org.exoplatform.webui.form.UIFormCheckBoxInput; import org.exoplatform.webui.form.UIFormInputItemSelector; import org.exoplatform.webui.form.UIFormInputSet; @@ -62,8 +62,8 @@ import org.exoplatform.webui.form.validator.StringLengthValidator; import org.exoplatform.webui.organization.UIGroupMembershipSelector; import org.exoplatform.webui.organization.UIListPermissionSelector; +import org.exoplatform.webui.organization.UIListPermissionSelector.EmptyIteratorValidator; import org.exoplatform.webui.organization.UIPermissionSelector; -import org.exoplatform.webui.organization.UIListPermissionSelector.EmptyIteratorValidator; import java.util.ArrayList; import java.util.List; @@ -429,11 +429,11 @@ public void execute(Event<UIPageForm> event) throws Exception { UIPageForm uiForm = event.getSource(); - String permission = "*:/" + uiForm.groupIdSelectBox.getValue(); - uiForm.findFirstComponentOfType(UIListPermissionSelector.class).setValue(new String[]{permission}); - UserACL userACL = uiForm.getApplicationComponent(UserACL.class); String groupIdSelected = uiForm.groupIdSelectBox.getValue(); groupIdSelected = groupIdSelected.startsWith("/") ? groupIdSelected : "/" + groupIdSelected; + String permission = "*:" + groupIdSelected; + uiForm.findFirstComponentOfType(UIListPermissionSelector.class).setValue(new String[]{permission}); + UserACL userACL = uiForm.getApplicationComponent(UserACL.class); permission = userACL.getMakableMT() + ":" + groupIdSelected; uiForm.findFirstComponentOfType(UIPermissionSelector.class).setValue(permission); event.getRequestContext().addUIComponentToUpdateByAjax(uiForm.getParent());