gatein SVN: r363 - components/pc/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-10-15 12:00:07 -0400 (Thu, 15 Oct 2009)
New Revision: 363
Modified:
components/pc/trunk/pom.xml
Log:
Upgrade gatein-parent from 1.0.0-Beta02 to 1.0.0-Beta03
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2009-10-15 15:23:38 UTC (rev 362)
+++ components/pc/trunk/pom.xml 2009-10-15 16:00:07 UTC (rev 363)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta02</version>
+ <version>1.0.0-Beta03</version>
</parent>
<scm>
15 years, 2 months
gatein SVN: r362 - components/mop/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-10-15 11:23:38 -0400 (Thu, 15 Oct 2009)
New Revision: 362
Modified:
components/mop/trunk/pom.xml
Log:
Upgrade gatein-parent from 1.0.0-Beta02 to 1.0.0-Beta03
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-10-15 14:59:44 UTC (rev 361)
+++ components/mop/trunk/pom.xml 2009-10-15 15:23:38 UTC (rev 362)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta02</version>
+ <version>1.0.0-Beta03</version>
</parent>
<!-- ****************** -->
15 years, 2 months
gatein SVN: r361 - components/common/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-10-15 10:59:44 -0400 (Thu, 15 Oct 2009)
New Revision: 361
Modified:
components/common/trunk/pom.xml
Log:
Upgrade gatein-parent from 1.0.0-Beta02 to 1.0.0-Beta03
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2009-10-15 14:52:07 UTC (rev 360)
+++ components/common/trunk/pom.xml 2009-10-15 14:59:44 UTC (rev 361)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta02</version>
+ <version>1.0.0-Beta03</version>
</parent>
<scm>
15 years, 2 months
gatein SVN: r360 - in components/wsrp/trunk: producer/src/main/java/org/gatein/wsrp/producer and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-10-15 10:52:07 -0400 (Thu, 15 Oct 2009)
New Revision: 360
Modified:
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/UserContextConverter.java
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java
Log:
- Moved existsAndIsNotEmpty methods to WSRPUtils.
- Fixed issue with getWindowStates and getModes in RequestProcessor.createPortalContext as just checking for null wasn't enough.
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/UserContextConverter.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/UserContextConverter.java 2009-10-15 13:55:16 UTC (rev 359)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/UserContextConverter.java 2009-10-15 14:52:07 UTC (rev 360)
@@ -68,7 +68,7 @@
{
org.oasis.wsrp.v1.UserContext wsrpUserContext = WSRPTypeFactory.createUserContext(userContextKey);
wsrpUserContext.setProfile(createUserProfileFrom(userContext));
- if (WSRPTypeFactory.existsAndIsNotEmpty(userCategories))
+ if (WSRPUtils.existsAndIsNotEmpty(userCategories))
{
wsrpUserContext.getUserCategories().addAll(userCategories);
}
@@ -79,7 +79,7 @@
{
Map<String, String> userInfos = userContext.getInformations();
- if (!WSRPTypeFactory.existsAndIsNotEmpty(userInfos))
+ if (!WSRPUtils.existsAndIsNotEmpty(userInfos))
{
return null;
}
@@ -304,7 +304,7 @@
{
List<Locale> locales = Collections.emptyList();
- if (WSRPTypeFactory.existsAndIsNotEmpty(desiredLocales))
+ if (WSRPUtils.existsAndIsNotEmpty(desiredLocales))
{
locales = new ArrayList<Locale>(desiredLocales.size());
for (String desiredLocale : desiredLocales)
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2009-10-15 13:55:16 UTC (rev 359)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2009-10-15 14:52:07 UTC (rev 360)
@@ -80,7 +80,6 @@
import org.oasis.wsrp.v1.UserContext;
import javax.xml.namespace.QName;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -366,11 +365,11 @@
markupParams.setSecureClientCommunication(secureClientCommunication);
markupParams.setMode(mode);
markupParams.setWindowState(windowState);
- if (existsAndIsNotEmpty(locales))
+ if (WSRPUtils.existsAndIsNotEmpty(locales))
{
markupParams.getLocales().addAll(locales);
}
- if (existsAndIsNotEmpty(mimeTypes))
+ if (WSRPUtils.existsAndIsNotEmpty(mimeTypes))
{
markupParams.getMimeTypes().addAll(mimeTypes);
}
@@ -783,7 +782,7 @@
public static ModelDescription createModelDescription(List<PropertyDescription> propertyDescriptions)
{
ModelDescription description = new ModelDescription();
- if (existsAndIsNotEmpty(propertyDescriptions))
+ if (WSRPUtils.existsAndIsNotEmpty(propertyDescriptions))
{
description.getPropertyDescriptions().addAll(propertyDescriptions);
}
@@ -881,7 +880,7 @@
description.setRegistrationContext(registrationContext);
description.setPortletContext(portletContext);
description.setUserContext(userContext);
- if (existsAndIsNotEmpty(desiredLocales))
+ if (WSRPUtils.existsAndIsNotEmpty(desiredLocales))
{
description.getDesiredLocales().addAll(desiredLocales);
}
@@ -930,7 +929,7 @@
public static DestroyPortletsResponse createDestroyPortletsResponse(List<DestroyFailed> destroyFailed)
{
DestroyPortletsResponse destroyPortletsResponse = new DestroyPortletsResponse();
- if (existsAndIsNotEmpty(destroyFailed))
+ if (WSRPUtils.existsAndIsNotEmpty(destroyFailed))
{
destroyPortletsResponse.getDestroyFailed().addAll(destroyFailed);
}
@@ -1005,7 +1004,7 @@
DestroyPortlets destroyPortlets = new DestroyPortlets();
destroyPortlets.setRegistrationContext(registrationContext);
- if (existsAndIsNotEmpty(portletHandles))
+ if (WSRPUtils.existsAndIsNotEmpty(portletHandles))
{
destroyPortlets.getPortletHandles().addAll(portletHandles);
}
@@ -1055,7 +1054,7 @@
ReleaseSessions sessions = new ReleaseSessions();
sessions.setRegistrationContext(registrationContext);
- if (existsAndIsNotEmpty(sessionIDs))
+ if (WSRPUtils.existsAndIsNotEmpty(sessionIDs))
{
sessions.getSessionIDs().addAll(sessionIDs);
}
@@ -1106,38 +1105,18 @@
MarkupType markupType = new MarkupType();
markupType.setMimeType(mimeType);
- if (existsAndIsNotEmpty(modeNames))
+ if (WSRPUtils.existsAndIsNotEmpty(modeNames))
{
markupType.getModes().addAll(modeNames);
}
- if (existsAndIsNotEmpty(windowStateNames))
+ if (WSRPUtils.existsAndIsNotEmpty(windowStateNames))
{
markupType.getWindowStates().addAll(windowStateNames);
}
- if (existsAndIsNotEmpty(localeNames))
+ if (WSRPUtils.existsAndIsNotEmpty(localeNames))
{
markupType.getLocales().addAll(localeNames);
}
return markupType;
}
-
- /**
- * @param collection
- * @return
- * @deprecated use ParameterValidation.existsAndIsNotEmpty instead
- */
- static boolean existsAndIsNotEmpty(Collection collection)
- {
- return collection != null && !collection.isEmpty();
- }
-
- /**
- * @param map
- * @return
- * @deprecated use ParameterValidation.existsAndIsNotEmpty instead
- */
- static boolean existsAndIsNotEmpty(Map map)
- {
- return map != null && !map.isEmpty();
- }
}
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java 2009-10-15 13:55:16 UTC (rev 359)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java 2009-10-15 14:52:07 UTC (rev 360)
@@ -47,6 +47,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -452,4 +453,24 @@
localizedString.setResourceName(wsrpLocalizedString.getResourceName());
return localizedString;
}
+
+ /**
+ * @param collection
+ * @return
+ * @deprecated use ParameterValidation.existsAndIsNotEmpty instead
+ */
+ public static boolean existsAndIsNotEmpty(Collection collection)
+ {
+ return collection != null && !collection.isEmpty();
+ }
+
+ /**
+ * @param map
+ * @return
+ * @deprecated use ParameterValidation.existsAndIsNotEmpty instead
+ */
+ public static boolean existsAndIsNotEmpty(Map map)
+ {
+ return map != null && !map.isEmpty();
+ }
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java 2009-10-15 13:55:16 UTC (rev 359)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java 2009-10-15 14:52:07 UTC (rev 360)
@@ -23,13 +23,13 @@
package org.gatein.wsrp.producer;
-import org.gatein.pc.api.Mode;
-import org.gatein.pc.api.WindowState;
import org.gatein.common.net.media.MediaType;
import org.gatein.common.util.MarkupInfo;
+import org.gatein.pc.api.Mode;
import org.gatein.pc.api.Portlet;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.StateString;
+import org.gatein.pc.api.WindowState;
import org.gatein.pc.api.invocation.PortletInvocation;
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
import org.gatein.pc.api.spi.PortalContext;
@@ -405,7 +405,7 @@
public Set<WindowState> getWindowStates()
{
List<String> validNewWindowStates = params.getValidNewWindowStates();
- if (validNewWindowStates != null)
+ if (WSRPUtils.existsAndIsNotEmpty(validNewWindowStates))
{
Set<WindowState> states = new HashSet<WindowState>(validNewWindowStates.size());
for (String state : validNewWindowStates)
@@ -420,7 +420,7 @@
public Set<Mode> getModes()
{
List<String> validNewModes = params.getValidNewModes();
- if (validNewModes != null)
+ if (WSRPUtils.existsAndIsNotEmpty(validNewModes))
{
Set<Mode> modes = new HashSet<Mode>(validNewModes.size());
for (String mode : validNewModes)
15 years, 2 months
gatein SVN: r358 - tools/maven/parent/tags.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-10-15 09:55:09 -0400 (Thu, 15 Oct 2009)
New Revision: 358
Added:
tools/maven/parent/tags/1.0.0-Beta03/
Log:
[maven-scm] copy for tag 1.0.0-Beta03
Copied: tools/maven/parent/tags/1.0.0-Beta03 (from rev 357, tools/maven/parent/trunk)
15 years, 2 months
gatein SVN: r356 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-10-15 09:47:39 -0400 (Thu, 15 Oct 2009)
New Revision: 356
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java
Log:
- Increase default time out to 10 seconds.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java 2009-10-15 13:03:26 UTC (rev 355)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java 2009-10-15 13:47:39 UTC (rev 356)
@@ -40,7 +40,7 @@
{
protected T service;
protected ManageableServiceFactory parentFactory;
- private static final int TIMEOUT_MS = 3 * 1000; //todo: expose timeout so that it can be changed from the GUI
+ private static final int TIMEOUT_MS = 10 * 1000; //todo: expose timeout so that it can be changed from the GUI
/**
* HTTP request timeout property. JAX-WS doesn't standardize that value, so needs to be adapted per used
15 years, 2 months
gatein SVN: r355 - tools/maven/parent/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-10-15 09:03:26 -0400 (Thu, 15 Oct 2009)
New Revision: 355
Modified:
tools/maven/parent/trunk/pom.xml
Log:
GTNPORTAL-27 : Do not add useless Classpath (in our case) in the manifest. It creates a problem of speed of the build within jdk 6 on windows
Modified: tools/maven/parent/trunk/pom.xml
===================================================================
--- tools/maven/parent/trunk/pom.xml 2009-10-14 22:46:07 UTC (rev 354)
+++ tools/maven/parent/trunk/pom.xml 2009-10-15 13:03:26 UTC (rev 355)
@@ -61,7 +61,6 @@
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addClasspath>true</addClasspath>
</manifest>
</archive>
</configuration>
15 years, 2 months
gatein SVN: r354 - components/wsrp/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-10-14 18:46:07 -0400 (Wed, 14 Oct 2009)
New Revision: 354
Modified:
components/wsrp/trunk/pom.xml
Log:
Upgrade to the new version of gatein-dep (1.0.0-Beta02)
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2009-10-14 22:25:56 UTC (rev 353)
+++ components/wsrp/trunk/pom.xml 2009-10-14 22:46:07 UTC (rev 354)
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02</version>
<type>pom</type>
<scope>import</scope>
</dependency>
15 years, 2 months