gatein SVN: r4351 - epp/portal/branches/EPP_5_1_Branch/component/scripting/src/test/java/org/exoplatform/groovyscript.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-09-23 07:09:32 -0400 (Thu, 23 Sep 2010)
New Revision: 4351
Modified:
epp/portal/branches/EPP_5_1_Branch/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java
Log:
JBEPP-505: Fix TestTemplateRendering.java testcase
Modified: epp/portal/branches/EPP_5_1_Branch/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-09-23 11:07:03 UTC (rev 4350)
+++ epp/portal/branches/EPP_5_1_Branch/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-09-23 11:09:32 UTC (rev 4351)
@@ -24,6 +24,8 @@
import java.awt.*;
import java.io.*;
+import java.text.DateFormat;
+import java.util.Date;
import java.util.EmptyStackException;
import java.util.HashMap;
import java.util.Locale;
@@ -36,6 +38,19 @@
public class TestTemplateRendering extends AbstractGateInTest
{
+ private DateFormat dateFormatFR;
+ private DateFormat dateFormatEN;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ // TODO Auto-generated method stub
+ super.setUp();
+
+ dateFormatFR = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.FRANCE);
+ dateFormatEN = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.ENGLISH);
+ }
+
public void testOutputStreamWriter() throws Exception
{
GroovyTemplate template = new GroovyTemplate("a<%='b'%>c<%out.print('d');%>e");
@@ -48,28 +63,31 @@
public void testDate1() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<% print(new Date(0)); %>");
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testDate2() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<% def date = new Date(0) %>$date");
System.out.println("template.getGroovy() = " + template.getGroovy());
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testDate3() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<%= new Date(0) %>");
System.out.println("template.getGroovy() = " + template.getGroovy());
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testFoo() throws Exception
14 years, 3 months
gatein SVN: r4350 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-23 07:07:03 -0400 (Thu, 23 Sep 2010)
New Revision: 4350
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-09-23 11:06:41 UTC (rev 4349)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-09-23 11:07:03 UTC (rev 4350)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-09-23 11:06:41 UTC (rev 4349)
+++ components/wsrp/trunk/api/pom.xml 2010-09-23 11:07:03 UTC (rev 4350)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-09-23 11:06:41 UTC (rev 4349)
+++ components/wsrp/trunk/common/pom.xml 2010-09-23 11:07:03 UTC (rev 4350)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-09-23 11:06:41 UTC (rev 4349)
+++ components/wsrp/trunk/consumer/pom.xml 2010-09-23 11:07:03 UTC (rev 4350)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-09-23 11:06:41 UTC (rev 4349)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-09-23 11:07:03 UTC (rev 4350)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-09-23 11:06:41 UTC (rev 4349)
+++ components/wsrp/trunk/pom.xml 2010-09-23 11:07:03 UTC (rev 4350)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-Alp...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-Alpha02</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-09-23 11:06:41 UTC (rev 4349)
+++ components/wsrp/trunk/producer/pom.xml 2010-09-23 11:07:03 UTC (rev 4350)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-09-23 11:06:41 UTC (rev 4349)
+++ components/wsrp/trunk/test/pom.xml 2010-09-23 11:07:03 UTC (rev 4350)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-23 11:06:41 UTC (rev 4349)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-23 11:07:03 UTC (rev 4350)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-09-23 11:06:41 UTC (rev 4349)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-09-23 11:07:03 UTC (rev 4350)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-09-23 11:06:41 UTC (rev 4349)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-09-23 11:07:03 UTC (rev 4350)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-Alpha02</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
14 years, 3 months
gatein SVN: r4349 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-23 07:06:41 -0400 (Thu, 23 Sep 2010)
New Revision: 4349
Added:
components/wsrp/tags/2.0.0-Alpha02/
Log:
[maven-scm] copy for tag 2.0.0-Alpha02
Copied: components/wsrp/tags/2.0.0-Alpha02 (from rev 4348, components/wsrp/trunk)
14 years, 3 months
gatein SVN: r4348 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-23 07:06:19 -0400 (Thu, 23 Sep 2010)
New Revision: 4348
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.0-Alpha02
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-09-23 11:05:05 UTC (rev 4347)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-09-23 11:06:19 UTC (rev 4348)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02-SNAPSHOT</version>
+ <version>2.0.0-Alpha02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-09-23 11:05:05 UTC (rev 4347)
+++ components/wsrp/trunk/api/pom.xml 2010-09-23 11:06:19 UTC (rev 4348)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02-SNAPSHOT</version>
+ <version>2.0.0-Alpha02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-09-23 11:05:05 UTC (rev 4347)
+++ components/wsrp/trunk/common/pom.xml 2010-09-23 11:06:19 UTC (rev 4348)
@@ -20,12 +20,11 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02-SNAPSHOT</version>
+ <version>2.0.0-Alpha02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-09-23 11:05:05 UTC (rev 4347)
+++ components/wsrp/trunk/consumer/pom.xml 2010-09-23 11:06:19 UTC (rev 4348)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02-SNAPSHOT</version>
+ <version>2.0.0-Alpha02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-09-23 11:05:05 UTC (rev 4347)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-09-23 11:06:19 UTC (rev 4348)
@@ -22,14 +22,13 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02-SNAPSHOT</version>
+ <version>2.0.0-Alpha02</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-09-23 11:05:05 UTC (rev 4347)
+++ components/wsrp/trunk/pom.xml 2010-09-23 11:06:19 UTC (rev 4348)
@@ -21,8 +21,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02-SNAPSHOT</version>
+ <version>2.0.0-Alpha02</version>
<packaging>pom</packaging>
@@ -41,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-Alp...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-Alpha02</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-09-23 11:05:05 UTC (rev 4347)
+++ components/wsrp/trunk/producer/pom.xml 2010-09-23 11:06:19 UTC (rev 4348)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02-SNAPSHOT</version>
+ <version>2.0.0-Alpha02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-09-23 11:05:05 UTC (rev 4347)
+++ components/wsrp/trunk/test/pom.xml 2010-09-23 11:06:19 UTC (rev 4348)
@@ -22,12 +22,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02-SNAPSHOT</version>
+ <version>2.0.0-Alpha02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-23 11:05:05 UTC (rev 4347)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-23 11:06:19 UTC (rev 4348)
@@ -22,12 +22,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02-SNAPSHOT</version>
+ <version>2.0.0-Alpha02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-09-23 11:05:05 UTC (rev 4347)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-09-23 11:06:19 UTC (rev 4348)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha02-SNAPSHOT</version>
+ <version>2.0.0-Alpha02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-09-23 11:05:05 UTC (rev 4347)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-09-23 11:06:19 UTC (rev 4348)
@@ -22,12 +22,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-Alpha02-SNAPSHOT</version>
+ <version>2.0.0-Alpha02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
14 years, 3 months
gatein SVN: r4347 - epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-09-23 07:05:05 -0400 (Thu, 23 Sep 2010)
New Revision: 4347
Modified:
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
Log:
Remove group page with facebook iframe
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2010-09-23 11:02:06 UTC (rev 4346)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2010-09-23 11:05:05 UTC (rev 4347)
@@ -46,12 +46,6 @@
<page-reference>group::/platform/users::mylink-google</page-reference>
</node>
- <node>
- <uri>mylink/facebooks</uri>
- <name>facebooks</name>
- <label>#{platform.users.mylink-facebook}</label>
- <page-reference>group::/platform/users::mylink-facebook</page-reference>
- </node>
</node>
</page-nodes>
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2010-09-23 11:02:06 UTC (rev 4346)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2010-09-23 11:05:05 UTC (rev 4347)
@@ -75,30 +75,5 @@
</portlet-application>
</page>
- <page>
- <name>mylink-facebook</name>
- <title>FaceBook</title>
- <access-permissions>*:/platform/users</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <portlet-application>
- <portlet>
- <application-ref>web</application-ref>
- <portlet-ref>IFramePortlet</portlet-ref>
- <preferences>
- <preference>
- <name>url</name>
- <value>http://www.facebook.com</value>
- <read-only>false</read-only>
- </preference>
- </preferences>
- </portlet>
- <title>FaceBook</title>
- <access-permissions>*:/platform/users</access-permissions>
- <show-info-bar>false</show-info-bar>
- <show-application-state>true</show-application-state>
- <show-application-mode>true</show-application-mode>
- </portlet-application>
- </page>
-
</page-set>
14 years, 3 months
gatein SVN: r4346 - portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-09-23 07:02:06 -0400 (Thu, 23 Sep 2010)
New Revision: 4346
Modified:
portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
Log:
GTNPORTAL-1485 Refresh InitParam object instead of legacy
Modified: portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-09-23 11:01:32 UTC (rev 4345)
+++ portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-09-23 11:02:06 UTC (rev 4346)
@@ -124,7 +124,7 @@
}
WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
Param param = initParams.getParam("PortalTemplateConfigOption");
- List<SelectItemCategory> portalTemplates = (List<SelectItemCategory>)param.getMapGroovyObject(context);
+ List<SelectItemCategory> portalTemplates = (List<SelectItemCategory>)param.getFreshObject(context);
for (SelectItemCategory itemCategory : portalTemplates)
{
uiTemplateInput.getItemCategories().add(itemCategory);
14 years, 3 months
gatein SVN: r4345 - epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-09-23 07:01:32 -0400 (Thu, 23 Sep 2010)
New Revision: 4345
Modified:
epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js
Log:
JBEPP-497: Have problem when search page or user does not exits in list by used enter key press
Modified: epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js 2010-09-23 11:00:27 UTC (rev 4344)
+++ epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js 2010-09-23 11:01:32 UTC (rev 4345)
@@ -19,7 +19,6 @@
function UIPortalControl() {
this.scrollManagers = new Array();
- this.t = 0;
};
/**
* Change state of window
@@ -70,18 +69,20 @@
if(e.keyCode) code = e.keyCode;
else if (e.which) code = e.which;
if(code ==13) {
- if(this.t != 13) {
- var uiPortalLoginFormAction = document.getElementById("UIPortalLoginFormAction");
- if(uiPortalLoginFormAction) {
- uiPortalLoginFormAction.onclick() ;
- }
- else
- {
- if(executeScript)
- eval(executeScript);
- }
+ if (window.event) {
+ e.returnValue = false;
+ } else {
+ e.preventDefault();
+ }
+ var uiPortalLoginFormAction = document.getElementById("UIPortalLoginFormAction");
+ if(uiPortalLoginFormAction) {
+ uiPortalLoginFormAction.onclick() ;
}
- this.t = code;
+ else
+ {
+ if(executeScript)
+ eval(executeScript);
+ }
}
};
14 years, 3 months
gatein SVN: r4344 - in portal/branches/branch-GTNPORTAL-1493: webui/portal/src/main/java/org/exoplatform/portal/webui/page and 1 other directories.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-09-23 07:00:27 -0400 (Thu, 23 Sep 2010)
New Revision: 4344
Modified:
portal/branches/branch-GTNPORTAL-1493/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java
portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
Log:
Clean DesktopPage relevant code from UI framework
Modified: portal/branches/branch-GTNPORTAL-1493/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1493/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-09-23 10:45:04 UTC (rev 4343)
+++ portal/branches/branch-GTNPORTAL-1493/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-09-23 11:00:27 UTC (rev 4344)
@@ -197,4 +197,18 @@
{
return "Page[ownerType=" + ownerType + ",ownerId=" + ownerId + ",name=" + name + "]";
}
+
+ @Override
+ public final String getFactoryId()
+ {
+ String factoryId = super.getFactoryId();
+ if (factoryId != null)
+ {
+ return factoryId;
+ }
+ else
+ {
+ return "org.exoplatform.portal.webui.page.UIPage";
+ }
+ }
}
\ No newline at end of file
Modified: portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-09-23 10:45:04 UTC (rev 4343)
+++ portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-09-23 11:00:27 UTC (rev 4344)
@@ -146,14 +146,9 @@
return uiPage;
}
- if (Page.DESKTOP_PAGE.equals(page.getFactoryId()))
- {
- uiPage = createUIComponent(context, UIDesktopPage.class, null, null);
- }
- else
- {
- uiPage = createUIComponent(context, UIPage.class, null, null);
- }
+ Class<? extends UIPage> clazz = Class.forName(page.getFactoryId()).asSubclass(UIPage.class);
+ uiPage = createUIComponent(context, clazz, null, null);
+
PortalDataMapper.toUIPage(uiPage, page);
uiPortal.setUIPage(page.getId(), uiPage);
Modified: portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-09-23 10:45:04 UTC (rev 4343)
+++ portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-09-23 11:00:27 UTC (rev 4344)
@@ -350,16 +350,10 @@
}
UIPagePreview uiPagePreview = uiWizard.getChild(UIPagePreview.class);
- UIPage uiPage;
- if (Page.DESKTOP_PAGE.equals(page.getFactoryId()))
- {
- uiPage = uiWizard.createUIComponent(context, UIDesktopPage.class, null, null);
- }
- else
- {
- uiPage = uiWizard.createUIComponent(context, UIPage.class, null, null);
- }
-
+
+ Class<? extends UIPage> clazz = Class.forName(page.getFactoryId()).asSubclass(UIPage.class);
+ UIPage uiPage = uiWizard.createUIComponent(context, clazz, null, null);
+
PortalDataMapper.toUIPage(uiPage, page);
uiPagePreview.setUIComponent(uiPage);
Modified: portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2010-09-23 10:45:04 UTC (rev 4343)
+++ portal/branches/branch-GTNPORTAL-1493/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2010-09-23 11:00:27 UTC (rev 4344)
@@ -19,13 +19,14 @@
package org.exoplatform.portal.webui.util;
+import java.util.List;
+
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.config.model.PageNode;
import org.exoplatform.portal.webui.application.UIPortlet;
import org.exoplatform.portal.webui.container.UIContainer;
-import org.exoplatform.portal.webui.page.UIDesktopPage;
import org.exoplatform.portal.webui.page.UIPage;
import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.webui.portal.UIPortalComponent;
@@ -38,8 +39,6 @@
import org.exoplatform.webui.core.UIComponentDecorator;
import org.exoplatform.webui.event.Event;
-import java.util.List;
-
/**
* Jun 5, 2006
*/
@@ -226,14 +225,10 @@
if (uiPage != null && uiPage.getId().equals(page.getId()))
return uiPage;
WebuiRequestContext context = Util.getPortalRequestContext();
- if (Page.DESKTOP_PAGE.equals(page.getFactoryId()))
- {
- uiPage = uiParent.createUIComponent(context, UIDesktopPage.class, null, null);
- }
- else
- {
- uiPage = uiParent.createUIComponent(context, UIPage.class, null, null);
- }
+
+ Class<? extends UIPage> clazz = Class.forName(page.getFactoryId()).asSubclass(UIPage.class);
+ uiPage = uiParent.createUIComponent(context, clazz, null, null);
+
PortalDataMapper.toUIPage(uiPage, page);
return uiPage;
}
14 years, 3 months
gatein SVN: r4343 - in epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java: org/exoplatform/portal/application/state and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-09-23 06:45:04 -0400 (Thu, 23 Sep 2010)
New Revision: 4343
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/conf/portal/configuration.xml
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/AbstractContextualPropertyProviderPlugin.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/InternalPropertiesPlugin.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/PublicPropertiesPlugin.java
Log:
JBEPP-503: Remove QName prefix
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/conf/portal/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/conf/portal/configuration.xml 2010-09-23 10:41:08 UTC (rev 4342)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/conf/portal/configuration.xml 2010-09-23 10:45:04 UTC (rev 4343)
@@ -52,11 +52,6 @@
<description>Namespace URI</description>
<value>http://www.gatein.org/xml/ns/prp_1_0</value>
</value-param>
- <value-param>
- <name>prefix</name>
- <description>Prefix of QName</description>
- <value>prp</value>
- </value-param>
</init-params>
</component-plugin>
<component-plugin>
@@ -69,11 +64,6 @@
<description>Namespace URI</description>
<value>http://www.gatein.org/xml/ns/internal_prp_1_0</value>
</value-param>
- <value-param>
- <name>prefix</name>
- <description>Prefix of QName</description>
- <value>iprp</value>
- </value-param>
</init-params>
</component-plugin>
</component-plugins>
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/AbstractContextualPropertyProviderPlugin.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/AbstractContextualPropertyProviderPlugin.java 2010-09-23 10:41:08 UTC (rev 4342)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/AbstractContextualPropertyProviderPlugin.java 2010-09-23 10:45:04 UTC (rev 4343)
@@ -40,13 +40,9 @@
/** . */
protected final String namespaceURI;
- /** . */
- protected final String prefix;
-
protected AbstractContextualPropertyProviderPlugin(InitParams params)
{
this.namespaceURI = params.getValueParam("namespaceURI").getValue();
- this.prefix = params.getValueParam("prefix").getValue();
}
public abstract void getProperties(UIPortlet portletWindow, Map<QName, String[]> properties);
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/InternalPropertiesPlugin.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/InternalPropertiesPlugin.java 2010-09-23 10:41:08 UTC (rev 4342)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/InternalPropertiesPlugin.java 2010-09-23 10:45:04 UTC (rev 4343)
@@ -46,8 +46,8 @@
super(params);
//
- this.storageIdQName = new QName(namespaceURI, "storage_id", prefix);
- this.storageNameQName = new QName(namespaceURI, "storage_name", prefix);
+ this.storageIdQName = new QName(namespaceURI, "storage_id");
+ this.storageNameQName = new QName(namespaceURI, "storage_name");
}
@Override
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/PublicPropertiesPlugin.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/PublicPropertiesPlugin.java 2010-09-23 10:41:08 UTC (rev 4342)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/state/PublicPropertiesPlugin.java 2010-09-23 10:45:04 UTC (rev 4343)
@@ -64,13 +64,13 @@
super(params);
//
- this.navigationURIQName = new QName(namespaceURI, "navigation_uri", prefix);
- this.pageNameQName = new QName(namespaceURI, "page_name", prefix);
- this.siteTypeQName = new QName(namespaceURI, "site_type", prefix);
- this.siteNameQName = new QName(namespaceURI, "site_name", prefix);
- this.windowWidth = new QName(namespaceURI, "window_width", prefix);
- this.windowHeight = new QName(namespaceURI, "window_height", prefix);
- this.windowShowInfoBarQName = new QName(namespaceURI, "window_show_info_bar", prefix);
+ this.navigationURIQName = new QName(namespaceURI, "navigation_uri");
+ this.pageNameQName = new QName(namespaceURI, "page_name");
+ this.siteTypeQName = new QName(namespaceURI, "site_type");
+ this.siteNameQName = new QName(namespaceURI, "site_name");
+ this.windowWidth = new QName(namespaceURI, "window_width");
+ this.windowHeight = new QName(namespaceURI, "window_height");
+ this.windowShowInfoBarQName = new QName(namespaceURI, "window_show_info_bar");
}
@Override
14 years, 3 months
gatein SVN: r4342 - epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-09-23 06:41:08 -0400 (Thu, 23 Sep 2010)
New Revision: 4342
Modified:
epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
Log:
JBEPP-501: Redirect to Home page after input tab with language having particular country.
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-09-23 10:39:20 UTC (rev 4341)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-09-23 10:41:08 UTC (rev 4342)
@@ -40,6 +40,7 @@
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
+import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
@@ -419,7 +420,7 @@
PortalRequestContext prContext = Util.getPortalRequestContext();
prContext.setResponseComplete(true);
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + selectedNode.getUri());
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(selectedNode.getUri(), "UTF-8"));
}
}
}
@@ -437,7 +438,7 @@
//We should redirect to current node while adding new tab fails
PageNode currentNode = tabPane.uiPortal.getSelectedNode();
PortalRequestContext prContext = Util.getPortalRequestContext();
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + currentNode.getUri());
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(currentNode.getUri(), "UTF-8"));
Object[] args = {newTabLabel};
context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", args));
@@ -450,7 +451,7 @@
{
PortalRequestContext prContext = Util.getPortalRequestContext();
prContext.setResponseComplete(true);
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + uri);
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(uri, "UTF-8"));
}
}
}
@@ -475,11 +476,10 @@
String newTabLabel = context.getRequestParameter(RENAMED_TAB_LABEL_PARAMETER);
if (!tabPane.validateName(newTabLabel))
{
- //TODO nguyenanhkien2a(a)gmail.com
//We should redirect to current node while renaming fails
PageNode currentNode = tabPane.uiPortal.getSelectedNode();
PortalRequestContext prContext = Util.getPortalRequestContext();
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + currentNode.getUri());
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(currentNode.getUri(), "UTF-8"));
Object[] args = {newTabLabel};
context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", args));
@@ -491,7 +491,7 @@
if (newUri != null)
{
PortalRequestContext prContext = Util.getPortalRequestContext();
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + newUri);
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(newUri, "UTF-8"));
}
}
}
14 years, 3 months