gatein SVN: r6217 - in components/wsrp/branches/2.0.x: producer/src/test/java/org/gatein/wsrp/producer/handlers/processors and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-14 08:14:56 -0400 (Thu, 14 Apr 2011)
New Revision: 6217
Modified:
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ActionRequestProcessor.java
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/EventRequestProcessor.java
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProcessorFactory.java
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProducerHelper.java
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RenderRequestProcessor.java
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RequestProcessor.java
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ResourceRequestProcessor.java
components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java
components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java
Log:
- GTNWSRP-221: Fixed language processing logic.
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ActionRequestProcessor.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ActionRequestProcessor.java 2011-04-14 11:11:52 UTC (rev 6216)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ActionRequestProcessor.java 2011-04-14 12:14:56 UTC (rev 6217)
@@ -47,6 +47,7 @@
import org.oasis.wsrp.v2.RegistrationContext;
import org.oasis.wsrp.v2.RuntimeContext;
import org.oasis.wsrp.v2.StateChange;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -63,7 +64,7 @@
ActionRequestProcessor(ProducerHelper producer, PerformBlockingInteraction performBlockingInteraction)
throws UnsupportedMimeType, UnsupportedWindowState, InvalidHandle, UnsupportedMode, MissingParameters,
- InvalidRegistration, OperationFailed, ModifyRegistrationRequired
+ InvalidRegistration, OperationFailed, ModifyRegistrationRequired, UnsupportedLocale
{
super(producer);
this.performBlockingInteraction = performBlockingInteraction;
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/EventRequestProcessor.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/EventRequestProcessor.java 2011-04-14 11:11:52 UTC (rev 6216)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/EventRequestProcessor.java 2011-04-14 12:14:56 UTC (rev 6217)
@@ -50,6 +50,7 @@
import org.oasis.wsrp.v2.RegistrationContext;
import org.oasis.wsrp.v2.RuntimeContext;
import org.oasis.wsrp.v2.StateChange;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -66,7 +67,7 @@
{
private HandleEvents handleEvents;
- public EventRequestProcessor(ProducerHelper producer, HandleEvents handleEvents) throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, UnsupportedWindowState, InvalidRegistration, OperationNotSupported, ModifyRegistrationRequired
+ public EventRequestProcessor(ProducerHelper producer, HandleEvents handleEvents) throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, UnsupportedWindowState, InvalidRegistration, OperationNotSupported, ModifyRegistrationRequired, UnsupportedLocale
{
super(producer);
this.handleEvents = handleEvents;
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProcessorFactory.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProcessorFactory.java 2011-04-14 11:11:52 UTC (rev 6216)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProcessorFactory.java 2011-04-14 12:14:56 UTC (rev 6217)
@@ -34,6 +34,7 @@
import org.oasis.wsrp.v2.OperationFailed;
import org.oasis.wsrp.v2.OperationNotSupported;
import org.oasis.wsrp.v2.PerformBlockingInteraction;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -46,7 +47,7 @@
{
public static RequestProcessor getProcessorFor(ProducerHelper producer, Object request)
throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType,
- UnsupportedWindowState, InvalidRegistration, ModifyRegistrationRequired
+ UnsupportedWindowState, InvalidRegistration, ModifyRegistrationRequired, UnsupportedLocale
{
if (request instanceof GetMarkup)
{
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProducerHelper.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProducerHelper.java 2011-04-14 11:11:52 UTC (rev 6216)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProducerHelper.java 2011-04-14 12:14:56 UTC (rev 6217)
@@ -46,7 +46,5 @@
PortletDescription getPortletDescription(PortletContext portletContext, List<String> locales, Registration registration) throws InvalidHandle, OperationFailed;
- PortletDescription getPortletDescription(Portlet portlet, List<String> locales);
-
Registration getRegistrationOrFailIfInvalid(RegistrationContext registrationContext) throws InvalidRegistration, OperationFailed, ModifyRegistrationRequired;
}
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RenderRequestProcessor.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RenderRequestProcessor.java 2011-04-14 11:11:52 UTC (rev 6216)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RenderRequestProcessor.java 2011-04-14 12:14:56 UTC (rev 6217)
@@ -41,6 +41,7 @@
import org.oasis.wsrp.v2.PortletContext;
import org.oasis.wsrp.v2.RegistrationContext;
import org.oasis.wsrp.v2.RuntimeContext;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -55,7 +56,7 @@
private final GetMarkup getMarkup;
public RenderRequestProcessor(ProducerHelper producer, GetMarkup getMarkup) throws UnsupportedMimeType,
- UnsupportedWindowState, InvalidHandle, UnsupportedMode, MissingParameters, InvalidRegistration, OperationFailed, ModifyRegistrationRequired
+ UnsupportedWindowState, InvalidHandle, UnsupportedMode, MissingParameters, InvalidRegistration, OperationFailed, ModifyRegistrationRequired, UnsupportedLocale
{
super(producer);
this.getMarkup = getMarkup;
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RequestProcessor.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RequestProcessor.java 2011-04-14 11:11:52 UTC (rev 6216)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RequestProcessor.java 2011-04-14 12:14:56 UTC (rev 6217)
@@ -42,6 +42,7 @@
import org.gatein.registration.Registration;
import org.gatein.wsrp.UserContextConverter;
import org.gatein.wsrp.WSRPConstants;
+import org.gatein.wsrp.WSRPTypeFactory;
import org.gatein.wsrp.WSRPUtils;
import org.gatein.wsrp.producer.Utils;
import org.gatein.wsrp.spec.v2.WSRP2ExceptionFactory;
@@ -59,6 +60,7 @@
import org.oasis.wsrp.v2.RegistrationContext;
import org.oasis.wsrp.v2.RuntimeContext;
import org.oasis.wsrp.v2.SessionParams;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -98,7 +100,7 @@
}
void prepareInvocation() throws InvalidRegistration, OperationFailed, InvalidHandle,
- UnsupportedMimeType, UnsupportedWindowState, UnsupportedMode, MissingParameters, ModifyRegistrationRequired
+ UnsupportedMimeType, UnsupportedWindowState, UnsupportedMode, MissingParameters, ModifyRegistrationRequired, UnsupportedLocale
{
Registration registration = producer.getRegistrationOrFailIfInvalid(getRegistrationContext());
@@ -117,6 +119,21 @@
WSRP2ExceptionFactory.throwMissingParametersIfValueIsMissing(wsrpPC, "PortletContext", getContextName());
org.gatein.pc.api.PortletContext portletContext = WSRPUtils.convertToPortalPortletContext(wsrpPC);
+ // check locales
+ final List<String> desiredLocales = params.getLocales();
+ for (String locale : desiredLocales)
+ {
+ try
+ {
+ WSRPUtils.getLocale(locale);
+ }
+ catch (IllegalArgumentException e)
+ {
+ throw WSRP2ExceptionFactory.throwWSException(UnsupportedLocale.class, e.getLocalizedMessage(), null);
+ }
+ }
+
+
// retrieve the portlet
try
{
@@ -129,8 +146,7 @@
}
// get portlet description for the desired portlet...
- final List<String> desiredLocales = params.getLocales();
- portletDescription = producer.getPortletDescription(portlet, desiredLocales);
+ portletDescription = producer.getPortletDescription(wsrpPC, null, registration);
if (Boolean.TRUE.equals(portletDescription.isUsesMethodGet()))
{
throw WSRP2ExceptionFactory.throwWSException(OperationFailed.class, "Portlets using GET method in forms are not currently supported.", null);
@@ -263,49 +279,24 @@
}
// use user-desired locales
- List<String> locales = params.getLocales();
+ List<String> desiredLocales = new ArrayList<String>(params.getLocales());
List<String> supportedLocales = new ArrayList<String>(markupType.getLocales());
- if (supportedLocales != null)
- {
- // reset markup type locales
- markupType.getLocales().clear();
- boolean found = false;
+ desiredLocales.retainAll(supportedLocales);
- // find the best match
- for (String locale : locales)
- {
- for (String supportedLocale : supportedLocales)
- {
- if (locale.equals(supportedLocale))
- {
- markupType.getLocales().add(locale);
- found = true;
- break;
- }
- }
-
- if (found)
- {
- break;
- }
- }
-
- // if no best match was found, use whatever the user gave us
- if (!found)
- {
- markupType.getLocales().addAll(locales);
- }
- }
- else
+ if (desiredLocales.isEmpty())
{
- markupType.getLocales().addAll(locales);
+ desiredLocales = params.getLocales();
}
+ // copy MarkupType as this is one shared instance
+ MarkupType markupTypeCopy = WSRPTypeFactory.createMarkupType(markupType.getMimeType(), markupType.getModes(), markupType.getWindowStates(), desiredLocales);
+ markupTypeCopy.getExtensions().addAll(markupType.getExtensions());
+
// get the mode
String mode;
try
{
- mode = getMatchingOrFailFrom(markupType.getModes(), params.getMode(), PORTLET_MODE);
+ mode = getMatchingOrFailFrom(markupTypeCopy.getModes(), params.getMode(), PORTLET_MODE);
}
catch (IllegalArgumentException e)
{
@@ -316,7 +307,7 @@
String windowState;
try
{
- windowState = getMatchingOrFailFrom(markupType.getWindowStates(), params.getWindowState(), WINDOW_STATE);
+ windowState = getMatchingOrFailFrom(markupTypeCopy.getWindowStates(), params.getWindowState(), WINDOW_STATE);
}
catch (IllegalArgumentException e)
{
@@ -326,7 +317,7 @@
// get the character set
String characterSet = getMatchingOrDefaultFrom(Collections.<String>emptyList(), params.getMarkupCharacterSets(), WSRPConstants.DEFAULT_CHARACTER_SET);
- return new MarkupRequest(markupType, mode, windowState, characterSet, portlet);
+ return new MarkupRequest(markupTypeCopy, mode, windowState, characterSet, portlet);
}
/**
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ResourceRequestProcessor.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ResourceRequestProcessor.java 2011-04-14 11:11:52 UTC (rev 6216)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ResourceRequestProcessor.java 2011-04-14 12:14:56 UTC (rev 6217)
@@ -43,6 +43,7 @@
import org.oasis.wsrp.v2.ResourceParams;
import org.oasis.wsrp.v2.ResourceResponse;
import org.oasis.wsrp.v2.RuntimeContext;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -56,7 +57,7 @@
{
private final GetResource getResource;
- public ResourceRequestProcessor(ProducerHelper producer, GetResource getResource) throws InvalidRegistration, OperationFailed, MissingParameters, InvalidHandle, UnsupportedMimeType, UnsupportedWindowState, UnsupportedMode, ModifyRegistrationRequired
+ public ResourceRequestProcessor(ProducerHelper producer, GetResource getResource) throws InvalidRegistration, OperationFailed, MissingParameters, InvalidHandle, UnsupportedMimeType, UnsupportedWindowState, UnsupportedMode, ModifyRegistrationRequired, UnsupportedLocale
{
super(producer);
this.getResource = getResource;
Modified: components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java 2011-04-14 11:11:52 UTC (rev 6216)
+++ components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java 2011-04-14 12:14:56 UTC (rev 6217)
@@ -44,6 +44,7 @@
import org.oasis.wsrp.v2.OperationFailed;
import org.oasis.wsrp.v2.PortletDescription;
import org.oasis.wsrp.v2.RegistrationContext;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -59,7 +60,7 @@
{
private static final String PORTLET_HANDLE = "portletHandle";
- public void testShouldUseProvidedNamespace() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, UnsupportedWindowState, InvalidRegistration, ModifyRegistrationRequired
+ public void testShouldUseProvidedNamespace() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, UnsupportedWindowState, InvalidRegistration, ModifyRegistrationRequired, UnsupportedLocale
{
String namespace = "namespace";
ServletAccess.setRequestAndResponse(MockHttpServletRequest.createMockRequest(MockHttpSession.createMockSession()), MockHttpServletResponse.createMockResponse());
@@ -72,7 +73,7 @@
assertEquals("namespace", processor.invocation.getWindowContext().getNamespace());
}
- public void testShouldProperlyHandleWildCardsInRequestedMimeTypes() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, ModifyRegistrationRequired, UnsupportedWindowState, InvalidRegistration
+ public void testShouldProperlyHandleWildCardsInRequestedMimeTypes() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, ModifyRegistrationRequired, UnsupportedWindowState, InvalidRegistration, UnsupportedLocale
{
List<String> mimeTypes = new ArrayList<String>(1);
mimeTypes.add("*/*");
@@ -122,7 +123,7 @@
}
}
- public void testShouldReturnFirstMimeTypeMatching() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, ModifyRegistrationRequired, UnsupportedWindowState, InvalidRegistration
+ public void testShouldReturnFirstMimeTypeMatching() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, ModifyRegistrationRequired, UnsupportedWindowState, InvalidRegistration, UnsupportedLocale
{
List<String> mimeTypes = new ArrayList<String>(2);
mimeTypes.add("text/xml");
@@ -176,11 +177,6 @@
public PortletDescription getPortletDescription(org.oasis.wsrp.v2.PortletContext portletContext, List<String> locales, Registration registration) throws InvalidHandle, OperationFailed
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public PortletDescription getPortletDescription(Portlet portlet, List<String> locales)
- {
List<String> modeNames = new ArrayList<String>(1);
modeNames.add(WSRPConstants.VIEW_MODE);
@@ -194,6 +190,11 @@
return WSRPTypeFactory.createPortletDescription(PORTLET_HANDLE, markupTypes);
}
+ public PortletDescription getPortletDescription(Portlet portlet, List<String> locales)
+ {
+ throw new UnsupportedOperationException();
+ }
+
public Registration getRegistrationOrFailIfInvalid(RegistrationContext registrationContext) throws InvalidRegistration, OperationFailed
{
return null; //To change body of implemented methods use File | Settings | File Templates.
Modified: components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java
===================================================================
--- components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2011-04-14 11:11:52 UTC (rev 6216)
+++ components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2011-04-14 12:14:56 UTC (rev 6217)
@@ -65,6 +65,7 @@
import org.oasis.wsrp.v2.SessionContext;
import org.oasis.wsrp.v2.SessionParams;
import org.oasis.wsrp.v2.StateChange;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UpdateResponse;
@@ -249,7 +250,6 @@
}
// fix-me: add more tests
-
@Test
public void testGetMarkupSession() throws Exception
{
@@ -436,10 +436,9 @@
try
{
producer.getMarkup(getMarkup);
- //fail("Should have thrown an UnsupportetLocaleFault"); // ideally cf http://jira.jboss.com/jira/browse/JBPORTAL-857
- ExtendedAssert.fail("Should have thrown an exception"); // right now
+ ExtendedAssert.fail("Should have thrown an exception");
}
- catch (Exception expected)
+ catch (UnsupportedLocale expected)
{
// expected
}
@@ -468,7 +467,7 @@
producer.usingStrictModeChangedTo(false);
// markup should be properly generated
- checkMarkupResponse(producer.getMarkup(getMarkup), "English (United States)");
+ checkMarkupResponse(producer.getMarkup(getMarkup), Locale.US.getDisplayName());
undeploy(getLocalesPortletArchive);
}
@@ -503,6 +502,7 @@
try
{
List<String> locales = getMarkup.getMarkupParams().getLocales();
+ locales.clear();
locales.add("en");
locales.add("fr");
MarkupResponse response = producer.getMarkup(getMarkup);
@@ -663,12 +663,6 @@
}
}
- private NamedString createNamedString(String name, String value)
- {
- NamedString namedString = WSRPTypeFactory.createNamedString(name, value);
- return namedString;
- }
-
@Test
public void testGetMarkupWithResource() throws Exception
{
@@ -1113,6 +1107,12 @@
return markupContext;
}
+ private NamedString createNamedString(String name, String value)
+ {
+ NamedString namedString = WSRPTypeFactory.createNamedString(name, value);
+ return namedString;
+ }
+
protected String getMostUsedPortletWARFileName()
{
return DEFAULT_MARKUP_PORTLET_WAR;
13 years, 9 months
- 1
- 0
gatein SVN: r6216 - in components/wsrp/trunk: producer/src/test/java/org/gatein/wsrp/producer/handlers/processors and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-14 07:11:52 -0400 (Thu, 14 Apr 2011)
New Revision: 6216
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ActionRequestProcessor.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/EventRequestProcessor.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProcessorFactory.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProducerHelper.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RenderRequestProcessor.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RequestProcessor.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ResourceRequestProcessor.java
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java
Log:
- GTNWSRP-221: Fixed language processing logic.
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ActionRequestProcessor.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ActionRequestProcessor.java 2011-04-14 10:20:53 UTC (rev 6215)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ActionRequestProcessor.java 2011-04-14 11:11:52 UTC (rev 6216)
@@ -47,6 +47,7 @@
import org.oasis.wsrp.v2.RegistrationContext;
import org.oasis.wsrp.v2.RuntimeContext;
import org.oasis.wsrp.v2.StateChange;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -63,7 +64,7 @@
ActionRequestProcessor(ProducerHelper producer, PerformBlockingInteraction performBlockingInteraction)
throws UnsupportedMimeType, UnsupportedWindowState, InvalidHandle, UnsupportedMode, MissingParameters,
- InvalidRegistration, OperationFailed, ModifyRegistrationRequired
+ InvalidRegistration, OperationFailed, ModifyRegistrationRequired, UnsupportedLocale
{
super(producer);
this.performBlockingInteraction = performBlockingInteraction;
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/EventRequestProcessor.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/EventRequestProcessor.java 2011-04-14 10:20:53 UTC (rev 6215)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/EventRequestProcessor.java 2011-04-14 11:11:52 UTC (rev 6216)
@@ -50,6 +50,7 @@
import org.oasis.wsrp.v2.RegistrationContext;
import org.oasis.wsrp.v2.RuntimeContext;
import org.oasis.wsrp.v2.StateChange;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -66,7 +67,7 @@
{
private HandleEvents handleEvents;
- public EventRequestProcessor(ProducerHelper producer, HandleEvents handleEvents) throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, UnsupportedWindowState, InvalidRegistration, OperationNotSupported, ModifyRegistrationRequired
+ public EventRequestProcessor(ProducerHelper producer, HandleEvents handleEvents) throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, UnsupportedWindowState, InvalidRegistration, OperationNotSupported, ModifyRegistrationRequired, UnsupportedLocale
{
super(producer);
this.handleEvents = handleEvents;
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProcessorFactory.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProcessorFactory.java 2011-04-14 10:20:53 UTC (rev 6215)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProcessorFactory.java 2011-04-14 11:11:52 UTC (rev 6216)
@@ -34,6 +34,7 @@
import org.oasis.wsrp.v2.OperationFailed;
import org.oasis.wsrp.v2.OperationNotSupported;
import org.oasis.wsrp.v2.PerformBlockingInteraction;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -46,7 +47,7 @@
{
public static RequestProcessor getProcessorFor(ProducerHelper producer, Object request)
throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType,
- UnsupportedWindowState, InvalidRegistration, ModifyRegistrationRequired
+ UnsupportedWindowState, InvalidRegistration, ModifyRegistrationRequired, UnsupportedLocale
{
if (request instanceof GetMarkup)
{
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProducerHelper.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProducerHelper.java 2011-04-14 10:20:53 UTC (rev 6215)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ProducerHelper.java 2011-04-14 11:11:52 UTC (rev 6216)
@@ -46,7 +46,5 @@
PortletDescription getPortletDescription(PortletContext portletContext, List<String> locales, Registration registration) throws InvalidHandle, OperationFailed;
- PortletDescription getPortletDescription(Portlet portlet, List<String> locales);
-
Registration getRegistrationOrFailIfInvalid(RegistrationContext registrationContext) throws InvalidRegistration, OperationFailed, ModifyRegistrationRequired;
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RenderRequestProcessor.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RenderRequestProcessor.java 2011-04-14 10:20:53 UTC (rev 6215)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RenderRequestProcessor.java 2011-04-14 11:11:52 UTC (rev 6216)
@@ -41,6 +41,7 @@
import org.oasis.wsrp.v2.PortletContext;
import org.oasis.wsrp.v2.RegistrationContext;
import org.oasis.wsrp.v2.RuntimeContext;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -55,7 +56,7 @@
private final GetMarkup getMarkup;
public RenderRequestProcessor(ProducerHelper producer, GetMarkup getMarkup) throws UnsupportedMimeType,
- UnsupportedWindowState, InvalidHandle, UnsupportedMode, MissingParameters, InvalidRegistration, OperationFailed, ModifyRegistrationRequired
+ UnsupportedWindowState, InvalidHandle, UnsupportedMode, MissingParameters, InvalidRegistration, OperationFailed, ModifyRegistrationRequired, UnsupportedLocale
{
super(producer);
this.getMarkup = getMarkup;
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RequestProcessor.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RequestProcessor.java 2011-04-14 10:20:53 UTC (rev 6215)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/RequestProcessor.java 2011-04-14 11:11:52 UTC (rev 6216)
@@ -43,8 +43,11 @@
import org.gatein.registration.RegistrationLocal;
import org.gatein.wsrp.UserContextConverter;
import org.gatein.wsrp.WSRPConstants;
+import org.gatein.wsrp.WSRPExceptionFactory;
+import org.gatein.wsrp.WSRPTypeFactory;
import org.gatein.wsrp.WSRPUtils;
import org.gatein.wsrp.producer.Utils;
+import org.gatein.wsrp.producer.WSRPValidator;
import org.gatein.wsrp.servlet.ServletAccess;
import org.gatein.wsrp.spec.v2.WSRP2ExceptionFactory;
import org.oasis.wsrp.v2.InvalidHandle;
@@ -61,6 +64,7 @@
import org.oasis.wsrp.v2.RegistrationContext;
import org.oasis.wsrp.v2.RuntimeContext;
import org.oasis.wsrp.v2.SessionParams;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -72,6 +76,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -102,7 +107,7 @@
}
void prepareInvocation() throws InvalidRegistration, OperationFailed, InvalidHandle,
- UnsupportedMimeType, UnsupportedWindowState, UnsupportedMode, MissingParameters, ModifyRegistrationRequired
+ UnsupportedMimeType, UnsupportedWindowState, UnsupportedMode, MissingParameters, ModifyRegistrationRequired, UnsupportedLocale
{
Registration registration = producer.getRegistrationOrFailIfInvalid(getRegistrationContext());
@@ -121,6 +126,20 @@
WSRP2ExceptionFactory.throwMissingParametersIfValueIsMissing(wsrpPC, "PortletContext", getContextName());
org.gatein.pc.api.PortletContext portletContext = WSRPUtils.convertToPortalPortletContext(wsrpPC);
+ // check locales
+ final List<String> desiredLocales = params.getLocales();
+ for (String locale : desiredLocales)
+ {
+ try
+ {
+ WSRPUtils.getLocale(locale);
+ }
+ catch (IllegalArgumentException e)
+ {
+ throw WSRP2ExceptionFactory.throwWSException(UnsupportedLocale.class, e.getLocalizedMessage(), null);
+ }
+ }
+
// retrieve the portlet
try
{
@@ -133,8 +152,7 @@
}
// get portlet description for the desired portlet...
- final List<String> desiredLocales = params.getLocales();
- portletDescription = producer.getPortletDescription(portlet, desiredLocales);
+ portletDescription = producer.getPortletDescription(wsrpPC, null, registration);
if (Boolean.TRUE.equals(portletDescription.isUsesMethodGet()))
{
throw WSRP2ExceptionFactory.throwWSException(OperationFailed.class, "Portlets using GET method in forms are not currently supported.", null);
@@ -226,7 +244,7 @@
* @return a MarkupRequest containing the most appropriate information to base markup generation for this request
*/
private MarkupRequest createMarkupRequestFrom(List<MarkupType> markupTypes, MimeRequest params, Portlet portlet)
- throws UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState
+ throws UnsupportedMimeType, UnsupportedMode, UnsupportedWindowState, UnsupportedLocale
{
List<String> desiredMIMETypes = params.getMimeTypes();
MarkupType markupType = null;
@@ -279,49 +297,24 @@
}
// use user-desired locales
- List<String> locales = params.getLocales();
+ List<String> desiredLocales = new ArrayList<String>(params.getLocales());
List<String> supportedLocales = new ArrayList<String>(markupType.getLocales());
- if (supportedLocales != null)
- {
- // reset markup type locales
- markupType.getLocales().clear();
- boolean found = false;
+ desiredLocales.retainAll(supportedLocales);
- // find the best match
- for (String locale : locales)
- {
- for (String supportedLocale : supportedLocales)
- {
- if (locale.equals(supportedLocale))
- {
- markupType.getLocales().add(locale);
- found = true;
- break;
- }
- }
-
- if (found)
- {
- break;
- }
- }
-
- // if no best match was found, use whatever the user gave us
- if (!found)
- {
- markupType.getLocales().addAll(locales);
- }
- }
- else
+ if (desiredLocales.isEmpty())
{
- markupType.getLocales().addAll(locales);
+ desiredLocales = params.getLocales();
}
+ // copy MarkupType as this is one shared instance
+ MarkupType markupTypeCopy = WSRPTypeFactory.createMarkupType(markupType.getMimeType(), markupType.getModes(), markupType.getWindowStates(), desiredLocales);
+ markupTypeCopy.getExtensions().addAll(markupType.getExtensions());
+
// get the mode
String mode;
try
{
- mode = getMatchingOrFailFrom(markupType.getModes(), params.getMode(), PORTLET_MODE);
+ mode = getMatchingOrFailFrom(markupTypeCopy.getModes(), params.getMode(), PORTLET_MODE);
}
catch (IllegalArgumentException e)
{
@@ -332,7 +325,7 @@
String windowState;
try
{
- windowState = getMatchingOrFailFrom(markupType.getWindowStates(), params.getWindowState(), WINDOW_STATE);
+ windowState = getMatchingOrFailFrom(markupTypeCopy.getWindowStates(), params.getWindowState(), WINDOW_STATE);
}
catch (IllegalArgumentException e)
{
@@ -342,7 +335,7 @@
// get the character set
String characterSet = getMatchingOrDefaultFrom(Collections.<String>emptyList(), params.getMarkupCharacterSets(), WSRPConstants.DEFAULT_CHARACTER_SET);
- return new MarkupRequest(markupType, mode, windowState, characterSet, portlet);
+ return new MarkupRequest(markupTypeCopy, mode, windowState, characterSet, portlet);
}
/**
@@ -516,7 +509,7 @@
private SecurityContext createSecurityContext(final MimeRequest params, final RuntimeContext runtimeContext,
final org.oasis.wsrp.v2.UserContext wsrpUserContext)
{
-
+
final HttpServletRequest request = ServletAccess.getRequest();
final boolean useSecurity;
if (request != null && request.getRemoteUser() != null)
@@ -527,7 +520,7 @@
{
useSecurity = false;
}
-
+
return new SecurityContext()
{
public boolean isSecure()
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ResourceRequestProcessor.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ResourceRequestProcessor.java 2011-04-14 10:20:53 UTC (rev 6215)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/ResourceRequestProcessor.java 2011-04-14 11:11:52 UTC (rev 6216)
@@ -43,6 +43,7 @@
import org.oasis.wsrp.v2.ResourceParams;
import org.oasis.wsrp.v2.ResourceResponse;
import org.oasis.wsrp.v2.RuntimeContext;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -56,7 +57,7 @@
{
private final GetResource getResource;
- public ResourceRequestProcessor(ProducerHelper producer, GetResource getResource) throws InvalidRegistration, OperationFailed, MissingParameters, InvalidHandle, UnsupportedMimeType, UnsupportedWindowState, UnsupportedMode, ModifyRegistrationRequired
+ public ResourceRequestProcessor(ProducerHelper producer, GetResource getResource) throws InvalidRegistration, OperationFailed, MissingParameters, InvalidHandle, UnsupportedMimeType, UnsupportedWindowState, UnsupportedMode, ModifyRegistrationRequired, UnsupportedLocale
{
super(producer);
this.getResource = getResource;
Modified: components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java
===================================================================
--- components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java 2011-04-14 10:20:53 UTC (rev 6215)
+++ components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java 2011-04-14 11:11:52 UTC (rev 6216)
@@ -44,6 +44,7 @@
import org.oasis.wsrp.v2.OperationFailed;
import org.oasis.wsrp.v2.PortletDescription;
import org.oasis.wsrp.v2.RegistrationContext;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMimeType;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UnsupportedWindowState;
@@ -59,7 +60,7 @@
{
private static final String PORTLET_HANDLE = "/app.portletHandle";
- public void testShouldUseProvidedNamespace() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, UnsupportedWindowState, InvalidRegistration, ModifyRegistrationRequired
+ public void testShouldUseProvidedNamespace() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, UnsupportedWindowState, InvalidRegistration, ModifyRegistrationRequired, UnsupportedLocale
{
String namespace = "namespace";
ServletAccess.setRequestAndResponse(MockHttpServletRequest.createMockRequest(MockHttpSession.createMockSession()), MockHttpServletResponse.createMockResponse());
@@ -72,7 +73,7 @@
assertEquals("namespace", processor.invocation.getWindowContext().getNamespace());
}
- public void testShouldProperlyHandleWildCardsInRequestedMimeTypes() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, ModifyRegistrationRequired, UnsupportedWindowState, InvalidRegistration
+ public void testShouldProperlyHandleWildCardsInRequestedMimeTypes() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, ModifyRegistrationRequired, UnsupportedWindowState, InvalidRegistration, UnsupportedLocale
{
List<String> mimeTypes = new ArrayList<String>(1);
mimeTypes.add("*/*");
@@ -122,7 +123,7 @@
}
}
- public void testShouldReturnFirstMimeTypeMatching() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, ModifyRegistrationRequired, UnsupportedWindowState, InvalidRegistration
+ public void testShouldReturnFirstMimeTypeMatching() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, ModifyRegistrationRequired, UnsupportedWindowState, InvalidRegistration, UnsupportedLocale
{
List<String> mimeTypes = new ArrayList<String>(2);
mimeTypes.add("text/xml");
@@ -176,11 +177,6 @@
public PortletDescription getPortletDescription(org.oasis.wsrp.v2.PortletContext portletContext, List<String> locales, Registration registration) throws InvalidHandle, OperationFailed
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public PortletDescription getPortletDescription(Portlet portlet, List<String> locales)
- {
List<String> modeNames = new ArrayList<String>(1);
modeNames.add(WSRPConstants.VIEW_MODE);
@@ -194,9 +190,15 @@
return WSRPTypeFactory.createPortletDescription(PORTLET_HANDLE, markupTypes);
}
+ public PortletDescription getPortletDescription(Portlet portlet, List<String> locales)
+ {
+ throw new UnsupportedOperationException();
+ }
+
public Registration getRegistrationOrFailIfInvalid(RegistrationContext registrationContext) throws InvalidRegistration, OperationFailed
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+
}
}
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2011-04-14 10:20:53 UTC (rev 6215)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2011-04-14 11:11:52 UTC (rev 6216)
@@ -65,6 +65,7 @@
import org.oasis.wsrp.v2.SessionContext;
import org.oasis.wsrp.v2.SessionParams;
import org.oasis.wsrp.v2.StateChange;
+import org.oasis.wsrp.v2.UnsupportedLocale;
import org.oasis.wsrp.v2.UnsupportedMode;
import org.oasis.wsrp.v2.UpdateResponse;
@@ -249,7 +250,6 @@
}
// fix-me: add more tests
-
@Test
public void testGetMarkupSession() throws Exception
{
@@ -436,10 +436,9 @@
try
{
producer.getMarkup(getMarkup);
- //fail("Should have thrown an UnsupportetLocaleFault"); // ideally cf http://jira.jboss.com/jira/browse/JBPORTAL-857
- ExtendedAssert.fail("Should have thrown an exception"); // right now
+ ExtendedAssert.fail("Should have thrown an exception");
}
- catch (Exception expected)
+ catch (UnsupportedLocale expected)
{
// expected
}
@@ -468,7 +467,7 @@
producer.usingStrictModeChangedTo(false);
// markup should be properly generated
- checkMarkupResponse(producer.getMarkup(getMarkup), "English (United States)");
+ checkMarkupResponse(producer.getMarkup(getMarkup), Locale.US.getDisplayName());
undeploy(getLocalesPortletArchive);
}
@@ -503,6 +502,7 @@
try
{
List<String> locales = getMarkup.getMarkupParams().getLocales();
+ locales.clear();
locales.add("en");
locales.add("fr");
MarkupResponse response = producer.getMarkup(getMarkup);
@@ -663,12 +663,6 @@
}
}
- private NamedString createNamedString(String name, String value)
- {
- NamedString namedString = WSRPTypeFactory.createNamedString(name, value);
- return namedString;
- }
-
@Test
public void testGetMarkupWithResource() throws Exception
{
@@ -1113,6 +1107,12 @@
return markupContext;
}
+ private NamedString createNamedString(String name, String value)
+ {
+ NamedString namedString = WSRPTypeFactory.createNamedString(name, value);
+ return namedString;
+ }
+
protected String getMostUsedPortletWARFileName()
{
return DEFAULT_MARKUP_PORTLET_WAR;
13 years, 9 months
- 1
- 0
gatein SVN: r6215 - in epp/portal/branches/EPP_5_1_Branch: testsuite/htmlunit-tests and 10 other directories.
by do-not-reply＠jboss.org
Author: tkobayas(a)redhat.com
Date: 2011-04-14 06:20:53 -0400 (Thu, 14 Apr 2011)
New Revision: 6215
Added:
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/pom.xml
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/AbstractWebTest.java
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/common/
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/common/WebHelper.java
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePage.java
epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePageNavNode.java
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
Log:
JBEPP-811 Fail to create one page when creating two new pages at the same time. -- This fix only addresses navigation overwriting.
Added: epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/pom.xml (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/pom.xml 2011-04-14 10:20:53 UTC (rev 6215)
@@ -0,0 +1,130 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file 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.
+ -->
+
+<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>
+
+ <groupId>org.jboss.gatein</groupId>
+ <artifactId>gatein.tests.htmlunit</artifactId>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>HTMLUnit Tests for GateIn</name>
+ <description>HTMLUnit Tests for GateIn</description>
+
+ <properties>
+ <testng.suite.file>testng.xml</testng.suite.file>
+ <test.host>localhost</test.host>
+ <test.port>8080</test.port>
+ <test.portalContainer>portal</test.portalContainer>
+ <test.waitTimeout>20</test.waitTimeout>
+ <test.shortPause>3</test.shortPause>
+ </properties>
+
+ <!-- no tests by default -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>htmlunit</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ <!--suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/${testng.suite.file}</suiteXmlFile>
+ </suiteXmlFiles-->
+ <systemProperties>
+ <property>
+ <name>test.host</name>
+ <value>${test.host}</value>
+ </property>
+ <property>
+ <name>test.port</name>
+ <value>${test.port}</value>
+ </property>
+ <property>
+ <name>test.portalContainer</name>
+ <value>${test.portalContainer}</value>
+ </property>
+ <property>
+ <name>test.waitTimeout</name>
+ <value>${test.waitTimeout}</value>
+ </property>
+ <property>
+ <name>test.shortPause</name>
+ <value>${test.shortPause}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.12.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.8</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/AbstractWebTest.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/AbstractWebTest.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/AbstractWebTest.java 2011-04-14 10:20:53 UTC (rev 6215)
@@ -0,0 +1,234 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.gatein.htmlunit;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import org.jboss.gatein.htmlunit.common.WebHelper;
+
+import java.io.IOException;
+
+/**
+ * This class provides every thread of execution with a single instance of WebHelper
+ * which represents a single session with the web application.
+ *
+ * By extending this class test code can be written as if the state exists at the test class instance level
+ * (shared across concurrent method calls), when in fact every thread has it's own copy.
+ *
+ * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
+ */
+public abstract class AbstractWebTest
+{
+ /** Thread specific WebHelper storage */
+ private static final ThreadLocal<WebHelper> tcl = new ThreadLocal<WebHelper>();
+
+ /**
+ * Get current WebHelper - lazy initialized if none yet exists.
+ *
+ * @return current WebHelper
+ */
+ protected WebHelper getWebHelper()
+ {
+ WebHelper ret = tcl.get();
+ if (ret == null)
+ {
+ tcl.set(new WebHelper());
+ ret = tcl.get();
+ }
+ return ret;
+ }
+
+ /**
+ * Get current WebClient
+ *
+ * @return current WebClient
+ */
+ protected WebClient getWebClient()
+ {
+ return getWebHelper().getWebClient();
+ }
+
+ /**
+ * @see WebHelper#openPortal(boolean)
+ */
+ protected void openPortal(boolean publicMode) throws IOException
+ {
+ getWebHelper().openPortal(publicMode);
+ }
+
+ /**
+ * @see WebHelper#signInAsRoot()
+ */
+ protected void signInAsRoot()
+ {
+ getWebHelper().signInAsRoot();
+ }
+
+ /**
+ * @see WebHelper#signIn(String, String)
+ */
+ protected void signIn(String user, String pass)
+ {
+ getWebHelper().signIn(user, pass);
+ }
+
+ /**
+ * @see WebHelper#type(String, String)
+ */
+ protected void type(String field, String value)
+ {
+ getWebHelper().type(field, value);
+ }
+
+ /**
+ * @see WebHelper#click(String)
+ */
+ protected void click(String el)
+ {
+ getWebHelper().click(el);
+ }
+
+ /**
+ * @see WebHelper#waitForElementPresent(String)
+ */
+ protected void waitForElementPresent(String el)
+ {
+ getWebHelper().waitForElementPresent(el);
+ }
+
+ /**
+ * @see WebHelper#isElementPresent(String)
+ */
+ protected boolean isElementPresent(String el)
+ {
+ return getWebHelper().isElementPresent(el);
+ }
+
+ /**
+ * @see WebHelper#getElement(String)
+ */
+ protected HtmlElement getElement(String el)
+ {
+ return getWebHelper().getElement(el);
+ }
+
+ /**
+ * @see WebHelper#waitForTextPresent(String ...)
+ */
+ protected String waitForTextPresent(String ... text)
+ {
+ return getWebHelper().waitForTextPresent(text);
+ }
+
+ /**
+ * @see WebHelper#waitForTextNotPresent(String)
+ */
+ protected void waitForTextNotPresent(String text)
+ {
+ getWebHelper().waitForTextNotPresent(text);
+ }
+
+ /**
+ * @see WebHelper#isTextPresent(String)
+ */
+ protected boolean isTextPresent(String text)
+ {
+ return getWebHelper().isTextPresent(text);
+ }
+
+ /**
+ * @see WebHelper#shortPause
+ */
+ protected void shortPause()
+ {
+ getWebHelper().shortPause();
+ }
+
+ /**
+ * @see WebHelper#pause(long)
+ */
+ protected void pause(long millis)
+ {
+ WebHelper.pause(millis);
+ }
+
+ /**
+ * @see WebHelper#dragAndDropToObject(String, String)
+ */
+ protected void dragAndDropToObject(String sourceEl, String targetEl)
+ {
+ getWebHelper().dragAndDropToObject(sourceEl, targetEl);
+ }
+
+ /**
+ * @see WebHelper#finishPageEdit
+ */
+ protected void finishPageEdit()
+ {
+ getWebHelper().finishPageEdit();
+ }
+
+ /**
+ * @see WebHelper#addNewPageUpToFinish(String, String, String, String)
+ */
+ protected void addNewPageUpToFinish(String categoryTitle, String portletName, String pageName, String portletElementToDnD)
+ {
+ getWebHelper().addNewPageUpToFinish(categoryTitle, portletName, pageName, portletElementToDnD);
+ }
+
+ protected void goToPageManagement()
+ {
+ getWebHelper().goToPageManagement();
+ }
+
+ protected void searchAndDeletePage(String testPage)
+ {
+ getWebHelper().searchAndDeletePage(testPage);
+ }
+
+ protected void goToSiteManagement()
+ {
+ getWebHelper().goToSiteManagement();
+ }
+
+ protected void editNavigation(String portalContainer)
+ {
+ getWebHelper().editNavigation(portalContainer);
+ }
+
+ protected void deleteNode(String nodeLabel)
+ {
+ getWebHelper().deleteNode(nodeLabel);
+ }
+
+ protected void leavePageEdit()
+ {
+ getWebHelper().leavePageEdit();
+ }
+
+ protected void finished()
+ {
+ if (getWebHelper().isDumpPageOnExit())
+ getWebHelper().dumpPage();
+ }
+}
Added: epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/common/WebHelper.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/common/WebHelper.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/common/WebHelper.java 2011-04-14 10:20:53 UTC (rev 6215)
@@ -0,0 +1,857 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.gatein.htmlunit.common;
+
+import com.gargoylesoftware.htmlunit.ConfirmHandler;
+import com.gargoylesoftware.htmlunit.IncorrectnessListener;
+import com.gargoylesoftware.htmlunit.Page;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HTMLParserListener;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlOption;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSelect;
+import org.apache.commons.logging.LogFactory;
+import org.testng.Assert;
+import org.testng.log4testng.Logger;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Properties;
+
+/**
+ * WebHelper class contains helper methods to easily perform GateIn portal operations
+ *
+ * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
+ */
+public class WebHelper
+{
+
+ /** HTMLUnit Webclient represents a web session */
+ private WebClient webClient;
+
+ /** Host to use for web session */
+ private String host = "localhost";
+
+ /** Port to use for web session */
+ private int port = 8080;
+
+ /** Portal container to use for web session */
+ private String portalContainer = "portal";
+
+ /** Time to wait (in seconds) for element or text to appear in the page */
+ private int waitTimeout = 20;
+
+ /** Short pause period (in seconds) */
+ private int shortPause = 3;
+
+ /** Dump current page before throwing exception */
+ private boolean dumpPageOnFail = false;
+
+ /** Dump current page on exit */
+ private boolean dumpPageOnExit = false;
+
+ /** Properties to use for configuration overrides */
+ private Properties props = System.getProperties();
+
+ /** Current page */
+ private HtmlPage page;
+
+
+ /**
+ * Get host property.
+ *
+ * @return value of host property
+ */
+ public String getHost()
+ {
+ return host;
+ }
+
+ /**
+ * Get port property.
+ *
+ * @return value of port property
+ */
+ public int getPort()
+ {
+ return port;
+ }
+
+ /**
+ * Get portalContainer property.
+ *
+ * @return value of portalContainer property
+ */
+ public String getPortalContainer()
+ {
+ return portalContainer;
+ }
+
+ /**
+ * Get properties used for initialization.
+ *
+ * @return Properties
+ */
+ public Properties getProps()
+ {
+ return props;
+ }
+
+ /**
+ * Get shortPause property.
+ *
+ * @return value of shortPause property
+ */
+ public int getShortPause()
+ {
+ return shortPause;
+ }
+
+ /**
+ * Get waitTimeout property.
+ *
+ * @return value of waitTimeout property
+ */
+ public int getWaitTimeout()
+ {
+ return waitTimeout;
+ }
+
+ /**
+ * Is dumpPageOnFail flag true.
+ *
+ * @return value of dumpPageOnFail property
+ */
+ public boolean isDumpPageOnFail()
+ {
+ return dumpPageOnFail;
+ }
+
+ /**
+ * Is dumpPageOnExit flag true.
+ *
+ * @return value of dumpPageOnExit property
+ */
+ public boolean isDumpPageOnExit()
+ {
+ return dumpPageOnExit;
+ }
+
+ /**
+ * Get HTMLUnit WebClient instance representing the current session.
+ *
+ * @return WebClient instance representing a browser window
+ */
+ public WebClient getWebClient()
+ {
+ if (webClient == null)
+ {
+ webClient = new WebClient();
+ webClient.setThrowExceptionOnFailingStatusCode(false);
+ webClient.setThrowExceptionOnScriptError(false);
+
+/*
+ //
+ // all this seems to have no effect on logging
+ //
+
+ webClient.setHTMLParserListener(new HTMLParserListener()
+ {
+ public void error(String message, URL url, int line, int column, String key)
+ {
+
+ }
+
+ public void warning(String message, URL url, int line, int column, String key)
+ {
+
+ }
+ });
+ webClient.setIncorrectnessListener(new IncorrectnessListener() {
+ public void notify(String message, Object origin)
+ {
+
+ }
+ });
+
+ LogFactory.getFactory().setAttribute("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog");
+
+ System.setProperty("org.apache.commons.logging.simplelog.defaultlog", "fatal");
+ System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http", "debug");
+*/
+
+ initFromProps();
+ }
+ return webClient;
+ }
+
+ /**
+ * Get current page.
+ *
+ * @return current page
+ */
+ public HtmlPage getPage()
+ {
+ return page;
+ }
+
+ /**
+ * Properties object containing configuration overrides.
+ *
+ * @return properties object
+ */
+ public Properties getProperties()
+ {
+ return props;
+ }
+
+ /**
+ * Set configuration overrides.
+ *
+ * @param props Properties object containing configuration overrides
+ */
+ public void setProperties(Properties props)
+ {
+ if (props == null)
+ throw new IllegalArgumentException("Null properties");
+ this.props = props;
+ }
+
+ /**
+ * Initialize from properties.
+ */
+ private void initFromProps()
+ {
+ String val = props.getProperty("test.host");
+ if (val != null)
+ host = val;
+
+ val = props.getProperty("test.port");
+ if (val != null)
+ port = Integer.parseInt(val);
+
+ val = props.getProperty("test.portalContainer");
+ if (val != null)
+ portalContainer = val;
+
+ val = props.getProperty("test.waitTimeout");
+ if (val != null)
+ waitTimeout = Integer.parseInt(val);
+
+ val = props.getProperty("test.shortPause");
+ if (val != null)
+ shortPause = Integer.parseInt(val);
+
+ val = props.getProperty("test.dumpPageOnFail");
+ if (val != null)
+ dumpPageOnFail = Boolean.parseBoolean(val);
+
+ val = props.getProperty("test.dumpPageOnExit");
+ if (val != null)
+ dumpPageOnExit = Boolean.parseBoolean(val);
+
+ log("Initial properties:\n\thost: " + host
+ + "\n\tport: " + port
+ + "\n\tportalContainer: " + portalContainer
+ + "\n\twaitTimeout: " + waitTimeout
+ + "\n\tshortPause: " + shortPause
+ + "\n\tdumpPageOnFail: " + dumpPageOnFail
+ + "\n\tdumpPageOnExit: " + dumpPageOnExit);
+ }
+
+ /**
+ * Open GateIn's home page.
+ *
+ * @param publicMode if true 'public' portal page is used, otherwise 'private', which requires signing in
+ * @throws IOException
+ */
+ public void openPortal(boolean publicMode) throws IOException
+ {
+ log("--Open portal home--");
+ page = getWebClient().getPage(getStartUrl(publicMode));
+ HtmlElement desc = page.getFirstByXPath(".//div[contains(text(), 'All rights reserved')]");
+ if (desc == null)
+ throw new RuntimeException("Portal page content corrupted\r\n" + page.asText());
+ }
+
+ /**
+ * Compose portal's home page url.
+ *
+ * @param publicMode
+ * @return
+ */
+ private String getStartUrl(boolean publicMode)
+ {
+ return "http://" + host + ":" + port + "/" + portalContainer + "/" + (publicMode ? "public" : "private");
+ }
+
+ /**
+ * Sign in as root.
+ */
+ public void signInAsRoot()
+ {
+ signIn("root", "gtn");
+ }
+
+ /**
+ * Sign in with username and password.
+ *
+ * @param user username
+ * @param pass password
+ */
+ public void signIn(String user, String pass)
+ {
+ log("--Sign in as " + user + "--");
+ waitForElementPresent("link=Sign in");
+ click("link=Sign in");
+ waitForElementPresent("username");
+ type("username", user);
+ type("password", pass);
+ click("//div[@id='UIPortalLoginFormAction']/div/div/div/a");
+ //waitForPageToLoad(timeout);
+ }
+
+ /**
+ * Fill form field with text.
+ *
+ * @param field
+ * @param value
+ */
+ public void type(String field, String value)
+ {
+ HtmlElement textField = getElement(field);
+ if (textField instanceof HtmlInput == false)
+ throw new RuntimeException("Element not text input: " + textField);
+
+ ((HtmlInput) textField).setValueAttribute(value);
+ }
+
+ /**
+ * Simulate clicking an element in the page.
+ *
+ * @param el expression identifying an element
+ */
+ public void click(String el)
+ {
+ HtmlElement node = getElement(el);
+ try
+ {
+ page = node.click();
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException("Click failed [" + el + "]" , ex);
+ }
+ }
+
+ /**
+ * Wait for element to be present in the current page,
+ * for a maximum time determined by <tt>waitSeconds</tt> property.
+ *
+ * @param el element specification
+ */
+ public void waitForElementPresent(String el)
+ {
+ for (int second = 0; ; second++)
+ {
+ if (second >= waitTimeout)
+ {
+ if (dumpPageOnFail)
+ dumpPage();
+ Assert.fail("Timeout at waitForElementPresent: " + el);
+ }
+ if (isElementPresent(el))
+ {
+ break;
+ }
+ pause(1000);
+ }
+ }
+
+ /**
+ * Wait for element to not be present any more in the current page,
+ * for a maximum time determined by <tt>waitSeconds</tt> property.
+ *
+ * @param el element specification
+ */
+ public void waitForElementNotPresent(String el)
+ {
+ for (int second = 0; ; second++)
+ {
+ if (second >= waitTimeout)
+ {
+ if (dumpPageOnFail)
+ dumpPage();
+ Assert.fail("Timeout at waitForElementPresent: " + el);
+ }
+ if (!isElementPresent(el))
+ {
+ break;
+ }
+ pause(1000);
+ }
+ }
+
+ /**
+ * Check if specified element is present in current page.
+ *
+ * @param el element specification
+ * @return true if present
+ */
+ public boolean isElementPresent(String el)
+ {
+ HtmlElement node = getElement(el);
+ return node != null;
+ }
+
+ /**
+ * Get first occurence of specified element in current page.
+ *
+ * <p>
+ * Element specification can have one of several forms:
+ * <ul>
+ * <li>link=<em>link-text</em> - matches the first %lt;a> element with specified link-text</li>
+ * <li>xpath=<em>xpath-query</em> - matches the first element that the specified xpath query returns</li>
+ * <li>//<em>xpath-query</em> - matches the first element that the specified xpath query returns</li>
+ * <li><em>name-id</em> - matches the first element with id or name attribute equal to <em>name-id</em></li>
+ * </ul>
+ *
+ * @param el element specification
+ * @return element if present, null otherwise
+ */
+ public HtmlElement getElement(String el)
+ {
+ // it seems that page state is often changing at the time we call getElement()
+ // which causes concurrency issues and results in RuntimeExceptions
+ RuntimeException e = null;
+ for (int i=0; i<3; i++)
+ {
+ try
+ {
+ return _getElement(el);
+ }
+ catch (RuntimeException ex)
+ {
+ e = ex;
+ try
+ {
+ Thread.sleep(1000);
+ }
+ catch(InterruptedException ex2)
+ {
+ throw new RuntimeException("Interrupted!");
+ }
+ }
+ }
+ throw e;
+ }
+
+ private HtmlElement _getElement(String el)
+ {
+ if (el.startsWith("link="))
+ {
+ String xpath = convertFromLinkElSpec(el);
+ return page.getFirstByXPath(xpath);
+ }
+ else if (el.startsWith("xpath="))
+ {
+ String xpath = convertFromXPathElSpec(el);
+ return page.getFirstByXPath(xpath);
+ }
+ else if (el.startsWith("//"))
+ {
+ return page.getFirstByXPath(el);
+ }
+ else
+ {
+ return page.getFirstByXPath(".//node()[@name='" + el + "' or @id='" + el + "']");
+ }
+ }
+
+ private String convertFromXPathElSpec(String el)
+ {
+ if (el.startsWith("xpath="))
+ el = el.substring(6);
+ return el;
+ }
+
+ private String convertFromLinkElSpec(String el)
+ {
+ if (el.startsWith("link="))
+ el = el.substring(5);
+ return ".//a[text() = '" + el + "']";
+ }
+
+ public String waitForTextPresent(String ... text)
+ {
+ for (int second = 0; ; second++)
+ {
+ if (second >= waitTimeout)
+ {
+ if (dumpPageOnFail)
+ dumpPage();
+ Assert.fail("Timeout at waitForTextPresent: " + Arrays.asList(text));
+ }
+ String found = getTextPresent(text);
+ if (found != null)
+ {
+ return found;
+ }
+ pause(1000);
+ }
+ }
+
+ /**
+ * Dump the current page as XML
+ */
+ public void dumpPage()
+ {
+ log("Page dump: " + page.asXml());
+ }
+
+ /**
+ * Wait for text to not be present any more in the current page,
+ * for a maximum time determined by <tt>waitSeconds</tt> property.
+ *
+ * @param text text to not be present any more
+ */
+ public void waitForTextNotPresent(String text)
+ {
+ for (int second = 0; ; second++)
+ {
+ if (second >= waitTimeout)
+ {
+ if (dumpPageOnFail)
+ dumpPage();
+ Assert.fail("Timeout at waitForTextPresent: " + text);
+ }
+ if (isTextPresent(text) == false)
+ {
+ break;
+ }
+ pause(1000);
+ }
+ }
+
+ /**
+ * Check if specified text is present
+ *
+ * @param text
+ * @return true if text is present
+ */
+ public boolean isTextPresent(String text)
+ {
+ try
+ {
+ return page.asText().indexOf(text) > -1;
+ }
+ catch (Exception e)
+ {
+ shortPause();
+ return page.asText().indexOf(text) > -1;
+ }
+ }
+
+ /**
+ * Check if any of the passed arguments is present as text in the page.
+ * When any is encountered it is returned.
+ *
+ * @param text string items to check for presence
+ * @return found item or null of none of the items is present
+ */
+ public String getTextPresent(String ... text)
+ {
+ String pageText;
+
+ try
+ {
+ pageText = page.asText();
+ }
+ catch (Exception e)
+ {
+ shortPause();
+ pageText = page.asText();
+ }
+
+ for (String item: text)
+ {
+ if (pageText.indexOf(item) != -1)
+ return item;
+ }
+
+ return null;
+ }
+
+ /**
+ * Pause for a few seconds - length controlled by shortPause property
+ */
+ public void shortPause()
+ {
+ pause(shortPause * 1000);
+ }
+
+ /**
+ * Pause for a specified number of millis
+ *
+ * @param millis
+ */
+ public static void pause(long millis)
+ {
+ try
+ {
+ Thread.sleep(millis);
+ }
+ catch (InterruptedException e)
+ {
+ throw new RuntimeException("Interrupted!");
+ }
+ }
+
+ /**
+ * Simulate dragging source element onto a target element
+ *
+ * @param sourceEl source element specification
+ * @param targetEl target element specification
+ */
+ public void dragAndDropToObject(String sourceEl, String targetEl)
+ {
+ log("--Drag and drop to object--");
+ HtmlElement src = getElement(sourceEl);
+ if (src == null)
+ throw new RuntimeException("No source element: " + sourceEl);
+
+ HtmlElement target = getElement(targetEl);
+ if (target == null)
+ throw new RuntimeException("No target element: " + targetEl);
+
+ src.mouseDown();
+ src.mouseMove();
+ target.mouseMove();
+ target.mouseUp();
+ }
+
+ /**
+ * Simulate clicking Finish inside Page Editor
+ */
+ public void finishPageEdit()
+ {
+ log("--Finish Page Edit--");
+ waitForElementPresent("//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]");
+ click("//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]");
+ waitForTextNotPresent("Page Editor");
+ }
+
+ /**
+ * Add a new page with the specified name, containing one specific portlet.
+ *
+ * @param categoryTitle application registry category title that contains the portlet to use
+ * @param portletName portlet name in application registry
+ * @param pageName name of the new page - used for both navigation node, and page title
+ * @param portletElementToDnD - element specification pointing to the div that is dragged onto
+ * the content placeholder within the new page
+ */
+ public void addNewPageUpToFinish(String categoryTitle, String portletName, String pageName, String portletElementToDnD)
+ {
+ log("--Add new page up to Finish--");
+
+ waitForElementPresent("link=Add New Page");
+ click("link=Add New Page");
+
+ waitForElementPresent("pageName");
+ type("pageName", pageName);
+ type("pageDisplayName", pageName);
+ click("//table[@class='ActionContainer']/tbody/tr/td/div[2]");
+ waitForTextPresent("Empty Layout");
+ click("//table[@class='ActionContainer']/tbody/tr/td/div[2]");
+ if (categoryTitle != null & portletName != null & portletElementToDnD != null)
+ {
+ waitForElementPresent("//div[contains(@class, 'Tab')]/a[@title='" + categoryTitle + "']");
+ click("//div[contains(@class, 'Tab')]/a[@title='" + categoryTitle + "']");
+ waitForTextPresent(portletName);
+ shortPause();
+ dragAndDropToObject(portletElementToDnD, "//div[@class='UIComponentBlock']");
+ shortPause();
+ }
+ }
+
+ public void goToPageManagement()
+ {
+ log("--Go to Page Management--");
+ waitForElementPresent("link=Page Management");
+ click("link=Page Management");
+ //waitForPageToLoad(); // no need for this - we're synchronous
+ }
+
+ public void searchAndDeletePage(String title)
+ {
+ searchPageByTitle(title, null);
+ deletePage(title, false, null);
+ }
+
+ public void setupConfirmation(final String text)
+ {
+ webClient.setConfirmHandler(new ConfirmHandler()
+ {
+ public boolean handleConfirm(Page page, String message)
+ {
+ if (text.equals(message))
+ {
+ return true;
+ }
+ else
+ throw new RuntimeException("Unexpected message: " + message);
+ }
+ });
+ }
+
+ public void resetConfirmation()
+ {
+ webClient.setConfirmHandler(null);
+ }
+
+ private void deletePage(String title, boolean closeDialog, String verifyText)
+ {
+ log("--Delete page: " + title + "--");
+ String delButton = "//tbody[@class='FeedBox']//tr[*/div[@title='" + title + "']]//img[@title='Delete Page' and contains(@onclick, 'op=Delete')]";
+ waitForElementPresent(delButton);
+
+ setupConfirmation("Do you want to delete this page?");
+ click(delButton);
+ resetConfirmation();
+
+ if (verifyText != null)
+ {
+ waitForTextNotPresent(verifyText);
+ }
+ //if (closeDialog)
+ //{
+ // closeMessageDialog();
+ //}
+ }
+
+ public void searchPageByTitle(String title, String verifyText)
+ {
+ log("--Searching page: " + title + "--");
+ waitForElementPresent("searchTerm");
+ type("searchTerm", title);
+ select("searchOption", "label=Title");
+ waitForElementPresent("xpath=//form[@id='UIPageSearch']/div[2]/a");
+ click("xpath=//form[@id='UIPageSearch']/div[2]/a");
+ shortPause();
+ if (verifyText != null)
+ {
+ waitForTextPresent(verifyText);
+ }
+ }
+
+ private void select(String selectEl, String select)
+ {
+ HtmlElement el = getElement(selectEl);
+ if (el instanceof HtmlSelect)
+ {
+ // find SelectOption
+ HtmlSelect sel = (HtmlSelect) el;
+ HtmlOption opt = null;
+
+ if (select.startsWith("label=") || select.indexOf("=") == -1)
+ {
+ String label = select.substring(6);
+ opt = sel.getOptionByText(label);
+ if (opt == null)
+ throw new RuntimeException("No such option (" + label + ") for Select Input " + selectEl);
+ page = (HtmlPage) sel.setSelectedAttribute(opt, true);
+ }
+ else
+ {
+ throw new RuntimeException("Unsupported options specification format: " + select);
+ }
+ }
+ else
+ {
+ throw new RuntimeException("Specified element not of type HtmlSelect (" + selectEl + "): " + el);
+ }
+ }
+
+ public void goToSiteManagement()
+ {
+ log("--Go to Page Management--");
+ waitForElementPresent("link=Page Management");
+ click("link=Page Management");
+ }
+
+ public void editNavigation(String site)
+ {
+ log("--Edit Navigation : " + site + "--");
+ String navLink = "//table[@class='ManagementBlock' and //tr/td/div/text() = '"
+ + site + "']//a[text() = 'Edit Navigation']";
+ waitForElementPresent(navLink);
+ click(navLink);
+ waitForElementPresent("link=Add Node");
+ }
+
+ public void deleteNode(String nodeLabel)
+ {
+ log("--Deleting node from navigation--");
+ waitForElementPresent("//a[@title='" + nodeLabel + "']");
+ shortPause();
+ contextMenuOnElement("//a[@title='" + nodeLabel + "']");
+ shortPause();
+ waitForElementPresent("//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']");
+ setupConfirmation("Are you sure you want to delete this node?");
+ click("//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']");
+ resetConfirmation();
+ waitForElementNotPresent("//a[@title='" + nodeLabel + "']");
+ waitForElementPresent("link=Save");
+ click("link=Save");
+ waitForTextNotPresent("Navigation Management");
+ waitForTextNotPresent(nodeLabel);
+ }
+
+ public void contextMenuOnElement(String element)
+ {
+ String source = "selenium.doComponentExoContextMenu(\"" + element + "\")";
+ webClient.getJavaScriptEngine().execute(page, source, "script", 1);
+ }
+
+ public void leavePageEdit()
+ {
+ log("-- Leave PageEdit --");
+ // we could have an error window popped up
+ String closeButton = "//div[@class='ExoMessageDecorator' and //div[@class='TabsContainer']//div[@class='SelectedTab']]//div[@class='CloseButton']";
+ click(closeButton);
+
+ // also we may have to abort
+ String abortButton = "//table[@class='ActionContainer']//div[contains(@onclick, 'action=Abort')]//a[text()='Abort']";
+ click(abortButton);
+
+ waitForTextNotPresent("Page Editor");
+ }
+
+ public void log(String msg)
+ {
+ System.out.println(msg);
+ }
+}
Added: epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePage.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePage.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePage.java 2011-04-14 10:20:53 UTC (rev 6215)
@@ -0,0 +1,220 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.gatein.htmlunit.jira;
+
+import org.jboss.gatein.htmlunit.AbstractWebTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.testng.log4testng.Logger;
+
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
+ */
+public class Test_GTNPORTAL_1823_FailToCreatePage extends AbstractWebTest
+{
+ /** Logger */
+ private static final Logger log = Logger.getLogger(Test_GTNPORTAL_1823_FailToCreatePage.class);
+
+ /** Number of concurrent threads for the test */
+ protected static final int TCOUNT = 2;
+
+ /** Counter for id generation */
+ protected static AtomicInteger idCounter = new AtomicInteger(1);
+
+ /** Down counter used to synchronize threads before clicking Finish */
+ protected static CountDownLatch sync = new CountDownLatch(TCOUNT);
+
+ /**
+ * Id for inclusion in page title so that every thread uses unique name for the newly added page
+ *
+ * @return id
+ */
+ public String nextId()
+ {
+ return "" + idCounter.getAndIncrement();
+ }
+
+ /**
+ * This test method relies on TestNG parallel test execution facility
+ * to perform two concurrent executions of this method on a single instance of the test class
+ *
+ * @throws Throwable if test fails
+ */
+ @Test(invocationCount = TCOUNT, threadPoolSize = TCOUNT, groups = {"GateIn", "jira", "htmlunit"})
+ public void testMain() throws Throwable
+ {
+ try
+ {
+ test(false);
+ }
+ finally
+ {
+ // If exception occurs we don't want the other thread to lock up
+ // - so we perform another countDown()
+ sync.countDown();
+ }
+ }
+
+ /**
+ * Main body of the test
+ *
+ * @throws Throwable
+ */
+ protected void test(boolean navNodeTest) throws Throwable
+ {
+ String id = nextId();
+ String categoryTitle = "Gadgets";
+ String portletName = "Calculator";
+ String pageName = "TestPage" + id;
+ String portletElementToDnD = "//div[@id='" + categoryTitle + "/" + portletName + "']";
+
+ openPortal(true);
+
+ // Check that testPage with this name does not yet exist
+ Assert.assertFalse(isElementPresent("link=" + pageName), "Page exists already: " + pageName);
+
+ signInAsRoot();
+
+ // Add new page, but don't click Finish yet at the end
+ addNewPageUpToFinish(categoryTitle, portletName, pageName, portletElementToDnD);
+
+ // Wait for the other thread ...
+ sync.countDown();
+ sync.await();
+
+
+ if (navNodeTest && id.equals("2"))
+ {
+ // Finish click concurrency is inappropriate for navNodeTest where we need predictable order
+ Thread.sleep(5000);
+ }
+
+ // Now click Finish (both threads at the same time)
+ finishPageEdit();
+
+ String failedText = "This node does not have any pages.";
+ String textPresent = waitForTextPresent(portletName, failedText);
+
+ Assert.assertNotSame(textPresent, failedText, "Concurrent Add Page issue reproduced!");
+ Assert.assertEquals(textPresent, portletName, "");
+
+ if (navNodeTest && id.equals("2"))
+ {
+ // Check that both test pages' navigation nodes are present
+ Assert.assertTrue(isElementPresent("link=TestPage1"), "TestPage1 link presence");
+ Assert.assertTrue(isElementPresent("link=TestPage2"), "TestPage2 link presence");
+ }
+ finished();
+ }
+
+ /**
+ * Perform cleanup
+ * @throws IOException
+ */
+ private void test2() throws IOException
+ {
+ openPortal(true);
+
+ signInAsRoot();
+
+ cleanup();
+ }
+
+ /**
+ * TODO: Cleanup code doesn't yet work
+ *
+ * @throws IOException
+ */
+ private void cleanup() throws IOException
+ {
+ try
+ {
+ leavePageEdit();
+ }
+ catch (Exception ex)
+ {
+ log.warn("IGNORED: ", ex);
+ }
+
+ try
+ {
+ goToPageManagement();
+
+ try
+ {
+ searchAndDeletePage("TestPage1");
+ }
+ catch (Throwable ex)
+ {
+ log.warn("IGNORED: Failed to delete TestPage1: ", ex);
+ }
+
+ try
+ {
+ searchAndDeletePage("TestPage2");
+ }
+ catch (Throwable ex)
+ {
+ log.warn("IGNORED: Failed to delete TestPage2: ", ex);
+ }
+
+ }
+ catch (Throwable e)
+ {
+ log.warn("IGNORED: Failed to open PageManagement: ", e);
+ }
+
+ try
+ {
+ goToSiteManagement();
+
+ try
+ {
+ editNavigation("classic");
+ deleteNode("TestPage");
+ }
+ catch (Throwable ex)
+ {
+ log.warn("IGNORED: Failed to delete TestPage1: ", ex);
+ }
+
+ try
+ {
+ editNavigation("classic");
+ deleteNode("TestPage2");
+ }
+ catch (Throwable ex)
+ {
+ log.warn("IGNORED: Failed to delete TestPage2: ", ex);
+ }
+ }
+ catch (Throwable e)
+ {
+ log.warn("IGNORED: Failed to remove TestPage from navigation: ", e);
+ }
+ }
+}
\ No newline at end of file
Added: epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePageNavNode.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePageNavNode.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/testsuite/htmlunit-tests/src/test/java/org/jboss/gatein/htmlunit/jira/Test_GTNPORTAL_1823_FailToCreatePageNavNode.java 2011-04-14 10:20:53 UTC (rev 6215)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.gatein.htmlunit.jira;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
+ */
+public class Test_GTNPORTAL_1823_FailToCreatePageNavNode extends Test_GTNPORTAL_1823_FailToCreatePage
+{
+
+ /**
+ * This test method relies on TestNG parallel test execution facility
+ * to perform two concurrent executions of this method on a single instance of the test class
+ *
+ * @throws Throwable if test fails
+ */
+ @Test(invocationCount = TCOUNT, threadPoolSize = TCOUNT, groups = {"GateIn", "jira", "htmlunit"})
+ public void testMain() throws Throwable
+ {
+ try
+ {
+ test(true);
+ }
+ finally
+ {
+ // If exception occurs we don't want the other thread to lock up
+ // - so we perform another countDown()
+ sync.countDown();
+ }
+ }
+}
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-04-14 08:05:17 UTC (rev 6214)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-04-14 10:20:53 UTC (rev 6215)
@@ -36,7 +36,6 @@
import org.exoplatform.portal.webui.workspace.UIPortalToolPanel;
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
import org.exoplatform.web.application.ApplicationMessage;
-import org.exoplatform.web.application.JavascriptManager;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.ComponentConfigs;
@@ -92,6 +91,22 @@
UIPageNodeSelector uiNodeSelector = uiPageInfo.getChild(UIPageNodeSelector.class);
PageNode selectedNode = uiNodeSelector.getSelectedPageNode();
PageNavigation pageNav = uiNodeSelector.getSelectedNavigation();
+
+ // reload page navigation
+ DataStorage dataService = getApplicationComponent(DataStorage.class);
+ pageNav = dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId());
+ UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
+ setNavigation(uiPortalApp.getNavigations(), pageNav);
+ uiPortalApp.localizeNavigations();
+ UIPortal uiPortal = Util.getUIPortal();
+ uiPortal.setNavigation(pageNav);
+ uiNodeSelector.selectNavigation(pageNav);
+ if (selectedNode != null)
+ {
+ uiNodeSelector.selectPageNodeByUri(selectedNode.getUri());
+ selectedNode = uiNodeSelector.getSelectedPageNode();
+ }
+
if (PortalConfig.USER_TYPE.equals(pageNav.getOwnerType()))
selectedNode = null;
@@ -114,11 +129,8 @@
}
uiNodeSelector.selectPageNodeByUri(pageNode.getUri());
- DataStorage dataService = getApplicationComponent(DataStorage.class);
dataService.create(page);
dataService.save(pageNav);
- UIPortal uiPortal = Util.getUIPortal();
- setNavigation(uiPortal.getNavigations(), uiNodeSelector.getSelectedNavigation());
}
private void setNavigation(List<PageNavigation> navs, PageNavigation nav)
13 years, 9 months
- 1
- 0
gatein SVN: r6214 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: tkobayas(a)redhat.com
Date: 2011-04-14 04:05:17 -0400 (Thu, 14 Apr 2011)
New Revision: 6214
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
Log:
GTNPORTAL-1823 Fail to create one page when creating two new pages at the same time. -- This fix only addresses navigation overwriting.
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-04-14 07:15:19 UTC (rev 6213)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-04-14 08:05:17 UTC (rev 6214)
@@ -36,7 +36,6 @@
import org.exoplatform.portal.webui.workspace.UIPortalToolPanel;
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
import org.exoplatform.web.application.ApplicationMessage;
-import org.exoplatform.web.application.JavascriptManager;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.ComponentConfigs;
@@ -92,6 +91,22 @@
UIPageNodeSelector uiNodeSelector = uiPageInfo.getChild(UIPageNodeSelector.class);
PageNode selectedNode = uiNodeSelector.getSelectedPageNode();
PageNavigation pageNav = uiNodeSelector.getSelectedNavigation();
+
+ // reload page navigation
+ DataStorage dataService = getApplicationComponent(DataStorage.class);
+ pageNav = dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId());
+ UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
+ setNavigation(uiPortalApp.getNavigations(), pageNav);
+ uiPortalApp.localizeNavigations();
+ UIPortal uiPortal = Util.getUIPortal();
+ uiPortal.setNavigation(pageNav);
+ uiNodeSelector.selectNavigation(pageNav);
+ if (selectedNode != null)
+ {
+ uiNodeSelector.selectPageNodeByUri(selectedNode.getUri());
+ selectedNode = uiNodeSelector.getSelectedPageNode();
+ }
+
if (PortalConfig.USER_TYPE.equals(pageNav.getOwnerType()))
selectedNode = null;
@@ -114,11 +129,8 @@
}
uiNodeSelector.selectPageNodeByUri(pageNode.getUri());
- DataStorage dataService = getApplicationComponent(DataStorage.class);
dataService.create(page);
dataService.save(pageNav);
- UIPortal uiPortal = Util.getUIPortal();
- setNavigation(uiPortal.getNavigations(), uiNodeSelector.getSelectedNavigation());
}
private void setNavigation(List<PageNavigation> navs, PageNavigation nav)
13 years, 9 months
- 1
- 0
gatein SVN: r6213 - portal/branches.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-04-14 03:15:19 -0400 (Thu, 14 Apr 2011)
New Revision: 6213
Added:
portal/branches/decoupled-webos/
Log:
Create branch for decouple webos code from gatein
13 years, 9 months
- 1
- 0
gatein SVN: r6212 - epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/config.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-04-14 02:17:30 -0400 (Thu, 14 Apr 2011)
New Revision: 6212
Modified:
epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java
Log:
OOM Issue when starting up with many pages
Modified: epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2011-04-13 19:59:57 UTC (rev 6211)
+++ epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2011-04-14 06:17:30 UTC (rev 6212)
@@ -20,7 +20,9 @@
package org.exoplatform.portal.config;
import org.exoplatform.commons.utils.IOUtil;
+import org.exoplatform.container.PortalContainer;
import org.exoplatform.container.component.BaseComponentPlugin;
+import org.exoplatform.container.component.RequestLifeCycle;
import org.exoplatform.container.configuration.ConfigurationManager;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.container.xml.ValueParam;
@@ -134,33 +136,48 @@
public void run() throws Exception
{
- if (dataStorage_.getPortalConfig(defaultPortal) != null)
- return;
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
+ {
+ if (dataStorage_.getPortalConfig(defaultPortal) != null)
+ return;
+ }
+ finally
+ {
+ RequestLifeCycle.end();
+ }
if (isUseTryCatch)
{
-
- for (NewPortalConfig ele : configs)
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
{
- try
+ for (NewPortalConfig ele : configs)
{
- initPortletPreferencesDB(ele);
+ try
+ {
+ initPortletPreferencesDB(ele);
+ }
+ catch (Exception e)
+ {
+ log.error("NewPortalConfig error: " + e.getMessage(), e);
+ }
}
- catch (Exception e)
+ for (NewPortalConfig ele : configs)
{
- log.error("NewPortalConfig error: " + e.getMessage(), e);
+ try
+ {
+ initPortalConfigDB(ele);
+ }
+ catch (Exception e)
+ {
+ log.error("NewPortalConfig error: " + e.getMessage(), e);
+ }
}
}
- for (NewPortalConfig ele : configs)
+ finally
{
- try
- {
- initPortalConfigDB(ele);
- }
- catch (Exception e)
- {
- log.error("NewPortalConfig error: " + e.getMessage(), e);
- }
+ RequestLifeCycle.end();
}
for (NewPortalConfig ele : configs)
{
@@ -173,17 +190,25 @@
log.error("NewPortalConfig error: " + e.getMessage(), e);
}
}
- for (NewPortalConfig ele : configs)
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
{
- try
+ for (NewPortalConfig ele : configs)
{
- initPageNavigationDB(ele);
+ try
+ {
+ initPageNavigationDB(ele);
+ }
+ catch (Exception e)
+ {
+ log.error("NewPortalConfig error: " + e.getMessage(), e);
+ }
}
- catch (Exception e)
- {
- log.error("NewPortalConfig error: " + e.getMessage(), e);
- }
}
+ finally
+ {
+ RequestLifeCycle.end();
+ }
for (NewPortalConfig ele : configs)
{
try
@@ -199,22 +224,38 @@
}
else
{
- for (NewPortalConfig ele : configs)
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
{
- initPortletPreferencesDB(ele);
+ for (NewPortalConfig ele : configs)
+ {
+ initPortletPreferencesDB(ele);
+ }
+ for (NewPortalConfig ele : configs)
+ {
+ initPortalConfigDB(ele);
+ }
}
- for (NewPortalConfig ele : configs)
+ finally
{
- initPortalConfigDB(ele);
+ RequestLifeCycle.end();
}
for (NewPortalConfig ele : configs)
{
initPageDB(ele);
}
- for (NewPortalConfig ele : configs)
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
{
- initPageNavigationDB(ele);
+ for (NewPortalConfig ele : configs)
+ {
+ initPageNavigationDB(ele);
+ }
}
+ finally
+ {
+ RequestLifeCycle.end();
+ }
for (NewPortalConfig ele : configs)
{
ele.getPredefinedOwner().clear();
@@ -374,8 +415,15 @@
ArrayList<Page> list = pageSet.getPages();
for (Page page : list)
{
- dataStorage_.create(page);
- pomMgr.getSession().save();
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
+ {
+ dataStorage_.create(page);
+ }
+ finally
+ {
+ RequestLifeCycle.end();
+ }
}
}
@@ -390,13 +438,11 @@
if (currentNavigation == null)
{
dataStorage_.create(navigation);
-// pomMgr.getSession().save();
}
else
{
navigation.merge(currentNavigation);
dataStorage_.save(navigation);
- pomMgr.getSession().save();
}
}
@@ -411,7 +457,6 @@
for (PortletPreferences portlet : list)
{
dataStorage_.save(portlet);
- pomMgr.getSession().save();
}
}
Modified: epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2011-04-13 19:59:57 UTC (rev 6211)
+++ epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2011-04-14 06:17:30 UTC (rev 6212)
@@ -646,19 +646,12 @@
}
//
- RequestLifeCycle.begin(PortalContainer.getInstance());
-
newPortalConfigListener_.run();
}
catch (Exception e)
{
log.error("Could not import initial data", e);
-
}
- finally
- {
- RequestLifeCycle.end();
- }
}
public void stop()
13 years, 9 months
- 1
- 0
gatein SVN: r6211 - epp/portal/branches.
by do-not-reply＠jboss.org
Author: ghjboss
Date: 2011-04-13 15:59:57 -0400 (Wed, 13 Apr 2011)
New Revision: 6211
Added:
epp/portal/branches/EPP_5_1_0_GA_JBEPP-860/
Log:
create support patch for JBEPP-860
13 years, 9 months
- 1
- 0
gatein SVN: r6210 - portal/trunk/packaging/jboss-as6/pkg.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-04-13 10:55:31 -0400 (Wed, 13 Apr 2011)
New Revision: 6210
Modified:
portal/trunk/packaging/jboss-as6/pkg/package.xml
Log:
GTNPORTAL-1812 Packaging that supports JBossAS6 and does away with javascript packager
- changed jboss-as6 packaging so that shared gatein libs are placed in default/deploy/gatein.ear/lib again, and not in default/lib
Modified: portal/trunk/packaging/jboss-as6/pkg/package.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/package.xml 2011-04-13 14:37:22 UTC (rev 6209)
+++ portal/trunk/packaging/jboss-as6/pkg/package.xml 2011-04-13 14:55:31 UTC (rev 6210)
@@ -19,7 +19,7 @@
includes="pom.xml"
extension=".xml"
style="${maven.project.basedir}/transform.xsl">
- <param name="default.jar.context" expression="${jbossas.target.dir}/server/default/lib"/>
+ <param name="default.jar.context" expression="${jbossas.target.dir}/server/default/deploy/gatein.ear/lib"/>
<param name="default.war.context" expression="${jbossas.target.dir}/server/default/deploy"/>
<param name="default.ear.context" expression="${jbossas.target.dir}/server/default/deploy"/>
<param name="lib.context" expression="${jbossas.target.dir}/server/default/lib"/>
13 years, 9 months
- 1
- 0
gatein SVN: r6209 - in portal/trunk: packaging/jboss-as6/pkg and 1 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-04-13 10:37:22 -0400 (Wed, 13 Apr 2011)
New Revision: 6209
Modified:
portal/trunk/packaging/jboss-as6/pkg/pom.xml
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/integration.war/WEB-INF/web.xml
portal/trunk/pom.xml
Log:
GTNPORTAL-1812 Packaging that supports JBossAS6 and does away with javascript packager
- replaced wci-tomcat with wci-jboss6 for jboss-as6 packaging
Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-13 14:36:54 UTC (rev 6208)
+++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-13 14:37:22 UTC (rev 6209)
@@ -315,7 +315,7 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
- <artifactId>wci-tomcat6</artifactId>
+ <artifactId>wci-jboss6</artifactId>
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
Modified: portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/integration.war/WEB-INF/web.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/integration.war/WEB-INF/web.xml 2011-04-13 14:36:54 UTC (rev 6208)
+++ portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/integration.war/WEB-INF/web.xml 2011-04-13 14:37:22 UTC (rev 6209)
@@ -30,7 +30,7 @@
</context-param>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
- <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class>
+ <servlet-class>org.gatein.wci.jboss.JB6ContainerServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
</web-app>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-04-13 14:36:54 UTC (rev 6208)
+++ portal/trunk/pom.xml 2011-04-13 14:37:22 UTC (rev 6209)
@@ -274,6 +274,11 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-jboss6</artifactId>
+ <version>${org.gatein.wci.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-jetty</artifactId>
<version>${org.gatein.wci.version}</version>
</dependency>
13 years, 9 months
- 1
- 0
gatein SVN: r6208 - epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: tkobayas(a)redhat.com
Date: 2011-04-13 10:36:54 -0400 (Wed, 13 Apr 2011)
New Revision: 6208
Modified:
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
Log:
JBEPP-883 Fix for some mistranslations in webui_ja.properties
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-04-13 12:52:50 UTC (rev 6207)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-04-13 14:36:54 UTC (rev 6208)
@@ -118,7 +118,7 @@
UIPortalComposer.action.Abort=\u4e2d\u65ad
UIPortalComposer.action.Finish=\u7d42\u4e86
UIPortalComposer.action.ViewProperties=\u30dd\u30fc\u30bf\u30eb\u306e\u30d7\u30ed\u30d1\u30c6\u30a3
-UIPortalComposer.action.SwitchMode=\u30d3\u30e5\u30fc\u30e2\u30fc\u30c9\u3092\u30e2\u30fc\u30c9
+UIPortalComposer.action.SwitchMode=\u30d3\u30e5\u30fc\u30e2\u30fc\u30c9\u3092\u5207\u308a\u66ff\u3048\u308b
UITabPane.title.UIApplicationList=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
UITabPane.title.UIContainerList=\u30b3\u30f3\u30c6\u30ca\u30fc
@@ -243,19 +243,20 @@
UILoginForm.msg.Invalid-account=\u30e6\u30fc\u30b6\u540d\u304b\u3064/\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u8aa4\u3063\u3066\u3044\u308b\u304b\u7a7a\u3067\u3059\u3002\u518d\u8a66\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
UILoginForm.label.welcome=\u3088\u3046\u3053\u305d
UILoginForm.label.login=\u30ed\u30b0\u30a4\u30f3
-UILoginForm.label.Discard=\u7834\u68c4
+UILoginForm.label.Discard=\u30ad\u30e3\u30f3\u30bb\u30eb
UILoginForm.label.user=\u30e6\u30fc\u30b6\u30fc
UILoginForm.label.forgot=\u30e6\u30fc\u30b6\u540d/\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5fd8\u308c\u307e\u3057\u305f\u304b\uff1f
UILoginForm.label.password=\u30d1\u30b9\u30ef\u30fc\u30c9
UILoginForm.label.UserName=\u30e6\u30fc\u30b6\u30fc\u540d
-UILoginForm.label.RememberOnComputer=\u30ed\u30b0\u30a4\u30f3\u3092\u8a18\u61b6
+UILoginForm.label.RememberOnComputer=\u30ed\u30b0\u30a4\u30f3\u60c5\u5831\u3092\u4fdd\u6301
UILoginForm.label.NotMember=\u30e1\u30f3\u30d0\u30fc\u3067\u306f\u306a\u3044\uff1f
UILoginForm.label.Signup=\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7
UILoginForm.label.Signin=\u30b5\u30a4\u30f3\u30a4\u30f3
UILoginForm.label.ForAccount=\u30a2\u30ab\u30a6\u30f3\u30c8\u767b\u9332
UILoginForm.label.SigninFail=\u30b5\u30a4\u30f3\u30a4\u30f3\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u8aa4\u3063\u305f\u30e6\u30fc\u30b6\u30fc\u540d\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059\u3002
-UILoginForm.label.Copyright=Copyright © 2010. All rights Reserved, eXo Platform SAS \u3057\u3066 Red Hat, Inc.
+UILoginForm.label.Copyright=Copyright © 2009-2010. All rights reserved, Red Hat, Inc
+
#############################################################################
# Message Error #
#############################################################################
@@ -926,9 +927,10 @@
# org.exoplatform.portal.component.customization.UIPortalToolPanel #
############################################################################
-UIPortalToolPanel.label.copyrightText=Copyright © 2010. All rights Reserved,
-UIPortalToolPanel.label.companyTitleText= eXo Platform SAS \u3057\u3066 Red Hat, Inc..
+UIPortalToolPanel.label.copyrightText=Copyright © 2010. All rights reserved,
+UIPortalToolPanel.label.companyTitleText= Red Hat, Inc
+
############################################################################
# org.exoplatform.portal.component.view.UIContainer #
############################################################################
13 years, 9 months
- 1
- 0