gatein SVN: r5705 - in components/pc/trunk/test: servers/tomcat6 and 1 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-07 08:47:58 -0500 (Fri, 07 Jan 2011)
New Revision: 5705
Modified:
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat6/src/test/common.xml
Log:
GTNPC-46 : make jar usage more mavenish
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-01-07 12:50:28 UTC (rev 5704)
+++ components/pc/trunk/test/core/pom.xml 2011-01-07 13:47:58 UTC (rev 5705)
@@ -142,8 +142,34 @@
<build>
<plugins>
+ <!-- Deploy the test jar and its sources -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version>
<executions>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 12:50:28 UTC (rev 5704)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 13:47:58 UTC (rev 5705)
@@ -135,6 +135,14 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>2.3.0-Alpha01-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>apache-taglibs</groupId>
Modified: components/pc/trunk/test/servers/tomcat6/src/test/common.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 12:50:28 UTC (rev 5704)
+++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 13:47:58 UTC (rev 5705)
@@ -387,13 +387,6 @@
<target name="package-tests">
- <copy todir="${target}/classes">
- <fileset dir="${basedir}/../../core/target/classes" includes="**/*"/>
- </copy>
- <copy todir="${target}/test-classes">
- <fileset dir="${basedir}/../../core/target/test-classes" includes="**/*"/>
- </copy>
-
<package-tck-test test="portletinterface"/>
<package-tck-test test="dispatcher"/>
<package-tck-test test="portletrequests"/>
@@ -453,18 +446,17 @@
<package-jsr286-ext-test test="portletmode"/>
<!-- -->
- <jar jarfile="${test.temp.lib}/portlet-test-lib.jar">
- <fileset dir="${target}/test-classes"/>
- <fileset dir="${target}/classes"/>
- </jar>
-
<copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war">
<fileset dir="${target}/test-classes/portlet-test-war"/>
</copy>
<copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war/WEB-INF/lib" flatten="true">
- <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
<path refid="${test.server.name}-${test.server.version}"/>
+ <path>
+ <pathelement location="${org.gatein.pc:pc-test-core:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/>
+ </path>
</copy>
+
<mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/>
<jar jarfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war">
<fileset dir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war"/>
@@ -510,9 +502,7 @@
</reports>
<classpath>
- <pathelement location="${target}/classes"/>
<pathelement location="${test.temp.lib}"/>
- <pathelement location="${target}/classes/test"/>
<pathelement location="${target}/test-classes/test"/>
<pathelement path="${test_classpath}"/>
</classpath>
@@ -521,6 +511,7 @@
</target>
+<!--
<target name="package-tck-portal" depends="prepare_env">
<property name="tck" value="${target}/tck"/>
@@ -558,5 +549,6 @@
<delete file="${target}/portlet-test-lib.jar"/>
</target>
+-->
</project>
14 years, 9 months
- 1
- 0
gatein SVN: r5704 - components/pc/trunk/test/servers/tomcat6.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-07 07:50:28 -0500 (Fri, 07 Jan 2011)
New Revision: 5704
Modified:
components/pc/trunk/test/servers/tomcat6/pom.xml
Log:
no need for that!
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 12:48:59 UTC (rev 5703)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 12:50:28 UTC (rev 5704)
@@ -135,14 +135,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-test-core</artifactId>
- <classifier>framework</classifier>
- <version>2.3.0-Alpha01-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
<!-- JSTL for Tomcat -->
<dependency>
<groupId>apache-taglibs</groupId>
14 years, 9 months
- 1
- 0
gatein SVN: r5703 - in components/pc/trunk/test: core/src/main and 3 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-07 07:48:59 -0500 (Fri, 07 Jan 2011)
New Revision: 5703
Added:
components/pc/trunk/test/core/src/main/assembly/
components/pc/trunk/test/core/src/main/assembly/framework.xml
Modified:
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/core/src/main/build.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat6/src/test/common.xml
Log:
GTNPC-46 : now generate portal-portlet-test-lib.jar with assembly plugin
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-01-07 10:40:55 UTC (rev 5702)
+++ components/pc/trunk/test/core/pom.xml 2011-01-07 12:48:59 UTC (rev 5703)
@@ -141,14 +141,36 @@
<build>
<plugins>
+
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <classifier>framework</classifier>
+ <descriptors>
+ <descriptor>src/main/assembly/framework.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<dependencies>
</dependencies>
<executions>
<execution>
- <id>test</id>
+ <id>package-test</id>
<phase>package</phase>
<goals>
<goal>run</goal>
@@ -173,6 +195,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
Added: components/pc/trunk/test/core/src/main/assembly/framework.xml
===================================================================
--- components/pc/trunk/test/core/src/main/assembly/framework.xml (rev 0)
+++ components/pc/trunk/test/core/src/main/assembly/framework.xml 2011-01-07 12:48:59 UTC (rev 5703)
@@ -0,0 +1,56 @@
+<!--
+ ~ Copyright (C) 2003-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.
+ -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+ <id>framework</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+
+ <baseDirectory>/</baseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>META-INF/*.tld</include>
+ </includes>
+ </unpackOptions>
+ <includes>
+ <include>org.gatein.pc:pc-portlet</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/gatein/pc/test/unit/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+
+</assembly>
\ No newline at end of file
Modified: components/pc/trunk/test/core/src/main/build.xml
===================================================================
--- components/pc/trunk/test/core/src/main/build.xml 2011-01-07 10:40:55 UTC (rev 5702)
+++ components/pc/trunk/test/core/src/main/build.xml 2011-01-07 12:48:59 UTC (rev 5703)
@@ -105,7 +105,7 @@
<include name="org/gatein/pc/test/portlet/framework/**"/>
</zipfileset>
<zipfileset dir="${target}" prefix="WEB-INF/lib">
- <include name="portal-portlet-test-framework-lib.jar"/>
+ <include name="${artifactId}-${version}-framework.jar"/>
</zipfileset>
<fileset dir="${basedir}/src/main/packaging/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war"/>
</jar>
@@ -121,25 +121,6 @@
<target name="package-tests">
- <!--Portlet test framework lib jar-->
- <jar jarfile="${target}/portal-portlet-test-framework-lib.jar">
-
- <!-- -->
- <fileset dir="${target}/classes" includes="org/gatein/pc/test/unit/**"/>
-
- <!-- JSR 168 TLD -->
- <zipfileset
- src="${dependency.portal-portlet-portlet.jar}"
- includes="META-INF/portlet.tld"
- fullpath="META-INF/portlet.tld"/>
-
- <!-- JSR 286 TLD -->
- <zipfileset
- src="${dependency.portal-portlet-portlet.jar}"
- includes="META-INF/portlet_2_0.tld"
- fullpath="META-INF/portlet_2_0.tld"/>
- </jar>
-
<package-tck-test test="portletinterface"/>
<package-tck-test test="dispatcher"/>
<package-tck-test test="portletrequests"/>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 10:40:55 UTC (rev 5702)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 12:48:59 UTC (rev 5703)
@@ -135,6 +135,14 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <classifier>framework</classifier>
+ <version>2.3.0-Alpha01-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>apache-taglibs</groupId>
Modified: components/pc/trunk/test/servers/tomcat6/src/test/common.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 10:40:55 UTC (rev 5702)
+++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 12:48:59 UTC (rev 5703)
@@ -394,23 +394,6 @@
<fileset dir="${basedir}/../../core/target/test-classes" includes="**/*"/>
</copy>
- <!--Portlet test framework lib jar-->
- <jar jarfile="${test.temp.lib}/portal-portlet-test-framework-lib.jar">
-
- <!-- -->
- <fileset dir="${target}/classes" includes="org/gatein/pc/test/unit/**"/>
-
- <!-- JSR 168 TLD -->
- <zipfileset
- src="${dependency.portal-portlet-portlet.jar}"
- includes="META-INF/portlet.tld"
- fullpath="META-INF/portlet.tld"/>
- <zipfileset
- src="${dependency.portal-portlet-portlet.jar}"
- includes="META-INF/portlet_2_0.tld"
- fullpath="META-INF/portlet_2_0.tld"/>
- </jar>
-
<package-tck-test test="portletinterface"/>
<package-tck-test test="dispatcher"/>
<package-tck-test test="portletrequests"/>
14 years, 9 months
- 1
- 0
gatein SVN: r5702 - portal/branches.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-01-07 05:40:55 -0500 (Fri, 07 Jan 2011)
New Revision: 5702
Removed:
portal/branches/branch-GTNPORTAL-1731/
Log:
GTNPORTAL-1731 Delete the commit branch of sprint 45
14 years, 9 months
- 1
- 0
gatein SVN: r5701 - portal/branches.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-01-07 05:32:40 -0500 (Fri, 07 Jan 2011)
New Revision: 5701
Added:
portal/branches/branch-GTNPORTAL-1745/
Log:
GTNPORTAL-1745 Create commit branch for activities in sprint 46
Copied: portal/branches/branch-GTNPORTAL-1745 (from rev 5700, portal/trunk)
14 years, 9 months
- 1
- 0
gatein SVN: r5700 - in portal/trunk: component/portal/src/test/resources/portal/group/platform/administrators and 67 other directories.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-01-07 05:29:16 -0500 (Fri, 07 Jan 2011)
New Revision: 5700
Added:
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/IconWindowPortlet.gif
Modified:
portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml
portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml
portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml
portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml
portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml
portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/DefaultTheme.png
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MDefaultTheme.png
portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml
portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/Dotted.gif
portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/LastNode.gif
portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js
portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java
portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl
portal/trunk/webui/portal/src/main/java/conf/portal/configuration.xml
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java
Log:
GTNPORTAL-1731 Merge the commit branch of sprint 45 back to trunk
Modified: portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/component/portal/src/test/resources/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -21,8 +21,8 @@
-->
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
<!-- Portal skins -->
<portal-skin>
Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<portal-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<portal-name>platform/administrators</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -20,8 +20,8 @@
<portal-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<portal-name>@owner@</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -20,8 +20,8 @@
-->
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
<!-- Portal skins -->
<portal-skin>
Modified: portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -19,8 +19,8 @@
-->
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
<!-- Portal skins -->
<portal-skin>
Modified: portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java
===================================================================
--- portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -64,15 +64,15 @@
String userAgent = req.getHeader("User-Agent");
if (dresource.getDownloadName() != null)
{
- if (userAgent != null && userAgent.contains("MSIE"))
+ if (userAgent != null && userAgent.contains("Firefox"))
{
- res.setHeader("Content-Disposition", "attachment;filename=\""
- + URLEncoder.encode(dresource.getDownloadName(), "UTF-8") + "\"");
+ res.setHeader("Content-Disposition", "attachment; filename*=utf-8''"
+ + URLEncoder.encode(dresource.getDownloadName(), "UTF-8") + "");
}
else
{
- res.setHeader("Content-Disposition", "attachment; filename*=utf-8''"
- + URLEncoder.encode(dresource.getDownloadName(), "UTF-8") + "");
+ res.setHeader("Content-Disposition", "attachment;filename=\""
+ + URLEncoder.encode(dresource.getDownloadName(), "UTF-8") + "\"");
}
}
res.setContentType(dresource.getResourceMimeType());
@@ -105,4 +105,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>8</priority>
<page-nodes>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -21,8 +21,8 @@
-->
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>sitemap</name>
<title>Site Map</title>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>1</priority>
<page-nodes>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>samplePage</name>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>3</priority>
<page-nodes>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>sampledashboard</name>
<title>Sample Dashboard</title>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -21,8 +21,8 @@
-->
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
<portlet-skin>
<application-name>web</application-name>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>8</priority>
<page-nodes>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>sitemap</name>
<title>Site Map</title>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>1</priority>
<page-nodes>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>samplePage</name>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>3</priority>
<page-nodes>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>sampledashboard</name>
<title>Sample Dashboard</title>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
<portlet-skin>
<application-name>web</application-name>
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -21,8 +21,8 @@
-->
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
<portal-skin>
<skin-name>SimpleSkin</skin-name>
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2011-01-07 10:29:16 UTC (rev 5700)
@@ -46,7 +46,7 @@
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 12px;
font-style: normal;
- color: #336699;
+ color: #058bb6;
}
/* Help messages, general additional information, etc. */
@@ -97,16 +97,17 @@
}
.portlet-section-selected {
- background-color: #CBD4E6;
+ background-color: #d9d8d9;
}
.portlet-section-subheader {
font-weight: bold;
- font-size: 10px;
+ padding: 5px 0px;
}
.portlet-section-footer {
font-size: 11px;
+ border-top: 1px solid #F2F2F2;
}
/* Text that belongs to the table but does not fall in one of the other categories
@@ -121,40 +122,45 @@
/* Table header */
.portlet-table-header {
- background-color: #eef;
- padding: 0 5px 5px 5px;
+ background-color: #e9e8ed;
+ padding: 0 0px 0px 5px;
font-weight: bold;
color: #333333;
font-size: 12px;
border-bottom: 1px solid #d5d5d5;
+ line-height: 20px;
}
/* Normal text in a table cell */
-.portlet-table-body {}
+.portlet-table-body {
+ padding: 10px;
+}
/* Text in every other row in the table */
.portlet-table-alternate {
- background-color: #E6E8E5;
+ background-color: #e7e6eb;
border-bottom: 1px solid #d5d5d5;
+ padding: 5px 10px;
}
/* Text in a selected cell range */
.portlet-table-selected {
color: #000;
- font-size: 12px;
- background-color: #CBD4E6;
+ background-color: #dddddd;
+ padding: 5px 10px;
}
/* Text of a subheading */
.portlet-table-subheader {
font-weight: bold;
- color: #000;
+ color: #777777;
font-size: 12px;
+ padding: 5px;
}
/* Table footer */
.portlet-table-footer {
- padding: 5px 5px 0 5px;
+ padding: 5px;
font-weight: bold;
color: #333333;
font-size: 12px;
@@ -170,7 +176,6 @@
/** FORMS **/
.portlet-form-label {
- font-size: 10px;
color: #333333;
}
@@ -182,14 +187,15 @@
/* Form Button Style */
.portlet-form-button {
- font-size: 10px;
- font-weight: bold;
- color: #FFFFFF;
- background-color: #5078aa;
- border-top: 1px solid #97B7C6;
- border-left: 1px solid #97B7C6;
- border-bottom: 1px solid #254869;
- border-right: 1px solid #254869;
+ font-size: 11px;
+ color: #5c5c5c;
+ background-color: #cfcfcf;
+ border-top: 1px solid #dadada;
+ border-left: 1px solid #dadada;
+ border-bottom: 1px solid #9a9a9a;
+ border-right: 1px solid #9a9a9a;
+ line-height: 22px;
+ padding: 0px 20px;
}
/* Text that appears beside a context dependent action icon */
@@ -231,60 +237,161 @@
/** MENUS **/
/*General menu settings such as background color, margins, etc. */
-.portlet-menu {}
+.portlet-menu {
+}
/* Normal, unselected menu item. */
.portlet-menu-item {
- color: #242424;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ background: #dddddd;
+ color: #2e2e2e;
+ text-decoration: none;
+ margin-bottom: 1px;
+ line-height: 22px;
+ padding: 0px 5px;
}
/* Selected menu item. */
-.portlet-menu-item-selected {}
+.portlet-menu-item-selected {
+ background: #dddddd;
+ color: #058bb6;
+ margin-bottom: 1px;
+ line-height: 22px;
+ padding: 0px 5px;
+}
.portlet-menu-item-hover {
- color: #5699B7;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ background: #dddddd;
+ color: #058bb6;
+ text-decoration: none;
+ margin-bottom: 1px;
+ line-height: 22px;
+ padding: 0px 5px;
}
/* Selected menu item when the mouse hovers over it. */
-.portlet-menu-item-hover-selected {}
+.portlet-menu-item-hover-selected {
+ background: #dddddd;
+ color: #058bb6;
+ line-height: 22px;
+ margin-bottom: 1px;
+ padding: 0px 5px;
+}
/* Normal, unselected menu item that has sub-menus. */
-.portlet-menu-cascade-item {}
+.portlet-menu-cascade-item {
+ background: #e9e8ed;
+ color: #636363;
+ text-decoration: none;
+ line-height: 22px;
+ padding: 0px 20px;
+ border-bottom: 1px solid #dddddd;
+}
/* Selected sub-menu item that has sub-menus */
-.portlet-menu-cascade-item-selected {}
+.portlet-menu-cascade-item-selected {
+ background: #e9e8ed;
+ color: #252525;
+ text-decoration: none;
+ line-height: 22px;
+ padding: 0px 20px;
+ border-bottom: 1px solid #dddddd;
+}
-.porlet-menu-cascade {}
+.porlet-menu-cascade {
+ background: #e9e8ed;
+ color: #636363;
+ text-decoration: none;
+ line-height: 22px;
+ padding: 0px 20px;
+ border-bottom: 1px solid #dddddd;
+}
-.portlet-menu-cascade-item-hover {}
+.portlet-menu-cascade-item-hover {
+ background: #e9e8ed;
+ color: #252525;
+ text-decoration: none;
+ line-height: 22px;
+ padding: 0px 20px;
+ border-bottom: 1px solid #dddddd;
+}
-.portlet-menu-cascade-item-hover-selected {}
+.portlet-menu-cascade-item-hover-selected {
+ background: #e9e8ed;
+ color: #252525;
+ text-decoration: none;
+ line-height: 22px;
+ padding: 0px 20px;
+ border-bottom: 1px solid #dddddd;
+}
-.portlet-menu-separator {}
+.portlet-menu-separator {
+}
.portlet-menu-cascade-separator {}
-.portlet-menu-content {}
+.portlet-menu-content {
+ background: #f6f6f6;
+ color: #717171;
+ text-decoration: none;
+ line-height: 22px;
+ padding: 0px 30px;
+ border-bottom: 1px solid #e9e8ed;
+}
-.portlet-menu-content-selected {}
+.portlet-menu-content-selected {
+ background: #f6f6f6;
+ color: #272727;
+ text-decoration: none;
+ line-height: 22px;
+ padding: 0px 30px;
+ border-bottom: 1px solid #e9e8ed;
+}
-.portlet-menu-content-hover {}
+.portlet-menu-content-hover {
+ background: #f6f6f6;
+ color: #272727;
+ text-decoration: none;
+ line-height: 22px;
+ padding: 0px 30px;
+ border-bottom: 1px solid #e9e8ed;
+}
-.portlet-menu-content-hover-selected {}
+.portlet-menu-content-hover-selected {
+ background: #f6f6f6;
+ color: #272727;
+ text-decoration: none;
+ line-height: 22px;
+ padding: 0px 30px;
+ border-bottom: 1px solid #e9e8ed;
+}
-.portlet-menu-indicator {}
+.portlet-menu-indicator {
+ color: #8b8b8b;
+ line-height: 22px;
+ padding: 0px 40px;
+ border-bottom: 1px solid #e9e8ed;
+}
-.portlet-menu-indicator-selected {}
+.portlet-menu-indicator-selected {
+ color: #606060;
+ line-height: 22px;
+ padding: 0px 40px;
+ border-bottom: 1px solid #e9e8ed;
+}
-.portlet-menu-indicator-hover {}
+.portlet-menu-indicator-hover {
+ color: #606060;
+ line-height: 22px;
+ padding: 0px 40px;
+ border-bottom: 1px solid #e9e8ed;
+}
-.portlet-menu-indicator-hover-selected {}
+.portlet-menu-indicator-hover-selected {
+ color: #606060;
+ line-height: 22px;
+ padding: 0px 40px;
+ border-bottom: 1px solid #e9e8ed;
+}
.portlet-menu-description {}
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-01-07 10:29:16 UTC (rev 5700)
@@ -34,43 +34,43 @@
}
.DefaultTheme .ArrowDownIcon {
- background-position: center 20px;
+ background-position: center 18px;
}
.DefaultTheme .OverArrowDownIcon {
- background-position: center 116px;
+ background-position: center 114px;
}
.DefaultTheme .MinimizedIcon {
- background-position: center 44px;
+ background-position: center 42px;
}
.DefaultTheme .OverMinimizedIcon {
- background-position: center 140px;
+ background-position: center 138px;
}
.DefaultTheme .MaximizedIcon {
- background-position: center 68px;
+ background-position: center 66px;
}
.DefaultTheme .OverMaximizedIcon {
- background-position: center 164px;
+ background-position: center 162px;
}
.DefaultTheme .RestoreIcon {
- background-position: center 92px;
+ background-position: center 90px;
}
.DefaultTheme .OverRestoreIcon {
- background-position: center 188px;
+ background-position: center 186px;
}
.DefaultTheme .NormalIcon {
- background-position: center 92px;
+ background-position: center 90px;
}
.DefaultTheme .OverNormalIcon {
- background-position: center 188px;
+ background-position: center 186px;
}
@@ -84,7 +84,7 @@
}
.DefaultTheme .Information {
- height: 18px; line-height: 18px;
+ height: 20px; line-height: 20px;
vertical-align: middle; font-size: 10px;
padding-left: 5px; /* orientation=lt */
padding-right: 5px; /* orientation=rt */
@@ -93,8 +93,8 @@
}
.DefaultTheme .WindowBarCenter .WindowPortletIcon {
- background-position: left top; /* orientation=lt */
- background-position: right top; /* orientation=rt */
+ background: url('background/IconWindowPortlet.gif') no-repeat left top; /* orientation=lt */
+ background: url('background/IconWindowPortlet-rt.gif') no-repeat right top; /* orientation=rt */
padding-left: 20px; /* orientation=lt */
padding-right: 20px; /* orientation=rt */
height: 16px;
@@ -110,14 +110,14 @@
}
.DefaultTheme .WindowBarLeft {
- padding-left: 12px;
+ padding-left: 8px;
background-image: url('background/DefaultTheme.png');
background-repeat: no-repeat;
background-position: left -148px;
}
.DefaultTheme .WindowBarRight {
- padding-right: 11px;
+ padding-right: 8px;
background-image: url('background/DefaultTheme.png');
background-repeat: no-repeat;
background-position: right -119px;
@@ -130,17 +130,17 @@
}
.DefaultTheme .WindowBarCenter .FixHeight {
- height: 21px;
- padding-top: 8px;
+ height: 20px;
+ padding-top: 7px;
}
.DefaultTheme .MiddleDecoratorLeft {
- padding-left: 12px;
+ padding-left: 8px;
background: url('background/MDefaultTheme.png') repeat-y left;
}
.DefaultTheme .MiddleDecoratorRight {
- padding-right: 11px;
+ padding-right: 8px;
background: url('background/MDefaultTheme.png') repeat-y right;
}
@@ -149,14 +149,14 @@
}
.DefaultTheme .BottomDecoratorLeft {
- padding-left: 12px;
+ padding-left: 8px;
background-image: url('background/DefaultTheme.png');
background-repeat: no-repeat;
background-position: left -60px;
}
.DefaultTheme .BottomDecoratorRight {
- padding-right: 11px;
+ padding-right: 8px;
background-image: url('background/DefaultTheme.png');
background-repeat: no-repeat;
background-position: right -30px;
@@ -169,7 +169,7 @@
}
.DefaultTheme .BottomDecoratorCenter .FixHeight {
- height: 30px;
+ height: 26px;
}
/*-------------------------- MacTheme ---------------------------*/
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/DefaultTheme.png
===================================================================
(Binary files differ)
Copied: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/IconWindowPortlet.gif (from rev 5697, portal/branches/branch-GTNPORTAL-1731/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/IconWindowPortlet.gif)
===================================================================
(Binary files differ)
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MDefaultTheme.png
===================================================================
(Binary files differ)
Modified: portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml
===================================================================
--- portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,7 +22,7 @@
<gadgets
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gadgets_1_0"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gadgets_1_0"
xmlns="http://www.gatein.org/xml/ns/gadgets_1_0">
<gadget name="Todo">
Modified: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
<!-- GadgetPortlet skins -->
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -324,7 +324,7 @@
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_EDITTING_WS_ID);
prContext.addUIComponentToUpdateByAjax(uiWorkingWS);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
}
}
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -140,7 +140,7 @@
Util.getPortalRequestContext().addUIComponentToUpdateByAjax(
uiApp.findFirstComponentOfType(UIWorkingWorkspace.class));
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
}
UIAccountEditInputSet accountInput = uiUserInfo.getChild(UIAccountEditInputSet.class);
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
<!-- OrganizationPortlet skins -->
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
<!-- BannerPortlet skins -->
Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/Dotted.gif
===================================================================
(Binary files differ)
Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/LastNode.gif
===================================================================
(Binary files differ)
Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css 2011-01-07 10:29:16 UTC (rev 5700)
@@ -93,36 +93,36 @@
.UISitemap .UISiteTree .Node {
line-height: 24px;
- background: url('DefaultSkin/background/Dotted.gif') repeat-y 4px top; /* orientation=lt */
- background: url('DefaultSkin/background/Dotted-rt.gif') repeat-y 99.6% top; /* orientation=rt */
+ background: url('DefaultSkin/background/Dotted.gif') repeat-y left top; /* orientation=lt */
+ background: url('DefaultSkin/background/Dotted.gif') repeat-y right top; /* orientation=rt */
}
.UISitemap .UISiteTree .LastNode {
line-height: 24px;
- background: url('DefaultSkin/background/LastNode.gif') no-repeat 4px top; /* orientation=lt */
- background: url('DefaultSkin/background/LastNode-rt.gif') no-repeat 99.6% top; /* orientation=rt */
+ background: url('DefaultSkin/background/LastNode.gif') no-repeat left top; /* orientation=lt */
+ background: url('DefaultSkin/background/LastNode.gif') no-repeat right top; /* orientation=rt */
}
.UISitemap .CollapseIcon {
background: url('DefaultSkin/background/CollapseIcon.gif') no-repeat left center; /* orientation=lt */
background: url('DefaultSkin/background/CollapseIcon-rt.gif') no-repeat right center; /* orientation=rt */
- padding: 0px 5px 0px 35px; /* orientation=lt */
- padding: 0px 35px 0px 5px; /* orientation=rt */
+ padding: 0px 5px 0px 30px; /* orientation=lt */
+ padding: 0px 30px 0px 5px; /* orientation=rt */
cursor: pointer;
}
.UISitemap .ExpandIcon {
background: url('DefaultSkin/background/ExpandIcon.gif') no-repeat left center; /* orientation=lt */
background: url('DefaultSkin/background/ExpandIcon-rt.gif') no-repeat right center; /* orientation=rt */
- padding: 0px 5px 0px 35px; /* orientation=lt */
- padding: 0px 35px 0px 5px; /* orientation=rt */
+ padding: 0px 5px 0px 30px; /* orientation=lt */
+ padding: 0px 30px 0px 5px; /* orientation=rt */
cursor: pointer;
}
.UISitemap .NullItem {
background: url('DefaultSkin/background/NullItem.gif') no-repeat left center; /* orientation=lt */
background: url('DefaultSkin/background/NullItem-rt.gif') no-repeat right center; /* orientation=rt */
- padding: 0px 35px;
+ padding: 0px 30px;
}
.UISitemap .DefaultPageIcon {
Modified: portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -21,8 +21,8 @@
-->
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
<portal-skin>
<skin-name>Default</skin-name>
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2011-01-07 10:29:16 UTC (rev 5700)
@@ -158,6 +158,7 @@
eXo.portal.UIPortalNavigation.toggleSubMenu(e, tab, menuItemContainer) ;
}
}
+ eXo.portal.UIPortalNavigation.cancelHideMenuContainer();
eXo.portal.UIPortalNavigation.menuVisible = true ;
} ;
@@ -327,7 +328,6 @@
subContainer.firstTime = true;
}
}
- eXo.portal.UIPortalNavigation.cancelHideMenuContainer() ;
};
/**
* Shows a sub menu, uses the methods from superClass (eXo.webui.UIPopupMenu)
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-01-07 10:29:16 UTC (rev 5700)
@@ -162,6 +162,14 @@
}
}
+UICalendar.prototype.onTabOut =function(event) {
+ var keyCode = event.keyCode;
+ //identify the tab key:
+ if (keyCode == 9) {
+ eXo.webui.UICalendar.hide();
+ }
+};
+
UICalendar.prototype.hide = function() {
if (this.dateField) {
document.getElementById(this.calendarId).firstChild.style.display = 'none' ;
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2011-01-07 10:29:16 UTC (rev 5700)
@@ -393,6 +393,9 @@
if(!popup || popup.style.display == "none") return;
var uiDashboard = eXo.core.DOMUtil.findAncestorByClass(popup, "UIDashboard");
var deltaY = Math.ceil((uiDashboard.offsetHeight - popup.offsetHeight) / 2);
+ if (deltaY < 0) {
+ deltaY = 0;
+ }
popup.style.top = eXo.core.Browser.findPosY(uiDashboard) + deltaY + "px";
};
/**
@@ -539,4 +542,4 @@
};
};
-eXo.webui.UIDashboard = new UIDashboard();
\ No newline at end of file
+eXo.webui.UIDashboard = new UIDashboard();
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2011-01-07 10:29:16 UTC (rev 5700)
@@ -37,6 +37,9 @@
//TODO Lambkin: this statement create a bug in select box component in Firefox
//this.superClass.init(popup) ;
+ if (isShow) {
+ popup.style.display = "block";
+ }
var contentBlock = DOMUtil.findFirstDescendantByClass(popup, 'div' ,'PopupContent');
if(contentBlock && (eXo.core.Browser.getBrowserHeight() - 100 < contentBlock.offsetHeight)) {
contentBlock.style.height = (eXo.core.Browser.getBrowserHeight() - 100) + "px";
@@ -285,4 +288,4 @@
DragDrop.init(null, clickBlock, dragBlock, evt) ;
} ;
-eXo.webui.UIPopupWindow = new UIPopupWindow();
\ No newline at end of file
+eXo.webui.UIPopupWindow = new UIPopupWindow();
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-01-07 10:29:16 UTC (rev 5700)
@@ -105,19 +105,16 @@
.portlet-section-subheader {
font-weight: bold;
- font-size: 10px;
line-height: 18px;
}
.portlet-section-footer {
- font-size: 11px;
line-height: 18px;
}
/* Text that belongs to the table but does not fall in one of the other categories
(e.g. explanatory or help text that is associated with the section. */
.portlet-section-text {
- font-size: 12px;
font-style: italic;
line-height: 18px;
}
@@ -154,7 +151,6 @@
/* Text in a selected cell range */
.portlet-table-selected {
color: #000;
- font-size: 12px;
background-color: #CBD4E6;
line-height: 18px;
}
@@ -176,7 +172,6 @@
/** FORMS **/
.portlet-form-label {
- font-size: 10px;
color: #333333;
line-height: 18px;
}
@@ -227,7 +222,6 @@
/* Text for a form field */
.portlet-form-field {
- font-size: 10px;
color: #000; /*margin-top: 10px;*/
line-height: 18px;
}
@@ -243,52 +237,63 @@
.portlet-menu-item {
color: #242424;
text-decoration: none;
- font-size: 12px;
- line-height: 18px;
background: #F5F9FA;
+ padding: 5px 10px;
+ border-bottom: 1px solid #cee0e4;
}
/* Selected menu item. */
.portlet-menu-item-selected {
- line-height: 18px;
+ padding: 5px 10px;
+ border-bottom: 1px solid #cee0e4;
background: #F5F9FA;
+ color: #058ee6;
}
.portlet-menu-item-hover {
- color: #058ee6;
- text-decoration: none;
- font-size: 12px;
- line-height: 18px;
+ color: #058ee6;
+ text-decoration: none;
+ padding: 5px 10px;
+ border-bottom: 1px solid #cee0e4;
background: #F5F9FA;
}
/* Selected menu item when the mouse hovers over it. */
.portlet-menu-item-hover-selected {
- line-height: 18px;
+ padding: 5px 10px;
+ border-bottom: 1px solid #cee0e4;
background: #F5F9FA;
+ color: #058ee6;
}
/* Normal, unselected menu item that has sub-menus. */
.portlet-menu-cascade-item {
line-height: 18px;
+ color: #585858;
}
/* Selected sub-menu item that has sub-menus */
.portlet-menu-cascade-item-selected {
- line-height: 18px;
+ border-bottom: 1px solid #d8e7ea;
+ padding: 5px 20px;
+ color: #058ee6;
}
.porlet-menu-cascade {
- line-height: 18px;
+ border-bottom: 1px solid #d8e7ea;
+ padding: 5px 20px;
}
.portlet-menu-cascade-item-hover {
- line-height: 18px;
+ border-bottom: 1px solid #d8e7ea;
+ padding: 5px 20px;
color: #058ee6;
}
.portlet-menu-cascade-item-hover-selected {
- line-height: 18px;
+ border-bottom: 1px solid #d8e7ea;
+ padding: 5px 20px;
+ color: #058ee6;
}
.portlet-menu-separator {
@@ -300,37 +305,51 @@
}
.portlet-menu-content {
- line-height: 18px;
+ border-bottom: 1px solid #e4eff2;
+ padding: 5px 30px;
+ color: #878787;
}
.portlet-menu-content-selected {
- line-height: 18px;
+ border-bottom: 1px solid #e4eff2;
+ padding: 5px 30px;
+ color: #058ee6;
}
.portlet-menu-content-hover {
- line-height: 18px;
+ border-bottom: 1px solid #e4eff2;
+ padding: 5px 30px;
color: #058ee6;
}
.portlet-menu-content-hover-selected {
- line-height: 18px;
+ border-bottom: 1px solid #e4eff2;
+ padding: 5px 30px;
+ color: #058ee6;
}
.portlet-menu-indicator {
- line-height: 18px;
+ padding: 5px 40px;
+ color: #bebebe;
+ border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-indicator-selected {
- line-height: 18px;
+ padding: 5px 40px;
+ color: #058ee6;
+ border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-indicator-hover {
- line-height: 18px;
+ padding: 5px 40px;
color: #058ee6;
+ border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-indicator-hover-selected {
- line-height: 18px;
+ padding: 5px 40px;
+ color: #058ee6;
+ border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-description {
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -298,56 +298,5 @@
</object-param>
</init-params>
</component-plugin>
-
-<!--
- <component-plugin>
- <name>ecm.new.user.event.listener</name>
- <set-method>addListenerPlugin</set-method>
- <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NewUserListener</type>
- <description>description</description>
- <init-params>
- <object-param>
- <name>configuration</name>
- <description>description</description>
- <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig">
- <field name="repository"><string>repository</string></field>
- <field name="workspaces">
- <collection type="java.util.ArrayList">
- <value><string>portal-system</string></value>
- </collection>
- </field>
- <field name="jcrPaths">
- <collection type="java.util.ArrayList">
- <value>
- <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$JcrPath">
- <field name="alias"><string>userApplicationData</string></field>
- <field name="path"><string>ApplicationData</string></field>
- <field name="nodeType"><string>nt:unstructured</string></field>
- <field name="permissions">
- <collection type="java.util.ArrayList">
- <value>
- <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$Permission">
- <field name="identity"><string>*:/platform/administrators</string></field>
- <field name="read"><string>true</string></field>
- <field name="addNode"><string>true</string></field>
- <field name="setProperty"><string>true</string></field>
- <field name="remove"><string>true</string></field>
- </object>
- </value>
- </collection>
- </field>
- <field name="mixinTypes">
- <collection type="java.util.ArrayList">
- </collection>
- </field>
- </object>
- </value>
- </collection>
- </field>
- </object>
- </object-param>
- </init-params>
- </component-plugin>
--->
</external-component-plugins>
</configuration>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>5</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -16,8 +16,8 @@
-->
<page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>newStaff</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>2</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>newAccount</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>9</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>sitemap</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>8</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>mylink-blog</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<portal-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<portal-name>@owner@</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>1</priority>
<page-nodes>
<node>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>homepage</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<portal-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<portal-name>classic</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<container template="system:/groovy/portal/webui/container/UIToolbarContainer.gtmpl">
<access-permissions>*:/platform/users</access-permissions>
<container id="StarToolBarPortlet" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>1</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>homepage</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<portal-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<portal-name>@owner@</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>1</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>homepage</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<portal-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<portal-name>@owner@</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<container template="classpath:groovy/dashboard/webui/component/UIColumnContainer.gtmpl"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl">
</container>
<container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl">
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<name></name>
<portlet-application>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,7 +22,7 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<name></name>
</page>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<name></name>
<container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<name></name>
<container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl">
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<name></name>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<name></name>
<container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<name></name>
<title></title>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<name></name>
<container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl">
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<name></name>
<container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<name></name>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<name></name>
<title></title>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,6 +22,6 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
</page-set>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,6 +22,6 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
</page-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,6 +22,6 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
</page-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,7 +22,7 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
</page-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,7 +22,7 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
</page-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<priority>2</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
<page>
<name>wsrpConfiguration</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -22,8 +22,8 @@
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
<portlet-skin>
<application-name>web</application-name>
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -234,6 +234,6 @@
w.write(value_.toString());
w.write('\'');
}
- w.write(" onclick='event.cancelBubble = true'/>");
+ w.write(" onclick='event.cancelBubble = true' onkeydown='eXo.webui.UICalendar.onTabOut(event)'/>");
}
}
Modified: portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl
===================================================================
--- portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2011-01-07 10:29:16 UTC (rev 5700)
@@ -36,8 +36,8 @@
<%
List lstGadgets = uicomponent.getGadgetsOfCategory(category);
if(lstGadgets != null){
- if(lstGadgets.size() >= 20)
- uiPopup.setWindowSize(-1, 600);
+// if(lstGadgets.size() >= 20)
+// uiPopup.setWindowSize(-1, 600);
for(gadget in lstGadgets){
%>
Modified: portal/trunk/webui/portal/src/main/java/conf/portal/configuration.xml
===================================================================
--- portal/trunk/webui/portal/src/main/java/conf/portal/configuration.xml 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/conf/portal/configuration.xml 2011-01-07 10:29:16 UTC (rev 5700)
@@ -34,7 +34,6 @@
<component>
<key>org.exoplatform.services.resources.LocalePolicy</key>
- <!--type>org.exoplatform.portal.application.NoBrowserLocalePolicyService</type-->
<type>org.exoplatform.portal.application.localization.DefaultLocalePolicyService</type>
</component>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -403,11 +403,30 @@
* 2) Portlets will be fully rendered if are inner of the portal ui components being updated
*
* @param forceFullUpdate
+ *
+ * This method is deprecated, ignoreAJAXUpdateOnPortlets should be used instead
*/
+ @Deprecated()
final public void setFullRender(boolean forceFullUpdate)
{
this.forceFullUpdate = forceFullUpdate;
}
+
+ /**
+ * Call to this method makes sense only in the scope of an AJAX request.
+ *
+ * Invoking ignoreAJAXUpdateOnPortlets(true) as there is need to update only UI components
+ * of portal (ie: the components outside portlet windows) are updated by AJAX. In the request
+ * response, all the blocks <PortletRespond > are empty. The content displayed in portlet
+ * windows are retrieved by non-AJAX render request to associated portlet object.
+ *
+ *
+ * @param ignoreAJAXUpdateOnPortlets
+ */
+ final public void ignoreAJAXUpdateOnPortlets(boolean ignoreAJAXUpdateOnPortlets)
+ {
+ this.forceFullUpdate = ignoreAJAXUpdateOnPortlets;
+ }
final public void sendRedirect(String url) throws IOException
{
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -262,7 +262,7 @@
PortalRequestContext pcontext = Util.getPortalRequestContext();
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
static public class AddApplicationActionListener extends EventListener<UIAddNewApplication>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -526,7 +526,7 @@
{
log
.info("Events were generated outside the scope of an AJAX call, hence will make a full render of the page");
- context.setFullRender(true);
+ context.ignoreAJAXUpdateOnPortlets(true);
}
if (newEvents != null && !newEvents.isEmpty())
{
@@ -751,7 +751,7 @@
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
String windowState = event.getRequestContext().getRequestParameter(Constants.PORTAL_WINDOW_STATE);
if (windowState == null)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -170,7 +170,7 @@
try
{
PortalRequestContext prcontext = (PortalRequestContext)WebuiRequestContext.getCurrentInstance();
- prcontext.setFullRender(true);
+ prcontext.ignoreAJAXUpdateOnPortlets(true);
StatefulPortletContext portletContext = uiPortlet_.getPortletContext();
ExoPortletInvocationContext portletInvocationContext = new ExoPortletInvocationContext(prcontext, uiPortlet_);
@@ -407,7 +407,7 @@
UIPortalApplication uiPortalApp = uiPortlet.getAncestorOfType(UIPortalApplication.class);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
Util.showComponentLayoutMode(UIPortlet.class);
}
}
@@ -429,7 +429,7 @@
uiMaskWorkspace.setUIComponent(null);
uiMaskWorkspace.setWindowSize(-1, -1);
pcontext.addUIComponentToUpdateByAjax(uiMaskWorkspace);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
Util.showComponentLayoutMode(UIPortlet.class);
}
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -82,7 +82,7 @@
UIPortalApplication uiPortalApp = uiParent.getAncestorOfType(UIPortalApplication.class);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -145,7 +145,7 @@
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();");
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
Util.showComponentLayoutMode(UIContainer.class);
}
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -116,7 +116,7 @@
UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication();
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
prContext.addUIComponentToUpdateByAjax(uiWorkingWS);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
return;
}
@@ -136,7 +136,7 @@
UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication();
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
prContext.addUIComponentToUpdateByAjax(uiWorkingWS);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
return;
}
}
@@ -166,7 +166,7 @@
uiPopup.setShow(false);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
prContext.addUIComponentToUpdateByAjax(uiWorkingWS);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
}
private void setNavigation(List<PageNavigation> navs, PageNavigation nav)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -452,7 +452,7 @@
// convert Page to UIPage
PortalDataMapper.toUIPage(uiPage, selectPage);
Util.getPortalRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS);
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
}
else
{
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -42,6 +42,8 @@
import org.exoplatform.webui.form.UIFormStringInput;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
/*
@@ -158,60 +160,48 @@
}
WebuiRequestContext pcontext = event.getRequestContext();
-
- // if edit navigation
- if (pageNav != null)
- {
- uiForm.invokeSetBindingBean(pageNav);
- UIFormSelectBox uiSelectBox = uiForm.findComponentById("priority");
- int priority = Integer.parseInt(uiSelectBox.getValue());
- pageNav.setPriority(priority);
-
- // update navigation
- dataService.save(pageNav);
-
- UIPopupWindow uiPopup = uiForm.getParent();
- uiPopup.setShow(false);
- UIComponent opener = uiPopup.getParent();
- pcontext.addUIComponentToUpdateByAjax(opener);
- return;
- }
-
- // if add navigation
- pageNav = new PageNavigation();
- // set properties for navigation
uiForm.invokeSetBindingBean(pageNav);
- UIFormStringInput uiOwnerId = uiForm.findComponentById("ownerId");
- UIFormStringInput uiOwnerType = uiForm.findComponentById("ownerType");
UIFormSelectBox uiSelectBox = uiForm.findComponentById("priority");
int priority = Integer.parseInt(uiSelectBox.getValue());
pageNav.setPriority(priority);
- pageNav.setModifiable(true);
- pageNav.setOwnerId(uiOwnerId.getValue());
- pageNav.setOwnerType(uiOwnerType.getValue());
- //UIPortalApplication uiPortalApp = uiForm.getAncestorOfType(UIPortalApplication.class);
- UIPortalApplication uiPortalApp = Util.getUIPortal().getAncestorOfType(UIPortalApplication.class);
- // ensure this navigation is not exist
- if (dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId()) != null)
- {
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNavigationForm.msg.existPageNavigation",
- new String[]{pageNav.getOwnerId()}));;
- return;
- }
+ // update navigation
+ dataService.save(pageNav);
- // create navigation for group
- dataService.create(pageNav);
+ pageNav = dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId());
- // close popup window, update popup window
+ UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
+ updateNavPriority(uiPortalApp.getNavigations(), pageNav);
+
+ uiPortalApp.localizeNavigations();
+
UIPopupWindow uiPopup = uiForm.getParent();
uiPopup.setShow(false);
UIComponent opener = uiPopup.getParent();
+ UIWorkingWorkspace uiWorkingWS =
+ Util.getUIPortal().getAncestorOfType(UIPortalApplication.class).getChild(UIWorkingWorkspace.class);
+ uiWorkingWS.updatePortletsByName("UserToolbarGroupPortlet");
pcontext.addUIComponentToUpdateByAjax(opener);
+ }
+
+ private void updateNavPriority(List<PageNavigation> navs, PageNavigation nav)
+ {
+ for (int i = 0; i < navs.size(); i++)
+ {
+ if (navs.get(i).getId() == nav.getId())
+ {
+ navs.set(i, nav);
+ break;
+ }
+ }
- UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChild(UIWorkingWorkspace.class);
- uiWorkingWS.updatePortletsByName("GroupNavigationPortlet");
-
+ Collections.sort(navs, new Comparator<PageNavigation>()
+ {
+ public int compare(PageNavigation nav1, PageNavigation nav2)
+ {
+ return nav1.getPriority() - nav2.getPriority();
+ }
+ });
}
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -254,7 +254,7 @@
uiToolPanel.setShowMaskLayer(true);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
UIContainer uiParent = uiPageNodeSelector.getParent();
PageNode node = null;
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -64,7 +64,7 @@
//This code snippet is to make sure that Javascript/Skin is fully loaded at the first request
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
PortalRequestContext pcontext = Util.getPortalRequestContext();
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
PageNavigation currentNav = showedUIPortal.getSelectedNavigation();
@@ -422,7 +422,7 @@
}
}
PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
- pcontext.setFullRender(false);
+ pcontext.ignoreAJAXUpdateOnPortlets(false);
pcontext.setResponseComplete(true);
pcontext.getWriter().write(EventListener.RESULT_OK);
}
@@ -445,7 +445,7 @@
}
DataStorage dataService = uiPage.getApplicationComponent(DataStorage.class);
dataService.save(page);
- pcontext.setFullRender(false);
+ pcontext.ignoreAJAXUpdateOnPortlets(false);
pcontext.setResponseComplete(true);
pcontext.getWriter().write(EventListener.RESULT_OK);
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -454,7 +454,7 @@
//uiWorkingWS.addChild(UIPortalComposer.class, "UIPageEditor", null);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_EDITTING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -321,7 +321,7 @@
if (page.getChildren() == null)
page.setChildren(new ArrayList<ModelObject>());
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();");
@@ -339,7 +339,7 @@
UIPortalToolPanel toolPanel = Util.getUIPortalToolPanel();
toolPanel.setShowMaskLayer(true);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();");
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -100,7 +100,7 @@
UIPortal uiPortal = Util.getUIPortal();
uiPortal.setRenderSibling(UIPortal.class);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
void updateWizardComponent()
@@ -111,7 +111,7 @@
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
static public class AbortActionListener extends EventListener<UIPageWizard>
@@ -124,7 +124,7 @@
UIPortal uiPortal = Util.getUIPortal();
uiPortal.setRenderSibling(UIPortal.class);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -168,7 +168,7 @@
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
uiMaskWS.setUIComponent(null);
// event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS) ;
- Util.getPortalRequestContext().setFullRender(false);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(false);
if (language == null || language.trim().length() < 1)
return;
// if(!uiPortal.isModifiable()) return;
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -461,7 +461,7 @@
{
public void execute(Event<UIPortal> event) throws Exception
{
- UIPortal uiPortal = Util.getUIPortal();
+ UIPortal uiPortal = event.getSource();
UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class);
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -72,7 +72,7 @@
{
PortalRequestContext pContext = (PortalRequestContext)event.getRequestContext();
HttpServletRequest request = pContext.getRequest();
- pContext.setFullRender(false);
+ pContext.ignoreAJAXUpdateOnPortlets(false);
pContext.setResponseComplete(true);
pContext.getWriter().write("" + request.getSession().getMaxInactiveInterval());
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -231,7 +231,7 @@
if (newComponent)
{
portalComposer.updateWorkspaceComponent();
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
UIWorkingWorkspace uiWorkingWS = uiApp.getChild(UIWorkingWorkspace.class);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -408,7 +408,7 @@
uiEditWS.getComposer().setEditted(false);
uiEditWS.setRendered(false);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
UISiteBody siteBody = uiWorkingWS.findFirstComponentOfType(UISiteBody.class);
UIPortal uiPortal = uiWorkingWS.getBackupUIPortal();
@@ -459,7 +459,7 @@
uiPortalApp.setSessionOpen(PortalProperties.SESSION_ALWAYS.equals(uiPortal.getSessionAlive()));
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- prContext.setFullRender(true);
+ prContext.ignoreAJAXUpdateOnPortlets(true);
String uri = (uiPortal.getSelectedNode() != null)? (uiPortal.getSelectedNode().getUri()) : null;
@@ -582,7 +582,7 @@
}
event.getSource().updateWorkspaceComponent();
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
}
}
@@ -655,7 +655,7 @@
UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
UIPortal uiPortal = uiPortalApp.getShowedUIPortal();
uiPortal.setRenderSibling(UIPortal.class);
@@ -704,7 +704,7 @@
uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.PageNotExist", new String[]{pageId}, 1));
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
PageNodeEvent<UIPortal> pnevent =
new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE,
(uiPortal.getSelectedNode() != null ? uiPortal.getSelectedNode().getUri() : null));
@@ -761,7 +761,7 @@
}
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
PageNodeEvent<UIPortal> pnevent =
new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, (uiPortal.getSelectedNode() != null
? uiPortal.getSelectedNode().getUri() : null));
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -100,7 +100,7 @@
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
uiMaskWS.setUIComponent(null);
//event.getRequestContext().addUIComponentToUpdateByAjax(uiApp) ;
- Util.getPortalRequestContext().setFullRender(false);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(false);
if (skin == null || skin.trim().length() < 1)
return;
uiApp.setSkin(skin);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -67,7 +67,7 @@
PortalRequestContext portalRequestContext = (PortalRequestContext)context.getParentAppRequestContext();
UIWorkingWorkspace uiWorkingWS = portalApplication.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
portalRequestContext.addUIComponentToUpdateByAjax(uiWorkingWS);
- portalRequestContext.setFullRender(true);
+ portalRequestContext.ignoreAJAXUpdateOnPortlets(true);
}
/**
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -315,7 +315,7 @@
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
return uiWorkingWS;
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -54,7 +54,7 @@
public void execute(Event<UIWorkingWorkspace> event) throws Exception
{
UIPortalApplication uiApp = Util.getUIPortalApplication();
- UIWorkingWorkspace uiWorkingWS = uiApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
+ UIWorkingWorkspace uiWorkingWS = event.getSource();
// check edit permission for page
UIPageBody pageBody = uiWorkingWS.findFirstComponentOfType(UIPageBody.class);
@@ -97,7 +97,7 @@
pageBody.setUIComponent(null);
event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS);
- Util.getPortalRequestContext().setFullRender(true);
+ Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
}
}
@@ -107,7 +107,7 @@
{
UIPortalApplication uiApp = Util.getUIPortalApplication();
uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
- UIWorkingWorkspace uiWorkingWS = uiApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
+ UIWorkingWorkspace uiWorkingWS = event.getSource();
if (!hasPageCreationPermission())
{
@@ -165,8 +165,7 @@
//Todo nguyenanhkien2a(a)gmail.com
//Check editing permission
UIPortalApplication portalApp = Util.getUIPortalApplication();
- UIPortal currentUIPortal = portalApp.<UIWorkingWorkspace>findComponentById(
- UIPortalApplication.UI_WORKING_WS_ID).findFirstComponentOfType(UIPortal.class);
+ UIPortal currentUIPortal = event.getSource().findFirstComponentOfType(UIPortal.class);
UserACL userACL = portalApp.getApplicationComponent(UserACL.class);
if(!userACL.hasEditPermissionOnPortal(currentUIPortal.getOwnerType(), currentUIPortal.getOwner(),
currentUIPortal.getEditPermission()))
@@ -177,7 +176,7 @@
}
PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
- UIWorkingWorkspace uiWorkingWS = uiApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
+ UIWorkingWorkspace uiWorkingWS = event.getSource();
uiWorkingWS.setBackupUIPortal(uiPortal);
uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
@@ -202,7 +201,7 @@
uiWorkingWS.setRenderedChild(UIEditInlineWorkspace.class);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
+ pcontext.ignoreAJAXUpdateOnPortlets(true);
}
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2011-01-07 09:38:22 UTC (rev 5699)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2011-01-07 10:29:16 UTC (rev 5700)
@@ -47,7 +47,7 @@
{
context.addUIComponentToUpdateByAjax(uicomponent.<UIComponent>getChildById(UIPortalApplication.UI_WORKING_WS_ID));
context.addUIComponentToUpdateByAjax(uicomponent.getChild(UIMaskWorkspace.class));
- ((PortalRequestContext)context).setFullRender(true);
+ ((PortalRequestContext)context).ignoreAJAXUpdateOnPortlets(true);
return;
}
if (uiTarget == uicomponent)
14 years, 9 months
- 1
- 0
gatein SVN: r5699 - components/pc/trunk/test/core/src/main.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-07 04:38:22 -0500 (Fri, 07 Jan 2011)
New Revision: 5699
Modified:
components/pc/trunk/test/core/src/main/build.xml
Log:
GTNPC-46 : improve how packaging of war is done
Modified: components/pc/trunk/test/core/src/main/build.xml
===================================================================
--- components/pc/trunk/test/core/src/main/build.xml 2011-01-07 09:36:39 UTC (rev 5698)
+++ components/pc/trunk/test/core/src/main/build.xml 2011-01-07 09:38:22 UTC (rev 5699)
@@ -6,6 +6,42 @@
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath" />
+ <macrodef name="install">
+ <attribute name="pomId"/>
+ <attribute name="artifactId"/>
+ <attribute name="packaging"/>
+ <attribute name="file"/>
+ <sequential>
+
+ <!-- Create dir if not exist -->
+ <mkdir dir="${target}/poms"/>
+
+ <!-- Generate pom -->
+ <artifact:pom
+ id="@{pomId}"
+ groupId="${groupId}"
+ artifactId="@{artifactId}"
+ version="${version}"
+ name="Generated @{pomId}"
+ packaging="@{packaging}"/>
+
+ <!-- Write the physical pom -->
+ <artifact:writepom
+ pomRefId="@{pomId}"
+ file="${target}/poms/(a){pomId}.xml"/>
+
+ <!-- Now we create the same pom but from the physical one -->
+ <artifact:pom
+ id="@{pomId}_"
+ file="${target}/poms/(a){pomId}.xml"/>
+
+ <!-- Install the file -->
+ <artifact:install file="@{file}">
+ <pom refid="@{pomId}_"/>
+ </artifact:install>
+ </sequential>
+ </macrodef>
+
<macrodef name="package-ext-test">
<attribute name="test"/>
<sequential>
@@ -55,10 +91,10 @@
<sequential>
<!-- Make directory -->
- <mkdir dir="${target}/test-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"/>
+ <mkdir dir="${target}/wars"/>
<!-- Generate artifact -->
- <jar jarfile="${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/artifact.war">
+ <jar jarfile="${target}/wars/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war">
<zipfileset dir="${target}/test-classes" prefix="WEB-INF/classes">
<include name="org/gatein/pc/test/portlet/@{testsuiteversion}/@{testsuitetype}/common/**"/>
<include name="org/gatein/pc/test/portlet/@{testsuiteversion}/common/**"/>
@@ -74,30 +110,12 @@
<fileset dir="${basedir}/src/main/packaging/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war"/>
</jar>
- <!-- Generate pom -->
- <artifact:pom
- id="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
- groupId="${groupId}"
- artifactId="${artifactId}-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
- version="${version}"
- name="Test @{testsuiteversion} @{testsuitetype} @{testsuitename}"
- packaging="war"/>
+ <install
+ pomId="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
+ artifactId="${artifactId}-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
+ packaging="war"
+ file="${target}/wars/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war"/>
- <!-- Write the physical pom -->
- <artifact:writepom
- pomRefId="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
- file="${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/pom.xml"/>
-
- <!-- Now we create the same pom but from the physical one -->
- <artifact:pom
- id="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}_"
- file="${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/pom.xml"/>
-
- <!-- Install the file -->
- <artifact:install file="${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/artifact.war">
- <pom refid="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}_"/>
- </artifact:install>
-
</sequential>
</macrodef>
14 years, 9 months
- 1
- 0
gatein SVN: r5698 - portal/trunk/testsuite/selenium-snifftests/src/suite.
by do-not-reply＠jboss.org
Author: vuthelinh
Date: 2011-01-07 04:36:39 -0500 (Fri, 07 Jan 2011)
New Revision: 5698
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/user-extensions.js
Log:
TESTVN-2323: Update user-extensions.js for GateIn
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/user-extensions.js
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/user-extensions.js 2011-01-07 09:17:22 UTC (rev 5697)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/user-extensions.js 2011-01-07 09:36:39 UTC (rev 5698)
@@ -73,4 +73,247 @@
evObj.initMouseEvent( 'dblclick', true, true, window, 1, 12, 345, 7, 220, false, false, false, false,0, null );
fireOnThis.dispatchEvent(evObj);
-};
\ No newline at end of file
+};
+
+/**
+ * add by linh_vu
+ * storeValue, storeText, storeAttribute and store actions now
+ * have 'global' equivalents.
+ * Use storeValueGlobal, storeTextGlobal, storeAttributeGlobal or storeGlobal
+ * will store the variable globally, making it available it subsequent tests.
+ *
+ * See the Reference.html for storeValue, storeText, storeAttribute and store
+ * for the arguments you should send to the new Global functions.
+ *
+ * example of use
+ * in testA.html:
+ * +------------------+----------------------+----------------------+
+ * |storeGlobal | http://localhost/ | baseURL |
+ * +------------------+----------------------+----------------------+
+ *
+ * in textB.html (executed after testA.html):
+ * +------------------+-----------------------+--+
+ * |open | ${baseURL}Main.jsp | |
+ * +------------------+-----------------------+--+
+ *
+ * Note: Selenium.prototype.replaceVariables from selenium-api.js has been replaced
+ * here to make it use global variables if no local variable is found.
+ * This might cause issues if you upgraded Selenium in the future and this function
+ * has been changed.
+ *
+ * @author Guillaume Boudreau
+ */
+
+globalStoredVars = new Object();
+
+/*
+ * Globally store the value of a form input in a variable
+ */
+Selenium.prototype.doStoreValueGlobal = function(target, varName) {
+ if (!varName) {
+ // Backward compatibility mode: read the ENTIRE text of the page
+ // and stores it in a variable with the name of the target
+ value = this.page().bodyText();
+ globalStoredVars[target] = value;
+ return;
+ }
+ var element = this.page().findElement(target);
+ globalStoredVars[varName] = getInputValue(element);
+};
+
+/*
+ * Globally store the text of an element in a variable
+ */
+Selenium.prototype.doStoreTextGlobal = function(target, varName) {
+ var element = this.page().findElement(target);
+ globalStoredVars[varName] = getText(element);
+};
+
+/*
+ * Globally store the value of an element attribute in a variable
+ */
+Selenium.prototype.doStoreAttributeGlobal = function(target, varName) {
+ globalStoredVars[varName] = this.page().findAttribute(target);
+};
+
+/*
+ * Globally store the result of a literal value
+ */
+Selenium.prototype.doStoreGlobal = function(value, varName) {
+ globalStoredVars[varName] = value;
+};
+
+/*
+ * Search through str and replace all variable references ${varName} with their
+ * value in storedVars (or globalStoredVars).
+ */
+Selenium.prototype.replaceVariables = function(str) {
+ var stringResult = str;
+
+ // Find all of the matching variable references
+ var match = stringResult.match(/\$\{\w+\}/g);
+ if (!match) {
+ return stringResult;
+ }
+
+ // For each match, lookup the variable value, and replace if found
+ for (var i = 0; match && i < match.length; i++) {
+ var variable = match[i]; // The replacement variable, with ${}
+ var name = variable.substring(2, variable.length - 1); // The replacement variable without ${}
+ var replacement = storedVars[name];
+ if (replacement != undefined) {
+ stringResult = stringResult.replace(variable, replacement);
+ }
+ var replacement = globalStoredVars[name];
+ if (replacement != undefined) {
+ stringResult = stringResult.replace(variable, replacement);
+ }
+ }
+ return stringResult;
+};
+
+//---------------------------------------while
+var gotoLabels= {};
+var whileLabels = {};
+
+// overload the original Selenium reset function
+Selenium.prototype.reset = function() {
+ // reset the labels
+ this.initialiseLabels();
+ // proceed with original reset code
+ this.defaultTimeout = Selenium.DEFAULT_TIMEOUT;
+ this.browserbot.selectWindow("null");
+ this.browserbot.resetPopups();
+}
+
+Selenium.prototype.initialiseLabels = function()
+{
+ gotoLabels = {};
+ whileLabels = { ends: {}, whiles: {} };
+ var command_rows = [];
+ var numCommands = testCase.commands.length;
+ for (var i = 0; i < numCommands; ++i) {
+ var x = testCase.commands[i];
+ command_rows.push(x);
+ }
+ var cycles = [];
+ for( var i = 0; i < command_rows.length; i++ ) {
+ if (command_rows[i].type == 'command')
+ switch( command_rows[i].command.toLowerCase() ) {
+ case "label":
+ gotoLabels[ command_rows[i].target ] = i;
+ break;
+ case "while":
+ case "endwhile":
+ cycles.push( [command_rows[i].command.toLowerCase(), i] )
+ break;
+ }
+ }
+ var i = 0;
+ while( cycles.length ) {
+ if( i >= cycles.length ) {
+ throw new Error( "non-matching while/endWhile found" );
+ }
+ switch( cycles[i][0] ) {
+ case "while":
+ if( ( i+1 < cycles.length ) && ( "endwhile" == cycles[i+1][0] ) ) {
+ // pair found
+ whileLabels.ends[ cycles[i+1][1] ] = cycles[i][1];
+ whileLabels.whiles[ cycles[i][1] ] = cycles[i+1][1];
+ cycles.splice( i, 2 );
+ i = 0;
+ } else ++i;
+ break;
+ case "endwhile":
+ ++i;
+ break;
+ }
+ }
+}
+
+Selenium.prototype.continueFromRow = function( row_num )
+{
+ if(row_num == undefined || row_num == null || row_num < 0) {
+ throw new Error( "Invalid row_num specified." );
+ }
+ testCase.debugContext.debugIndex = row_num;
+}
+
+// do nothing. simple label
+Selenium.prototype.doLabel = function(){};
+
+Selenium.prototype.doGotolabel = function( label )
+{
+ if( undefined == gotoLabels[label] ) {
+ throw new Error( "Specified label '" + label + "' is not found." );
+ }
+ this.continueFromRow( gotoLabels[ label ] );
+};
+
+Selenium.prototype.doGoto = Selenium.prototype.doGotolabel;
+
+Selenium.prototype.doGotoIf = function( condition, label )
+{
+ if( eval(condition) ) this.doGotolabel( label );
+}
+
+Selenium.prototype.doWhile = function( condition )
+{
+ if( !eval(condition) ) {
+ var last_row = testCase.debugContext.debugIndex;
+ var end_while_row = whileLabels.whiles[ last_row ];
+ if( undefined == end_while_row ) throw new Error( "Corresponding 'endWhile' is not found." );
+ this.continueFromRow( end_while_row );
+ }
+}
+
+Selenium.prototype.doEndWhile = function()
+{
+ var last_row = testCase.debugContext.debugIndex;
+ var while_row = whileLabels.ends[ last_row ] - 1;
+ if( undefined == while_row ) throw new Error( "Corresponding 'While' is not found." );
+ this.continueFromRow( while_row );
+}
+//-----------------write by linh_vu
+Selenium.prototype.doTypeRepeated = function(locator, text) {
+ // All locator-strategies are automatically handled by "findElement"
+ var element = this.page().findElement(locator);
+
+ // Create the text to type
+ var valueToType = text + "__" +text;
+
+ // Replace the element text with the new text
+ this.page().replaceText(element, valueToType);
+};
+//--------------------------------
+Selenium.prototype.doTypeRandom = function randomString(locator,string_length) {
+
+ var element = this.page().findElement(locator);
+
+ var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+ var randomstring = '';
+ for (var i=0; i<string_length; i++) {
+ var rnum = Math.floor(Math.random() * chars.length);
+ randomstring += chars.substring(rnum,rnum+1);
+ }
+ //return randomstring;
+ var valueToType ="test-"+randomstring;
+
+ this.page().replaceText(element, valueToType);
+ }
+ //-------------------------------
+ Selenium.prototype.doTypeRandomEmail = function randomString(locator,string_length) {
+
+ var element = this.page().findElement(locator);
+
+ var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+ var randomstring = '';
+ for (var i=0; i<string_length; i++) {
+ var rnum = Math.floor(Math.random() * chars.length);
+ randomstring += chars.substring(rnum,rnum+1);
+ }
+ //return randomstring;
+ var valueToType =randomstring+"@exoplatform.com";
+
+ this.page().replaceText(element, valueToType);
+ }
\ No newline at end of file
14 years, 9 months
- 1
- 0
gatein SVN: r5697 - in components/pc/trunk/test: core/src/main and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-07 04:17:22 -0500 (Fri, 07 Jan 2011)
New Revision: 5697
Added:
components/pc/trunk/test/core/src/main/build.xml
components/pc/trunk/test/core/src/main/packaging/
components/pc/trunk/test/core/src/main/packaging/ha/
components/pc/trunk/test/core/src/main/packaging/info/
components/pc/trunk/test/core/src/main/packaging/jsr168/
components/pc/trunk/test/core/src/main/packaging/jsr286/
components/pc/trunk/test/servers/tomcat6/src/test/common.xml
Removed:
components/pc/trunk/test/servers/tomcat6/src/test/resources/ha/
components/pc/trunk/test/servers/tomcat6/src/test/resources/info/
components/pc/trunk/test/servers/tomcat6/src/test/resources/jsr168/
components/pc/trunk/test/servers/tomcat6/src/test/resources/jsr286/
Modified:
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
Log:
GTNPC-46 : Improve build for testsuite / now properly produce maven artifacts for test war files that are then consumed in tomcat6
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-01-07 09:12:21 UTC (rev 5696)
+++ components/pc/trunk/test/core/pom.xml 2011-01-07 09:17:22 UTC (rev 5697)
@@ -130,6 +130,50 @@
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-ant-tasks</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <dependencies>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+
+ <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
+
+ <property name="target" value="${basedir}/target"/>
+ <property name="test.temp.dir" value="${basedir}/target/temp"/>
+ <property name="groupId" value="${project.groupId}"/>
+ <property name="artifactId" value="${project.artifactId}"/>
+ <property name="version" value="${project.version}"/>
+
+ <ant antfile="${basedir}/src/main/build.xml" inheritRefs="true">
+ <target name="package-tests"/>
+ </ant>
+
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: components/pc/trunk/test/core/src/main/build.xml
===================================================================
--- components/pc/trunk/test/core/src/main/build.xml (rev 0)
+++ components/pc/trunk/test/core/src/main/build.xml 2011-01-07 09:17:22 UTC (rev 5697)
@@ -0,0 +1,185 @@
+<?xml version="1.0"?>
+<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+
+ <macrodef name="package-ext-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="ext" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-tck-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="tck" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-api-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="api" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-tck-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="tck" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-api-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="api" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-ext-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="ext" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-testsuite">
+ <attribute name="testsuiteversion"/>
+ <attribute name="testsuitetype"/>
+ <attribute name="testsuitename"/>
+ <sequential>
+
+ <!-- Make directory -->
+ <mkdir dir="${target}/test-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"/>
+
+ <!-- Generate artifact -->
+ <jar jarfile="${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/artifact.war">
+ <zipfileset dir="${target}/test-classes" prefix="WEB-INF/classes">
+ <include name="org/gatein/pc/test/portlet/@{testsuiteversion}/@{testsuitetype}/common/**"/>
+ <include name="org/gatein/pc/test/portlet/@{testsuiteversion}/common/**"/>
+ <include name="org/gatein/pc/test/portlet/common/**"/>
+ <include name="org/gatein/pc/test/portlet/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}/**"/>
+ </zipfileset>
+ <zipfileset dir="${target}/classes" prefix="WEB-INF/classes">
+ <include name="org/gatein/pc/test/portlet/framework/**"/>
+ </zipfileset>
+ <zipfileset dir="${target}" prefix="WEB-INF/lib">
+ <include name="portal-portlet-test-framework-lib.jar"/>
+ </zipfileset>
+ <fileset dir="${basedir}/src/main/packaging/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war"/>
+ </jar>
+
+ <!-- Generate pom -->
+ <artifact:pom
+ id="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
+ groupId="${groupId}"
+ artifactId="${artifactId}-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
+ version="${version}"
+ name="Test @{testsuiteversion} @{testsuitetype} @{testsuitename}"
+ packaging="war"/>
+
+ <!-- Write the physical pom -->
+ <artifact:writepom
+ pomRefId="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
+ file="${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/pom.xml"/>
+
+ <!-- Now we create the same pom but from the physical one -->
+ <artifact:pom
+ id="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}_"
+ file="${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/pom.xml"/>
+
+ <!-- Install the file -->
+ <artifact:install file="${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/artifact.war">
+ <pom refid="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}_"/>
+ </artifact:install>
+
+ </sequential>
+ </macrodef>
+
+ <target name="package-tests">
+
+ <!--Portlet test framework lib jar-->
+ <jar jarfile="${target}/portal-portlet-test-framework-lib.jar">
+
+ <!-- -->
+ <fileset dir="${target}/classes" includes="org/gatein/pc/test/unit/**"/>
+
+ <!-- JSR 168 TLD -->
+ <zipfileset
+ src="${dependency.portal-portlet-portlet.jar}"
+ includes="META-INF/portlet.tld"
+ fullpath="META-INF/portlet.tld"/>
+
+ <!-- JSR 286 TLD -->
+ <zipfileset
+ src="${dependency.portal-portlet-portlet.jar}"
+ includes="META-INF/portlet_2_0.tld"
+ fullpath="META-INF/portlet_2_0.tld"/>
+ </jar>
+
+ <package-tck-test test="portletinterface"/>
+ <package-tck-test test="dispatcher"/>
+ <package-tck-test test="portletrequests"/>
+ <package-tck-test test="portletmode"/>
+ <package-tck-test test="portletconfig"/>
+ <package-tck-test test="portletresponses"/>
+ <package-tck-test test="preferences"/>
+ <package-tck-test test="portletsession"/>
+ <package-tck-test test="portleturl"/>
+ <package-tck-test test="windowstates"/>
+ <package-tck-test test="portletcontext"/>
+ <package-api-test test="portletconfig"/>
+ <package-api-test test="portletmode"/>
+ <package-api-test test="windowstate"/>
+ <package-api-test test="portletsessionutil"/>
+ <package-api-test test="portalcontext"/>
+ <package-api-test test="portletcontext"/>
+ <package-api-test test="portleturl"/>
+ <package-api-test test="portletpreferences"/>
+ <package-api-test test="portletsession"/>
+ <package-api-test test="actionrequest"/>
+ <package-api-test test="renderrequest"/>
+ <package-api-test test="actionresponse"/>
+ <package-api-test test="renderresponse"/>
+ <package-ext-test test="nocache"/>
+ <package-ext-test test="expiringcache"/>
+ <package-ext-test test="neverexpiringcache"/>
+ <package-ext-test test="preferences"/>
+ <package-ext-test test="session"/>
+ <package-ext-test test="portletresponses"/>
+ <package-ext-test test="portletrequests"/>
+ <package-ext-test test="portletmode"/>
+ <package-ext-test test="portletconfig"/>
+ <package-ext-test test="taglib"/>
+ <package-jsr286-tck-test test="dispatcher"/>
+ <package-jsr286-tck-test test="portletconfig"/>
+ <package-jsr286-tck-test test="portletconfignonamespace"/>
+ <package-jsr286-tck-test test="event"/>
+ <package-jsr286-tck-test test="eventnonamespace"/>
+ <package-jsr286-tck-test test="stateawareresponse"/>
+ <package-jsr286-tck-test test="portletrequests"/>
+ <package-jsr286-tck-test test="resourceserving"/>
+ <package-jsr286-tck-test test="portleturl"/>
+ <package-jsr286-tck-test test="portletfilter"/>
+ <package-jsr286-tck-test test="taglib"/>
+ <package-jsr286-tck-test test="userinformation"/>
+ <package-jsr286-api-test test="event"/>
+ <package-jsr286-api-test test="portleturl"/>
+ <package-jsr286-ext-test test="portletrequests"/>
+ <package-jsr286-ext-test test="portletfilter"/>
+ <package-jsr286-ext-test test="portletresponses"/>
+ <package-jsr286-ext-test test="dispatcher"/>
+ <package-jsr286-ext-test test="portletcontext"/>
+ <package-jsr286-ext-test test="portletinterface"/>
+ <package-jsr286-ext-test test="event"/>
+ <package-jsr286-ext-test test="eventsupport"/>
+ <package-jsr286-ext-test test="portletmode"/>
+
+ </target>
+
+</project>
\ No newline at end of file
Copied: components/pc/trunk/test/core/src/main/packaging/ha (from rev 5691, components/pc/trunk/test/servers/tomcat6/src/test/resources/ha)
Copied: components/pc/trunk/test/core/src/main/packaging/info (from rev 5691, components/pc/trunk/test/servers/tomcat6/src/test/resources/info)
Copied: components/pc/trunk/test/core/src/main/packaging/jsr168 (from rev 5691, components/pc/trunk/test/servers/tomcat6/src/test/resources/jsr168)
Copied: components/pc/trunk/test/core/src/main/packaging/jsr286 (from rev 5691, components/pc/trunk/test/servers/tomcat6/src/test/resources/jsr286)
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 09:12:21 UTC (rev 5696)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 09:17:22 UTC (rev 5697)
@@ -162,6 +162,13 @@
<version>${version.cargo}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-ant-tasks</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+
</dependencies>
<profiles>
@@ -279,7 +286,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.6</version>
<dependencies>
@@ -389,7 +396,8 @@
<property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
<!-- location of common.xml shared between the different server's build.xml -->
- <property name="common.xml.file" value="${test.common.xml}"/>
+ <!--<property name="common.xml.file" value="${test.common.xml}"/>-->
+ <property name="common.xml.file" value="${basedir}/src/test/common.xml"/>
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests"/>
Added: components/pc/trunk/test/servers/tomcat6/src/test/common.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/common.xml (rev 0)
+++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 09:17:22 UTC (rev 5697)
@@ -0,0 +1,579 @@
+<?xml version="1.0"?>
+<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+
+ <property name="target.dir" value="${basedir}/target"/>
+ <property name="test.dir" value="${target.dir}/integration-tests"/>
+ <property name="test.cargo.dir" value="${test.dir}/cargo/"/>
+
+ <target name="tests.common" depends="prepare_env, evaluate_properties.init" >
+
+ <echo message="compile classpath: ${compile_classpath}"/>
+ <echo message="runtime classpath: ${runtime_classpath}"/>
+ <echo message="test classpath: ${test_classpath}"/>
+ <echo message="plugin classpath: ${plugin_classpath}"/>
+ <echo message="base directory: ${basedir}"/>
+
+ <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/>
+
+ <antcall target="package-tests"/>
+
+ <antcall target="evaluate_properties.all"/>
+ <antcall target="test.container-servlet"/>
+
+ </target>
+
+ <target name="prepare_env">
+
+ <!--Relative path to target dir-->
+ <property name="target" value="${basedir}/target"/>
+ <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/>
+ <property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/>
+ <property name="test.temp.lib" value="${test.temp.dir}/lib"/>
+
+ <mkdir dir="${test.temp.dir}"/>
+ <mkdir dir="${test.temp.lib}"/>
+ <mkdir dir="${target}/jboss-unit"/>
+
+ <echo message="Preparing environment"/>
+
+ <path id="jboss-logging">
+ <pathelement path="${dependency.jboss-logging-spi.jar}"/>
+ <pathelement path="${dependency.jboss-logging-jdk.jar}"/>
+ <pathelement path="${dependency.jboss-logging-log4j.jar}"/>
+ </path>
+
+ <path id="jboss-microcontainer">
+ <pathelement path="${dependency.jbossxb.jar}"/>
+ </path>
+
+ <path id="portal-common">
+ <pathelement path="${dependency.portal-common-mc.jar}"/>
+ </path>
+
+ <path id="portal-common-shared">
+ <pathelement path="${dependency.portal-common-common.jar}"/>
+ <pathelement path="${dependency.portal-common-logging.jar}"/>
+ <pathelement path="${dependency.slf4j-simple.jar}"/>
+ <pathelement path="${dependency.slf4j-api.jar}"/>
+ </path>
+
+ <path id="portal-web">
+ </path>
+
+ <path id="portal-web-shared">
+ <pathelement path="${dependency.portal-wci-wci.jar}"/>
+ </path>
+
+ <path id="portal-portlet">
+ <pathelement path="${dependency.portal-portlet-controller.jar}"/>
+ <pathelement path="${dependency.portal-portlet-mc.jar}"/>
+ <pathelement path="${dependency.portal-portlet-tests.jar}"/>
+ </path>
+
+ <path id="portal-portlet-shared">
+ <path location="${dependency.portal-portlet-portlet.jar}"/>
+ <path location="${dependency.portal-portlet-api.jar}"/>
+ <path location="${dependency.jsr168api.jar}"/>
+ </path>
+
+ <path id="jboss-unit">
+ </path>
+
+ <path id="jboss-unit-shared">
+ <pathelement path="${dependency.jboss-unit.jar}"/>
+ <pathelement path="${dependency.jboss-unit-remote.jar}"/>
+ <pathelement path="${dependency.portal-test-generic.jar}"/>
+ <pathelement path="${dependency.portal-test.jar}"/>
+ <pathelement path="${dependency.jboss-remoting.jar}"/>
+ </path>
+
+ <path id="JBoss-4.2">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-microcontainer"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
+ </path>
+
+ <path id="JBoss-4.2-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.portal-wci-tomcat.jar}"/>
+ </path>
+
+ <path id="JBoss-5.1">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-microcontainer"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
+ </path>
+
+ <path id="JBoss-5.1-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.portal-wci-tomcat.jar}"/>
+
+ <!-- paths needed for remote jboss deployment -->
+ <path location="${dependency.cargo-jboss-deployer.jar}"/>
+ <path location="${dependency.jboss-profile-service.jar}"/>
+ <path location="${dependency.cargo-core-container-jboss.jar}"/>
+ </path>
+
+ <path id="Tomcat-6.0">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-microcontainer"/>
+ <pathelement path="${dependency.xercesImpl.jar}"/>
+ <pathelement path="${dependency.resolver.jar}"/>
+ <pathelement path="${dependency.xml-apis.jar}"/>
+ <pathelement path="${dependency.trove.jar}"/>
+ </path>
+
+ <path id="Tomcat-6.0-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path refid="jboss-logging"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
+ <path location="${dependency.log4j.jar}"/>
+ <path location="${dependency.concurrent.jar}"/>
+ <path location="${dependency.activation.jar}"/>
+ <path location="${dependency.jaxb.jar}"/>
+ <path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.jboss-serialization.jar}"/>
+ <path location="${dependency.portal-wci-tomcat.jar}"/>
+ </path>
+
+ <path id="Tomcat-7.0">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-microcontainer"/>
+ <pathelement path="${dependency.xercesImpl.jar}"/>
+ <pathelement path="${dependency.resolver.jar}"/>
+ <pathelement path="${dependency.xml-apis.jar}"/>
+ <pathelement path="${dependency.trove.jar}"/>
+ </path>
+
+ <path id="Tomcat-7.0-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path refid="jboss-logging"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
+ <path location="${dependency.log4j.jar}"/>
+ <path location="${dependency.concurrent.jar}"/>
+ <path location="${dependency.activation.jar}"/>
+ <path location="${dependency.jaxb.jar}"/>
+ <path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.jboss-serialization.jar}"/>
+ <path location="${dependency.portal-wci-tomcat.jar}"/>
+ </path>
+
+ <path id="Jetty-6.1">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-microcontainer"/>
+ <pathelement path="${dependency.xercesImpl.jar}"/>
+ <pathelement path="${dependency.resolver.jar}"/>
+ <pathelement path="${dependency.xml-apis.jar}"/>
+ <pathelement path="${dependency.trove.jar}"/>
+ </path>
+
+ <path id="Jetty-6.1-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path refid="jboss-logging"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
+ <path location="${dependency.log4j.jar}"/>
+ <path location="${dependency.concurrent.jar}"/>
+ <path location="${dependency.activation.jar}"/>
+ <path location="${dependency.jaxb.jar}"/>
+ <path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.jboss-serialization.jar}"/>
+ <path location="${dependency.portal-wci-jetty.jar}"/>
+ </path>
+
+ </target>
+
+ <!-- Check which servlet containers are known -->
+ <target name="evaluate_properties.init">
+
+ <property environment="env"/>
+
+ <!--If properties are not in command line check if they are set in env-->
+ <condition property="JBOSS_4_2_HOME" value="${env.JBOSS_4_2_HOME}">
+ <and>
+ <isset property="env.JBOSS_4_2_HOME"/>
+ <not>
+ <isset property="JBOSS_4_2_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="JBOSS_5_1_HOME" value="${env.JBOSS_5_1_HOME}">
+ <and>
+ <isset property="env.JBOSS_5_1_HOME"/>
+ <not>
+ <isset property="JBOSS_5_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}">
+ <and>
+ <isset property="env.TOMCAT_6_0_HOME"/>
+ <not>
+ <isset property="TOMCAT_6_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="TOMCAT_7_0_HOME" value="${env.TOMCAT_7_0_HOME}">
+ <and>
+ <isset property="env.TOMCAT_7_0_HOME"/>
+ <not>
+ <isset property="TOMCAT_7_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}">
+ <and>
+ <isset property="env.JETTY_6_1_HOME"/>
+ <not>
+ <isset property="JETTY_6_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+
+ <echo message="JBOSS_4_2_HOME: ${JBOSS_4_2_HOME}"/>
+ <echo message="JBOSS_5_1_HOME: ${JBOSS_5_1_HOME}"/>
+ <echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/>
+ <echo message="TOMCAT_7_0_HOME: ${TOMCAT_7_0_HOME}"/>
+ <echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/>
+ </target>
+
+ <target name="evaluate_properties.tomcat">
+ <fail message="Please set the environment variable TOMCAT_6_0_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="TOMCAT_6_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+ </target>
+
+ <target name="evaluate_properties.jetty">
+ <fail message="Please set the environment variable JETTY_6_1_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JETTY_6_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+ </target>
+
+ <target name="evaluate_properties.jboss">
+ <fail message="Please set the environment variables JBOSS_4_2_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JBOSS_4_2_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+ <fail message="Please set the environment variable JBOSS_5_1_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JBOSS_5_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+ </target>
+
+ <target name="evaluate_properties.all">
+ <antcall target="evaluate_properties.jboss"/>
+ <antcall target="evaluate_properties.jetty"/>
+ <antcall target="evaluate_properties.tomcat"/>
+ </target>
+
+ <macrodef name="package-ext-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="ext" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-tck-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="tck" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-api-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="api" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-tck-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="tck" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-api-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="api" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-ext-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="ext" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-testsuite">
+ <attribute name="testsuiteversion"/>
+ <attribute name="testsuitetype"/>
+ <attribute name="testsuitename"/>
+ <sequential>
+
+ <artifact:dependencies pathId="dependency.classpath">
+ <dependency
+ groupId="org.gatein.pc"
+ artifactId="pc-test-core-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
+ version="${project.version}"
+ type="war"/>
+ </artifact:dependencies>
+
+ <copy tofile="${test.temp.lib}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war">
+ <path refid="dependency.classpath"/>
+ </copy>
+
+ </sequential>
+ </macrodef>
+
+ <target name="package-tests">
+
+ <copy todir="${target}/classes">
+ <fileset dir="${basedir}/../../core/target/classes" includes="**/*"/>
+ </copy>
+ <copy todir="${target}/test-classes">
+ <fileset dir="${basedir}/../../core/target/test-classes" includes="**/*"/>
+ </copy>
+
+ <!--Portlet test framework lib jar-->
+ <jar jarfile="${test.temp.lib}/portal-portlet-test-framework-lib.jar">
+
+ <!-- -->
+ <fileset dir="${target}/classes" includes="org/gatein/pc/test/unit/**"/>
+
+ <!-- JSR 168 TLD -->
+ <zipfileset
+ src="${dependency.portal-portlet-portlet.jar}"
+ includes="META-INF/portlet.tld"
+ fullpath="META-INF/portlet.tld"/>
+ <zipfileset
+ src="${dependency.portal-portlet-portlet.jar}"
+ includes="META-INF/portlet_2_0.tld"
+ fullpath="META-INF/portlet_2_0.tld"/>
+ </jar>
+
+ <package-tck-test test="portletinterface"/>
+ <package-tck-test test="dispatcher"/>
+ <package-tck-test test="portletrequests"/>
+ <package-tck-test test="portletmode"/>
+ <package-tck-test test="portletconfig"/>
+ <package-tck-test test="portletresponses"/>
+ <package-tck-test test="preferences"/>
+ <package-tck-test test="portletsession"/>
+ <package-tck-test test="portleturl"/>
+ <package-tck-test test="windowstates"/>
+ <package-tck-test test="portletcontext"/>
+ <package-api-test test="portletconfig"/>
+ <package-api-test test="portletmode"/>
+ <package-api-test test="windowstate"/>
+ <package-api-test test="portletsessionutil"/>
+ <package-api-test test="portalcontext"/>
+ <package-api-test test="portletcontext"/>
+ <package-api-test test="portleturl"/>
+ <package-api-test test="portletpreferences"/>
+ <package-api-test test="portletsession"/>
+ <package-api-test test="actionrequest"/>
+ <package-api-test test="renderrequest"/>
+ <package-api-test test="actionresponse"/>
+ <package-api-test test="renderresponse"/>
+ <package-ext-test test="nocache"/>
+ <package-ext-test test="expiringcache"/>
+ <package-ext-test test="neverexpiringcache"/>
+ <package-ext-test test="preferences"/>
+ <package-ext-test test="session"/>
+ <package-ext-test test="portletresponses"/>
+ <package-ext-test test="portletrequests"/>
+ <package-ext-test test="portletmode"/>
+ <package-ext-test test="portletconfig"/>
+ <package-ext-test test="taglib"/>
+ <package-jsr286-tck-test test="dispatcher"/>
+ <package-jsr286-tck-test test="portletconfig"/>
+ <package-jsr286-tck-test test="portletconfignonamespace"/>
+ <package-jsr286-tck-test test="event"/>
+ <package-jsr286-tck-test test="eventnonamespace"/>
+ <package-jsr286-tck-test test="stateawareresponse"/>
+ <package-jsr286-tck-test test="portletrequests"/>
+ <package-jsr286-tck-test test="resourceserving"/>
+ <package-jsr286-tck-test test="portleturl"/>
+ <package-jsr286-tck-test test="portletfilter"/>
+ <package-jsr286-tck-test test="taglib"/>
+ <package-jsr286-tck-test test="userinformation"/>
+ <package-jsr286-api-test test="event"/>
+ <package-jsr286-api-test test="portleturl"/>
+ <package-jsr286-ext-test test="portletrequests"/>
+ <package-jsr286-ext-test test="portletfilter"/>
+ <package-jsr286-ext-test test="portletresponses"/>
+ <package-jsr286-ext-test test="dispatcher"/>
+ <package-jsr286-ext-test test="portletcontext"/>
+ <package-jsr286-ext-test test="portletinterface"/>
+ <package-jsr286-ext-test test="event"/>
+ <package-jsr286-ext-test test="eventsupport"/>
+ <package-jsr286-ext-test test="portletmode"/>
+
+ <!-- -->
+ <jar jarfile="${test.temp.lib}/portlet-test-lib.jar">
+ <fileset dir="${target}/test-classes"/>
+ <fileset dir="${target}/classes"/>
+ </jar>
+
+ <copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war">
+ <fileset dir="${target}/test-classes/portlet-test-war"/>
+ </copy>
+ <copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war/WEB-INF/lib" flatten="true">
+ <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
+ <path refid="${test.server.name}-${test.server.version}"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/>
+ <jar jarfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war">
+ <fileset dir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war"/>
+ </jar>
+
+ </target>
+
+ <target name="cargo.setup">
+ <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/>
+ <mkdir dir="${cargo.log.dir}"/>
+ <taskdef resource="cargo.tasks">
+ <classpath>
+ <pathelement path="${plugin_classpath}"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+ <target name="test.container-servlet">
+ <echo message="Starting ${test.server.name} ${test.server.version} with ${test.remote.server.name} to execute ${test.server.name} tests"/>
+ <antcall target="cargo.start">
+ <param name="cargo.wait" value="false"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.server.name" value="${test.remote.server.name}"/>
+ </antcall>
+ <antcall target="cargo.stop"/>
+ </target>
+
+ <target name="tests.remote">
+
+ <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
+
+ <jboss-unit jpda="false" jpdaPort="9000" jpdaSuspend="true" failOnError="true">
+
+ <tests config="${target}/test-classes/test/remote-jboss-unit.xml">
+ <property name="archivePath" value="${test.temp.lib}"/>
+ <property name="serverName" value="${test.server.name}"/>
+ </tests>
+
+ <reports>
+ <xml toDir="${target}/tests/reports/xml/${test.server.name}"/>
+ <html toDir="${target}/tests/reports/html/${test.server.name}"/>
+ </reports>
+
+ <classpath>
+ <pathelement location="${target}/classes"/>
+ <pathelement location="${test.temp.lib}"/>
+ <pathelement location="${target}/classes/test"/>
+ <pathelement location="${target}/test-classes/test"/>
+ <pathelement path="${test_classpath}"/>
+ </classpath>
+
+ </jboss-unit>
+
+ </target>
+
+ <target name="package-tck-portal" depends="prepare_env">
+
+ <property name="tck" value="${target}/tck"/>
+ <property name="tck-server" value="${tck}/${test.server.name}-${test.server.version}"/>
+
+ <mkdir dir="${tck}"/>
+ <mkdir dir="${tck-server}"/>
+
+ <jar jarfile="${target}/portlet-test-lib.jar">
+ <fileset dir="${target}/classes" excludes="org/gatein/pc/portal/samples/**"/>
+ </jar>
+
+ <copy todir="${tck-server}/portlet-tck-war">
+ <fileset dir="${target}/classes/portlet-tck-war"/>
+ </copy>
+ <copy todir="${tck-server}/portlet-tck-war">
+ <fileset dir="${target}/classes/${test.server.name}-${test.server.version}/portlet-tck-war"/>
+ </copy>
+
+ <copy todir="${tck-server}/portlet-tck-war/WEB-INF/lib" flatten="true">
+ <fileset dir="${target}" includes="portlet-test-lib.jar"/>
+ <path refid="${test.server.name}-${test.server.version}"/>
+ </copy>
+
+ <mkdir dir="${tck-server}/tck-portal"/>
+
+ <jar jarfile="${tck-server}/tck-portal/portlet-tck.war">
+ <fileset dir="${tck-server}/portlet-tck-war"/>
+ </jar>
+
+ <copy todir="${tck-server}/tck-portal" flatten="true">
+ <path refid="${test.server.name}-${test.server.version}-shared"/>
+ </copy>
+
+ <delete file="${target}/portlet-test-lib.jar"/>
+
+ </target>
+
+</project>
14 years, 9 months
- 1
- 0
gatein SVN: r5696 - portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: vuthelinh
Date: 2011-01-07 04:12:21 -0500 (Fri, 07 Jan 2011)
New Revision: 5696
Modified:
portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java
Log:
TESTVN-2323: Update SeleniumTestCaseGenerator.java
Modified: portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2011-01-07 04:33:55 UTC (rev 5695)
+++ portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2011-01-07 09:12:21 UTC (rev 5696)
@@ -91,15 +91,17 @@
sb.append("public String timeout = \"30000\";\n");
sb.append("public int timeoutSecInt = 30;\n");
sb.append("public String browser = \"firefox\";\n");
- sb.append("public String host = \"localhost\";\n");
+ sb.append("public String host = \"localhost\";\n");
+ sb.append("public String hostPort = \"8080\";\n");
sb.append("public void setSpeed() {\n selenium.setSpeed(speed);\n}\n\n");
sb.append("public void setUp() throws Exception {\n");
sb.append(" browser = System.getProperty(\"selenium.browser\", browser);\n");
sb.append(" timeout = System.getProperty(\"selenium.timeout\", timeout);\n");
sb.append(" timeoutSecInt = Integer.parseInt(timeout)/1000;\n");
sb.append(" speed = System.getProperty(\"selenium.speed\", speed);\n");
- sb.append(" host = System.getProperty(\"selenium.host\", host);\n");
- sb.append(" super.setUp(\"http://\" + host + \":8080/portal/\", \"*\" + browser);\n");
+ sb.append(" host = System.getProperty(\"selenium.host\", host);\n");
+ sb.append(" hostPort = System.getProperty(\"selenium.host.port\", hostPort);\n");
+ sb.append(" super.setUp(\"http://\" + host + \":\" + hostPort + \"/portal/\", \"*\" + browser);\n");
sb.append("}\n\n");
}
@@ -336,7 +338,7 @@
sb.append("\", selenium.getValue(\"");
sb.append(param2);
sb.append("\"));\n");
- }else if (param1.equals("waitForAlert")) {
+ }else if (param1.equals("waitForAlert")) {
sb.append("waitForAlert(\"");
sb.append(param2);
sb.append("\");\n");
@@ -384,11 +386,30 @@
sb.append("(\"");
sb.append(param2);
sb.append("\"));\n");
- }
//-----------------add by linh_vu------------
- else if (param1.equals("waitForChecked")) {
+ } else if (param1.equals("verifySelectedValue")) {
+ sb.append("TestCase.assertTrue");
+ sb.append("(selenium.getSelectedValue(\"");
+ sb.append(param2);
+ sb.append("\").equals(\"");
+ sb.append(param3);
+ sb.append("\"));\n");
+ } else if (param1.equals("verifyNotVisible")) {
+ sb.append("TestCase.assertFalse(selenium.isVisible");
+ sb.append("(\"");
+ sb.append(param2);
+ sb.append("\"));\n");
+ } else if (param1.equals("waitForVisible")) {
sb.append("for (int second = 0;; second++) {\n");
sb.append(getTimeoutMessage(param1));
+ sb.append("try {\nif (selenium.isVisible(\"");
+ sb.append(param2);
+ sb.append("\"))\n break;\n }\n catch (Exception e) {}\n");
+ sb.append("Thread.sleep(1000);\n");
+ sb.append("}\n");
+ } else if (param1.equals("waitForChecked")) {
+ sb.append("for (int second = 0;; second++) {\n");
+ sb.append(getTimeoutMessage(param1));
sb.append("try {\nif (selenium.isChecked(\"");
sb.append(param2);
sb.append("\"))\n break;\n }\n catch (Exception e) {}\n");
@@ -453,9 +474,8 @@
sb.append("\").equals(\"");
sb.append(param3);
sb.append("\"));\n");
- }
//-----------------------------
- else if (param1.equals("assertNotVisible")) {
+ } else if (param1.equals("assertNotVisible")) {
sb.append("TestCase.assertFalse(selenium.isVisible");
sb.append("(\"");
sb.append(param2);
@@ -503,10 +523,42 @@
sb.append("}\n");
} else if (param1.equals("refresh")) {
sb.append("selenium.refresh();\n");
+
+ //-----------------add by linh_vu------------
+ } else if (param1.equals("keyDown")) {
+ sb.append("selenium.");
+ sb.append(param1);
+ sb.append("(\"");
+ sb.append(param2);
+ sb.append("\", \"");
+ sb.append(param3);
+ sb.append("\");\n");
+ } else if (param1.equals("keyUp")) {
+ sb.append("selenium.");
+ sb.append(param1);
+ sb.append("(\"");
+ sb.append(param2);
+ sb.append("\", \"");
+ sb.append(param3);
+ sb.append("\");\n");
+ } else if (param1.equals("storeValue")) {
+ sb.append("String ");
+ sb.append(param3);
+ sb.append(" = selenium.getValue(\"");
+ sb.append(param2);
+ sb.append("\");\n");
+ sb.append("RuntimeVariables.setValue(\"");
+ sb.append(param3);
+ sb.append("\", ");
+ sb.append(param3);
+ sb.append(");\n");
+
+ //-----------------------------
+
} else if (param1.equals("refreshAndWait")) {
sb.append("selenium.refresh();\n");
sb.append("selenium.waitForPageToLoad(timeout);\n");
- } else if (param1.equals("storeXpathCount")) {
+ }else if (param1.equals("storeXpathCount")) {
sb.append("String ").append(param3).append(" = selenium.getXpathCount(\"").append(param2).append(
"\").toString();\n");
}else if (param1.equals("verifyOrdered")) {
14 years, 9 months
- 1
- 0