September 2010 - gatein-commits - Jboss List Archives

gatein SVN: r4401 - epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-09-27 22:25:12 -0400 (Mon, 27 Sep 2010) New Revision: 4401 Modified: epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Book_Info.xml epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Revision_History.xml Log: JBEPP-377: Increment for new build Modified: epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Book_Info.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Book_Info.xml 2010-09-28 02:06:53 UTC (rev 4400) +++ epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Book_Info.xml 2010-09-28 02:25:12 UTC (rev 4401) @@ -5,7 +5,7 @@ <title>5.0.1 Release Notes</title> <subtitle>For use with JBoss Enterprise Portal Platform 5.0.1</subtitle> <edition>1.0</edition> - <pubsnumber>1.4</pubsnumber> + <pubsnumber>1.5</pubsnumber> <productname>JBoss Enterprise Portal Platform</productname> <productnumber>5.0</productnumber> <abstract> Modified: epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Revision_History.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Revision_History.xml 2010-09-28 02:06:53 UTC (rev 4400) +++ epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/Revision_History.xml 2010-09-28 02:25:12 UTC (rev 4401) @@ -5,6 +5,20 @@ <title>Revision History</title> <simpara> <revhistory> + <revision> + <revnumber>1.5</revnumber> + <date>Tues Sep 28 2010</date> + <author> + <firstname>Scott</firstname> + <surname>Mumford</surname> + <email>smumford(a)redhat.com</email> + </author> + <revdescription> + <simplelist> + <member>Fix typo and increment for new build.</member> + </simplelist> + </revdescription> + </revision> <revision> <revnumber>1.4</revnumber> <date>Thu Sep 23 2010</date> @@ -18,7 +32,8 @@ <member>Minor editorial changes.</member> </simplelist> </revdescription> - </revision> <revision> + </revision> + <revision> <revnumber>1.3</revnumber> <date>Wed Sep 22 2010</date> <author>

13 years, 7 months

1
0
0 / 0

gatein SVN: r4400 - epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-09-27 22:06:53 -0400 (Mon, 27 Sep 2010) New Revision: 4400 Modified: epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/5.0.1_Release_Notes.xml Log: JBEPP-377: Fixed typo Modified: epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/5.0.1_Release_Notes.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/5.0.1_Release_Notes.xml 2010-09-27 15:28:28 UTC (rev 4399) +++ epp/docs/branches/EPP_5_0_Branch/5.0.1_Release_Notes/en-US/5.0.1_Release_Notes.xml 2010-09-28 02:06:53 UTC (rev 4400) @@ -391,7 +391,7 @@ <title>Recommended Practices</title>  <para> - &PRODUCT; &VERSION; includes four pre-configured user accounts for testing and evaluation puposes. These accounts can be used for direct access to the portal. + &PRODUCT; &VERSION; includes four pre-configured user accounts for testing and evaluation purposes. These accounts can be used for direct access to the portal. </para> <para> For security reasons, before going in production, you should restrict the access to the login servlet to POST.

13 years, 7 months

1
0
0 / 0

gatein SVN: r4399 - in portal/branches/wci: packaging/module/src/main/javascript and 23 other directories.

by do-not-reply＠jboss.org

Author: alain_defrance Date: 2010-09-27 11:28:28 -0400 (Mon, 27 Sep 2010) New Revision: 4399 Added: portal/branches/wci/server/tomcat7/ portal/branches/wci/server/tomcat7/patch/ portal/branches/wci/server/tomcat7/patch/pom.xml portal/branches/wci/server/tomcat7/patch/src/ portal/branches/wci/server/tomcat7/patch/src/main/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/GATEIN-README.txt portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/commons-logging.properties portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/exokey.pem portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein-dev.bat portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein-dev.sh portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein.bat portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein.sh portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/oauthkey.pem portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/eXoGadgetServer.xml portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/eXoResources.xml portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/portal.xml portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/rest.xml portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/exoSSLkey portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/jaas.conf portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/logging.properties portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/producer.server.xml portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/server.xml portal/branches/wci/server/tomcat7/patch/src/main/tomcat/gatein/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/gatein/conf/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/gatein/conf/configuration.xml portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/integration/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/integration/META-INF/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/integration/META-INF/context.xml portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/integration/WEB-INF/ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/integration/WEB-INF/web.xml portal/branches/wci/server/tomcat7/plugin/ portal/branches/wci/server/tomcat7/plugin/pom.xml portal/branches/wci/server/tomcat7/plugin/src/ portal/branches/wci/server/tomcat7/plugin/src/main/ portal/branches/wci/server/tomcat7/plugin/src/main/java/ portal/branches/wci/server/tomcat7/plugin/src/main/java/conf/ portal/branches/wci/server/tomcat7/plugin/src/main/java/conf/portal/ portal/branches/wci/server/tomcat7/plugin/src/main/java/conf/portal/configuration.xml portal/branches/wci/server/tomcat7/pom.xml Modified: portal/branches/wci/packaging/module/pom.xml portal/branches/wci/packaging/module/src/main/javascript/portal.packaging.module.js portal/branches/wci/packaging/pkg/pom.xml portal/branches/wci/server/pom.xml Log: tomcat 7 packaging in progress Modified: portal/branches/wci/packaging/module/pom.xml =================================================================== --- portal/branches/wci/packaging/module/pom.xml 2010-09-27 11:28:04 UTC (rev 4398) +++ portal/branches/wci/packaging/module/pom.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -34,8 +34,20 @@ <properties> <exobuild.name>portal</exobuild.name> <exobuild.type>module</exobuild.type> + <wci.native.module>tomcat6</wci.native.module> + <patch.tomcat.version>tomcat</patch.tomcat.version> </properties> + <profiles> + <profile> + <id>pkg-tomcat7</id> + <properties> + <wci.native.module>tomcat7</wci.native.module> + <patch.tomcat.version>tomcat7</patch.tomcat.version> + </properties> + </profile> + </profiles> + <build> <plugins> <plugin> Modified: portal/branches/wci/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/branches/wci/packaging/module/src/main/javascript/portal.packaging.module.js 2010-09-27 11:28:04 UTC (rev 4398) +++ portal/branches/wci/packaging/module/src/main/javascript/portal.packaging.module.js 2010-09-27 15:28:28 UTC (rev 4399) @@ -70,7 +70,7 @@ addDependency(new Project("org.gatein.pc", "pc-controller", "jar", pcVersion)). addDependency(new Project("org.gatein.pc", "pc-federation", "jar", pcVersion)). addDependency(new Project("org.gatein.wci", "wci-wci", "jar", wciVersion)). - addDependency(new Project("org.gatein.wci", "wci-tomcat6", "jar", wciVersion)). + addDependency(new Project("org.gatein.wci", "wci-${wci.native.module}", "jar", wciVersion)). addDependency(new Project("org.gatein.wci", "wci-exo", "jar", wciVersion)). addDependency(new Project("org.gatein.common", "common-common", "jar", commonVersion)). addDependency(new Project("log4j", "log4j", "jar", "1.2.14")). @@ -276,7 +276,7 @@ module.server.tomcat = {} module.server.tomcat.patch = - new Project("org.exoplatform.portal", "exo.portal.server.tomcat.patch", "jar", module.version); + new Project("org.exoplatform.portal", "exo.portal.server.${patch.tomcat.version}.patch", "jar", module.version); module.server.jboss = {} module.server.jboss.patch = Modified: portal/branches/wci/packaging/pkg/pom.xml =================================================================== --- portal/branches/wci/packaging/pkg/pom.xml 2010-09-27 11:28:04 UTC (rev 4398) +++ portal/branches/wci/packaging/pkg/pom.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -235,6 +235,106 @@ </profile> <profile> + <id>pkg-tomcat7</id> + <build> + <finalName>GateIn-${project.version}</finalName> + <plugins> +  + <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.tomcat7.version</property> + <message>"You must define the property exo.projects.app.tomcat7.version to give the name of the directory where is stored tomcat"</message> + </requireProperty> + <requireFilesExist> + <files> + <file>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat7.version}/</file> + </files> + <message>"The following Tomcat directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat7.version}"</message> + </requireFilesExist> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> +  + <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.dep.dir=${exo.projects.directory.dependencies}</argument> + <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument> + <argument>-Dclean.server=${exo.projects.app.tomcat7.version}</argument> + <argument>-Dexo.m2.home=${maven.home}</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> + </arguments> + </configuration> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + <profile> <id>pkg-jbossas</id> <build> <finalName>GateIn-${project.version}</finalName> Modified: portal/branches/wci/server/pom.xml =================================================================== --- portal/branches/wci/server/pom.xml 2010-09-27 11:28:04 UTC (rev 4398) +++ portal/branches/wci/server/pom.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -37,6 +37,7 @@ <modules> <module>tomcat</module> <module>jboss</module> + <module>tomcat7</module> </modules> </project> Added: portal/branches/wci/server/tomcat7/patch/pom.xml =================================================================== --- portal/branches/wci/server/tomcat7/patch/pom.xml (rev 0) +++ portal/branches/wci/server/tomcat7/patch/pom.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,42 @@ + + +<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.server.tomcat7</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.server.tomcat7.patch</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Server Tomcat 7 Patch</name> + + <build> + <resources> + <resource> + <directory>src/main/tomcat</directory> + <includes><include>**/*</include></includes> + </resource> + </resources> + </build> +</project> Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/GATEIN-README.txt =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/GATEIN-README.txt (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/GATEIN-README.txt 2010-09-27 15:28:28 UTC (rev 4399) @@ -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. +==== + +Welcome on GateIn Tomcat packaging + +1) How to run Tomcat + * On the Windows platform + Open a DOS prompt command, go to tomcat/bin and type the command + "gatein.bat run" for production + "gatein-dev.bat run" for development + + * On Unix/linux/cygwin/MacOSX + Open a terminal, go to tomcat/bin and type the command: + "./gatein.sh run" for production + "./gatein-dev.sh run" for development + + You may need to change the permission of all *.sh files in the tomcat/bin dir by using: chmod +x *.sh + + For both OS environments, you need to set the JAVA_HOME variable. + +2) How to access GateIn front page: + + * Enter one of the following addresses into your browser address bar: + http://localhost:8080/portal + http://localhost:8080/portal/public/classic + + + You can log into the portal with the following accounts: root, john, mary, demo. + All those accounts have the default password "gtn". + +For more documentation and latest updated news, please visit our website www.gatein.org. + +Thank your for using GateIn ! +JBoss & eXo Platform development teams Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/commons-logging.properties =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/commons-logging.properties (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/commons-logging.properties 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,3 @@ +# Configure commons logging to use JDK logger +org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl +org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/exokey.pem =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/exokey.pem (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/exokey.pem 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,29 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDMYzu2ZJb6Mt89RxjYcPb01clMna7PJTm+UneDYELKjG6EZ4Nu ++v8Di7e2PxpNlW4cCwUiEkiWBrZH8S1caz4CYIAG+VmKXZXBgmNCINgRVzNtj0/E +4xi5Yz+G1uGCkaB+1mheJWke1rO6SgL6tJ5LmEYCGGu0mj+vxD8W2i4nBwIDAQAB +AoGAJS1zwiSf9djlFI9nLI+3zCdLG32fO5zI2R7FEIek/pT20WzG0pwjYPC8NRFb +Zntk8QLsJxtuSqPj6kgreSEkwRR/YGVIo/xIr46vwl/WydMLKJljvu+E7Y4yjYHb +X4+FDRSL+huOMNNrHgnMy8WnplvtuW5LNV4kD3izU37jxQECQQD15re+8J3C8O6m +wt8+5Ed6a+1+BIdFggFFpV4oC2AKE11+dnwxD5ZyB77sg6sCbcWbLTXOyp/CCAY8 +bkp9ZbOBAkEA1MgP7ZKUUrtrIIg0VYaTTH24iMWTOsPbgNWg9DlLzmIagHHmmmLC +O6gFT05bsNPcFv5a25m+jT1yfvjuKLN+hwJBAJHD544/UjWZ3s5p3C6K4bg3PDwk +cQ+KBjkD0zHHtHGkkxqBIBNxGwyTfOD1GC1DZw0amrfvsw4w9YljE7ML04ECQHrX +IPLrm3uDvZ3jZCs37RPMxNsZDR1w8ukW67vy1APK+TfMCfB5MV8VajNVrnOQa9BO +eY+r26lYnyAUgBG5RkMCQHW5qFDYmgJjb38+uwxd53zGy6m+Jd7kdnGms9V4pPd1 +b21WA/5ncxrpFaz5OFPLtv2zrKYVBAj0tros5hs8Fwk= +-----END RSA PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIICGzCCAYSgAwIBAgIJAJ/PJcjrAB25MA0GCSqGSIb3DQEBBAUAMBQxEjAQBgNV +BAMTCW15dGVzdGtleTAeFw0wOTAxMDgwNzUwMjlaFw0xMDAxMDgwNzUwMjlaMBQx +EjAQBgNVBAMTCW15dGVzdGtleTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA +zGM7tmSW+jLfPUcY2HD29NXJTJ2uzyU5vlJ3g2BCyoxuhGeDbvr/A4u3tj8aTZVu +HAsFIhJIlga2R/EtXGs+AmCABvlZil2VwYJjQiDYEVczbY9PxOMYuWM/htbhgpGg +ftZoXiVpHtazukoC+rSeS5hGAhhrtJo/r8Q/FtouJwcCAwEAAaN1MHMwHQYDVR0O +BBYEFB6QdOIZawuedUjT4F+bK9RG8+sMMEQGA1UdIwQ9MDuAFB6QdOIZawuedUjT +4F+bK9RG8+sMoRikFjAUMRIwEAYDVQQDEwlteXRlc3RrZXmCCQCfzyXI6wAduTAM +BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAAE/6mmd8/mMyzzFozblp04e +TonwNrUB7TldXj+0WnYP04u0hNJuFJ/KD29gHdMnYDdOiVdmK/WS6a7Mn+7HVDT7 +wytizzu/Jfvlrr3yMQYCZssvNIbXPTmr+MjLErjkRxYi4quAnkankTNCDxa4mxN3 +WNlNt2SavfSi3d60wd5o +-----END CERTIFICATE----- Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein-dev.bat =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein-dev.bat (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein-dev.bat 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,39 @@ +@REM +@REM Copyright (C) 2009 eXo Platform SAS. +@REM +@REM This is free software; you can redistribute it and/or modify it +@REM under the terms of the GNU Lesser General Public License as +@REM published by the Free Software Foundation; either version 2.1 of +@REM the License, or (at your option) any later version. +@REM +@REM This software is distributed in the hope that it will be useful, +@REM but WITHOUT ANY WARRANTY; without even the implied warranty of +@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +@REM Lesser General Public License for more details. +@REM +@REM You should have received a copy of the GNU Lesser General Public +@REM License along with this software; if not, write to the Free +@REM Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +@REM 02110-1301 USA, or see the FSF site: http://www.fsf.org. +@REM + +@echo off + +rem Computes the absolute path of eXo +setlocal ENABLEDELAYEDEXPANSION +for %%i in ( !%~f0! ) do set BIN_DIR=%%~dpi +cd %BIN_DIR% + +rem Sets some variables +set LOG_OPTS=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog +set SECURITY_OPTS=-Djava.security.auth.login.config=..\conf\jaas.conf +set EXO_OPTS=-Dexo.product.developing=true -Dexo.conf.dir.name=gatein\conf +set EXO_CONFIG_OPTS=-Dorg.exoplatform.container.configuration.debug +set REMOTE_DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n + +set JAVA_OPTS=-Xms128m -Xmx512m -XX:MaxPermSize=256m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% %EXO_CONFIG_OPTS% %REMOTE_DEBUG% +set JPDA_TRANSPORT=dt_socket +set JPDA_ADDRESS=8000 + +rem Launches the server +call catalina.bat %* Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein-dev.sh =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein-dev.sh (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein-dev.sh 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,47 @@ +#!/bin/sh +# +# 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. +# + +# Computes the absolute path of eXo +cd `dirname "$0"` + +# Sets some variables +LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" +SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf" +EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true" +EXO_CONFIG_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.exoplatform.container.configuration.debug" + +JPDA_TRANSPORT=dt_socket +JPDA_ADDRESS=8000 + +REMOTE_DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n" + +JMX_AGENT="-Dcom.sun.management.jmxremote" + +#For profiling +#LD_LIBRARY_PATH="/cygdrive/d/tools/YourKit/bin/win32/" +#PATH="$PATH:$LD_LIBRARY_PATH" +#export LD_LIBRARY_PATH +#YOURKIT_PROFILE_OPTION="-agentlib:yjpagent -Djava.awt.headless=true" + +JAVA_OPTS="$YOURKIT_PROFILE_OPTION $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $EXO_CONFIG_OPTS $REMOTE_DEBUG" +export JAVA_OPTS + +# Launches the server +exec "$PRGDIR"./catalina.sh "$@" Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein.bat =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein.bat (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein.bat 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,34 @@ +@REM +@REM Copyright (C) 2009 eXo Platform SAS. +@REM +@REM This is free software; you can redistribute it and/or modify it +@REM under the terms of the GNU Lesser General Public License as +@REM published by the Free Software Foundation; either version 2.1 of +@REM the License, or (at your option) any later version. +@REM +@REM This software is distributed in the hope that it will be useful, +@REM but WITHOUT ANY WARRANTY; without even the implied warranty of +@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +@REM Lesser General Public License for more details. +@REM +@REM You should have received a copy of the GNU Lesser General Public +@REM License along with this software; if not, write to the Free +@REM Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +@REM 02110-1301 USA, or see the FSF site: http://www.fsf.org. +@REM + +@echo off + +rem Computes the absolute path of eXo +setlocal ENABLEDELAYEDEXPANSION +for %%i in ( !%~f0! ) do set BIN_DIR=%%~dpi +cd %BIN_DIR% + +rem Sets some variables +set LOG_OPTS=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog +set SECURITY_OPTS=-Djava.security.auth.login.config=..\conf\jaas.conf +set EXO_OPTS=-Dexo.product.developing=false -Dexo.conf.dir.name=gatein\conf +set JAVA_OPTS=-Xms128m -Xmx512m -XX:MaxPermSize=256m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% + +rem Launches the server +call catalina.bat %* Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein.sh =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein.sh (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/gatein.sh 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,36 @@ +#!/bin/sh +# +# 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. +# + +#Production Script to launch GateIn +#See gatein-dev.sh for development starup + +# Computes the absolute path of eXo +cd `dirname "$0"` + +# Sets some variables +LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" +SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf" +EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true" + +JAVA_OPTS="-Xms128m -Xmx384m -XX:MaxPermSize=192m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS" +export JAVA_OPTS + +# Launches the server +exec "$PRGDIR"./catalina.sh "$@" Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/oauthkey.pem =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/oauthkey.pem (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/bin/oauthkey.pem 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,16 @@ +-----BEGIN PRIVATE KEY----- +MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H +GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx +LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK +Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb +fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g +ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25 +bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT +XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV +hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o +s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8 +4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy +6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia +AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE +CPS2uizmGzwXCQ== +-----END PRIVATE KEY----- Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/eXoGadgetServer.xml =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/eXoGadgetServer.xml (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/eXoGadgetServer.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,22 @@ + + +<Context path="/eXoGadgetServer" docBase="eXoGadgetServer" debug="0" reloadable="true" crossContext="true"/> Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/eXoResources.xml =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/eXoResources.xml (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/eXoResources.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,22 @@ + + +<Context path="/eXoResources" docBase="eXoResources" debug="0" reloadable="true" crossContext="true"/> Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/portal.xml =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/portal.xml (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/portal.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,31 @@ + + +<Context path='/portal' docBase='portal' debug='0' reloadable='true' crossContext='true' privileged='true'> + <Logger className='org.apache.catalina.logger.SystemOutLogger' + prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/> + <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/> + <Realm className='org.apache.catalina.realm.JAASRealm' + appName='gatein-domain' + userClassNames='org.exoplatform.services.security.jaas.UserPrincipal' + roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal' + debug='0' cache='false'/> + <Valve className='org.apache.catalina.authenticator.FormAuthenticator' characterEncoding='UTF-8'/></Context> Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/rest.xml =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/rest.xml (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/Catalina/localhost/rest.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,32 @@ + + +<Context path="/rest" docBase="rest" reloadable="true" crossContext="false"> + + <Logger className='org.apache.catalina.logger.SystemOutLogger' + prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/> + <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/> + <Realm className='org.apache.catalina.realm.JAASRealm' + appName='gatein-domain' + userClassNames="org.exoplatform.services.security.jaas.UserPrincipal" + roleClassNames="org.exoplatform.services.security.jaas.RolePrincipal" + debug='0' cache='false'/> +</Context> Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/exoSSLkey =================================================================== (Binary files differ) Property changes on: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/exoSSLkey ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/jaas.conf =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/jaas.conf (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/jaas.conf 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,12 @@ +gatein-domain { + org.exoplatform.web.security.PortalLoginModule required; + org.exoplatform.services.security.jaas.SharedStateLoginModule required; + org.exoplatform.services.security.j2ee.TomcatLoginModule required; + + // Uncomment the following part (and comment the other part for CAS integration + // org.gatein.sso.agent.login.SSOLoginModule required + // org.exoplatform.services.security.j2ee.TomcatLoginModule required + // portalContainerName=portal + // realmName=gatein-domain + +}; Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/logging.properties =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/logging.properties (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/logging.properties 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,111 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4admin.org.apache.juli.FileHandler, 5host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler, 6gatein.org.apache.juli.FileHandler + +.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +1catalina.org.apache.juli.FileHandler.level = FINE +1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +1catalina.org.apache.juli.FileHandler.prefix = catalina. + +2localhost.org.apache.juli.FileHandler.level = FINE +2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +2localhost.org.apache.juli.FileHandler.prefix = localhost. + +3manager.org.apache.juli.FileHandler.level = FINE +3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +3manager.org.apache.juli.FileHandler.prefix = manager. + +4admin.org.apache.juli.FileHandler.level = FINE +4admin.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +4admin.org.apache.juli.FileHandler.prefix = admin. + +5host-manager.org.apache.juli.FileHandler.level = FINE +5host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +5host-manager.org.apache.juli.FileHandler.prefix = host-manager. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + +6gatein.org.apache.juli.FileHandler.level = FINE +6gatein.org.apache.juli.FileHandler.directory = ${catalina.base}/gatein/logs +6gatein.org.apache.juli.FileHandler.prefix = gatein + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers = 4admin.org.apache.juli.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 5host-manager.org.apache.juli.FileHandler + +# For example, set the com.xyz.foo logger to only log SEVERE +# messages: +#org.apache.catalina.startup.ContextConfig.level = FINE +#org.apache.catalina.startup.HostConfig.level = FINE +#org.apache.catalina.session.ManagerBase.level = FINE +#org.apache.catalina.core.AprLifecycleListener.level=FINE + +############################################################ +# GateIn log configuration +############################################################ + +org.exoplatform.level = INFO +org.exoplatform.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler + +org.gatein.level = INFO +org.gatein.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler + +org.chromattic.level = INFO +org.chromattic.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler + +jcr.level = INFO +jcr.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler + +ws.level = INFO +ws.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler + +XMLResolvingServiceImpl.level = INFO +XMLResolvingServiceImpl.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler + +TRAXTemplatesServiceImpl.level = INFO +TRAXTemplatesServiceImpl.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler + +org.hibernate.level = INFO +org.hibernate.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler + +com.arjuna.level = INFO +com.arjuna.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler + +org.jboss.level = INFO +org.jboss.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler + +org.apache.shindig.level = INFO +org.apache.shindig.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/producer.server.xml =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/producer.server.xml (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/producer.server.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,387 @@ + + + + + + + +<Server port="8006" shutdown="SHUTDOWN" debug="0"> + + +  +  + <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" + debug="0"/> + <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" + debug="0"/> + +  + <GlobalNamingResources> + +  + <Environment name="simpleValue" type="java.lang.Integer" value="30"/> + +  + <Resource name="UserDatabase" auth="Container" + type="org.apache.catalina.UserDatabase" + description="User database that can be updated and saved"> + </Resource> + <ResourceParams name="UserDatabase"> + <parameter> + <name>factory</name> + <value>org.apache.catalina.users.MemoryUserDatabaseFactory</value> + </parameter> + <parameter> + <name>pathname</name> + <value>conf/tomcat-users.xml</value> + </parameter> + </ResourceParams> + + </GlobalNamingResources> + +  + +  + <Service name="Catalina"> + +  + +  + <Connector port="8081" + maxThreads="150" minSpareThreads="25" maxSpareThreads="75" + enableLookups="false" redirectPort="8444" acceptCount="100" + debug="0" connectionTimeout="20000" + disableUploadTimeout="true" /> +  + +  + +  +  + +  + <Connector port="8010" + enableLookups="false" redirectPort="8444" debug="0" + protocol="AJP/1.3" /> + +  +  +  + +  + +  + +  + <Engine name="Catalina" defaultHost="localhost" debug="0"> + +  +  + +  + <Logger className="org.apache.catalina.logger.FileLogger" + prefix="catalina_log." suffix=".txt" + timestamp="true"/> + +  + +  + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" + debug="0" resourceName="UserDatabase"/> + +  +  + +  + +  + +  + +  + +  + <Host name="localhost" debug="0" appBase="webapps" + unpackWARs="true" autoDeploy="true" + xmlValidation="false" xmlNamespaceAware="false"> + +  + +  +  +  +  +  + +  +  + +  + <Logger className="org.apache.catalina.logger.FileLogger" + directory="logs" prefix="localhost_log." suffix=".txt" + timestamp="true"/> + +  + +  +  + + </Host> + + </Engine> + + </Service> + +</Server> Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/server.xml =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/server.xml (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/conf/server.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,138 @@ + + + +<Server port="8005" shutdown="SHUTDOWN"> + +  + <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> +  + <Listener className="org.apache.catalina.core.JasperListener" /> +  + <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" /> + <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> + +  + <GlobalNamingResources> +  + <Resource name="UserDatabase" auth="Container" + type="org.apache.catalina.UserDatabase" + description="User database that can be updated and saved" + factory="org.apache.catalina.users.MemoryUserDatabaseFactory" + pathname="conf/tomcat-users.xml" /> + </GlobalNamingResources> + +  + <Service name="Catalina"> + +  + <Connector port="8080" protocol="HTTP/1.1" + maxThreads="150" connectionTimeout="20000" + redirectPort="8443" URIEncoding="UTF-8" + emptySessionPath="true"/> + +  +  + +  + <Connector port="8009" protocol="AJP/1.3" redirectPort="8443"/> + + +  + +  + <Engine name="Catalina" defaultHost="localhost"> + +  +  + +  +  + +  + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" + resourceName="UserDatabase"/> + +  + <Host name="localhost" appBase="webapps" + unpackWARs="true" autoDeploy="true" + xmlValidation="false" xmlNamespaceAware="false"> + +  +  + +  +  + + </Host> + </Engine> + </Service> +</Server> Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/gatein/conf/configuration.xml =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/gatein/conf/configuration.xml (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/gatein/conf/configuration.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,65 @@ +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> +  + <type>org.exoplatform.container.definition.PortalContainerConfig</type> + <init-params> +  + <value-param> + <name>default.portal.container</name> + <value>portal</value> + </value-param> +  + <value-param> + <name>default.rest.context</name> + <value>rest</value> + </value-param> +  + <value-param> + <name>default.realm.name</name> + <value>gatein-domain</value> + </value-param> +  +  + <object-param> + <name>default.portal.definition</name> + <object type="org.exoplatform.container.definition.PortalContainerDefinition"> +  + <field name="externalSettingsPath"> + <string>configuration.properties</string> + </field> + <field name="dependencies"> + <collection type="java.util.ArrayList"> + <value> + <string>eXoResources</string> + </value> + <value> + <string>portal</string> + </value> + <value> + <string>dashboard</string> + </value> + <value> + <string>exoadmin</string> + </value> + <value> + <string>eXoGadgets</string> + </value> + <value> + <string>eXoGadgetServer</string> + </value> + <value> + <string>rest</string> + </value> + <value> + <string>web</string> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component> +</configuration> Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/integration/META-INF/context.xml =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/integration/META-INF/context.xml (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/integration/META-INF/context.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,23 @@ + + +<Context privileged="true">  +</Context> \ No newline at end of file Added: portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/integration/WEB-INF/web.xml =================================================================== --- portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/integration/WEB-INF/web.xml (rev 0) +++ portal/branches/wci/server/tomcat7/patch/src/main/tomcat/webapps/integration/WEB-INF/web.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,32 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.gatein.wci.tomcat.TC7ContainerServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> +</web-app> Added: portal/branches/wci/server/tomcat7/plugin/pom.xml =================================================================== --- portal/branches/wci/server/tomcat7/plugin/pom.xml (rev 0) +++ portal/branches/wci/server/tomcat7/plugin/pom.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,33 @@ + + +<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.server.tomcat7</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.server.tomcat7.plugin</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Server Tomcat 7 Plugin</name> +</project> Added: portal/branches/wci/server/tomcat7/plugin/src/main/java/conf/portal/configuration.xml =================================================================== --- portal/branches/wci/server/tomcat7/plugin/src/main/java/conf/portal/configuration.xml (rev 0) +++ portal/branches/wci/server/tomcat7/plugin/src/main/java/conf/portal/configuration.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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/branches/wci/server/tomcat7/pom.xml =================================================================== --- portal/branches/wci/server/tomcat7/pom.xml (rev 0) +++ portal/branches/wci/server/tomcat7/pom.xml 2010-09-27 15:28:28 UTC (rev 4399) @@ -0,0 +1,41 @@ + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <modules> + <module>patch</module> + <module>plugin</module> + </modules> + + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + + <artifactId>exo.portal.server.tomcat7</artifactId> + <packaging>pom</packaging> + + <name>GateIn Portal Server Tomcat 7</name> + +</project>

13 years, 7 months

1
0
0 / 0

gatein SVN: r4398 - portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/webui/page.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2010-09-27 07:28:04 -0400 (Mon, 27 Sep 2010) New Revision: 4398 Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java Log: Fix to use the correct request context in a Portlet action Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java =================================================================== --- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-09-27 09:37:56 UTC (rev 4397) +++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-09-27 11:28:04 UTC (rev 4398) @@ -253,23 +253,23 @@ public void execute(Event<UIPageBrowser> event) throws Exception { UIPageBrowser uiPageBrowser = event.getSource(); - PortalRequestContext pcontext = Util.getPortalRequestContext(); - String id = pcontext.getRequestParameter(OBJECTID); + WebuiRequestContext context = event.getRequestContext(); + String id = context.getRequestParameter(OBJECTID); UserPortalConfigService service = uiPageBrowser.getApplicationComponent(UserPortalConfigService.class); DataStorage dataService = uiPageBrowser.getApplicationComponent(DataStorage.class); - UIPortalApplication uiPortalApp = (UIPortalApplication)pcontext.getUIApplication(); + UIApplication uiApp = context.getUIApplication(); if (service.getPage(id) == null) { - uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.PageNotExist", new String[]{id}, 1)); - pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); + uiApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.PageNotExist", new String[]{id}, 1)); + context.addUIComponentToUpdateByAjax(uiApp.getUIPopupMessages()); return; } - Page page = service.getPage(id, pcontext.getRemoteUser()); + Page page = service.getPage(id, context.getRemoteUser()); if (page == null || !page.isModifiable()) { - uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.delete.NotDelete", new String[]{id}, 1)); - pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); + uiApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.delete.NotDelete", new String[]{id}, 1)); + context.addUIComponentToUpdateByAjax(uiApp.getUIPopupMessages()); return; } @@ -385,9 +385,10 @@ public void execute(Event<UIPageBrowser> event) throws Exception { UIPageBrowser uiPageBrowser = event.getSource(); - PortalRequestContext pcontext = Util.getPortalRequestContext(); + WebuiRequestContext context = event.getRequestContext(); + PortalRequestContext pcontext = (PortalRequestContext)context.getParentAppRequestContext(); UIPortalApplication uiPortalApp = (UIPortalApplication)pcontext.getUIApplication(); - String id = pcontext.getRequestParameter(OBJECTID); + String id = context.getRequestParameter(OBJECTID); UserPortalConfigService service = uiPageBrowser.getApplicationComponent(UserPortalConfigService.class); //Check existence of the page @@ -395,7 +396,7 @@ if (page == null) { uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.PageNotExist", new String[]{id}, 1)); - pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); + context.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); return; } @@ -404,7 +405,7 @@ if (!userACL.hasEditPermission(page)) { uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.edit.NotEditPage", new String[]{id}, 1)); - pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); + context.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); return; }

13 years, 7 months

1
0
0 / 0

gatein SVN: r4397 - in exo/portal/branches/3.1.x: examples/portal/war/src/main/webapp/WEB-INF and 1 other directories.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2010-09-27 05:37:56 -0400 (Mon, 27 Sep 2010) New Revision: 4397 Modified: exo/portal/branches/3.1.x/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java exo/portal/branches/3.1.x/examples/portal/war/src/main/webapp/WEB-INF/web.xml exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/web.xml Log: EXOGTN-36 Avoid NPE when a portal container has been disabled Modified: exo/portal/branches/3.1.x/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java =================================================================== --- exo/portal/branches/3.1.x/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java 2010-09-27 09:07:10 UTC (rev 4396) +++ exo/portal/branches/3.1.x/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java 2010-09-27 09:37:56 UTC (rev 4397) @@ -19,6 +19,7 @@ package org.exoplatform.web; +import org.exoplatform.commons.utils.PropertyManager; import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.PortalContainer; @@ -140,7 +141,19 @@ PortalContainer.setInstance(portalContainer); hasBeenSet = true; } - broadcast(portalContainer, CONTEXT_DESTROYED, event); + final String ctxName = event.getServletContext().getServletContextName(); + if (!PortalContainer.isPortalContainerNameDisabled(ctxName) && portalContainer instanceof PortalContainer) + { + // The portal container corresponding to the current servlet context could be found + broadcast(portalContainer, CONTEXT_DESTROYED, event); + } + else if (PropertyManager.isDevelopping()) + { + log.info("The portal environment could not be set for the webapp '" + ctxName + + "' because this servlet context has not been defined as a " + + "dependency of any portal container or it is a disabled portal" + + " container, the contextDestroyed event will be ignored"); + } } catch (Exception ex) { Modified: exo/portal/branches/3.1.x/examples/portal/war/src/main/webapp/WEB-INF/web.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-09-27 09:07:10 UTC (rev 4396) +++ exo/portal/branches/3.1.x/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-09-27 09:37:56 UTC (rev 4397) @@ -73,7 +73,15 @@ <filter-name>CacheUserProfileFilter</filter-name> <filter-class>org.exoplatform.web.CacheUserProfileFilter</filter-class> </filter> + <filter> + <filter-name>PortalContainerFilter</filter-name> + <filter-class>org.exoplatform.container.web.PortalContainerFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>PortalContainerFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> <filter-mapping> <filter-name>GenericFilter</filter-name> <url-pattern>/*</url-pattern> Modified: exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/web.xml =================================================================== --- exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/web.xml 2010-09-27 09:07:10 UTC (rev 4396) +++ exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/web.xml 2010-09-27 09:37:56 UTC (rev 4397) @@ -90,8 +90,16 @@ <filter-name>ClusteredSSOFilter</filter-name> <filter-class>org.exoplatform.web.login.ClusteredSSOFilter</filter-class> </filter> + <filter> + <filter-name>PortalContainerFilter</filter-name> + <filter-class>org.exoplatform.container.web.PortalContainerFilter</filter-class> + </filter> <filter-mapping> + <filter-name>PortalContainerFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> <filter-name>RememberMeFilter</filter-name> <url-pattern>/public/*</url-pattern> </filter-mapping>

13 years, 7 months

1
0
0 / 0

gatein SVN: r4396 - in portal/branches/branch-GTNPORTAL-1493: web/portal/src/main/webapp/groovy/portal/webui/workspace and 1 other directory.

by do-not-reply＠jboss.org

Author: kien_nguyen Date: 2010-09-27 05:07:10 -0400 (Mon, 27 Sep 2010) New Revision: 4396 Modified: portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/Javascript.java portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java portal/branches/branch-GTNPORTAL-1493/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl Log: GTNPORTAL-1470 Allow to add an external javascript in gatein-resource Modified: portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/Javascript.java =================================================================== --- portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/Javascript.java 2010-09-27 08:57:03 UTC (rev 4395) +++ portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/Javascript.java 2010-09-27 09:07:10 UTC (rev 4396) @@ -47,6 +47,10 @@ } public String getPath() { + if(key.isExternalScript()) + { + return key.getScriptPath(); + } return key.getContextPath() + key.getScriptPath(); } Modified: portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java =================================================================== --- portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2010-09-27 08:57:03 UTC (rev 4395) +++ portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2010-09-27 09:07:10 UTC (rev 4396) @@ -178,37 +178,40 @@ object_view_of_merged_JS.put(javascript.getKey().getContextPath(), mergedJS_list); } - StringBuffer sB = new StringBuffer(); - String line = ""; - try - { - BufferedReader reader = javascript.getReader(); + //Merge internal javascripts + if(!javascript.getKey().isExternalScript()) { + StringBuffer sB = new StringBuffer(); + String line = ""; try { - while ((line = reader.readLine()) != null) + BufferedReader reader = javascript.getReader(); + try { - line = line + "\n"; - sB.append(line); - mergedJS_list.add(line); + while ((line = reader.readLine()) != null) + { + line = line + "\n"; + sB.append(line); + mergedJS_list.add(line); + } } + catch (Exception ex) + { + ex.printStackTrace(); + } + finally + { + Safe.close(reader); + } } - catch (Exception ex) + catch (Exception e) { - ex.printStackTrace(); + e.printStackTrace(); } - finally - { - Safe.close(reader); - } + sB.append("\n"); + mergedJS_list.add("\n"); + + mergedJavascript = mergedJavascript.concat(sB.toString()); } - catch (Exception e) - { - e.printStackTrace(); - } - sB.append("\n"); - mergedJS_list.add("\n"); - - mergedJavascript = mergedJavascript.concat(sB.toString()); } /** Modified: portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java =================================================================== --- portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java 2010-09-27 08:57:03 UTC (rev 4395) +++ portal/branches/branch-GTNPORTAL-1493/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java 2010-09-27 09:07:10 UTC (rev 4396) @@ -75,4 +75,9 @@ { return contextPath; } + + public boolean isExternalScript() + { + return (scriptPath.startsWith("http") || scriptPath.startsWith("https")) ? true : false; + } } Modified: portal/branches/branch-GTNPORTAL-1493/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1493/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2010-09-27 08:57:03 UTC (rev 4395) +++ portal/branches/branch-GTNPORTAL-1493/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2010-09-27 09:07:10 UTC (rev 4396) @@ -63,7 +63,13 @@ <%} else {%> <script type="text/javascript" src="<%=docBase%>/javascript/merged.js"></script> - <%}%> + <% + for(path in scriptsPaths) { + if(path.startsWith("http") || path.startsWith("https")) {%> + <script type="text/javascript" src="<%=path%>"></script> + <%} + } + }%> <script type="text/javascript"> eXo.env.portal.context = "<%=docBase%>" ; <%if(rcontext.getAccessPath() == 0) {%>eXo.env.portal.accessMode = "public" ;<%}

13 years, 7 months

1
0
0 / 0

gatein SVN: r4395 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-09-27 04:57:03 -0400 (Mon, 27 Sep 2010) New Revision: 4395 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_045_CheckWhenUserDoesNotHaveRightToEditPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_18_009_CheckDisplayPageCreatedInPageManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_03_04_005_CheckExistingOfPagesInDeletedGroup.html Log: TESTVN-1635 - Manage folders in selegen with GTNPORTAL product Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html 2010-09-27 08:57:03 UTC (rev 4395) @@ -0,0 +1,777 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_14_01_044_CheckWhenHaveRightToEditPage</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_14_01_044_CheckWhenHaveRightToEditPage</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>Check when user does not have right to edit page --</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new user--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=New Staff</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>Confirmpassword</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>firstName</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>lastName</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>email</td> + <td>POR_TEST_14_01_045(a)gmail.com</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add user into group with membership is member--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Group Management</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Group Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Click Search User--</td> + <td></td> +</tr> +<tr> + <td>pause</td> + <td>2000</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Create new page for portal--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>ownerType</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>ownerType</td> + <td>label=portal</td> +</tr> +<tr> + <td>click</td> + <td>//option[@value='portal']</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new node & select added page for that  node--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UINavigationManagement']/div[3]/table/tbody/tr/td[1]/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UINavigationManagement']/div[3]/table/tbody/tr/td[1]/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>label</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Search and Select Page</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Search and Select Page</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//td[2]/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//td[2]/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- edit permission for portal's page--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- https://jira.jboss.org/browse/GTNPORTAL-1304 --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@title='Edit Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Edit Page']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=View Page properties</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=View Page properties</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Permission Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Edit Permission Setting tab--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Change permission for this page--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=manager</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=manager</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Close Page Editor--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Login with new user--</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- View new node--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>link=Site Editor</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete this node--</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//a[@class='NodeIcon DefaultPageIcon' and @title='POR_TEST_14_01_045']</td> + <td></td> +</tr> +<tr> + <td>mouseDownRight</td> + <td>//a[@class='NodeIcon DefaultPageIcon' and @title='POR_TEST_14_01_045']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Delete Node</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Delete Node</td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete this node?</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete page--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- https://jira.jboss.org/browse/GTNPORTAL-1304--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@title='Delete Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Delete Page']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Do you want to delete this page?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete user--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>POR_TEST_14_01_045</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UISearchForm']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UISearchForm']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete POR_TEST_14_01_045 user?</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_045_CheckWhenUserDoesNotHaveRightToEditPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_045_CheckWhenUserDoesNotHaveRightToEditPage.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_045_CheckWhenUserDoesNotHaveRightToEditPage.html 2010-09-27 08:57:03 UTC (rev 4395) @@ -0,0 +1,842 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_14_01_045_CheckWhenUserDoesNotHaveRightToEditPage</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_14_01_045_CheckWhenUserDoesNotHaveRightToEditPage</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check when user have right to edit layout of page --</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new user--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=New Staff</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>Confirmpassword</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>firstName</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>lastName</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>email</td> + <td>TEST_POR_14_01_045(a)gmail.com</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose User Profile --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/div/div[1]/div/div/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>user.language</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>user.language</td> + <td>label=English</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>You have registered a new account.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>You have registered a new account.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add user into group--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Group Management</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Group Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Create new page for portal--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>ownerType</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>ownerType</td> + <td>label=portal</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new node & select added page for that  node--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UINavigationManagement']/div[3]/table/tbody/tr/td[1]/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UINavigationManagement']/div[3]/table/tbody/tr/td[1]/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>label</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Page selector --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Search and Select Page</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Search and Select Page</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//td[2]/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//td[2]/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- edit permission for portal's page--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit page --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@title='Edit Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Edit Page']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=View Page properties</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=View Page properties</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Page Template --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Permision Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=manager</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=manager</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Login with new user--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- View page --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>link=Site Editor</td> + <td>Site Editor</td> +</tr> +<tr> + <td>verifyText</td> + <td>link=Add New Page</td> + <td>Add New Page</td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>Edit Page</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete this node--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>mouseDownRight</td> + <td>//a[@class='NodeIcon DefaultPageIcon' and @title='TEST_POR_14_01_045']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Delete Node</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Delete Node</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete this node?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete page--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@title='Delete Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Delete Page']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Do you want to delete this page?</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>No result found.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>No result found.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete user--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>TEST_POR_14_01_045</td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UISearchForm']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete TEST_POR_14_01_045 user?</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>No result found.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>No result found.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_18_009_CheckDisplayPageCreatedInPageManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_18_009_CheckDisplayPageCreatedInPageManagement.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_18_009_CheckDisplayPageCreatedInPageManagement.html 2010-09-27 08:57:03 UTC (rev 4395) @@ -0,0 +1,357 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_18_009_CheckDisplayPageCreatedInPageManagement</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_18_009_CheckDisplayPageCreatedInPageManagement</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new page for group--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>ownerType</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>ownerType</td> + <td>label=group</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>ownerId</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>ownerId</td> + <td>label=/organization/management/executive-board</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>TEST_POR_18_009</td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td>TEST_POR_18_009</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Login by any user has right to access new added page--</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>john</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>link=classic</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>link=Organization</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>TEST_POR_18_009</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UINavigationManagement']/div[3]/table/tbody/tr/td[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UINavigationManagement']/div[3]/table/tbody/tr/td[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>TEST_POR_18_009</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Delete page--</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>TEST_POR_18_009</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Delete Page']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Do you want to delete this page?</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>No result found.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>No result found.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_03_04_005_CheckExistingOfPagesInDeletedGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_03_04_005_CheckExistingOfPagesInDeletedGroup.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_PRL_03_04_005_CheckExistingOfPagesInDeletedGroup.html 2010-09-27 08:57:03 UTC (rev 4395) @@ -0,0 +1,942 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_PRL_03_04_005_CheckExistingOfPagesInDeletedGroup</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_PRL_03_04_005_CheckExistingOfPagesInDeletedGroup</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check existing of pages in deleted group--</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new user--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=New Staff</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=New Staff</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>type</td> + <td>Confirmpassword</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>type</td> + <td>firstName</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>type</td> + <td>lastName</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>type</td> + <td>email</td> + <td>Test_PRL_03_04_005(a)gmail.com</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose User Profile --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIAccountPortlet']/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIAccountPortlet']/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>user.language</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>user.language</td> + <td>label=English</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>You have registered a new account.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>You have registered a new account.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Go to Group and user management--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose User and group management --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new group--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[3]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>groupName</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>groupName</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>type</td> + <td>label</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>type</td> + <td>description</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add user into group--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[2]/div[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Test_PRL_03_04_005</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Test_PRL_03_04_005</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>membership</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>membership</td> + <td>label=manager</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Go to Page Management --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new page --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>ownerType</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>ownerType</td> + <td>label=group</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>echo</td> + <td>-- Page Layout--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Permission Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Access Permission Setting--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Access Permission Setting</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Access Permission Setting</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit Permission Setting--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Continue Add new page--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>ownerType</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>ownerType</td> + <td>label=group</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>Test_PRL_03_04_005_add</td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td>Test_PRL_03_04_005_add</td> +</tr> +<tr> + <td>echo</td> + <td>-- Page Layout--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Permission Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Access Permission Setting--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Access Permission Setting</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Access Permission Setting</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit Permission Setting--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Change Edit permission on one page (page B) to another group --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Test_PRL_03_04_005_add</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit page --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@title='Edit Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Edit Page']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- View Page Properties --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageEditor']/div[3]/div/div/div[1]/table/tbody/tr/td/div[1]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPageEditor']/div[3]/div/div/div[1]/table/tbody/tr/td/div[1]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Permission Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Edit Permission --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSetting']/div[1]/div/div/div/div/div[3]/div/div/div/div/div[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='PermissionSetting']/div[1]/div/div/div/div/div[3]/div/div/div/div/div[1]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete Permission --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Delete Permission</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Delete Permission</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose New Edit Permission --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[4]/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[4]/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Management</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Executive Board</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Executive Board</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Close Page Editor --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--  Delete new added group --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[1]/a[1]</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete this group?</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check existing of deleted group's pages that was not changed Edit permission --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>No result found.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>No result found.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check existing of deleted group's pages that was  changed Edit permission --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Test_PRL_03_04_005_add</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Go to Users and Group Management --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[1]/div[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[1]/div/div/div/div/div/div/a[1]/div[1]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Search user --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Test_PRL_03_04_005</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UISearchForm']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UISearchForm']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete user --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete Test_PRL_03_04_005 user?</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>No result found.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>No result found.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html>

13 years, 7 months

1
0
0 / 0

gatein SVN: r4394 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-09-27 04:54:42 -0400 (Mon, 27 Sep 2010) New Revision: 4394 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_PRL_03_04_005_CheckExistingOfPagesInDeletedGroup.html Log: TestVN-356:Clean and Improve existing Selenium for GateIn Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_PRL_03_04_005_CheckExistingOfPagesInDeletedGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_PRL_03_04_005_CheckExistingOfPagesInDeletedGroup.html 2010-09-27 08:09:42 UTC (rev 4393) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_PRL_03_04_005_CheckExistingOfPagesInDeletedGroup.html 2010-09-27 08:54:42 UTC (rev 4394) @@ -548,6 +548,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//form[@id='UIPageSearch']/div[2]/a</td> <td></td> </tr> @@ -712,6 +722,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Users and groups management</td> <td></td>

13 years, 7 months

1
0
0 / 0

gatein SVN: r4393 - exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2010-09-27 04:09:42 -0400 (Mon, 27 Sep 2010) New Revision: 4393 Modified: exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIUpload.js Log: EXOGTN-62 Upload fields issue in chrome browser Modified: exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIUpload.js =================================================================== --- exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIUpload.js 2010-09-27 08:02:58 UTC (rev 4392) +++ exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIUpload.js 2010-09-27 08:09:42 UTC (rev 4393) @@ -54,28 +54,40 @@ var uploadAction = eXo.env.server.context + "/command?" ; uploadAction += "type=org.exoplatform.web.command.handler.UploadHandler"; uploadAction += "&uploadId=" + uploadId+"&action=upload" ; - idoc.open(); - idoc.write("<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>"); - idoc.write("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='" +eXo.core.I18n.lang+ "' dir='" +eXo.core.I18n.dir+ "'>"); - idoc.write("<head>"); - idoc.write("<style type='text/css'>"); - idoc.write(".UploadButton {width: 20px; height: 20px; cursor: pointer; vertical-align: bottom;"); - idoc.write(" background: url('/eXoResources/skin/DefaultSkin/webui/component/UIUpload/background/UpArrow16x16.gif') no-repeat left; }"); - idoc.write("</style>"); - idoc.write("<script type='text/javascript'>var eXo = parent.eXo</script>"); - idoc.write("</head>"); - idoc.write("<body style='margin: 0px; border: 0px;'>"); - idoc.write(" <form id='"+uploadId+"' class='UIUploadForm' style='margin: 0px; padding: 0px' action='"+uploadAction+"' enctype='multipart/form-data' method='post'>"); + + var uploadHTML = ""; + uploadHTML += "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>"; + uploadHTML += "<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='" +eXo.core.I18n.lang+ "' dir='" +eXo.core.I18n.dir+ "'>"; + uploadHTML += "<head>"; + uploadHTML += "<style type='text/css'>"; + uploadHTML += ".UploadButton {width: 20px; height: 20px; cursor: pointer; vertical-align: bottom;"; + uploadHTML += " background: url('/eXoResources/skin/DefaultSkin/webui/component/UIUpload/background/UpArrow16x16.gif') no-repeat left; }"; + uploadHTML += "</style>"; + uploadHTML += "</head>"; + uploadHTML += "<body style='margin: 0px; border: 0px;'>"; + uploadHTML += " <form id='"+uploadId+"' class='UIUploadForm' style='margin: 0px; padding: 0px' action='"+uploadAction+"' enctype='multipart/form-data' method='post'>"; if(isAutoUpload){ - idoc.write(" <input type='file' name='file' id='file' value='' onchange='eXo.webui.UIUpload.upload(this, "+uploadId+")' onkeypress='return false;' />"); + uploadHTML += " <input type='file' name='file' id='file' value='' onchange='parent.eXo.webui.UIUpload.upload(this, "+uploadId+")' onkeypress='return false;' />"; }else{ - idoc.write(" <input type='file' name='file' id='file' value='' onkeypress='return false;' />"); - idoc.write(" <img class='UploadButton' onclick='eXo.webui.UIUpload.upload(this, "+uploadId+")' alt='' src='/eXoResources/skin/sharedImages/Blank.gif'/>"); + uploadHTML += " <input type='file' name='file' id='file' value='' onkeypress='return false;' />"; + uploadHTML += " <img class='UploadButton' style='width: 20px; height: 20px; cursor: pointer; vertical-align: bottom; background: url(\"/eXoResources/skin/DefaultSkin/webui/component/UIUpload/background/UpArrow16x16.gif\") no-repeat left;' " + + " onclick='parent.eXo.webui.UIUpload.upload(this, "+uploadId+")' alt='' src='/eXoResources/skin/sharedImages/Blank.gif'/>"; } - idoc.write(" </form>"); - idoc.write("</body>"); - idoc.write("</html>"); - idoc.close(); + uploadHTML += " </form>"; + uploadHTML += "</body>"; + uploadHTML += "</html>"; + + if (navigator.userAgent.toLowerCase().indexOf('chrome') > -1) { + //workaround for Chrome + //When submit in iframe with Chrome, the iframe.contentWindow.document seems not be reconstructed correctly + idoc.open(); + idoc.close(); + idoc.documentElement.innerHTML = uploadHTML; + } else { + idoc.open(); + idoc.write(uploadHTML); + idoc.close(); + } }; /**

13 years, 7 months

1
0
0 / 0

gatein SVN: r4392 - in portal/branches/navcontroller/web: eXoResources/src/main/webapp/javascript/eXo/webui and 1 other directories.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2010-09-27 04:02:58 -0400 (Mon, 27 Sep 2010) New Revision: 4392 Modified: portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIRightClickPopupMenu.js portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl Log: Use POST instead of GET method to submit a request in UIRightClickPopupMenu component Modified: portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js =================================================================== --- portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js 2010-09-27 07:25:55 UTC (rev 4391) +++ portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js 2010-09-27 08:02:58 UTC (rev 4392) @@ -574,16 +574,12 @@ doRequest("Get", url, null, callback) ; } ; -/* -* This method is called when a HTTP POST should be done but in an AJAX -* case some maniputalions are needed -* Once the content of the form is placed into a string object, the call -* is delegated to the doRequest() method -*/ -function ajaxPost(formElement, callback) { +/** + * Do a POST request in AJAX with given <code>url</code> and <code>queryString</code>. + * The call is delegated to the doRequest() method with a callback function + */ +function ajaxPost(url, queryString, callback) { if (!callback) callback = null ; - var queryString = eXo.webui.UIForm.serializeForm(formElement) ; - var url = formElement.action + "&ajaxRequest=true" ; doRequest("POST", url, queryString, callback) ; } ; @@ -613,6 +609,7 @@ eXo.session.itvInit() ; } } ; + /** * Abort an ajax request * @return @@ -625,6 +622,7 @@ eXo.portal.CurrentRequest.aborted = true ; eXo.portal.CurrentRequest = null ; } ; + /** * Create a ajax request * @param {String} url - Url @@ -643,6 +641,7 @@ } if(!async) return request.responseText ; } + /** * Redirect browser to url * @param url Modified: portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js =================================================================== --- portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js 2010-09-27 07:25:55 UTC (rev 4391) +++ portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js 2010-09-27 08:02:58 UTC (rev 4392) @@ -22,7 +22,21 @@ */ function UIForm() { }; + /** + * This method is called when a HTTP POST should be done but in an AJAX + * case some maniputalions are needed + * Once the content of the form is placed into a string object, the call + * is delegated to the doRequest() method + */ +UIForm.prototype.ajaxPost = function(formElement, callback) { + if (!callback) callback = null ; + var queryString = eXo.webui.UIForm.serializeForm(formElement) ; + var url = formElement.action + "&ajaxRequest=true" ; + doRequest("POST", url, queryString, callback) ; +} ; + +/** * Get form element with pattern condition * @param {String} pattern * The pattern can be Id#Id, example: Account#UIAccountForm @@ -36,7 +50,7 @@ /** * A function that submits the form identified by formId, with the specified action - * If useAjax is true, calls the ajaxPost function from PortalHttpRequest, with the given callback function + * If useAjax is true, calls the ajaxPost function, with the given callback function * Note: ie bug you cannot have more than one button tag */ UIForm.prototype.submitForm = function(formId, action, useAjax, callback) { @@ -60,13 +74,13 @@ } catch(e) {} form.elements['formOp'].value = action ; - if(useAjax) ajaxPost(form, callback) ; + if(useAjax) this.ajaxPost(form, callback) ; else form.submit(); } ; /** * Submits a form by Ajax, with the given action and the given parameters - * Calls ajaxPost of PortalHttpRequest + * Calls ajaxPost * Note: ie bug you cannot have more than one button tag */ UIForm.prototype.submitEvent = function(formId, action, params) { @@ -84,7 +98,7 @@ form.elements['formOp'].value = action ; if(!form.originalAction) form.originalAction = form.action ; form.action = form.originalAction + encodeURI(params) ; - ajaxPost(form) ; + this.ajaxPost(form) ; } ; UIForm.prototype.selectBoxOnChange = function(formId, elemt) { Modified: portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIRightClickPopupMenu.js =================================================================== --- portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIRightClickPopupMenu.js 2010-09-27 07:25:55 UTC (rev 4391) +++ portal/branches/navcontroller/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIRightClickPopupMenu.js 2010-09-27 08:02:58 UTC (rev 4392) @@ -72,9 +72,15 @@ eXo.core.MouseEventManager.docMouseDownEvt(evt) ; return false; } - elemt.setAttribute('href', href.replace('_objectid_', encodeURI(contextMenu.objId.replace(/'/g, "\\'")))) ; + elemt.setAttribute('href', href += '&objectId=' + encodeURI(contextMenu.objId.replace(/'/g, "\\'"))) ; return true; } + +UIRightClickPopupMenu.prototype.ajaxPost = function(url, objId) { + var queryString = "ajaxRequest=true&objectId=" + objId; + ajaxPost(url, queryString); +} + /** * Mouse click on element, If click is right-click, the context menu will be shown * @param {Object} event Modified: portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl =================================================================== --- portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl 2010-09-27 07:25:55 UTC (rev 4391) +++ portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl 2010-09-27 08:02:58 UTC (rev 4392) @@ -18,12 +18,12 @@ <%for(action in uicomponent.getActions()) {%> <div class="MenuItem"> - <a exo:attr="$action" href="<%=uicomponent.event(action,"_objectid_");%>" onclick="return eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this);" class="ItemIcon ${action}16x16Icon" > + <a exo:attr="$action" href="javascript: eXo.webui.UIRightClickPopupMenu.ajaxPost('<%=uicomponent.url(action);%>', '_objectid_')" onclick="return eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this);" class="ItemIcon ${action}16x16Icon" > <%=_ctx.appRes(uicomponent.getId() + ".event." + action) %> </a> </div> <%}%> - <div class="RightClickCustomItem"><span></span></div> + <div class="RightClickCustomItem"><span></span></div> </div> </div>

13 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits September 2010