JBoss Portal SVN: r9899 - in modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp: taglib and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-09 09:31:49 -0500 (Sat, 09 Feb 2008)
New Revision: 9899
Added:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalRenderResponse.java
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/ControllerFilter.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/JspWriterResponse.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageParamTag.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageTag.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalSimpleTagSupport.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletURLTag.java
Log:
rename PortalResponse to PortalRenderResponse
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/ControllerFilter.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/ControllerFilter.java 2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/ControllerFilter.java 2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp;
-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
@@ -207,10 +207,10 @@
}
//
- PortalResponse portalResponse = new PortalResponse(resp, context, pageState);
+ PortalRenderResponse renderResponse = new PortalRenderResponse(resp, context, pageState);
//
- chain.doFilter(req, portalResponse);
+ chain.doFilter(req, renderResponse);
}
public void destroy()
@@ -218,7 +218,7 @@
this.config = null;
}
- protected void render(HttpServletRequest req, PortalResponse resp) throws ServletException, IOException, ClassNotFoundException
+ protected void render(HttpServletRequest req, PortalRenderResponse resp) throws ServletException, IOException, ClassNotFoundException
{
//
Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalRenderResponse.java (from rev 9898, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalResponse.java)
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalRenderResponse.java (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalRenderResponse.java 2008-02-09 14:31:49 UTC (rev 9899)
@@ -0,0 +1,203 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, 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.test.jsp;
+
+import org.jboss.portal.portlet.test.controller.TestInstanceContext;
+import org.jboss.portal.portlet.test.controller.TestPortalContext;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
+import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
+import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
+import org.jboss.portal.portlet.impl.spi.AbstractWindowContext;
+import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.Mode;
+import org.jboss.portal.common.util.ParameterMap;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+import javax.xml.namespace.QName;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class PortalRenderResponse extends HttpServletResponseWrapper
+{
+
+ /** . */
+ private final PagePortletControllerContext portletControllerContext;
+
+ /** . */
+ private PageNavigationalState pageState;
+
+ /** . */
+ private int count = 0;
+
+ /** Wether or not the page state can be modified. */
+ private boolean pageStateModifiable;
+
+ public PortalRenderResponse(
+ HttpServletResponse response,
+ PagePortletControllerContext portletControllerContext,
+ PageNavigationalState pageState)
+ {
+ super(response);
+
+ //
+ this.portletControllerContext = portletControllerContext;
+ this.pageState = pageState;
+ this.pageStateModifiable = true;
+ }
+
+ /**
+ * The page state for the rendering.
+ *
+ * @return the page state
+ */
+ public PageNavigationalState getPageState()
+ {
+ return pageState;
+ }
+
+ public PortletInvocationResponse render(Portlet portlet, String windowId) throws PortletInvokerException
+ {
+ WindowNavigationalState windowNS = null;
+ if (pageState != null)
+ {
+ windowNS = pageState.getWindowNavigationalState(windowId);
+ }
+
+ //
+ ParameterMap publicNS = null;
+ if (pageState != null)
+ {
+ publicNS = pageState.getPublicNavigationalState(windowId);
+ }
+
+ //
+ Mode mode = Mode.VIEW;
+ WindowState windowState = WindowState.NORMAL;
+ StateString portletNS = null;
+
+ //
+ if (windowNS != null)
+ {
+ if (windowNS.getMode() != null)
+ {
+ mode = windowNS.getMode();
+ }
+ if (windowNS.getWindowState() != null)
+ {
+ windowState = windowNS.getWindowState();
+ }
+ if (windowNS.getPortletNavigationalState() != null)
+ {
+ portletNS = windowNS.getPortletNavigationalState();
+ }
+ }
+
+ //
+ PortletInvocationContext renderContext = portletControllerContext.createPortletInvocationContext(windowId, pageState);
+ RenderInvocation render = new RenderInvocation(renderContext);
+ render.setClientContext(new AbstractClientContext(portletControllerContext.getClientRequest()));
+ render.setServerContext(new AbstractServerContext(portletControllerContext.getClientRequest(), portletControllerContext.getClientResponse()));
+ render.setInstanceContext(new TestInstanceContext(portletControllerContext.getClientRequest(), portlet.getContext(), false));
+ render.setUserContext(new AbstractUserContext(portletControllerContext.getClientRequest()));
+ render.setWindowContext(new AbstractWindowContext(windowId));
+ render.setPortalContext(new TestPortalContext());
+ render.setSecurityContext(new AbstractSecurityContext(portletControllerContext.getClientRequest()));
+ render.setTarget(portlet.getContext());
+ render.setMode(mode);
+ render.setWindowState(windowState);
+ render.setNavigationalState(portletNS);
+ render.setPublicNavigationalState(publicNS);
+
+ //
+ pageStateModifiable = false;
+
+ //
+ return portletControllerContext.invoke(render);
+ }
+
+ public boolean isPageStateModifiable()
+ {
+ return pageStateModifiable;
+ }
+
+ public String getPageParameter(QName name)
+ {
+ return pageState != null ? pageState.getPublicNavigationalState(name)[0] : null;
+ }
+
+ public void setPageParameter(QName name, String value)
+ {
+ if (pageStateModifiable)
+ {
+ if (pageState == null)
+ {
+ pageState = portletControllerContext.getStateControllerContext().createPageState(true);
+ }
+ pageState.setPublicNavigationalState(name, new String[]{value});
+ }
+ else
+ {
+ throw new IllegalStateException("Page state cannot be modified");
+ }
+ }
+
+ public String getMaximizedWindowId()
+ {
+ if (pageState != null)
+ {
+ for (String windowId : pageState.getWindowIds())
+ {
+ WindowNavigationalState windowNS = pageState.getWindowNavigationalState(windowId);
+ if (WindowState.MAXIMIZED.equals(windowNS.getWindowState()))
+ {
+ return windowId;
+ }
+ }
+ }
+
+ //
+ return null;
+ }
+
+ public PagePortletControllerContext getPortletControllerContext()
+ {
+ return portletControllerContext;
+ }
+
+ public String nextId()
+ {
+ return "" + count++;
+ }
+}
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/JspWriterResponse.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/JspWriterResponse.java 2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/JspWriterResponse.java 2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import javax.servlet.jsp.JspWriter;
@@ -43,9 +43,9 @@
/** . */
private final PrintWriter writer;
- public JspWriterResponse(PortalResponse portalResponse, JspWriter delegate)
+ public JspWriterResponse(PortalRenderResponse renderResponse, JspWriter delegate)
{
- super(portalResponse);
+ super(renderResponse);
//
this.delegate = delegate;
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageParamTag.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageParamTag.java 2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageParamTag.java 2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
import javax.servlet.jsp.JspException;
import javax.xml.namespace.QName;
@@ -89,17 +89,17 @@
public void internalDoTag() throws JspException, IOException
{
- PortalResponse response = getPortalResponse();
+ PortalRenderResponse renderResponse = getPortalResponse();
//
- if (response.isPageStateModifiable())
+ if (renderResponse.isPageStateModifiable())
{
QName name = new QName(namespaceURI, localName);
//
- if (!"true".equals(frozen) || response.getPageParameter(name) == null)
+ if (!"true".equals(frozen) || renderResponse.getPageParameter(name) == null)
{
- response.setPageParameter(name, value);
+ renderResponse.setPageParameter(name, value);
}
}
}
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageTag.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageTag.java 2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageTag.java 2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
import javax.servlet.jsp.JspException;
import javax.xml.namespace.QName;
@@ -57,13 +57,13 @@
{
if (status == Status.INACTIVE)
{
- PortalResponse response = getPortalResponse();
+ PortalRenderResponse renderResponse = getPortalResponse();
//
status = Status.ACTIVE;
//
- maximizedId = response.getMaximizedWindowId();
+ maximizedId = renderResponse.getMaximizedWindowId();
//
if (maximizedId != null)
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.java 2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.java 2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.JspException;
@@ -33,9 +33,9 @@
*/
public class PortalBodyTagSupport extends BodyTagSupport
{
- protected final PortalResponse getPortalResponse()
+ protected final PortalRenderResponse getPortalResponse()
{
- return (PortalResponse)pageContext.getResponse();
+ return (PortalRenderResponse)pageContext.getResponse();
}
public int doStartTag() throws JspException
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalSimpleTagSupport.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalSimpleTagSupport.java 2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalSimpleTagSupport.java 2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import javax.servlet.jsp.PageContext;
@@ -35,10 +35,10 @@
*/
public class PortalSimpleTagSupport extends SimpleTagSupport
{
- protected final PortalResponse getPortalResponse()
+ protected final PortalRenderResponse getPortalResponse()
{
PageContext pageContext = (PageContext)getJspContext();
- return (PortalResponse)pageContext.getResponse();
+ return (PortalRenderResponse)pageContext.getResponse();
}
public void doTag() throws JspException, IOException
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java 2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java 2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
@@ -41,7 +41,7 @@
{
public void internalDoTag() throws JspException, IOException
{
- PortalResponse resp = getPortalResponse();
+ PortalRenderResponse resp = getPortalResponse();
PortletTag portletTag = (PortletTag)SimpleTagSupport.findAncestorWithClass(this, PortletTag.class);
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java 2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java 2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
@@ -78,7 +78,7 @@
private Set<Mode> supportedModes;
private Mode initialMode;
private PageTag pageTag;
- private PortalResponse response;
+ private PortalRenderResponse renderResponse;
/** . */
PortletResult result;
@@ -187,7 +187,7 @@
this.supportedModes = supportedModes;
this.supportedWindowStates = supportedWindowStates;
this.pageTag = (PageTag)findAncestorWithClass(this, PageTag.class);
- this.response = getPortalResponse();
+ this.renderResponse = getPortalResponse();
}
private void destroyState()
@@ -196,7 +196,7 @@
this.supportedModes = null;
this.supportedWindowStates = null;
this.pageTag = null;
- this.response = null;
+ this.renderResponse = null;
}
public int internalDoStartTag() throws JspException
@@ -204,7 +204,7 @@
initState();
//
- PagePortletControllerContext context = response.getPortletControllerContext();
+ PagePortletControllerContext context = renderResponse.getPortletControllerContext();
//
Portlet portlet = context.findPortlet(applicationNameAttr, nameAttr);
@@ -219,7 +219,7 @@
}
else
{
- String windowId = portlet.getContext().getId() + "." + response.nextId();
+ String windowId = portlet.getContext().getId() + "." + renderResponse.nextId();
//
if (pageTag.maximizedId != null)
@@ -258,7 +258,7 @@
{
try
{
- PortletInvocationResponse portletResponse = response.render(portlet, windowId);
+ PortletInvocationResponse portletResponse = renderResponse.render(portlet, windowId);
//
if (portletResponse instanceof FragmentResponse)
@@ -330,7 +330,7 @@
request.setAttribute(Constants.ERROR_PORTLET_NAME, nameAttr);
//
- rd.include(pageContext.getRequest(), new JspWriterResponse(response, pageContext.getOut()));
+ rd.include(pageContext.getRequest(), new JspWriterResponse(renderResponse, pageContext.getOut()));
}
catch (ServletException e)
{
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletURLTag.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletURLTag.java 2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletURLTag.java 2008-02-09 14:31:49 UTC (rev 9899)
@@ -24,7 +24,7 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl;
@@ -77,8 +77,8 @@
public int internalDoEndTag() throws JspException
{
- PortalResponse response = getPortalResponse();
- PagePortletControllerContext context = response.getPortletControllerContext();
+ PortalRenderResponse renderResponse = getPortalResponse();
+ PagePortletControllerContext context = renderResponse.getPortletControllerContext();
PortletTag portletTag = (PortletTag)SimpleTagSupport.findAncestorWithClass(this, PortletTag.class);
Mode mode = null;
@@ -96,7 +96,7 @@
PortletURLRenderer renderer = new PortletURLRenderer(
(StateControllerContextImpl)context.getStateControllerContext(),
- response.getPageState(),
+ renderResponse.getPageState(),
context.getClientRequest(),
context.getClientResponse());
16 years, 5 months
JBoss Portal SVN: r9898 - in modules/portlet/trunk: test and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-09 09:21:49 -0500 (Sat, 09 Feb 2008)
New Revision: 9898
Modified:
modules/portlet/trunk/controller/pom.xml
modules/portlet/trunk/test/pom.xml
modules/portlet/trunk/test/src/test/build.xml
Log:
revert the rename of artifact id of portlet-controller
Modified: modules/portlet/trunk/controller/pom.xml
===================================================================
--- modules/portlet/trunk/controller/pom.xml 2008-02-09 14:20:51 UTC (rev 9897)
+++ modules/portlet/trunk/controller/pom.xml 2008-02-09 14:21:49 UTC (rev 9898)
@@ -7,7 +7,7 @@
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>controller</artifactId>
+ <artifactId>portlet-controller</artifactId>
<packaging>jar</packaging>
<name>Portlet controller</name>
Modified: modules/portlet/trunk/test/pom.xml
===================================================================
--- modules/portlet/trunk/test/pom.xml 2008-02-09 14:20:51 UTC (rev 9897)
+++ modules/portlet/trunk/test/pom.xml 2008-02-09 14:21:49 UTC (rev 9898)
@@ -21,7 +21,7 @@
</dependency>
<dependency>
<groupId>org.jboss.portal.portlet</groupId>
- <artifactId>controller</artifactId>
+ <artifactId>portlet-controller</artifactId>
<version>${project.version}</version>
</dependency>
@@ -361,8 +361,8 @@
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.portal-portlet.jar"
value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/>
- <property name="dependency.portal-controller.jar"
- value="${maven.dependency.org.jboss.portal.portlet.controller.jar.path}"/>
+ <property name="dependency.portal-portlet-controller.jar"
+ value="${maven.dependency.org.jboss.portal.portlet.portlet-controller.jar.path}"/>
<property name="dependency.portal-portlet-tests.test-jar"
value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-jar.path}"/>
<property name="dependency.cargo-core-uberjar.jar"
@@ -388,4 +388,4 @@
</build>
-</project>
+</project>
\ No newline at end of file
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2008-02-09 14:20:51 UTC (rev 9897)
+++ modules/portlet/trunk/test/src/test/build.xml 2008-02-09 14:21:49 UTC (rev 9898)
@@ -127,8 +127,8 @@
<path id="mc.portal-portlet">
<pathelement path="${dependency.portal-portlet.jar}"/>
</path>
- <path id="mc.portal-controller">
- <pathelement path="${dependency.portal-controller.jar}"/>
+ <path id="mc.portal-portlet-controller">
+ <pathelement path="${dependency.portal-portlet-controller.jar}"/>
</path>
<path id="mc.jaxb-api">
<pathelement path="${dependency.jaxb-api.jar}"/>
@@ -397,7 +397,7 @@
<!-- -->
<path refid="mc.portal-common"/>
- <path refid="mc.portal-controller"/>
+ <path refid="mc.portal-portlet-controller"/>
<!-- Remote plugin -->
<path refid="mc.jboss-remoting"/>
@@ -437,7 +437,7 @@
<!-- -->
<path refid="mc.portal-common"/>
- <path refid="mc.portal-controller"/>
+ <path refid="mc.portal-portlet-controller"/>
<!-- Remote plugin -->
<path refid="mc.jboss-remoting"/>
@@ -709,7 +709,7 @@
<path refid="mc.portal-common"/>
- <path refid="mc.portal-controller"/>
+ <path refid="mc.portal-portlet-controller"/>
<!-- MC 2.0.0.Beta4 -->
<path refid="mc.trove"/>
@@ -801,4 +801,4 @@
</target>
-</project>
+</project>
\ No newline at end of file
16 years, 5 months
JBoss Portal SVN: r9897 - in modules/portlet/trunk/test/src/test/resources/simple-portal-war: css and 3 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-02-09 09:20:51 -0500 (Sat, 09 Feb 2008)
New Revision: 9897
Added:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo1.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo2.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp
Removed:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp
Log:
layout changes and new pages
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-09 14:09:09 UTC (rev 9896)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-09 14:20:51 UTC (rev 9897)
@@ -204,12 +204,12 @@
/*-------------------------------Portlet Decoration*/
div#container div#content div.portlet{
- /*width: 800px;*/
border: 1px solid #969696;
background-color: #e2e2e2;
padding: 2px;
float:left;
margin:10px;
+ width: 95%;
}
div#container div#content div.portlet-frame{
Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo1.jsp (from rev 9894, modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo.jsp)
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo1.jsp (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo1.jsp 2008-02-09 14:20:51 UTC (rev 9897)
@@ -0,0 +1,21 @@
+<%@ page contentType="text/html" %>
+<%@ page language="java" %>
+<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<%@ page isELIgnored="false" %>
+
+<%@ include file="/layouts/header.jsp" %>
+
+<portal:page>
+ <portal:pageparam namespaceURI="urn:jboss:portal:simple:google" localName="zipcode" value="80201"/>
+ <jbp:layout1>
+ <jsp:attribute name="leftcol">
+
+ </jsp:attribute>
+ <jsp:attribute name="rightcol">
+
+ </jsp:attribute>
+ </jbp:layout1>
+</portal:page>
+
+<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo2.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo2.jsp (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo2.jsp 2008-02-09 14:20:51 UTC (rev 9897)
@@ -0,0 +1,21 @@
+<%@ page contentType="text/html" %>
+<%@ page language="java" %>
+<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<%@ page isELIgnored="false" %>
+
+<%@ include file="/layouts/header.jsp" %>
+
+<portal:page>
+ <portal:pageparam namespaceURI="urn:jboss:portal:simple:google" localName="zipcode" value="80201"/>
+ <jbp:layout1>
+ <jsp:attribute name="leftcol">
+
+ </jsp:attribute>
+ <jsp:attribute name="rightcol">
+
+ </jsp:attribute>
+ </jbp:layout1>
+</portal:page>
+
+<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp 2008-02-09 14:20:51 UTC (rev 9897)
@@ -0,0 +1,21 @@
+<%@ page contentType="text/html" %>
+<%@ page language="java" %>
+<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<%@ page isELIgnored="false" %>
+
+<%@ include file="/layouts/header.jsp" %>
+
+<portal:page>
+ <portal:pageparam namespaceURI="urn:jboss:portal:simple:google" localName="zipcode" value="80201"/>
+ <jbp:layout1>
+ <jsp:attribute name="leftcol">
+
+ </jsp:attribute>
+ <jsp:attribute name="rightcol">
+
+ </jsp:attribute>
+ </jbp:layout1>
+</portal:page>
+
+<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp 2008-02-09 14:09:09 UTC (rev 9896)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp 2008-02-09 14:20:51 UTC (rev 9897)
@@ -3,8 +3,6 @@
<%@ page isELIgnored="false" %>
<html>
<body>
-<jsp:forward page="demo/home.jsp">
- <jsp:param name="nav" value="home"/>
-</jsp:forward>
+<jsp:forward page="demo/home.jsp"/>
</body>
</html>
Deleted: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp 2008-02-09 14:09:09 UTC (rev 9896)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/demo.jsp 2008-02-09 14:20:51 UTC (rev 9897)
@@ -1,47 +0,0 @@
-<%@ page contentType="text/html" %>
-<%@ page language="java" %>
-<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
-<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
-<%@ page isELIgnored="false" %>
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>Portlet Container 2.0</title>
-<link rel="stylesheet" href="${pageContext.request.contextPath}/css/master.css" type="text/css"/>
-</head>
-<body>
-
-<div id="container" class="full-width">
- <div class="header full-width">
- <div class="float-left three-quarter-width logo"></div>
- <div class="float-right quarter-width pc20">
- <img src="${pageContext.request.contextPath}/images/pc20.gif" alt=""/>
- </div>
- <br class="clear"/>
- </div>
- <%@ include file="nav/main.jsp" %>
-
- <div id="content">
- <portal:page>
- <portal:pageparam namespaceURI="urn:jboss:portal:simple:google" localName="zipcode" value="80201"/>
- <jbp:layout1>
- <jsp:attribute name="leftcol">
- <jbp:portlet name="RemoteControl" applicationName="remotecontrol-portlet"/>
- <jbp:portlet name="Foo" applicationName="bar"/>
- <jbp:portlet name="ErrorPortlet" applicationName="samples-basic"/>
- </jsp:attribute>
- <jsp:attribute name="rightcol">
- <jbp:portlet name="GoogleMap" applicationName="google-map-portlet"/>
- <jbp:portlet name="GoogleWeather" applicationName="google-weather-portlet"/>
- </jsp:attribute>
- </jbp:layout1>
- </portal:page>
- </div>
- <br class="clear"/>
-</div>
-
-</body>
-</html>
\ No newline at end of file
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp 2008-02-09 14:09:09 UTC (rev 9896)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/nav/main.jsp 2008-02-09 14:20:51 UTC (rev 9897)
@@ -18,6 +18,15 @@
<li>
<a href="${pageContext.request.contextPath}/demo/demo.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo.jsp' ? 'selected' : ''}">Demo Portlets</a>
</li>
+ <li>
+ <a href="${pageContext.request.contextPath}/demo/demo1.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo1.jsp' ? 'selected' : ''}">Demo1</a>
+ </li>
+ <li>
+ <a href="${pageContext.request.contextPath}/demo/demo2.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo2.jsp' ? 'selected' : ''}">Demo2</a>
+ </li>
+ <li>
+ <a href="${pageContext.request.contextPath}/demo/demo3.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo3.jsp' ? 'selected' : ''}">Demo3</a>
+ </li>
</ul>
<br class="clear"/>
</div>
16 years, 5 months
JBoss Portal SVN: r9896 - in modules/portlet/trunk: controller and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-09 09:09:09 -0500 (Sat, 09 Feb 2008)
New Revision: 9896
Added:
modules/portlet/trunk/controller/
Removed:
modules/portlet/trunk/portlet-controller/
Modified:
modules/portlet/trunk/controller/pom.xml
modules/portlet/trunk/pom.xml
modules/portlet/trunk/test/pom.xml
modules/portlet/trunk/test/src/test/build.xml
Log:
renamed portlet-controller module to controller
Copied: modules/portlet/trunk/controller (from rev 9895, modules/portlet/trunk/portlet-controller)
Modified: modules/portlet/trunk/controller/pom.xml
===================================================================
--- modules/portlet/trunk/portlet-controller/pom.xml 2008-02-09 14:00:34 UTC (rev 9895)
+++ modules/portlet/trunk/controller/pom.xml 2008-02-09 14:09:09 UTC (rev 9896)
@@ -7,7 +7,7 @@
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>portlet-controller</artifactId>
+ <artifactId>controller</artifactId>
<packaging>jar</packaging>
<name>Portlet controller</name>
Modified: modules/portlet/trunk/pom.xml
===================================================================
--- modules/portlet/trunk/pom.xml 2008-02-09 14:00:34 UTC (rev 9895)
+++ modules/portlet/trunk/pom.xml 2008-02-09 14:09:09 UTC (rev 9896)
@@ -29,7 +29,7 @@
<module>build</module>
<module>jsr168api</module>
<module>portlet</module>
- <module>portlet-controller</module>
+ <module>controller</module>
<module>bridge</module>
<module>federation</module>
<module>management</module>
Modified: modules/portlet/trunk/test/pom.xml
===================================================================
--- modules/portlet/trunk/test/pom.xml 2008-02-09 14:00:34 UTC (rev 9895)
+++ modules/portlet/trunk/test/pom.xml 2008-02-09 14:09:09 UTC (rev 9896)
@@ -21,7 +21,7 @@
</dependency>
<dependency>
<groupId>org.jboss.portal.portlet</groupId>
- <artifactId>portlet-controller</artifactId>
+ <artifactId>controller</artifactId>
<version>${project.version}</version>
</dependency>
@@ -361,8 +361,8 @@
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.portal-portlet.jar"
value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/>
- <property name="dependency.portal-portlet-controller.jar"
- value="${maven.dependency.org.jboss.portal.portlet.portlet-controller.jar.path}"/>
+ <property name="dependency.portal-controller.jar"
+ value="${maven.dependency.org.jboss.portal.portlet.controller.jar.path}"/>
<property name="dependency.portal-portlet-tests.test-jar"
value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-jar.path}"/>
<property name="dependency.cargo-core-uberjar.jar"
@@ -388,4 +388,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2008-02-09 14:00:34 UTC (rev 9895)
+++ modules/portlet/trunk/test/src/test/build.xml 2008-02-09 14:09:09 UTC (rev 9896)
@@ -127,8 +127,8 @@
<path id="mc.portal-portlet">
<pathelement path="${dependency.portal-portlet.jar}"/>
</path>
- <path id="mc.portal-portlet-controller">
- <pathelement path="${dependency.portal-portlet-controller.jar}"/>
+ <path id="mc.portal-controller">
+ <pathelement path="${dependency.portal-controller.jar}"/>
</path>
<path id="mc.jaxb-api">
<pathelement path="${dependency.jaxb-api.jar}"/>
@@ -397,7 +397,7 @@
<!-- -->
<path refid="mc.portal-common"/>
- <path refid="mc.portal-portlet-controller"/>
+ <path refid="mc.portal-controller"/>
<!-- Remote plugin -->
<path refid="mc.jboss-remoting"/>
@@ -437,7 +437,7 @@
<!-- -->
<path refid="mc.portal-common"/>
- <path refid="mc.portal-portlet-controller"/>
+ <path refid="mc.portal-controller"/>
<!-- Remote plugin -->
<path refid="mc.jboss-remoting"/>
@@ -709,7 +709,7 @@
<path refid="mc.portal-common"/>
- <path refid="mc.portal-portlet-controller"/>
+ <path refid="mc.portal-controller"/>
<!-- MC 2.0.0.Beta4 -->
<path refid="mc.trove"/>
@@ -801,4 +801,4 @@
</target>
-</project>
\ No newline at end of file
+</project>
16 years, 5 months
JBoss Portal SVN: r9894 - modules/portlet/trunk/portlet.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-02-09 08:53:38 -0500 (Sat, 09 Feb 2008)
New Revision: 9894
Modified:
modules/portlet/trunk/portlet/pom.xml
Log:
comment out
Modified: modules/portlet/trunk/portlet/pom.xml
===================================================================
--- modules/portlet/trunk/portlet/pom.xml 2008-02-09 13:46:21 UTC (rev 9893)
+++ modules/portlet/trunk/portlet/pom.xml 2008-02-09 13:53:38 UTC (rev 9894)
@@ -40,13 +40,13 @@
<artifactId>jaxb-api</artifactId>
</dependency>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>sun.jdk</groupId>-->
+ <!--<artifactId>tools</artifactId>-->
+ <!--<version>1.5.0</version>-->
+ <!--<scope>system</scope>-->
+ <!--<systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>-->
+ <!--</dependency>-->
<!--TEST SCOPE-->
<dependency>
@@ -109,26 +109,26 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <configuration>
+ <!--<plugin>-->
+ <!--<groupId>org.apache.myfaces.tobago</groupId>-->
+ <!--<artifactId>maven-apt-plugin</artifactId>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<phase>test</phase>-->
+ <!--<configuration>-->
<!--<generated>.apt_generated</generated>-->
<!--<aptOptions>x=3</aptOptions>-->
- <target>1.5</target>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- <factory>org.jboss.portal.unit.reports.TestCaseAPF</factory>
- </configuration>
- <goals>
- <goal>testExecute</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <!--<target>1.5</target>-->
+ <!--<nocompile>true</nocompile>-->
+ <!--<showWarnings>true</showWarnings>-->
+ <!--<factory>org.jboss.portal.unit.reports.TestCaseAPF</factory>-->
+ <!--</configuration>-->
+ <!--<goals>-->
+ <!--<goal>testExecute</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
</plugins>
</build>
16 years, 5 months
JBoss Portal SVN: r9893 - modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/portlet.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-02-09 08:46:21 -0500 (Sat, 09 Feb 2008)
New Revision: 9893
Added:
modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/portlet/controller/
Log:
part two: fix what I broke. sorry
Copied: modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/portlet/controller (from rev 9889, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller)
16 years, 5 months
JBoss Portal SVN: r9892 - in modules/portlet/trunk/test/src/test/resources/simple-portal-war: layouts and 1 other directory.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-02-09 08:41:36 -0500 (Sat, 09 Feb 2008)
New Revision: 9892
Removed:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp
Log:
delete file
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp 2008-02-09 13:33:22 UTC (rev 9891)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp 2008-02-09 13:41:36 UTC (rev 9892)
@@ -8,7 +8,7 @@
<portal:page>
<div class="home-content full-width">
- <div class="third-width float-right">
+ <div class="third-width float-right">
<jbp:portlet name="GoogleMap" applicationName="google-map-portlet" />
</div>
<h2 class="title">Demo Page Title</h2>
Deleted: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp 2008-02-09 13:33:22 UTC (rev 9891)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/default.jsp 2008-02-09 13:41:36 UTC (rev 9892)
@@ -1,107 +0,0 @@
-<%@ page contentType="text/html" %>
-<%@ page language="java" %>
-<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
-<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
-<%@ page isELIgnored="false" %>
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>Portlet Container 2.0</title>
- <link rel="stylesheet" href="${pageContext.request.contextPath}/css/master.css" type="text/css"/>
-</head>
-<body>
-
-<div id="container" class="full-width">
- <div class="header full-width">
- <div class="float-left three-quarter-width logo"></div>
- <div class="float-right quarter-width pc20"><img src="${pageContext.request.contextPath}/images/pc20.gif"
- alt="Portlet Container 2.0"/></div>
- <br class="clear"/>
- </div>
- <%@ include file="nav/main.jsp" %>
-
- <div id="content">
- <portal:page>
- <div class="home-content full-width">
- <div class="third-width float-right">
- <jbp:portlet name="GoogleMap" applicationName="google-map-portlet"/>
- </div>
- <h2 class="title">Demo Page Title</h2>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
- mollit anim id est laborum.
- <br/>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
- mollit anim id est laborum.
- <br/>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
- mollit anim id est laborum.
- <br/>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
- mollit anim id est laborum.
- <br/>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
- mollit anim id est laborum.
- <br/>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
- mollit anim id est laborum.
- <br/>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
- mollit anim id est laborum.
- <br/>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
- mollit anim id est laborum.
- <br/>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
- mollit anim id est laborum.
- <br/>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
- mollit anim id est laborum.
- <br/>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
- mollit anim id est laborum.
- <br/>
- </div>
-
- </portal:page>
- </div>
- <br class="clear"/>
-</div>
-
-</body>
-</html>
\ No newline at end of file
16 years, 5 months
JBoss Portal SVN: r9890 - in modules/portlet/trunk: bridge and 12 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-02-09 08:17:09 -0500 (Sat, 09 Feb 2008)
New Revision: 9890
Added:
modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/portlet/controller/
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/reports/
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/reports/TestCaseAPF.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/reports/TestCaseAnnotationProcessor.java
Removed:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/
Modified:
modules/portlet/trunk/bridge/pom.xml
modules/portlet/trunk/build/pom.xml
modules/portlet/trunk/federation/pom.xml
modules/portlet/trunk/jsr168api/pom.xml
modules/portlet/trunk/management/pom.xml
modules/portlet/trunk/pom.xml
modules/portlet/trunk/portlet-controller/pom.xml
modules/portlet/trunk/portlet/pom.xml
modules/portlet/trunk/test/pom.xml
modules/portlet/trunk/test/src/test/build.xml
Log:
extracted portlet-controller module and version update to 2.0-SNAPSHOT
Modified: modules/portlet/trunk/bridge/pom.xml
===================================================================
--- modules/portlet/trunk/bridge/pom.xml 2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/bridge/pom.xml 2008-02-09 13:17:09 UTC (rev 9890)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/build/pom.xml 2008-02-09 13:17:09 UTC (rev 9890)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -40,7 +40,7 @@
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
<version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common>
<version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web>
- <version.jboss.unit>1.2.0-SNAPSHOT</version.jboss.unit>
+ <version.jboss.unit>1.2.0-Beta1</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
Modified: modules/portlet/trunk/federation/pom.xml
===================================================================
--- modules/portlet/trunk/federation/pom.xml 2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/federation/pom.xml 2008-02-09 13:17:09 UTC (rev 9890)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/trunk/jsr168api/pom.xml
===================================================================
--- modules/portlet/trunk/jsr168api/pom.xml 2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/jsr168api/pom.xml 2008-02-09 13:17:09 UTC (rev 9890)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/trunk/management/pom.xml
===================================================================
--- modules/portlet/trunk/management/pom.xml 2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/management/pom.xml 2008-02-09 13:17:09 UTC (rev 9890)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/trunk/pom.xml
===================================================================
--- modules/portlet/trunk/pom.xml 2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/pom.xml 2008-02-09 13:17:09 UTC (rev 9890)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module Aggregator</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
@@ -29,6 +29,7 @@
<module>build</module>
<module>jsr168api</module>
<module>portlet</module>
+ <module>portlet-controller</module>
<module>bridge</module>
<module>federation</module>
<module>management</module>
Modified: modules/portlet/trunk/portlet/pom.xml
===================================================================
--- modules/portlet/trunk/portlet/pom.xml 2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/portlet/pom.xml 2008-02-09 13:17:09 UTC (rev 9890)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,6 +40,14 @@
<artifactId>jaxb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
+ </dependency>
+
<!--TEST SCOPE-->
<dependency>
<groupId>org.jboss.unit</groupId>
@@ -100,6 +108,27 @@
</reports>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>maven-apt-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <configuration>
+ <!--<generated>.apt_generated</generated>-->
+ <!--<aptOptions>x=3</aptOptions>-->
+ <target>1.5</target>
+ <nocompile>true</nocompile>
+ <showWarnings>true</showWarnings>
+ <factory>org.jboss.portal.unit.reports.TestCaseAPF</factory>
+ </configuration>
+ <goals>
+ <goal>testExecute</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/reports/TestCaseAPF.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/reports/TestCaseAPF.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/reports/TestCaseAPF.java 2008-02-09 13:17:09 UTC (rev 9890)
@@ -0,0 +1,65 @@
+/*
+* 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.unit.reports;
+
+import com.sun.mirror.apt.AnnotationProcessorFactory;
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.apt.AnnotationProcessors;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+
+import java.util.Collection;
+import java.util.Set;
+import java.util.Collections;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class TestCaseAPF implements AnnotationProcessorFactory
+{
+ public Collection<String> supportedOptions()
+ {
+ return Collections.emptyList();
+ }
+
+ public Collection<String> supportedAnnotationTypes()
+ {
+ return Collections.singletonList("org.jboss.portal.unit.annotations.TestCase");
+ }
+
+ public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> annotationTypeDeclarations, AnnotationProcessorEnvironment annotationProcessorEnvironment)
+ {
+ System.out.println("### HERE");
+ AnnotationProcessor result;
+ if(annotationTypeDeclarations.isEmpty()) {
+ result = AnnotationProcessors.NO_OP;
+ }
+ else {
+ // Next Step - implement this class:
+ result = new TestCaseAnnotationProcessor(annotationProcessorEnvironment);
+ }
+ return result;
+
+ }
+}
Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/reports/TestCaseAnnotationProcessor.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/reports/TestCaseAnnotationProcessor.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/reports/TestCaseAnnotationProcessor.java 2008-02-09 13:17:09 UTC (rev 9890)
@@ -0,0 +1,114 @@
+/*
+* 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.unit.reports;
+
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import com.sun.mirror.declaration.Declaration;
+import com.sun.mirror.declaration.AnnotationMirror;
+import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
+import com.sun.mirror.declaration.AnnotationValue;
+import com.sun.mirror.util.SourcePosition;
+
+import java.util.Collection;
+import java.util.Map;
+import java.io.File;
+import java.io.OutputStream;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.io.FileNotFoundException;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class TestCaseAnnotationProcessor implements AnnotationProcessor
+{
+
+ private AnnotationProcessorEnvironment environment;
+
+ private AnnotationTypeDeclaration testCaseDeclaration;
+
+ public TestCaseAnnotationProcessor(AnnotationProcessorEnvironment env) {
+
+ environment = env;
+ testCaseDeclaration = (AnnotationTypeDeclaration) environment
+ .getTypeDeclaration("org.jboss.portal.unit.annotations.TestCase");
+ }
+
+ public void process()
+ {
+ Collection<Declaration> declarations = environment
+ .getDeclarationsAnnotatedWith(testCaseDeclaration);
+ for (Declaration declaration : declarations) {
+ processAnnotations(declaration);
+ }
+ }
+
+ private void processAnnotations(Declaration declaration) {
+ // Get all of the annotation usage for this declaration.
+ // the annotation mirror is a reflection of what is in the source.
+
+ File f = new File("./apt-output.txt");
+
+ PrintStream ps = null;
+
+ try
+ {
+ ps = new PrintStream(f);
+ }
+ catch (FileNotFoundException e)
+ {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+
+
+ Collection<AnnotationMirror> annotations = declaration
+ .getAnnotationMirrors();
+ // iterate over the mirrors.
+ for (AnnotationMirror mirror : annotations) {
+ // if the mirror in this iteration is for our note declaration...
+ if(mirror.getAnnotationType().getDeclaration().equals(
+ testCaseDeclaration)) {
+
+ // print out the goodies.
+ SourcePosition position = mirror.getPosition();
+ Map<AnnotationTypeElementDeclaration, AnnotationValue> values = mirror
+ .getElementValues();
+
+ ps.println("Declaration: " + declaration.toString());
+ ps.println("Position: " + position);
+ ps.println("Values:");
+ for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> entry : values
+ .entrySet()) {
+ AnnotationTypeElementDeclaration elemDecl = entry.getKey();
+ AnnotationValue value = entry.getValue();
+ ps.println(" " + elemDecl + "=" + value);
+ }
+ }
+ }
+ ps.close();
+
+ }
+}
Modified: modules/portlet/trunk/portlet-controller/pom.xml
===================================================================
--- modules/portlet/trunk/portlet-controller/pom.xml 2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/portlet-controller/pom.xml 2008-02-09 13:17:09 UTC (rev 9890)
@@ -17,7 +17,7 @@
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>portlet-portlet</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
+ <type>jar</type>
</dependency>
<!--TEST SCOPE-->
Copied: modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/portlet/controller (from rev 9884, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller)
Modified: modules/portlet/trunk/test/pom.xml
===================================================================
--- modules/portlet/trunk/test/pom.xml 2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/test/pom.xml 2008-02-09 13:17:09 UTC (rev 9890)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -19,8 +19,14 @@
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.portal.portlet</groupId>
+ <artifactId>portlet-controller</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <!--TEST SCOPE-->
+
+
<dependency>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>portlet-portlet</artifactId>
@@ -355,6 +361,8 @@
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.portal-portlet.jar"
value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/>
+ <property name="dependency.portal-portlet-controller.jar"
+ value="${maven.dependency.org.jboss.portal.portlet.portlet-controller.jar.path}"/>
<property name="dependency.portal-portlet-tests.test-jar"
value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-jar.path}"/>
<property name="dependency.cargo-core-uberjar.jar"
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/test/src/test/build.xml 2008-02-09 13:17:09 UTC (rev 9890)
@@ -127,6 +127,9 @@
<path id="mc.portal-portlet">
<pathelement path="${dependency.portal-portlet.jar}"/>
</path>
+ <path id="mc.portal-portlet-controller">
+ <pathelement path="${dependency.portal-portlet-controller.jar}"/>
+ </path>
<path id="mc.jaxb-api">
<pathelement path="${dependency.jaxb-api.jar}"/>
</path>
@@ -394,10 +397,14 @@
<!-- -->
<path refid="mc.portal-common"/>
+ <path refid="mc.portal-portlet-controller"/>
+
<!-- Remote plugin -->
<path refid="mc.jboss-remoting"/>
<path refid="mc.portal-test-generic"/>
+
+
<!-- MC 2.0.0.Beta4 -->
<path refid="mc.trove"/>
<path refid="mc.javassist"/>
@@ -430,6 +437,8 @@
<!-- -->
<path refid="mc.portal-common"/>
+ <path refid="mc.portal-portlet-controller"/>
+
<!-- Remote plugin -->
<path refid="mc.jboss-remoting"/>
<path refid="mc.portal-test-generic"/>
@@ -697,8 +706,11 @@
<!-- -->
<fileset dir="${target}" includes="portlet-test-lib.jar"/>
+
<path refid="mc.portal-common"/>
+ <path refid="mc.portal-portlet-controller"/>
+
<!-- MC 2.0.0.Beta4 -->
<path refid="mc.trove"/>
<path refid="mc.javassist"/>
16 years, 5 months