gatein SVN: r6629 - maven/dep/tags.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-06-10 02:04:18 -0400 (Fri, 10 Jun 2011)
New Revision: 6629
Added:
maven/dep/tags/1.1.0-Beta04/
Log:
[maven-release-plugin] copy for tag 1.1.0-Beta04
13 years, 6 months
gatein SVN: r6627 - maven/dep/trunk.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-06-10 00:14:45 -0400 (Fri, 10 Jun 2011)
New Revision: 6627
Modified:
maven/dep/trunk/pom.xml
Log:
GTNMAVEN-26 Upgrade JUEL to version 2.2.3 in gatein-dep
Modified: maven/dep/trunk/pom.xml
===================================================================
--- maven/dep/trunk/pom.xml 2011-06-10 03:56:01 UTC (rev 6626)
+++ maven/dep/trunk/pom.xml 2011-06-10 04:14:45 UTC (rev 6627)
@@ -73,7 +73,7 @@
<version.jdom>1.0</version.jdom>
<version.jodatime>1.6</version.jodatime>
<version.jsecurity>0.9.0</version.jsecurity>
- <version.juel>2.1.2</version.juel>
+ <version.juel>2.2.3</version.juel>
<version.pdfbox>1.4.0</version.pdfbox>
<version.picocontainer>1.1</version.picocontainer>
<version.quartz>1.8.4</version.quartz>
13 years, 6 months
gatein SVN: r6626 - in portal/branches/stax-integration/packaging: jboss-as6/pkg and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-06-09 23:56:01 -0400 (Thu, 09 Jun 2011)
New Revision: 6626
Modified:
portal/branches/stax-integration/packaging/jboss-as5/pkg/pom.xml
portal/branches/stax-integration/packaging/jboss-as6/pkg/pom.xml
Log:
GTNPORTAL-1905: Add dependency configuration to JBoss packaging
Modified: portal/branches/stax-integration/packaging/jboss-as5/pkg/pom.xml
===================================================================
--- portal/branches/stax-integration/packaging/jboss-as5/pkg/pom.xml 2011-06-10 03:06:13 UTC (rev 6625)
+++ portal/branches/stax-integration/packaging/jboss-as5/pkg/pom.xml 2011-06-10 03:56:01 UTC (rev 6626)
@@ -360,6 +360,12 @@
<artifactId>mop-spi</artifactId>
</dependency>
+ <!-- Staxnav -->
+ <dependency>
+ <groupId>org.staxnav</groupId>
+ <artifactId>staxnav.core</artifactId>
+ </dependency>
+
<!-- GateIn Captcha -->
<dependency>
<groupId>org.gatein.captcha</groupId>
Modified: portal/branches/stax-integration/packaging/jboss-as6/pkg/pom.xml
===================================================================
--- portal/branches/stax-integration/packaging/jboss-as6/pkg/pom.xml 2011-06-10 03:06:13 UTC (rev 6625)
+++ portal/branches/stax-integration/packaging/jboss-as6/pkg/pom.xml 2011-06-10 03:56:01 UTC (rev 6626)
@@ -358,6 +358,12 @@
<artifactId>mop-spi</artifactId>
</dependency>
+ <!-- Staxnav -->
+ <dependency>
+ <groupId>org.staxnav</groupId>
+ <artifactId>staxnav.core</artifactId>
+ </dependency>
+
<!-- GateIn Captcha -->
<dependency>
<groupId>org.gatein.captcha</groupId>
13 years, 6 months
gatein SVN: r6625 - portal/branches/branch-GTNPORTAL-1921/webui/portal/src/main/java/org/exoplatform/portal/webui/login.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-06-09 23:06:13 -0400 (Thu, 09 Jun 2011)
New Revision: 6625
Modified:
portal/branches/branch-GTNPORTAL-1921/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIResetPassword.java
Log:
GTNPORTAL-1893: Update Java code to fix the issue
Modified: portal/branches/branch-GTNPORTAL-1921/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIResetPassword.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1921/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIResetPassword.java 2011-06-10 02:52:48 UTC (rev 6624)
+++ portal/branches/branch-GTNPORTAL-1921/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIResetPassword.java 2011-06-10 03:06:13 UTC (rev 6625)
@@ -118,8 +118,7 @@
setPassword = false;
}
- Token token = tokenService.getToken(uiForm.getTokenId());
- // Making sure a token exist
+ Token token = tokenService.deleteToken(uiForm.getTokenId());
if (token == null || token.isExpired())
{
uiApp.addMessage(new ApplicationMessage("UIForgetPassword.msg.expration", null));
@@ -133,8 +132,6 @@
uiMaskWorkspace.setUIComponent(null);
uiMaskWorkspace.setWindowSize(-1, -1);
uiApp.addMessage(new ApplicationMessage("UIResetPassword.msg.change-password-successfully", null));
-
- tokenService.deleteToken(uiForm.getTokenId());
}
event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWorkspace);
}
13 years, 6 months
gatein SVN: r6624 - portal/trunk/testsuite/testdefinitions.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2011-06-09 22:52:48 -0400 (Thu, 09 Jun 2011)
New Revision: 6624
Modified:
portal/trunk/testsuite/testdefinitions/eXo_SniffTest_GateIn_3.1.x_TestDefinition.ods
portal/trunk/testsuite/testdefinitions/eXo_SniffTest_GateIn_3.2.x_TestDefinition.ods
Log:
Update test case with detail requirement for change languages function
Modified: portal/trunk/testsuite/testdefinitions/eXo_SniffTest_GateIn_3.1.x_TestDefinition.ods
===================================================================
(Binary files differ)
Modified: portal/trunk/testsuite/testdefinitions/eXo_SniffTest_GateIn_3.2.x_TestDefinition.ods
===================================================================
(Binary files differ)
13 years, 6 months
gatein SVN: r6623 - components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-06-09 17:46:20 -0400 (Thu, 09 Jun 2011)
New Revision: 6623
Modified:
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletResponseImpl.java
Log:
GTNPC-65 : Improve the DocumentBuilder creation in PortletResponseImpl
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletResponseImpl.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletResponseImpl.java 2011-06-09 21:40:48 UTC (rev 6622)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletResponseImpl.java 2011-06-09 21:46:20 UTC (rev 6623)
@@ -29,10 +29,12 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import java.lang.reflect.UndeclaredThrowableException;
import javax.portlet.PortletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponseWrapper;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
/**
@@ -42,6 +44,22 @@
public abstract class PortletResponseImpl implements PortletResponse
{
+ /** Keep a document builder in a thread local as it can create contention during its creation. */
+ private static final ThreadLocal<DocumentBuilder> builder = new ThreadLocal<DocumentBuilder>()
+ {
+ protected DocumentBuilder initialValue()
+ {
+ try
+ {
+ return DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ }
+ catch (ParserConfigurationException e)
+ {
+ throw new UndeclaredThrowableException(e);
+ }
+ }
+ };
+
/** . */
protected final PortletInvocation invocation;
@@ -117,15 +135,7 @@
{
if (doc == null)
{
- try
- {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- doc = factory.newDocumentBuilder().newDocument();
- }
- catch (ParserConfigurationException e)
- {
- throw new IllegalStateException("Could not create a document builder factory", e);
- }
+ doc = builder.get().newDocument();
}
//
13 years, 6 months
gatein SVN: r6622 - components/pc/branches/2.2.x/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-06-09 17:40:48 -0400 (Thu, 09 Jun 2011)
New Revision: 6622
Modified:
components/pc/branches/2.2.x/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletResponseImpl.java
Log:
GTNPC-65 : Improve the DocumentBuilder creation in PortletResponseImpl
Modified: components/pc/branches/2.2.x/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletResponseImpl.java
===================================================================
--- components/pc/branches/2.2.x/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletResponseImpl.java 2011-06-09 21:24:49 UTC (rev 6621)
+++ components/pc/branches/2.2.x/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletResponseImpl.java 2011-06-09 21:40:48 UTC (rev 6622)
@@ -29,10 +29,12 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import java.lang.reflect.UndeclaredThrowableException;
import javax.portlet.PortletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponseWrapper;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
/**
@@ -42,6 +44,22 @@
public abstract class PortletResponseImpl implements PortletResponse
{
+ /** Keep a document builder in a thread local as it can create contention during its creation. */
+ private static final ThreadLocal<DocumentBuilder> builder = new ThreadLocal<DocumentBuilder>()
+ {
+ protected DocumentBuilder initialValue()
+ {
+ try
+ {
+ return DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ }
+ catch (ParserConfigurationException e)
+ {
+ throw new UndeclaredThrowableException(e);
+ }
+ }
+ };
+
/** . */
protected final PortletInvocation invocation;
@@ -117,15 +135,7 @@
{
if (doc == null)
{
- try
- {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- doc = factory.newDocumentBuilder().newDocument();
- }
- catch (ParserConfigurationException e)
- {
- throw new IllegalStateException("Could not create a document builder factory", e);
- }
+ doc = builder.get().newDocument();
}
//
13 years, 6 months
gatein SVN: r6621 - components/common/trunk/common/src/main/java/org/gatein/common/concurrent.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-06-09 17:24:49 -0400 (Thu, 09 Jun 2011)
New Revision: 6621
Modified:
components/common/trunk/common/src/main/java/org/gatein/common/concurrent/BoundedBuffer.java
components/common/trunk/common/src/main/java/org/gatein/common/concurrent/ObjectRef.java
Log:
GTNCOMMON-16 : Decrease synchronization in BoundedBuffer
Modified: components/common/trunk/common/src/main/java/org/gatein/common/concurrent/BoundedBuffer.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/concurrent/BoundedBuffer.java 2011-06-09 11:35:59 UTC (rev 6620)
+++ components/common/trunk/common/src/main/java/org/gatein/common/concurrent/BoundedBuffer.java 2011-06-09 21:24:49 UTC (rev 6621)
@@ -60,7 +60,7 @@
private ObjectRef<T> first;
/** The size, it is declared as volatile for the @link{getSize()} method. */
- private volatile int size;
+ private int size;
public BoundedBuffer(int maxSize)
{
@@ -79,11 +79,6 @@
return maxSize;
}
- public int getSize()
- {
- return size;
- }
-
/**
* Add an element to the buffer.
*
@@ -91,26 +86,26 @@
*/
public void add(T t)
{
+ ObjectRef<T> added = new ObjectRef<T>(t);
synchronized (this)
{
if (first == null)
{
- first = new ObjectRef<T>(t);
- last = first;
+ last = first = added;
size = 1;
}
else
{
ObjectRef<T> tmp = first;
- first = new ObjectRef<T>(t);
- tmp.next.set(first);
+ first = added;
+ tmp.next = first;
if (size < maxSize)
{
size++;
}
else
{
- last = last.next.get();
+ last = last.next;
}
}
}
@@ -124,22 +119,20 @@
*/
public Iterator<T> iterator()
{
+ ObjectRef<T> last;
+ int size;
+ synchronized (this)
+ {
+ last = this.last;
+ size = this.size;
+ }
if (size == 0)
{
- List<T> empty = Collections.emptyList();
- return empty.iterator();
+ return Collections.<T>emptyList().iterator();
}
else
{
- // Get consistent state
- final ObjectRef<T> lastSnapshot;
- final int sizeSnapshot;
- synchronized (this)
- {
- lastSnapshot = last;
- sizeSnapshot = size;
- }
- return new BoundedIterator<T>(lastSnapshot, sizeSnapshot);
+ return new BoundedIterator<T>(last, size);
}
}
@@ -171,7 +164,7 @@
throw new NoSuchElementException();
}
T next = current.object;
- current = current.next.get();
+ current = current.next;
count++;
return next;
}
Modified: components/common/trunk/common/src/main/java/org/gatein/common/concurrent/ObjectRef.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/concurrent/ObjectRef.java 2011-06-09 11:35:59 UTC (rev 6620)
+++ components/common/trunk/common/src/main/java/org/gatein/common/concurrent/ObjectRef.java 2011-06-09 21:24:49 UTC (rev 6621)
@@ -18,8 +18,6 @@
*/
package org.gatein.common.concurrent;
-import java.util.concurrent.atomic.AtomicReference;
-
/**
* An internal class to keep a reference onto another object, it is used in the bounded buffer implementation.
*
@@ -33,11 +31,11 @@
final T object;
/** . */
- final AtomicReference<ObjectRef<T>> next;
+ volatile ObjectRef<T> next;
ObjectRef(T object)
{
this.object = object;
- this.next = new AtomicReference<ObjectRef<T>>();
+ this.next = null;
}
}
13 years, 6 months
gatein SVN: r6620 - in epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src: main/resources and 1 other directory.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-06-09 07:35:59 -0400 (Thu, 09 Jun 2011)
New Revision: 6620
Removed:
epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/conf/
Modified:
epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml
Log:
Copy configuration.xml and .properties from source.
Modified: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml 2011-06-09 11:31:30 UTC (rev 6619)
+++ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml 2011-06-09 11:35:59 UTC (rev 6620)
@@ -9,6 +9,19 @@
<includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <!-- Configuration -->
+ <file>
+ <source>../../component/common/src/main/java/conf/configuration-jboss.properties</source>
+ <destName>configuration.properties</destName>
+ <outputDirectory>conf/gatein</outputDirectory>
+ </file>
+ <file>
+ <source>../../component/common/src/main/java/conf/configuration.xml</source>
+ <outputDirectory>conf/gatein</outputDirectory>
+ </file>
+ </files>
+
<dependencySets>
<!-- GateIn ear module - unpacked -->
<dependencySet>
13 years, 6 months