gatein SVN: r2784 - maven/parent/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-26 13:56:08 -0400 (Mon, 26 Apr 2010)
New Revision: 2784
Added:
maven/parent/tags/1.0.1-GA/
Log:
[maven-scm] copy for tag 1.0.1-GA
Copied: maven/parent/tags/1.0.1-GA (from rev 2783, maven/parent/trunk)
14 years, 8 months
gatein SVN: r2782 - maven/parent/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-26 13:25:49 -0400 (Mon, 26 Apr 2010)
New Revision: 2782
Modified:
maven/parent/trunk/pom.xml
Log:
Updating for Nexus usage
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2010-04-26 16:39:31 UTC (rev 2781)
+++ maven/parent/trunk/pom.xml 2010-04-26 17:25:49 UTC (rev 2782)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
- <version>5-beta-5</version>
+ <version>5</version>
</parent>
<name>GateIn - Maven parent</name>
@@ -202,53 +202,40 @@
<!-- **************** -->
<!-- Repositiories -->
<!-- **************** -->
-
<repositories>
<repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
<releases>
- <enabled>false</enabled>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>
-
+
<pluginRepositories>
<pluginRepository>
- <id>apache.org</id>
- <name>Maven Plugin Snapshots</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
<releases>
- <enabled>false</enabled>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
</snapshots>
</pluginRepository>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </pluginRepository>
- <pluginRepository>
- <id>java.net maven repository</id>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
</pluginRepositories>
-
<!-- **************** -->
<!-- Reporting -->
<!-- **************** -->
14 years, 8 months
gatein SVN: r2781 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-04-26 12:39:31 -0400 (Mon, 26 Apr 2010)
New Revision: 2781
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html
Log:
UI Tests: adding bigger pause at test 18 (before deleting portal)
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-04-26 16:10:09 UTC (rev 2780)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-04-26 16:39:31 UTC (rev 2781)
@@ -143,7 +143,7 @@
</tr>
<tr>
<td>pause</td>
- <td>5000</td>
+ <td>10000</td>
<td></td>
</tr>
<tr>
@@ -163,12 +163,17 @@
</tr>
<tr>
<td>clickAndWait</td>
+ <td>link=Home</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
<td>link=Site</td>
<td></td>
</tr>
<tr>
<td>pause</td>
- <td>5000</td>
+ <td>10000</td>
<td></td>
</tr>
<tr>
@@ -192,11 +197,6 @@
<td></td>
</tr>
<tr>
- <td>clickAndWait</td>
- <td>link=Site</td>
- <td></td>
-</tr>
-<tr>
<td>waitForTextNotPresent</td>
<td>test_portal_18</td>
<td></td>
14 years, 8 months
gatein SVN: r2780 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-04-26 12:10:09 -0400 (Mon, 26 Apr 2010)
New Revision: 2780
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_AddDragDropInDashboardInApplicationRegistry.html
Log:
UI Test: put back fix of test SNF_PRL_28
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_AddDragDropInDashboardInApplicationRegistry.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_AddDragDropInDashboardInApplicationRegistry.html 2010-04-26 15:19:10 UTC (rev 2779)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_AddDragDropInDashboardInApplicationRegistry.html 2010-04-26 16:10:09 UTC (rev 2780)
@@ -148,12 +148,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@class='GadgetTitle' and contains(@style,'display: block;')]</td>
+ <td>xpath=//div[@class='CenterControlBar']//div[@class='GadgetTitle' and text()='Calculator']</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
- <td>xpath=//div[@class='GadgetTitle' and contains(@style,'display: block;')]</td>
+ <td>xpath=//div[@class='CenterControlBar']//div[@class='GadgetTitle' and text()='Calculator']</td>
<td></td>
</tr>
<tr>
14 years, 8 months
gatein SVN: r2779 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-04-26 11:19:10 -0400 (Mon, 26 Apr 2010)
New Revision: 2779
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html
Log:
UI tests: another fixes of tests - waiting and speed issues, tests: 18, 20, 21
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-04-26 13:57:21 UTC (rev 2778)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-04-26 15:19:10 UTC (rev 2779)
@@ -127,16 +127,6 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>xpath=//div[@id='PermissionSelector']//a[@title='manager']</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>xpath=//div[@id='PermissionSelector']//a[@title='manager']</td>
- <td></td>
-</tr>
-<tr>
<td>waitForTextNotPresent</td>
<td>Permission Selector</td>
<td></td>
@@ -152,6 +142,11 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td></td>
+</tr>
+<tr>
<td>echo</td>
<td>--Verify portal creation</td>
<td></td>
@@ -167,13 +162,13 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>clickAndWait</td>
<td>link=Site</td>
<td></td>
</tr>
<tr>
- <td>waitForTextPresent</td>
- <td>Portal Navigation</td>
+ <td>pause</td>
+ <td>5000</td>
<td></td>
</tr>
<tr>
@@ -192,21 +187,16 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>link=Site</td>
+ <td>pause</td>
+ <td>5000</td>
<td></td>
</tr>
<tr>
- <td>waitForTextPresent</td>
- <td>Portal Navigation</td>
+ <td>clickAndWait</td>
+ <td>link=Site</td>
<td></td>
</tr>
<tr>
- <td>refresh</td>
- <td></td>
- <td></td>
-</tr>
-<tr>
<td>waitForTextNotPresent</td>
<td>test_portal_18</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-04-26 13:57:21 UTC (rev 2778)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-04-26 15:19:10 UTC (rev 2779)
@@ -187,11 +187,21 @@
<td></td>
</tr>
<tr>
+ <td>clickAndWait</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
<td></td>
@@ -202,11 +212,6 @@
<td></td>
</tr>
<tr>
- <td>pause</td>
- <td>5000</td>
- <td></td>
-</tr>
-<tr>
<td>waitForTextNotPresent</td>
<td>test_portal_name_20</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html 2010-04-26 13:57:21 UTC (rev 2778)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html 2010-04-26 15:19:10 UTC (rev 2779)
@@ -137,6 +137,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>test_portal_name_21</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
<td></td>
@@ -144,7 +149,7 @@
<tr>
<td>verifyTextPresent</td>
<td>test_portal_name_21</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>echo</td>
@@ -152,7 +157,12 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>clickAndWait</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
<td>link=test_portal_name_21</td>
<td></td>
</tr>
14 years, 8 months
gatein SVN: r2778 - in components/wsrp/trunk: consumer/src/main/java/org/gatein/wsrp/consumer and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-04-26 09:57:21 -0400 (Mon, 26 Apr 2010)
New Revision: 2778
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java
components/wsrp/trunk/pom.xml
Log:
- Since new versions of components are going to be released, replaced duplicated code in MarkupProcessor by call to TextTools and use 2.0.1-GA-SNAPSHOT version of common.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java 2010-04-26 12:18:27 UTC (rev 2777)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java 2010-04-26 13:57:21 UTC (rev 2778)
@@ -23,7 +23,7 @@
package org.gatein.wsrp.consumer;
-import org.gatein.common.util.ParameterValidation;
+import org.gatein.common.text.TextTools;
import org.gatein.pc.api.URLFormat;
import org.gatein.pc.api.spi.PortletInvocationContext;
import org.gatein.wsrp.WSRPPortletURL;
@@ -36,7 +36,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-public class MarkupProcessor
+public class MarkupProcessor implements TextTools.StringReplacementGenerator
{
private final PortletInvocationContext context;
private final URLFormat format;
@@ -87,137 +87,4 @@
// right now the resourceURL should be output as is, because it will be used directly but it really should be encoded
return resourceURL;
}
-
- /**
- * TODO: This is a copy of the TextTools.replaceBoundedString method found in common module, copied here to avoid
- * having to release a new version of the module TODO: REMOVE when a new version of common is released.
- *
- * @param initial
- * @param prefix
- * @param suffix
- * @param generator
- * @param replaceIfBoundedStringEmpty
- * @param keepBoundaries
- * @param suffixIsOptional
- * @return
- */
- public static String replaceBoundedString(final String initial, final String prefix, final String suffix, final MarkupProcessor generator,
- final boolean replaceIfBoundedStringEmpty, final boolean keepBoundaries, final boolean suffixIsOptional)
- {
- if (ParameterValidation.isNullOrEmpty(initial))
- {
- return initial;
- }
-
- ParameterValidation.throwIllegalArgExceptionIfNull(generator, "StringReplacementGenerator");
-
- ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(prefix, "prefix", "Tools.replaceBoundedString");
-
- StringBuilder tmp = new StringBuilder(initial);
- int prefixIndex = tmp.indexOf(prefix);
- final int prefixLength = prefix.length();
- boolean suffixAbsent = suffix == null;
-
- // nothing to do if didn't ask for an optional suffix and we have one and it's not present in our string
- if (!suffixIsOptional && suffix != null && tmp.indexOf(suffix) == -1)
- {
- return initial;
- }
-
- // loop as long as we can find an instance of prefix in the String
- while (prefixIndex != -1)
- {
- int suffixIndex;
- if (suffixAbsent)
- {
- // replace prefix with replacement
- if (keepBoundaries)
- {
- // just insert replacement for prefix
- tmp.insert(prefixIndex + prefixLength, generator.getReplacementFor(prefix, prefix, suffix));
- }
- else
- {
- // delete prefix then insert remplacement instead
- tmp.delete(prefixIndex, prefixIndex + prefixLength);
- tmp.insert(prefixIndex, generator.getReplacementFor(prefix, prefix, suffix));
- }
-
- // new lookup starting position
- prefixIndex = tmp.indexOf(prefix, prefixIndex + prefixLength);
- }
- else
- {
- // look for suffix
- suffixIndex = tmp.indexOf(suffix, prefixIndex);
-
- if (suffixIndex == -1)
- {
- // we haven't found suffix in the rest of the String so don't look for it again
- suffixAbsent = true;
- continue;
- }
- else
- {
- if (suffixIsOptional)
- {
- // if suffix is optional, look for potential next prefix instance that we'd need to replace
- int nextPrefixIndex = tmp.indexOf(prefix, prefixIndex + prefixLength);
-
- if (nextPrefixIndex != -1 && nextPrefixIndex <= suffixIndex)
- {
- // we've found an in-between prefix, use it as the suffix for the current match
- // delete prefix then insert remplacement instead
- tmp.delete(prefixIndex, prefixIndex + prefixLength);
- String replacement = generator.getReplacementFor(prefix, prefix, suffix);
- tmp.insert(prefixIndex, replacement);
-
- prefixIndex = nextPrefixIndex - prefixLength + replacement.length();
- continue;
- }
- }
-
- // we don't care about empty bounded strings or prefix and suffix don't delimit an empty String => replace!
- if (replaceIfBoundedStringEmpty || suffixIndex != prefixIndex + prefixLength)
- {
- String match = tmp.substring(prefixIndex + prefixLength, suffixIndex);
- if (keepBoundaries)
- {
- if (suffix != null)
- {
- // delete only match
- tmp.delete(prefixIndex + prefixLength, suffixIndex);
- }
- else
- {
- // delete nothing
- }
- tmp.insert(prefixIndex + prefixLength, generator.getReplacementFor(match, prefix, suffix));
- }
- else
- {
- int suffixLength = suffix != null ? suffix.length() : 0;
-
- if (suffix != null)
- {
- // if we have a suffix, delete everything between start of prefix and end of suffix
- tmp.delete(prefixIndex, suffixIndex + suffixLength);
- }
- else
- {
- // only delete prefix
- tmp.delete(prefixIndex, prefixIndex + prefixLength);
- }
- tmp.insert(prefixIndex, generator.getReplacementFor(match, prefix, suffix));
- }
- }
- }
-
- prefixIndex = tmp.indexOf(prefix, prefixIndex + prefixLength);
-
- }
- }
-
- return tmp.toString();
- }
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java 2010-04-26 12:18:27 UTC (rev 2777)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java 2010-04-26 13:57:21 UTC (rev 2778)
@@ -23,6 +23,7 @@
package org.gatein.wsrp.consumer;
+import org.gatein.common.text.TextTools;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.URLFormat;
import org.gatein.pc.api.cache.CacheScope;
@@ -192,7 +193,7 @@
// todo: remove, this is a work-around for GTNWSRP-12
markup = markup.replaceFirst("%3ftimeout%3d.*%2f", "%2f");
- markup = MarkupProcessor.replaceBoundedString(
+ markup = TextTools.replaceBoundedString(
markup,
WSRPRewritingConstants.WSRP_REWRITE,
WSRPRewritingConstants.END_WSRP_REWRITE,
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-04-26 12:18:27 UTC (rev 2777)
+++ components/wsrp/trunk/pom.xml 2010-04-26 13:57:21 UTC (rev 2778)
@@ -21,7 +21,8 @@
~ 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>
@@ -47,7 +48,7 @@
<properties>
<version.gatein.pc>2.1.0-GA</version.gatein.pc>
- <version.gatein.common>2.0.0-GA</version.gatein.common>
+ <version.gatein.common>2.0.1-GA-SNAPSHOT</version.gatein.common>
<version.gatein.wci>2.0.0-GA</version.gatein.wci>
<version.jsf>1.2_12</version.jsf>
14 years, 8 months
gatein SVN: r2777 - components/common/trunk/common/src/main/java/org/gatein/common/text.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-04-26 08:18:27 -0400 (Mon, 26 Apr 2010)
New Revision: 2777
Modified:
components/common/trunk/common/src/main/java/org/gatein/common/text/TextTools.java
Log:
- Minor.
Modified: components/common/trunk/common/src/main/java/org/gatein/common/text/TextTools.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/text/TextTools.java 2010-04-26 11:27:00 UTC (rev 2776)
+++ components/common/trunk/common/src/main/java/org/gatein/common/text/TextTools.java 2010-04-26 12:18:27 UTC (rev 2777)
@@ -1,25 +1,25 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2009, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * 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. *
- ******************************************************************************/
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.gatein.common.text;
import org.gatein.common.util.ParameterValidation;
@@ -162,7 +162,7 @@
ParameterValidation.throwIllegalArgExceptionIfNull(generator, "StringReplacementGenerator");
- ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(prefix, "prefix", "Tools.replaceBoundedString");
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(prefix, "prefix", "TextTools.replaceBoundedString");
StringBuilder tmp = new StringBuilder(initial);
int prefixIndex = tmp.indexOf(prefix);
14 years, 8 months
gatein SVN: r2776 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-26 07:27:00 -0400 (Mon, 26 Apr 2010)
New Revision: 2776
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java
Log:
GTNPORTAL-1037: Still keep old validation text when change some invalid fields
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java 2010-04-26 11:17:53 UTC (rev 2775)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java 2010-04-26 11:27:00 UTC (rev 2776)
@@ -30,6 +30,7 @@
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.EventConfig;
import org.exoplatform.webui.core.UIApplication;
+import org.exoplatform.webui.core.UIPopupMessages;
import org.exoplatform.webui.core.lifecycle.UIFormLifecycle;
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
@@ -87,6 +88,24 @@
getChild(UIRegisterInputSet.class).reset();
}
+ @Override
+ public void processAction(WebuiRequestContext context) throws Exception
+ {
+ // TODO Auto-generated method stub
+ super.processAction(context);
+
+ UIApplication uiApp = context.getUIApplication();
+ UIPopupMessages popupMessages = uiApp.getUIPopupMessages();
+ if(popupMessages.getWarnings().size() > 0 || popupMessages.getErrors().size() > 0)
+ {
+ //Invalidate the capcha
+ PortalRequestContext prContext = Util.getPortalRequestContext();
+ HttpServletRequest request = prContext.getRequest();
+ HttpSession session = request.getSession();
+ session.removeAttribute(Captcha.NAME);
+ }
+ }
+
static public class SubscribeActionListener extends EventListener<UIRegisterForm>
{
@Override
14 years, 8 months
gatein SVN: r2775 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-04-26 07:17:53 -0400 (Mon, 26 Apr 2010)
New Revision: 2775
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
Log:
GTNPORTAL-1079 Wrong information message while managing portals
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 2010-04-26 11:07:42 UTC (rev 2774)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-26 11:17:53 UTC (rev 2775)
@@ -191,12 +191,31 @@
selectedNavigation = navigation;
}
+ public boolean isExistInPageList(String portalName) throws Exception {
+ List<PortalConfig> portals = this.getPortalConfigs();
+
+ for(PortalConfig p : portals) {
+ if(p.getName().equals(portalName))
+ return true;
+ }
+
+ return false;
+ }
+
static public class DeletePortalActionListener extends EventListener<UISiteManagement>
{
public void execute(Event<UISiteManagement> event) throws Exception
{
UISiteManagement uicomp = event.getSource();
String portalName = event.getRequestContext().getRequestParameter(OBJECTID);
+
+ //TODO nguyenanhkien2a(a)gmail.com (GTNPORTAL-1079)
+ //We should check portal is existing in current UI to ensure exactly request of Delete action, not be of Refresh(F5) or Malware
+ if(!uicomp.isExistInPageList(portalName))
+ {
+ return;
+ }
+
UserPortalConfigService service = event.getSource().getApplicationComponent(UserPortalConfigService.class);
String defaultPortalName = service.getDefaultPortal();
14 years, 8 months