JBoss Portal SVN: r9738 - in modules/portlet/branches/JBP_PORTLET_BRANCH_1_0: test and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-02-04 06:20:20 -0500 (Mon, 04 Feb 2008)
New Revision: 9738
Added:
modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletUtilsTestCase.java
Modified:
modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/build.xml
Log:
JBPORTAL-1875: RenderResponse.getNamespace() generates a not correct value
Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2008-02-04 11:10:11 UTC (rev 9737)
+++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2008-02-04 11:20:20 UTC (rev 9738)
@@ -192,7 +192,8 @@
for (int i = 0; i < windowId.length(); i++)
{
char c = windowId.charAt(i);
- if (Character.isLetterOrDigit(c))
+ int charVal = c;
+ if ((charVal >= 65 && charVal <= 90) || (charVal >= 97 && charVal <= 122) || (charVal >=48 && charVal <= 57) || (charVal == 95) || charVal == 36)
{
tmp.append(c);
}
Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/build.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/build.xml 2008-02-04 11:10:11 UTC (rev 9737)
+++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/build.xml 2008-02-04 11:20:20 UTC (rev 9738)
@@ -717,6 +717,7 @@
<target name="tests.local" depends="init">
<execute-tests>
<x-test>
+ <test todir="${test.reports}" name="org.jboss.portal.portlet.test.PortletUtilsTestCase"/>
<test todir="${test.reports}" name="org.jboss.portal.portlet.test.url.EncoderTestCase"/>
<test todir="${test.reports}" name="org.jboss.portal.portlet.test.url.DecoderTestCase"/>
<test todir="${test.reports}" name="org.jboss.portal.portlet.test.StringCodecTestCase"/>
Added: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletUtilsTestCase.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletUtilsTestCase.java (rev 0)
+++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletUtilsTestCase.java 2008-02-04 11:20:20 UTC (rev 9738)
@@ -0,0 +1,21 @@
+package org.jboss.portal.portlet.test;
+
+import org.jboss.portal.portlet.impl.jsr168.PortletUtils;
+
+import junit.framework.TestCase;
+
+public class PortletUtilsTestCase extends TestCase {
+
+ public void testgenerateNamespaceFrom()
+ {
+ String name = "_09azAZ$";
+ assertEquals(PortletUtils.PREFIX + name + PortletUtils.SUFFIX, PortletUtils.generateNamespaceFrom(name));
+
+ name = "_";
+ assertEquals(PortletUtils.PREFIX + "_" + PortletUtils.SUFFIX, PortletUtils.generateNamespaceFrom(name));
+
+ name = "_é";
+ assertEquals(PortletUtils.PREFIX + "__e9" + PortletUtils.SUFFIX, PortletUtils.generateNamespaceFrom(name));
+ }
+
+}
16 years, 4 months
JBoss Portal SVN: r9737 - in modules/portlet/trunk: portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api and 3 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-04 06:10:11 -0500 (Mon, 04 Feb 2008)
New Revision: 9737
Removed:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/StateResponse.java
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/FragmentResponse.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java
Log:
- add notion of output request attributes in fragment and updatens responses
- remove the fact that a redirect can be followed by events (it wasnt make sense actally) and remove the related StateResponse class that was carrying the events
- updated the controller accordingly
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java 2008-02-04 10:57:05 UTC (rev 9736)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java 2008-02-04 11:10:11 UTC (rev 9737)
@@ -73,6 +73,19 @@
UserContext userContext,
HttpServletRequestWrapper wreq)
{
+ if (container == null)
+ {
+ throw new IllegalArgumentException("No null container allowed");
+ }
+ if (userContext == null)
+ {
+ throw new IllegalArgumentException("No null user context allowed");
+ }
+ if (wreq == null)
+ {
+ throw new IllegalArgumentException("No null wrapped request allowed");
+ }
+
this.container = container;
this.userContext = userContext;
this.wreq = wreq;
@@ -193,4 +206,36 @@
}
setAttribute(name, null);
}
+
+ public void setAttributeMap(Map<String, Object> map)
+ {
+ for (Map.Entry<String, Object> attribute : map.entrySet())
+ {
+ setAttribute(attribute.getKey(), attribute.getValue());
+ }
+ }
+
+ public Map<String, Object> getAttributeMap()
+ {
+ Map<String, Object> map = Collections.emptyMap();
+
+ //
+ if (attributes != null)
+ {
+ for (Map.Entry<String, Object> attribute : attributes.entrySet())
+ {
+ if (attribute.getValue() != REMOVED_ATTRIBUTE)
+ {
+ if (map.size() == 0)
+ {
+ map = new HashMap<String, Object>(attributes.size());
+ }
+ map.put(attribute.getKey(), attribute.getValue());
+ }
+ }
+ }
+
+ //
+ return map;
+ }
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java 2008-02-04 10:57:05 UTC (rev 9736)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java 2008-02-04 11:10:11 UTC (rev 9737)
@@ -92,6 +92,7 @@
else
{
fragment.setProperties(getProperties(false));
+ fragment.setAttributes(preq.attributes.getAttributeMap());
//
return fragment;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-02-04 10:57:05 UTC (rev 9736)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-02-04 11:10:11 UTC (rev 9737)
@@ -148,8 +148,16 @@
ContainerPreferencesInfo containerPrefs = info.getPreferences();
ContainerNavigationInfo navigationInfo = info.getNavigation();
UserContext userContext = invocation.getUserContext();
+ HttpServletRequestWrapper realReq = new HttpServletRequestWrapper(invocation.getDispatchedRequest());
//
+ PortletRequestAttributes attributes = new PortletRequestAttributes(container, userContext, realReq);
+ if (invocation.getAttributes() != null)
+ {
+ attributes.setAttributeMap(invocation.getAttributes());
+ }
+
+ //
this.contextPath = (String)invocation.getDispatchedRequest().getAttribute("javax.servlet.include.context_path");
this.invocation = invocation;
this.userContext = userContext;
@@ -158,9 +166,9 @@
this.clientContext = invocation.getClientContext();
this.windowContext = invocation.getWindowContext();
this.container = container;
- this.realReq = new HttpServletRequestWrapper(invocation.getDispatchedRequest());
+ this.realReq = realReq;
this.portalContext = new PortalContextImpl(invocation.getPortalContext());
- this.attributes = new PortletRequestAttributes(container, userContext, realReq);
+ this.attributes = attributes;
this.preferences = new PortletPreferencesImpl(prefs, containerPrefs, validator, mode);
this.navigationInfo = navigationInfo;
this.requestParameterMap = PortletRequestParameterMap.create(navigationInfo, invocation);
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-02-04 10:57:05 UTC (rev 9736)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-02-04 11:10:11 UTC (rev 9737)
@@ -35,7 +35,6 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.invocation.response.StateResponse;
import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
import javax.portlet.PortletMode;
@@ -75,7 +74,7 @@
protected WantRedirect wantRedirect;
/** . */
- private List<StateResponse.Event> events;
+ private List<UpdateNavigationalStateResponse.Event> events;
public StateAwareResponseImpl(PortletInvocation invocation, PortletRequestImpl preq)
{
@@ -345,33 +344,16 @@
{
if (events == null)
{
- events = new LinkedList<StateResponse.Event>();
+ events = new LinkedList<UpdateNavigationalStateResponse.Event>();
}
- events.add(new StateResponse.Event(name, value));
+ events.add(new UpdateNavigationalStateResponse.Event(name, value));
}
private abstract class Decision
{
- protected StateResponse getResponse()
- {
- StateResponse response = createResponse();
+ protected abstract PortletInvocationResponse getResponse();
- //
- if (events != null)
- {
- for (StateResponse.Event event : events)
- {
- response.queueEvent(event);
- }
- }
-
- //
- return response;
- }
-
- protected abstract StateResponse createResponse();
-
}
protected class WantUpdate extends Decision
@@ -386,12 +368,13 @@
/** The new mode requested. */
protected Mode mode;
- protected StateResponse createResponse()
+ protected PortletInvocationResponse getResponse()
{
UpdateNavigationalStateResponse response = new UpdateNavigationalStateResponse();
//
response.setProperties(getProperties(false));
+ response.setAttributes(preq.attributes.getAttributeMap());
//
response.setMode(mode);
@@ -400,6 +383,15 @@
response.setNavigationalState(ParametersStateString.create(navigationalState.getPrivateMapSnapshot()));
//
+ if (events != null)
+ {
+ for (UpdateNavigationalStateResponse.Event event : events)
+ {
+ response.queueEvent(event);
+ }
+ }
+
+ //
return response;
}
}
@@ -410,7 +402,7 @@
/** . */
protected String location;
- protected StateResponse createResponse()
+ protected PortletInvocationResponse getResponse()
{
return new HTTPRedirectionResponse(location);
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-02-04 10:57:05 UTC (rev 9736)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-02-04 11:10:11 UTC (rev 9737)
@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Set;
+import java.util.Map;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -80,6 +81,9 @@
/** The target portlet. */
protected PortletContext target;
+ /** . */
+ protected Map<String, Object> attributes;
+
/** The invocation context. */
protected PortletInvocationContext ctx;
@@ -291,4 +295,14 @@
{
this.windowContext = windowContext;
}
+
+ public Map<String, Object> getAttributes()
+ {
+ return attributes;
+ }
+
+ public void setAttributes(Map<String, Object> attributes)
+ {
+ this.attributes = attributes;
+ }
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/FragmentResponse.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/FragmentResponse.java 2008-02-04 10:57:05 UTC (rev 9736)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/FragmentResponse.java 2008-02-04 11:10:11 UTC (rev 9737)
@@ -31,6 +31,7 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Set;
+import java.util.Map;
/**
* Data produced.
@@ -54,6 +55,9 @@
private ResponseProperties properties;
/** . */
+ private Map<String, Object> attributes;
+
+ /** . */
private ContentBuffer buffer;
/** The title if any. */
@@ -72,6 +76,7 @@
this.cacheControl = null;
this.properties = null;
this.nextModes = null;
+ this.attributes = null;
}
public ResponseProperties getProperties()
@@ -94,6 +99,16 @@
this.cacheControl = cacheControl;
}
+ public Map<String, Object> getAttributes()
+ {
+ return attributes;
+ }
+
+ public void setAttributes(Map<String, Object> attributes)
+ {
+ this.attributes = attributes;
+ }
+
public int getType()
{
return buffer.getType();
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java 2008-02-04 10:57:05 UTC (rev 9736)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java 2008-02-04 11:10:11 UTC (rev 9737)
@@ -28,6 +28,6 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5448 $
*/
-public abstract class RedirectionResponse extends StateResponse
+public abstract class RedirectionResponse extends PortletInvocationResponse
{
}
Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/StateResponse.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/StateResponse.java 2008-02-04 10:57:05 UTC (rev 9736)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/StateResponse.java 2008-02-04 11:10:11 UTC (rev 9737)
@@ -1,95 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.portlet.invocation.response;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Collections;
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class StateResponse extends PortletInvocationResponse
-{
-
- /** . */
- private List<Event> producedEvents = Collections.emptyList();
-
- public void queueEvent(Event event)
- {
- if (event == null)
- {
- throw new IllegalArgumentException("No null event accepted");
- }
-
- //
- if (producedEvents.size() == 0)
- {
- producedEvents = new ArrayList<Event>();
- }
-
- //
- producedEvents.add(event);
- }
-
- public List<Event> getEvents()
- {
- return producedEvents;
- }
-
- /**
- * An event produced by a state response.
- */
- public static class Event
- {
-
- /** The optional event. */
- private QName name;
-
- /** The optional event payload. */
- private Serializable payload;
-
- public Event(QName name, Serializable payload)
- {
- if (name == null)
- {
- throw new IllegalArgumentException();
- }
- this.name = name;
- this.payload = payload;
- }
-
- public QName getName()
- {
- return name;
- }
-
- public Serializable getPayload()
- {
- return payload;
- }
- }
-}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java 2008-02-04 10:57:05 UTC (rev 9736)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java 2008-02-04 11:10:11 UTC (rev 9737)
@@ -24,10 +24,14 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.common.util.ParameterMap;
import org.jboss.portal.portlet.StateString;
+import javax.xml.namespace.QName;
import java.util.Map;
+import java.util.List;
+import java.util.Collections;
+import java.util.ArrayList;
+import java.io.Serializable;
/**
* Update the navigational state.
@@ -35,21 +39,27 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5477 $
*/
-public class UpdateNavigationalStateResponse extends StateResponse
+public class UpdateNavigationalStateResponse extends PortletInvocationResponse
{
/** . */
private ResponseProperties properties;
/** The navigational state returned. */
- protected StateString navigationalState;
+ private StateString navigationalState;
/** The new window state requested. */
- protected WindowState windowState;
+ private WindowState windowState;
/** The new mode requested. */
- protected Mode mode;
+ private Mode mode;
+ /** The attributes snapshot after the request. */
+ private Map<String, Object> attributes;
+
+ /** . */
+ private List<Event> producedEvents;
+
/**
* The update to the public parameters. Each entry having a zero length value must be interpeted as
* a public parameter removal otherwise it must be interpreted as a public parameter values update.
@@ -62,6 +72,7 @@
windowState = null;
mode = null;
publicNavigationalStateUpdates = null;
+ producedEvents = Collections.emptyList();
}
public ResponseProperties getProperties()
@@ -74,6 +85,16 @@
this.properties = properties;
}
+ public Map<String, Object> getAttributes()
+ {
+ return attributes;
+ }
+
+ public void setAttributes(Map<String, Object> attributes)
+ {
+ this.attributes = attributes;
+ }
+
public Mode getMode()
{
return mode;
@@ -113,4 +134,59 @@
{
this.publicNavigationalStateUpdates = publicNavigationalStateUpdates;
}
+
+ public void queueEvent(UpdateNavigationalStateResponse.Event event)
+ {
+ if (event == null)
+ {
+ throw new IllegalArgumentException("No null event accepted");
+ }
+
+ //
+ if (producedEvents.size() == 0)
+ {
+ producedEvents = new ArrayList<Event>();
+ }
+
+ //
+ producedEvents.add(event);
+ }
+
+ public List<UpdateNavigationalStateResponse.Event> getEvents()
+ {
+ return producedEvents;
+ }
+
+ /**
+ * An event produced by a state response.
+ */
+ public static class Event
+ {
+
+ /** The optional event. */
+ private QName name;
+
+ /** The optional event payload. */
+ private Serializable payload;
+
+ public Event(QName name, Serializable payload)
+ {
+ if (name == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ this.name = name;
+ this.payload = payload;
+ }
+
+ public QName getName()
+ {
+ return name;
+ }
+
+ public Serializable getPayload()
+ {
+ return payload;
+ }
+ }
}
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-04 10:57:05 UTC (rev 9736)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-04 11:10:11 UTC (rev 9737)
@@ -25,9 +25,7 @@
import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.ResponseProperties;
-import org.jboss.portal.portlet.invocation.response.StateResponse;
import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
-import org.jboss.portal.portlet.test.controller.PageNavigationalState;
import org.jboss.portal.portlet.test.PortletURLRenderer;
import org.jboss.portal.portlet.test.TestActionContext;
import org.jboss.portal.portlet.test.TestEventContext;
@@ -100,7 +98,7 @@
//
context.getClientResponse().sendError(404, error.getMessage());
}
- else if (response instanceof StateResponse)
+ else if (response instanceof UpdateNavigationalStateResponse)
{
// Update portlet NS
if (response instanceof UpdateNavigationalStateResponse)
@@ -118,11 +116,11 @@
//
EventControllerContext eventCC = context.getEventControllerContext();
- StateResponse stateResponse = (StateResponse)response;
+ UpdateNavigationalStateResponse stateResponse = (UpdateNavigationalStateResponse)response;
// Create event list and feed it with the events that may have been produced
LinkedList<Event> eventQueue = new LinkedList<Event>();
- for (StateResponse.Event portletEvent : stateResponse.getEvents())
+ for (UpdateNavigationalStateResponse.Event portletEvent : stateResponse.getEvents())
{
Event producedEvent = new Event(portletEvent.getName(), portletEvent.getPayload(), portletContext);
List<Event> consumedEvents = eventCC.getConsumedEvents(producedEvent);
@@ -146,7 +144,7 @@
updateNavigationalState(context, event.getPortletContext().getId(), update, pageState);
// Add events if any
- for (StateResponse.Event portletEvent : update.getEvents())
+ for (UpdateNavigationalStateResponse.Event portletEvent : update.getEvents())
{
Event producedEvent = new Event(portletEvent.getName(), portletEvent.getPayload(), portletContext);
List<Event> consumedEvents = eventCC.getConsumedEvents(producedEvent);
@@ -169,14 +167,13 @@
// Do something here !!!!
}
}
-
- if (response instanceof HTTPRedirectionResponse)
- {
- HTTPRedirectionResponse redirection = (HTTPRedirectionResponse)response;
- context.getClientResponse().sendRedirect(redirection.getLocation());
- return;
- }
}
+ else if (response instanceof HTTPRedirectionResponse)
+ {
+ HTTPRedirectionResponse redirection = (HTTPRedirectionResponse)response;
+ context.getClientResponse().sendRedirect(redirection.getLocation());
+ return;
+ }
else
{
System.out.println("Not yet handled " + response);
16 years, 4 months
JBoss Portal SVN: r9736 - in modules/identity/branches/JBP_IDENTITY_BRANCH_1_0: identity/src/main/org/jboss/portal/identity and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-02-04 05:57:05 -0500 (Mon, 04 Feb 2008)
New Revision: 9736
Removed:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/config/
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build.xml
Log:
minor
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml 2008-02-04 10:48:40 UTC (rev 9735)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml 2008-02-04 10:57:05 UTC (rev 9736)
@@ -47,8 +47,8 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/>
- <componentref name="jboss-portal/modules/test" version="1.0-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/common" version="1.1.0"/>
+ <componentref name="jboss-portal/modules/test" version="1.0.1"/>
<componentref name="apache-log4j" version="1.2.8"/>
<componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
<componentref name="apache-xerces" version="2.7.1"/>
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build.xml
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build.xml 2008-02-04 10:48:40 UTC (rev 9735)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build.xml 2008-02-04 10:57:05 UTC (rev 9736)
@@ -61,8 +61,8 @@
<property name="version.major" value="1"/>
<property name="version.minor" value="0"/>
- <property name="version.revision" value="0"/>
- <property name="version.tag" value="GA"/>
+ <property name="version.revision" value="3"/>
+ <property name="version.tag" value="SNAPSHOT"/>
<property name="version.name" value=""/>
<!-- This must be set to the CVS tag for any release -->
16 years, 4 months
JBoss Portal SVN: r9735 - in docs/branches/JBoss_Portal_Branch_2_6: readmeFiles and 3 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-02-04 05:48:40 -0500 (Mon, 04 Feb 2008)
New Revision: 9735
Modified:
docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml
docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-bin.README
docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-ha-bin.README
docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-src.README
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/master.xml
Log:
2.6.4 update
Modified: docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml 2008-02-04 10:44:53 UTC (rev 9734)
+++ docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml 2008-02-04 10:48:40 UTC (rev 9735)
@@ -11,9 +11,9 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6.3-SNAPSHOT</title>
+ <title>JBoss Portal 2.6.4</title>
<subtitle>Quickstart User Guide</subtitle>
- <releaseinfo>Release 2.6.3-SNAPSHOT</releaseinfo>
+ <releaseinfo>Release 2.6.4</releaseinfo>
<author>
<firstname>Kevin</firstname>
Modified: docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-bin.README
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-bin.README 2008-02-04 10:44:53 UTC (rev 9734)
+++ docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-bin.README 2008-02-04 10:48:40 UTC (rev 9735)
@@ -1,5 +1,5 @@
- JBoss Portal 2.6.3-SNAPSHOT
+ JBoss Portal 2.6.4
LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage)
JBoss Portal is the next generation open source content management system (CMS) and portal
Modified: docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-ha-bin.README
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-ha-bin.README 2008-02-04 10:44:53 UTC (rev 9734)
+++ docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-ha-bin.README 2008-02-04 10:48:40 UTC (rev 9735)
@@ -1,5 +1,5 @@
- JBoss Portal 2.6.3-SNAPSHOT
+ JBoss Portal 2.6.4
LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage)
JBoss Portal is the next generation open source content management system (CMS) and portal
Modified: docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-src.README
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-src.README 2008-02-04 10:44:53 UTC (rev 9734)
+++ docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-src.README 2008-02-04 10:48:40 UTC (rev 9735)
@@ -1,5 +1,5 @@
- JBoss Portal 2.6.3-SNAPSHOT
+ JBoss Portal 2.6.4
LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage)
JBoss Portal is the next generation open source content management system (CMS) and portal
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml 2008-02-04 10:44:53 UTC (rev 9734)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml 2008-02-04 10:48:40 UTC (rev 9735)
@@ -37,10 +37,10 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6.3-SNAPSHOT</title>
+ <title>JBoss Portal 2.6.4</title>
<subtitle>Reference Guide</subtitle>
- <releaseinfo>Release 2.6.3-SNAPSHOT</releaseinfo>
- <releaseinfo>October 2007</releaseinfo>
+ <releaseinfo>Release 2.6.4</releaseinfo>
+ <releaseinfo>February 2008</releaseinfo>
<author>
<firstname>Thomas</firstname>
<surname>Heute</surname>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-02-04 10:44:53 UTC (rev 9734)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-02-04 10:48:40 UTC (rev 9735)
@@ -219,7 +219,7 @@
</itemizedlist>
</para>
<para>
- Several modules have been extracted from the JBoss Portal SVN repository. These modules have a different lifecycle and a different version scheme. The following is a list of modules used in JBoss Portal 2.6.3, and the locations of their source code:
+ Several modules have been extracted from the JBoss Portal SVN repository. These modules have a different lifecycle and a different version scheme. The following is a list of modules used in JBoss Portal 2.6.4, and the locations of their source code:
</para>
<para>
<itemizedlist>
@@ -230,7 +230,7 @@
</listitem>
<listitem>
<para>
- JBoss Portal Web 1.1: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/web/tags/JBP_WEB_1_1_0</emphasis>
+ JBoss Portal Web 1.1.0: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/web/tags/JBP_WEB_1_1_0</emphasis>
</para>
</listitem>
<listitem>
@@ -240,12 +240,12 @@
</listitem>
<listitem>
<para>
- JBoss Portal Portlet 1.0.1: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/portlet/tags/JBP_PORTLET_1_0_1</emphasis>
+ JBoss Portal Portlet 1.0.2: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/portlet/tags/JBP_PORTLET_1_0_2</emphasis>
</para>
</listitem>
<listitem>
<para>
- JBoss Portal Identity 1.0.1: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/identity/tags/JBP_IDENTITY_...</emphasis>
+ JBoss Portal Identity 1.0.2: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/identity/tags/JBP_IDENTITY_...</emphasis>
</para>
</listitem>
</itemizedlist>
Modified: docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/master.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/master.xml 2008-02-04 10:44:53 UTC (rev 9734)
+++ docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/master.xml 2008-02-04 10:48:40 UTC (rev 9735)
@@ -13,10 +13,10 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6.3-SNAPSHOT</title>
+ <title>JBoss Portal 2.6.4</title>
<subtitle>User Guide</subtitle>
- <releaseinfo>Release 2.6.3-SNAPSHOT "Ninja"</releaseinfo>
- <releaseinfo>October 2007</releaseinfo>
+ <releaseinfo>Release 2.6.4</releaseinfo>
+ <releaseinfo>February 2008</releaseinfo>
</bookinfo>
<toc/>
<!-- portal overview - marketing stuff --> &overview;
16 years, 4 months
JBoss Portal SVN: r9734 - in modules/identity/tags/JBP_IDENTITY_1_0_2: identity/src/main/org/jboss/portal/identity and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-02-04 05:44:53 -0500 (Mon, 04 Feb 2008)
New Revision: 9734
Removed:
modules/identity/tags/JBP_IDENTITY_1_0_2/identity/src/main/org/jboss/portal/identity/config/
Modified:
modules/identity/tags/JBP_IDENTITY_1_0_2/build/build-thirdparty.xml
modules/identity/tags/JBP_IDENTITY_1_0_2/build/build.xml
Log:
Fix versions
Modified: modules/identity/tags/JBP_IDENTITY_1_0_2/build/build-thirdparty.xml
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_0_2/build/build-thirdparty.xml 2008-02-04 10:31:45 UTC (rev 9733)
+++ modules/identity/tags/JBP_IDENTITY_1_0_2/build/build-thirdparty.xml 2008-02-04 10:44:53 UTC (rev 9734)
@@ -47,8 +47,8 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/>
- <componentref name="jboss-portal/modules/test" version="1.0-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/common" version="1.1.0"/>
+ <componentref name="jboss-portal/modules/test" version="1.0.1"/>
<componentref name="apache-log4j" version="1.2.8"/>
<componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
<componentref name="apache-xerces" version="2.7.1"/>
Modified: modules/identity/tags/JBP_IDENTITY_1_0_2/build/build.xml
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_0_2/build/build.xml 2008-02-04 10:31:45 UTC (rev 9733)
+++ modules/identity/tags/JBP_IDENTITY_1_0_2/build/build.xml 2008-02-04 10:44:53 UTC (rev 9734)
@@ -61,7 +61,7 @@
<property name="version.major" value="1"/>
<property name="version.minor" value="0"/>
- <property name="version.revision" value="0"/>
+ <property name="version.revision" value="2"/>
<property name="version.tag" value="GA"/>
<property name="version.name" value=""/>
16 years, 4 months
JBoss Portal SVN: r9733 - modules/identity/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-02-04 05:31:45 -0500 (Mon, 04 Feb 2008)
New Revision: 9733
Added:
modules/identity/tags/JBP_IDENTITY_1_0_2/
Log:
Tagging identity 1.0.2
Copied: modules/identity/tags/JBP_IDENTITY_1_0_2 (from rev 9732, modules/identity/branches/JBP_IDENTITY_BRANCH_1_0)
16 years, 4 months
JBoss Portal SVN: r9732 - in modules/portlet/branches/JBP_PORTLET_BRANCH_1_0: .settings and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-02-04 05:27:12 -0500 (Mon, 04 Feb 2008)
New Revision: 9732
Added:
modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.settings/org.eclipse.jdt.ui.prefs
Removed:
modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.settings/org.eclipse.jdt.core.prefs
Modified:
modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.classpath
modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build-thirdparty.xml
modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build.xml
modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java
Log:
Fix build
Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.classpath
===================================================================
--- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.classpath 2008-02-04 10:25:04 UTC (rev 9731)
+++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.classpath 2008-02-04 10:27:12 UTC (rev 9732)
@@ -22,5 +22,6 @@
<classpathentry kind="lib" path="thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
+ <classpathentry kind="lib" path="thirdparty/tagsoup/lib/tagsoup.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Deleted: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.settings/org.eclipse.jdt.core.prefs 2008-02-04 10:25:04 UTC (rev 9731)
+++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.settings/org.eclipse.jdt.core.prefs 2008-02-04 10:27:12 UTC (rev 9732)
@@ -1,12 +0,0 @@
-#Wed Sep 12 11:19:13 CEST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
Added: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.settings/org.eclipse.jdt.ui.prefs (rev 0)
+++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/.settings/org.eclipse.jdt.ui.prefs 2008-02-04 10:27:12 UTC (rev 9732)
@@ -0,0 +1,3 @@
+#Mon Feb 04 10:02:33 CET 2008
+eclipse.preferences.version=1
+internal.default.compliance=default
Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build-thirdparty.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build-thirdparty.xml 2008-02-04 10:25:04 UTC (rev 9731)
+++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build-thirdparty.xml 2008-02-04 10:27:12 UTC (rev 9732)
@@ -47,8 +47,8 @@
-->
<componentref name="jboss-portal/modules/common" version="1.1.0"/>
- <componentref name="jboss-portal/modules/web" version="trunk-SNAPSHOT"/>
- <componentref name="jboss-portal/modules/test" version="1.0-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/web" version="1.1.0"/>
+ <componentref name="jboss-portal/modules/test" version="1.0.1"/>
<componentref name="sun-servlet" version="2.4"/>
<componentref name="sun-jaf" version="1.1"/>
Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build.xml 2008-02-04 10:25:04 UTC (rev 9731)
+++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build.xml 2008-02-04 10:27:12 UTC (rev 9732)
@@ -61,8 +61,8 @@
<property name="version.major" value="1"/>
<property name="version.minor" value="0"/>
- <property name="version.revision" value="0"/>
- <property name="version.tag" value="GA"/>
+ <property name="version.revision" value="3"/>
+ <property name="version.tag" value="SNAPSHOT"/>
<property name="version.name" value=""/>
<!-- This must be set to the CVS tag for any release -->
Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-04 10:25:04 UTC (rev 9731)
+++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-04 10:27:12 UTC (rev 9732)
@@ -45,7 +45,9 @@
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
import org.jboss.beans.metadata.plugins.AbstractInstallMetaData;
import org.jboss.beans.metadata.plugins.ThisValueMetaData;
+import org.jboss.beans.metadata.spi.InstallMetaData;
import org.jboss.beans.metadata.spi.ParameterMetaData;
+import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.apache.log4j.Logger;
import javax.servlet.ServletContext;
@@ -53,6 +55,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Collections;
+import java.util.Set;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -110,23 +113,23 @@
bmd.setConstructor(ctormd);
bmd.setStart(new AbstractLifecycleMetaData("start"));
bmd.setStop(new AbstractLifecycleMetaData("stop"));
- bmd.setProperties(Collections.singleton(new AbstractPropertyMetaData("application", new AbstractDependencyValueMetaData(id))));
+ bmd.setProperties(Collections.singleton((PropertyMetaData)new AbstractPropertyMetaData("application", new AbstractDependencyValueMetaData(id))));
AbstractInstallMetaData deployerinstallmd = new AbstractInstallMetaData();
deployerinstallmd.setBean("PortletApplicationDeployer");
- deployerinstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ deployerinstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
deployerinstallmd.setMethodName("installPortletContainer");
AbstractInstallMetaData applicationinstallmd = new AbstractInstallMetaData();
applicationinstallmd.setBean(id);
- applicationinstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ applicationinstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
applicationinstallmd.setMethodName("addContainer");
bmd.setInstalls((List)CollectionBuilder.arrayList().add(deployerinstallmd).add(applicationinstallmd).get());
AbstractInstallMetaData deployeruninstallmd = new AbstractInstallMetaData();
deployeruninstallmd.setBean("PortletApplicationDeployer");
- deployeruninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ deployeruninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
deployeruninstallmd.setMethodName("uninstallPortletContainer");
AbstractInstallMetaData applicationuninstallmd = new AbstractInstallMetaData();
applicationuninstallmd.setBean(id);
- applicationuninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ applicationuninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
applicationuninstallmd.setMethodName("removeContainer");
bmd.setUninstalls((List)CollectionBuilder.arrayList().add(deployeruninstallmd).add(applicationuninstallmd).get());
try
@@ -155,14 +158,14 @@
bmd.setStop(new AbstractLifecycleMetaData("stop"));
AbstractInstallMetaData installmd = new AbstractInstallMetaData();
installmd.setBean("PortletApplicationDeployer");
- installmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ installmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
installmd.setMethodName("installPortletApplication");
- bmd.setInstalls(Collections.singletonList(installmd));
+ bmd.setInstalls(Collections.singletonList((InstallMetaData)installmd));
AbstractInstallMetaData uninstallmd = new AbstractInstallMetaData();
uninstallmd.setBean("PortletApplicationDeployer");
- uninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ uninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
uninstallmd.setMethodName("uninstallPortletApplication");
- bmd.setUninstalls(Collections.singletonList(uninstallmd));
+ bmd.setUninstalls(Collections.singletonList((InstallMetaData)uninstallmd));
//
try
16 years, 4 months
JBoss Portal SVN: r9731 - modules/portlet/tags/JBP_PORTLET_1_0_2/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-02-04 05:25:04 -0500 (Mon, 04 Feb 2008)
New Revision: 9731
Removed:
modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties
Log:
Delete
Deleted: modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties
===================================================================
--- modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties 2008-02-04 10:14:08 UTC (rev 9730)
+++ modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties 2008-02-04 10:25:04 UTC (rev 9731)
@@ -1,48 +0,0 @@
-### ====================================================================== ###
-## ##
-## Local project properties. ##
-## ##
-## Define properties that are local to your environment here. This ##
-## file (local.properties) should not be checked in. Modify the ##
-## example to affect all users. ##
-## ##
-### ====================================================================== ###
-
-### General compiler configuration ###
-
-#build.compiler=jikes
-#build.warnings=true
-#build.pedantic=true
-#javac.depend=on
-
-### Javac/Jikes compiler configuration ###
-
-javac.optimize=off
-javac.debug=on
-javac.deprecation=on
-
-### Enable verbose build output ###
-
-#init.verbose=true
-
-### JavaDoc ###
-#docs-javadocs.disable=true
-
-### Do we build xdoclet or get it from thirdparty ###
-### uncomment for thirdparty: comment to use xdoclet module.
-### To use xdoclet module also uncomment the xdoclet line in groups in build/build.xml
-#xdoclet.xdoclet.root=${project.root}/thirdparty/xdoclet
-
-# Portal database, for now : hsqldb, mysql, postgresql are the possible values
-portal.database=mysql
-# The datasource name used in the JNDI binding
-portal.datasource.name=PortalDS
-# Context root for the portal main servlet
-portal.web.context-root=/portal
-# JBoss server/<xxx> directory for JBoss Portal, ie: $JBOSS_HOME/server/default
-portal.deploy.dir=default/deploy
-portal-ha.deploy.dir=all/deploy
-# Show SQL or not
-portal.sql.show=false
-# Uncomment if you want to use a specific JBoss home path otherwise the build will use the JBOSS_HOME env variable
-#jboss.home=
16 years, 4 months
JBoss Portal SVN: r9730 - in modules/portlet/tags/JBP_PORTLET_1_0_2: .settings and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-02-04 05:14:08 -0500 (Mon, 04 Feb 2008)
New Revision: 9730
Added:
modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.ui.prefs
modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties
Removed:
modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.core.prefs
Modified:
modules/portlet/tags/JBP_PORTLET_1_0_2/.classpath
modules/portlet/tags/JBP_PORTLET_1_0_2/build/build-thirdparty.xml
modules/portlet/tags/JBP_PORTLET_1_0_2/build/build.xml
modules/portlet/tags/JBP_PORTLET_1_0_2/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java
Log:
Fixing build and version number
Modified: modules/portlet/tags/JBP_PORTLET_1_0_2/.classpath
===================================================================
--- modules/portlet/tags/JBP_PORTLET_1_0_2/.classpath 2008-02-04 08:47:23 UTC (rev 9729)
+++ modules/portlet/tags/JBP_PORTLET_1_0_2/.classpath 2008-02-04 10:14:08 UTC (rev 9730)
@@ -22,5 +22,6 @@
<classpathentry kind="lib" path="thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
+ <classpathentry kind="lib" path="thirdparty/tagsoup/lib/tagsoup.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Deleted: modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.core.prefs 2008-02-04 08:47:23 UTC (rev 9729)
+++ modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.core.prefs 2008-02-04 10:14:08 UTC (rev 9730)
@@ -1,12 +0,0 @@
-#Wed Sep 12 11:19:13 CEST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
Added: modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.ui.prefs (rev 0)
+++ modules/portlet/tags/JBP_PORTLET_1_0_2/.settings/org.eclipse.jdt.ui.prefs 2008-02-04 10:14:08 UTC (rev 9730)
@@ -0,0 +1,3 @@
+#Mon Feb 04 10:02:33 CET 2008
+eclipse.preferences.version=1
+internal.default.compliance=default
Modified: modules/portlet/tags/JBP_PORTLET_1_0_2/build/build-thirdparty.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_1_0_2/build/build-thirdparty.xml 2008-02-04 08:47:23 UTC (rev 9729)
+++ modules/portlet/tags/JBP_PORTLET_1_0_2/build/build-thirdparty.xml 2008-02-04 10:14:08 UTC (rev 9730)
@@ -47,8 +47,8 @@
-->
<componentref name="jboss-portal/modules/common" version="1.1.0"/>
- <componentref name="jboss-portal/modules/web" version="trunk-SNAPSHOT"/>
- <componentref name="jboss-portal/modules/test" version="1.0-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/web" version="1.1.0"/>
+ <componentref name="jboss-portal/modules/test" version="1.0.1"/>
<componentref name="sun-servlet" version="2.4"/>
<componentref name="sun-jaf" version="1.1"/>
Modified: modules/portlet/tags/JBP_PORTLET_1_0_2/build/build.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_1_0_2/build/build.xml 2008-02-04 08:47:23 UTC (rev 9729)
+++ modules/portlet/tags/JBP_PORTLET_1_0_2/build/build.xml 2008-02-04 10:14:08 UTC (rev 9730)
@@ -61,7 +61,7 @@
<property name="version.major" value="1"/>
<property name="version.minor" value="0"/>
- <property name="version.revision" value="0"/>
+ <property name="version.revision" value="2"/>
<property name="version.tag" value="GA"/>
<property name="version.name" value=""/>
Added: modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties
===================================================================
--- modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties (rev 0)
+++ modules/portlet/tags/JBP_PORTLET_1_0_2/build/local.properties 2008-02-04 10:14:08 UTC (rev 9730)
@@ -0,0 +1,48 @@
+### ====================================================================== ###
+## ##
+## Local project properties. ##
+## ##
+## Define properties that are local to your environment here. This ##
+## file (local.properties) should not be checked in. Modify the ##
+## example to affect all users. ##
+## ##
+### ====================================================================== ###
+
+### General compiler configuration ###
+
+#build.compiler=jikes
+#build.warnings=true
+#build.pedantic=true
+#javac.depend=on
+
+### Javac/Jikes compiler configuration ###
+
+javac.optimize=off
+javac.debug=on
+javac.deprecation=on
+
+### Enable verbose build output ###
+
+#init.verbose=true
+
+### JavaDoc ###
+#docs-javadocs.disable=true
+
+### Do we build xdoclet or get it from thirdparty ###
+### uncomment for thirdparty: comment to use xdoclet module.
+### To use xdoclet module also uncomment the xdoclet line in groups in build/build.xml
+#xdoclet.xdoclet.root=${project.root}/thirdparty/xdoclet
+
+# Portal database, for now : hsqldb, mysql, postgresql are the possible values
+portal.database=mysql
+# The datasource name used in the JNDI binding
+portal.datasource.name=PortalDS
+# Context root for the portal main servlet
+portal.web.context-root=/portal
+# JBoss server/<xxx> directory for JBoss Portal, ie: $JBOSS_HOME/server/default
+portal.deploy.dir=default/deploy
+portal-ha.deploy.dir=all/deploy
+# Show SQL or not
+portal.sql.show=false
+# Uncomment if you want to use a specific JBoss home path otherwise the build will use the JBOSS_HOME env variable
+#jboss.home=
Modified: modules/portlet/tags/JBP_PORTLET_1_0_2/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java
===================================================================
--- modules/portlet/tags/JBP_PORTLET_1_0_2/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-04 08:47:23 UTC (rev 9729)
+++ modules/portlet/tags/JBP_PORTLET_1_0_2/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-04 10:14:08 UTC (rev 9730)
@@ -45,7 +45,9 @@
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
import org.jboss.beans.metadata.plugins.AbstractInstallMetaData;
import org.jboss.beans.metadata.plugins.ThisValueMetaData;
+import org.jboss.beans.metadata.spi.InstallMetaData;
import org.jboss.beans.metadata.spi.ParameterMetaData;
+import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.apache.log4j.Logger;
import javax.servlet.ServletContext;
@@ -53,6 +55,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Collections;
+import java.util.Set;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -110,23 +113,23 @@
bmd.setConstructor(ctormd);
bmd.setStart(new AbstractLifecycleMetaData("start"));
bmd.setStop(new AbstractLifecycleMetaData("stop"));
- bmd.setProperties(Collections.singleton(new AbstractPropertyMetaData("application", new AbstractDependencyValueMetaData(id))));
+ bmd.setProperties(Collections.singleton((PropertyMetaData)new AbstractPropertyMetaData("application", new AbstractDependencyValueMetaData(id))));
AbstractInstallMetaData deployerinstallmd = new AbstractInstallMetaData();
deployerinstallmd.setBean("PortletApplicationDeployer");
- deployerinstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ deployerinstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
deployerinstallmd.setMethodName("installPortletContainer");
AbstractInstallMetaData applicationinstallmd = new AbstractInstallMetaData();
applicationinstallmd.setBean(id);
- applicationinstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ applicationinstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
applicationinstallmd.setMethodName("addContainer");
bmd.setInstalls((List)CollectionBuilder.arrayList().add(deployerinstallmd).add(applicationinstallmd).get());
AbstractInstallMetaData deployeruninstallmd = new AbstractInstallMetaData();
deployeruninstallmd.setBean("PortletApplicationDeployer");
- deployeruninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ deployeruninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
deployeruninstallmd.setMethodName("uninstallPortletContainer");
AbstractInstallMetaData applicationuninstallmd = new AbstractInstallMetaData();
applicationuninstallmd.setBean(id);
- applicationuninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ applicationuninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
applicationuninstallmd.setMethodName("removeContainer");
bmd.setUninstalls((List)CollectionBuilder.arrayList().add(deployeruninstallmd).add(applicationuninstallmd).get());
try
@@ -155,14 +158,14 @@
bmd.setStop(new AbstractLifecycleMetaData("stop"));
AbstractInstallMetaData installmd = new AbstractInstallMetaData();
installmd.setBean("PortletApplicationDeployer");
- installmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ installmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
installmd.setMethodName("installPortletApplication");
- bmd.setInstalls(Collections.singletonList(installmd));
+ bmd.setInstalls(Collections.singletonList((InstallMetaData)installmd));
AbstractInstallMetaData uninstallmd = new AbstractInstallMetaData();
uninstallmd.setBean("PortletApplicationDeployer");
- uninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData())));
+ uninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
uninstallmd.setMethodName("uninstallPortletApplication");
- bmd.setUninstalls(Collections.singletonList(uninstallmd));
+ bmd.setUninstalls(Collections.singletonList((InstallMetaData)uninstallmd));
//
try
16 years, 4 months
JBoss Portal SVN: r9729 - modules/portlet/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-02-04 03:47:23 -0500 (Mon, 04 Feb 2008)
New Revision: 9729
Added:
modules/portlet/tags/JBP_PORTLET_1_0_2/
Log:
Tagging portlet 1.0.2
Copied: modules/portlet/tags/JBP_PORTLET_1_0_2 (from rev 9728, modules/portlet/branches/JBP_PORTLET_BRANCH_1_0)
16 years, 4 months