[portal-commits] JBoss Portal SVN: r9005 - in branches/UIServer: core/src/main/org/jboss/portal/core and 14 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Sun Nov 18 08:34:31 EST 2007
Author: julien at jboss.com
Date: 2007-11-18 08:34:30 -0500 (Sun, 18 Nov 2007)
New Revision: 9005
Added:
branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/
branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/
branches/UIServer/core-uiserver/src/resources/presentation-sar/
branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/
branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml
branches/UIServer/uiserver/src/resources/presentation-war/
Removed:
branches/UIServer/core/src/main/org/jboss/portal/core/presentation/
branches/UIServer/core/src/main/org/jboss/portal/test/core/presentation/model/UIModelTester.java
branches/UIServer/uiserver/src/resources/portal-uiserver.sar/
branches/UIServer/uiserver/src/resources/portal-uiserver.war/
Modified:
branches/UIServer/core-uiserver/build.xml
branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java
branches/UIServer/core/build.xml
branches/UIServer/core/src/main/org/jboss/portal/core/controller/Controller.java
branches/UIServer/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
branches/UIServer/tools/etc/buildfragments/modules.ent
branches/UIServer/uiserver/build.xml
Log:
- moved uiserver stuff from core to core-uiserver that deploys in a separate sar file
- re enabled the default jboss portal pipeline
- commented instance security instance interceptor that prevent access to instance on a redeploy of the core-uiserver sar
Modified: branches/UIServer/core/build.xml
===================================================================
--- branches/UIServer/core/build.xml 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core/build.xml 2007-11-18 13:34:30 UTC (rev 9005)
@@ -133,7 +133,6 @@
<path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-theme.classpath"/>
<path refid="jboss.portal-security.classpath"/>
- <path refid="jboss.portal-uiserver.classpath"/>
<path refid="jboss.portal-test.classpath"/>
</path>
@@ -361,7 +360,7 @@
</target>
<!-- Build the jboss-portal-ha.sar -->
- <target name="output-ha" depends="artifacts,pre-output">
+ <target name="output-ha" depends="artifacts">
<copy todir="${build.resources}/jboss-portal-ha.sar">
<fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
</copy>
@@ -379,13 +378,7 @@
</target>
- <!-- Build the jboss-portal.sar -->
- <target name="pre-output">
- <copy todir="${build.resources}/jboss-portal/portal-uiserver.sar">
- <fileset dir="${jboss.portal-uiserver.root}/resources/portal-uiserver.sar"/>
- </copy>
- </target>
- <target name="output" depends="artifacts,pre-output">
+ <target name="output" depends="artifacts">
<!-- Build configurations -->
<copy todir="${build.resources}/jboss-portal.sar">
<fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
@@ -641,11 +634,6 @@
<test todir="${test.reports}"
name="org.jboss.portal.test.core.model.portal.PortalObjectPathTestCase"/>
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.presentation.model.UIModelTester"
- outfile="TEST-UIModelTester">
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="persistent-jboss-beans.xml"/>
- </zest>
</x-test>
<x-classpath>
<pathelement location="${build.lib}/portal-core-lib.jar"/>
@@ -676,61 +664,7 @@
</x-classpath>
</execute-tests>
</target>
-
- <target name="test-presentation" depends="init">
- <execute-tests>
- <x-sysproperty>
-
- <!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
- -->
- <sysproperty
- key="jboss.aop.path"
- value="${build.resources}/jboss-portal.sar/portal-aop.xml${path.separator}${source.etc}/jboss-aop/base-aop.xml"/>
- <sysproperty
- key="jboss.aop.class.path"
- value="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
-
- </x-sysproperty>
- <x-test>
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.presentation.model.UIModelTester"
- outfile="TEST-UIModelTester">
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="persistent-jboss-beans.xml"/>
- </zest>
- </x-test>
- <x-classpath>
- <pathelement location="${build.lib}/portal-core-lib.jar"/>
- <pathelement location="${build.lib}/portal-core-test-lib.jar"/>
- <pathelement location="${build.resources}/jboss-portal.sar"/>
- <pathelement location="${jboss.portal-test.root}/etc"/>
- <pathelement location="${build.resources}"/>
-
- <path refid="apache.collections.classpath"/>
- <path refid="apache.logging.classpath"/>
- <path refid="apache.xerces.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="apache.httpclient.classpath"/>
- <path refid="aop.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="cglib.cglib.classpath"/>
- <path refid="antlr.antlr.classpath"/>
- <path refid="asm.asm.classpath"/>
-
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <pathelement location="${nekohtml.nekohtml.lib}/nekohtml.jar"/>
- <pathelement location="${dbunit.dbunit.lib}/dbunit.jar"/>
- <pathelement location="${jdbc.connectors.lib}/mysql-connector-java.jar"/>
- <!--<pathelement location="postgresql-8.1-407.jdbc3.jar"/>-->
- </x-classpath>
- </execute-tests>
- </target>
-
<!--
Run a single unit test.
ant -Dtest=org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase one-test
Modified: branches/UIServer/core/src/main/org/jboss/portal/core/controller/Controller.java
===================================================================
--- branches/UIServer/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-11-18 13:34:30 UTC (rev 9005)
@@ -314,7 +314,7 @@
ControllerResponse response = forward.getResponse();
processCommandResponse(controllerContext, command, response);
}
- /*else if (handlerResponse instanceof HTTPResponse)
+ else if (handlerResponse instanceof HTTPResponse)
{
HTTPResponse hr = (HTTPResponse)handlerResponse;
sendResponse(controllerContext, hr);
@@ -323,13 +323,13 @@
{
AjaxResponse ar = (AjaxResponse)handlerResponse;
sendResponse(controllerContext, ar);
- }*/
+ }
}
/**
* All http responses in the stack should be handled here.
*/
- /*protected void sendResponse(ControllerContext ctx, HTTPResponse resp)
+ protected void sendResponse(ControllerContext ctx, HTTPResponse resp)
{
try
{
@@ -343,12 +343,12 @@
{
log.error("Cound not send http response", e);
}
- }*/
+ }
/**
* All http responses in the stack should be handled here.
*/
- /*protected void sendResponse(ControllerContext ctx, AjaxResponse resp)
+ protected void sendResponse(ControllerContext ctx, AjaxResponse resp)
{
try
{
@@ -362,5 +362,5 @@
{
log.error("Cound not send http response", e);
}
- }*/
+ }
}
\ No newline at end of file
Modified: branches/UIServer/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
===================================================================
--- branches/UIServer/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2007-11-18 13:34:30 UTC (rev 9005)
@@ -79,13 +79,7 @@
final PageRendition rendition = (PageRendition)resp;
final ServerInvocation invocation = controllerContext.getServerInvocation();
- /**
- * Used for integration with the new Presentation Framework
- */
- invocation.getServerContext().getClientRequest().setAttribute("pfTask", "aggregate");
- invocation.getServerContext().getClientRequest().setAttribute("pageResult", rendition.getPageResult());
-
- /*return new HTTPResponse()
+ return new HTTPResponse()
{
public void sendResponse(ServerInvocationContext ctx) throws IOException, ServletException
{
@@ -93,8 +87,7 @@
MarkupInfo markupInfo = (MarkupInfo)invocation.getResponse().getContentInfo();
rendition.render(markupInfo, dispatcher);
}
- };*/
- return null;
+ };
}
else
{
Deleted: branches/UIServer/core/src/main/org/jboss/portal/test/core/presentation/model/UIModelTester.java
===================================================================
--- branches/UIServer/core/src/main/org/jboss/portal/test/core/presentation/model/UIModelTester.java 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core/src/main/org/jboss/portal/test/core/presentation/model/UIModelTester.java 2007-11-18 13:34:30 UTC (rev 9005)
@@ -1,150 +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.test.core.presentation.model;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestSuite;
-
-import org.apache.log4j.Logger;
-import org.jboss.portal.test.core.model.portal.AbstractPortalObjectContainerTestCase;
-import org.jboss.portal.test.framework.AbstractPortalTestCase;
-
-import org.jboss.portal.common.junit.TransactionAssert;
-import org.jboss.portal.core.model.portal.*;
-import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.presentation.model.ModelLoaderImpl;
-import org.jboss.portal.presentation.impl.model.UIContextImpl;
-import org.jboss.portal.presentation.model.UIContext;
-import org.jboss.portal.presentation.model.UIObject;
-import org.jboss.portal.presentation.model.UIPortal;
-import org.jboss.portal.presentation.model.UIPage;
-
-/**
- * @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
- *
- */
-public class UIModelTester extends AbstractPortalObjectContainerTestCase
-{
- private Logger logger = Logger.getLogger(this.getClass());
-
- private UIContext uiContext = null;
-
- /**
- *
- * @return
- * @throws Exception
- */
- public static TestSuite suite() throws Exception
- {
- return AbstractPortalTestCase.suite(UIModelTester.class);
- }
-
- /**
- *
- */
- public void setUp() throws Exception
- {
- super.setUp();
- ModelLoaderImpl modelLoader = new ModelLoaderImpl();
- modelLoader.setPortalObjectContainer(this.container);
- this.uiContext = new UIContextImpl(modelLoader);
- this.loadPortalObjectContainer();
- }
-
- /**
- *
- */
- public void tearDown() throws Exception
- {
- super.tearDown();
- this.uiContext = null;
- }
-
- /**
- *
- * @throws Exception
- */
- /*public void testModelLoading() throws Exception
- {
- TransactionAssert.beginTransaction();
-
- //Setup rootChildrenInfo
- Map rootChildrenInfo = new HashMap();
- rootChildrenInfo.put("defaultPortal", UIPortal.class);
-
- UIContext objectTree = this.uiContext.initUIObjectTree(rootChildrenInfo);
- UIPortal defaultPortal = objectTree.getChildren(UIPortal.class).get(0);
-
- assertEquals(defaultPortal.getName(), "defaultPortal");
- assertEquals(defaultPortal.getId(), "/defaultPortal");
-
- List<UIObject> lazyLoadedChildren = defaultPortal.getChildren();
-
- assertTrue((lazyLoadedChildren != null && lazyLoadedChildren.size()>0));
- for(int i=0; i<lazyLoadedChildren.size(); i++)
- {
- UIObject child = lazyLoadedChildren.get(i);
- assertEquals(child.getParent().getName(), "defaultPortal");
- assertEquals(child.getParent().getId(), "/defaultPortal");
- assertTrue(child instanceof UIPage);
- assertTrue(child.getId().equals("/defaultPortal/page1") || child.getId().equals("/defaultPortal/page2"));
-
- if(child.getId().equals("/defaultPortal/page1"))
- {
- List<UIObject> subchildren = child.getChildren();
- for(int j=0; j<subchildren.size(); j++)
- {
- UIObject subchild = subchildren.get(j);
-
- logger.info("------------------------------");
- logger.info("Child="+subchild+"("+subchild.getId()+")");
- logger.info("------------------------------");
- }
- }
- }
-
-
- TransactionAssert.commitTransaction();
- }*/
-
- /**
- *
- *
- */
- private void loadPortalObjectContainer() throws Exception
- {
- TransactionAssert.beginTransaction();
- PortalContainer ctx = container.getContext();
- Portal portal_1 = ctx.createPortal("defaultPortal");
- Page page_1_1 = portal_1.createPage("page1");
- Page page_1_2 = portal_1.createPage("page2");
- Page page_1_1_1 = page_1_1.createPage("subpage1");
- Page page_1_1_3 = page_1_1.createPage("subpage2");
- Window window_1_1_2 = page_1_1.createWindow("window1", ContentType.PORTLET, "uri");
- Window window_1_1_4 = page_1_1.createWindow("window3", ContentType.PORTLET, "uri");
- TransactionAssert.commitTransaction();
- }
-}
Modified: branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-11-18 13:34:30 UTC (rev 9005)
@@ -287,7 +287,7 @@
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
+ <!--<depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>-->
<depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization</depends-list-element>
</depends-list>
</mbean>
@@ -1053,7 +1053,7 @@
<!-- The controller -->
<mbean
code="org.jboss.portal.core.controller.Controller"
- name="portal:service=RequestController"
+ name="portal:service=Controller"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
@@ -1091,64 +1091,6 @@
optional-attribute-name="PageControlPolicy"
proxy-type="attribute">portal:service=ControlPolicy,type=Page</depends>
</mbean>
- <mbean
- code="org.jboss.portal.core.presentation.server.PresentationServerImpl"
- name="portal:service=PresentationServer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends optional-attribute-name="Processor" proxy-type="attribute">portal:service=Processor</depends>
- <depends optional-attribute-name="ModelLoader" proxy-type="attribute">portal:container=ModelLoader</depends>
- <depends optional-attribute-name="ControllerContextFactory" proxy-type="attribute">portal:service=RequestController</depends>
- <depends>portal:service=PageService</depends>
- <depends>portal:commandFactory=DefaultPortal</depends>
- <depends>portal:urlFactory=Delegating</depends>
- <depends>portal:service=InterceptorStackFactory,type=Command</depends>
- <depends>portal:container=Instance</depends>
- <depends>portal:service=PortalAuthorizationManagerFactory</depends>
- <depends>portal:service=CustomizationManager</depends>
- <depends>portal:service=ContentProviderRegistry</depends>
- <depends>portal:service=ResponseHandler,type=Selector</depends>
- <depends>portal:service=ControlPolicy,type=Page</depends>
- </mbean>
- <mbean
- code="org.jboss.portal.core.presentation.server.MainProcessor"
- name="portal:service=Processor"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends optional-attribute-name="RequestController" proxy-type="attribute">portal:service=RequestController</depends>
- <depends>portal:container=PortalObject</depends>
- <depends>portal:service=PageService</depends>
- <depends>portal:commandFactory=DefaultPortal</depends>
- <depends>portal:urlFactory=Delegating</depends>
- <depends>portal:service=InterceptorStackFactory,type=Command</depends>
- <depends>portal:container=Instance</depends>
- <depends>portal:service=PortalAuthorizationManagerFactory</depends>
- <depends>portal:service=CustomizationManager</depends>
- <depends>portal:service=ContentProviderRegistry</depends>
- <depends>portal:service=ResponseHandler,type=Selector</depends>
- <depends>portal:service=ControlPolicy,type=Page</depends>
- </mbean>
- <mbean
- code="org.jboss.portal.core.presentation.model.ModelLoaderImpl"
- name="portal:container=ModelLoader"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject</depends>
- <depends>portal:container=PortalObject</depends>
- <depends>portal:service=PageService</depends>
- <depends>portal:commandFactory=DefaultPortal</depends>
- <depends>portal:urlFactory=Delegating</depends>
- <depends>portal:service=InterceptorStackFactory,type=Command</depends>
- <depends>portal:container=Instance</depends>
- <depends>portal:service=PortalAuthorizationManagerFactory</depends>
- <depends>portal:service=CustomizationManager</depends>
- <depends>portal:service=ContentProviderRegistry</depends>
- <depends>portal:service=ResponseHandler,type=Selector</depends>
- <depends>portal:service=ControlPolicy,type=Page</depends>
- </mbean>
<!-- The controller factory -->
<mbean
Modified: branches/UIServer/core-uiserver/build.xml
===================================================================
--- branches/UIServer/core-uiserver/build.xml 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core-uiserver/build.xml 2007-11-18 13:34:30 UTC (rev 9005)
@@ -90,23 +90,9 @@
<echo message="${xdoclet.xdoclet.lib}"/>
<echo message="${sun.servlet.lib}"/>
<path id="library.classpath">
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="jbossas/core.libs.classpath"/>
- <path refid="apache.ant.classpath"/>
- <path refid="apache.collections.classpath"/>
<path refid="apache.log4j.classpath"/>
- <path refid="apache.httpclient.classpath"/>
- <path refid="apache.logging.classpath"/>
- <path refid="apache.codec.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="jboss.test.classpath"/>
<path refid="sun.servlet.classpath"/>
- <path refid="jboss/backport.concurrent.classpath"/>
- <pathelement location="jboss-bean-deployer.jar"/>
- <pathelement location="jboss-container.jar"/>
- <pathelement location="jboss-dependency.jar"/>
- <pathelement location="jboss-microcontainer.jar"/>
</path>
<!-- Configure modules -->
@@ -116,6 +102,9 @@
<path refid="jboss.portal-web.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-test.classpath"/>
+ <path refid="jboss.portal-server.classpath"/>
+ <path refid="jboss.portal-uiserver.classpath"/>
+ <path refid="jboss.portal-core.classpath"/>
</path>
<!--+=======================================+-->
@@ -166,98 +155,26 @@
<mkdir dir="${build.lib}"/>
<!-- -->
- <jar jarfile="${build.lib}/portal-server-lib.jar">
- <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
- </jar>
+ <jar jarfile="${build.lib}/portal-core-presentation-lib.jar">
+ <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
+ </jar>
- <copy todir="${build.resources}/portal-server-sar">
- <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
- <fileset dir="${build.lib}/" includes="portal-server-lib.jar"/>
- </copy>
- <jar jarfile="${build.lib}/portal-server.sar">
- <fileset dir="${build.resources}/portal-server-sar"/>
- </jar>
- <jar jarfile="${build.lib}/portal-server-test-lib.jar">
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/server/**"/>
- </jar>
- <jar jarfile="${build.lib}/portal-server-test-framework-lib.jar">
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/**"/>
- </jar>
- </target>
+ <copy file="${gwt.gwt.root}/lib/gwt-user.jar" todir="${build.resources}/presentation-sar/lib" overwrite="true"/>
+ <copy file="${build.lib}/portal-core-presentation-lib.jar" todir="${build.resources}/presentation-sar/lib" overwrite="true"/>
+ <copy file="${jboss.portal-uiserver.lib}/portal-presentation-lib.jar" todir="${build.resources}/presentation-sar/lib" overwrite="true"/>
+ <copy todir="${build.resources}/presentation-sar">
+ <fileset dir="${jboss.portal-uiserver.lib}" includes="presentation.war"/>
+ </copy>
+ <jar jarfile="${build.lib}/presentation.sar">
+ <fileset dir="${build.resources}/presentation-sar"/>
+ </jar>
+ </target>
+
<!-- generates artifacts used for tests, requires output to be previously run -->
<target name="package-tests" depends="init">
+ </target>
- <jar jarfile="${build.lib}/test-agent.war">
- <fileset dir="${build.resources}/test-agent-war"/>
- </jar>
-
- <jar jarfile="${build.lib}/test-parameters.sar">
- <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
- <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
- <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
- <fileset dir="${build.lib}" includes="test-agent.war"/>
- <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
- <fileset dir="${build.resources}/test/test-parameters-sar"/>
- </jar>
-
- <jar jarfile="${build.lib}/test-servlet-rootpathmapping.war">
- <fileset dir="${build.resources}/test/test-servlet-rootpathmapping-war"/>
- </jar>
- <jar jarfile="${build.lib}/test-servlet-pathmapping.war">
- <fileset dir="${build.resources}/test/test-servlet-pathmapping-war"/>
- </jar>
- <jar jarfile="${build.lib}/test-servlet-defaultservletmapping.war">
- <fileset dir="${build.resources}/test/test-servlet-defaultservletmapping-war"/>
- </jar>
- <jar jarfile="${build.lib}/test-servlet.sar">
- <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
- <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
- <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
- <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
- <fileset dir="${build.lib}" includes="test-agent.war"/>
- <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
- <fileset dir="${build.resources}/test/test-servlet-sar"/>
- <fileset dir="${build.lib}" includes="test-servlet-rootpathmapping.war"/>
- <fileset dir="${build.lib}" includes="test-servlet-pathmapping.war"/>
- <fileset dir="${build.lib}" includes="test-servlet-defaultservletmapping.war"/>
- </jar>
-
- <jar jarfile="${build.lib}/test-charset.sar">
- <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
- <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
- <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
- <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
- <fileset dir="${build.lib}" includes="test-agent.war"/>
- <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
- <fileset dir="${build.resources}/test/test-charset-sar"/>
- </jar>
-
- <jar jarfile="${build.lib}/test-response.sar">
- <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
- <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
- <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
- <fileset dir="${build.lib}" includes="test-agent.war"/>
- <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
- <fileset dir="${build.resources}/test/test-response-sar"/>
- </jar>
- </target>
-
<!-- ================================================================== -->
<!-- Cleaning -->
<!-- ================================================================== -->
@@ -294,45 +211,16 @@
description="Deploy."
depends="output">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy file="${build.lib}/portal-server.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/>
+ <copy file="${build.lib}/presentation.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/>
</target>
<target name="undeploy"
description="Undeploy."
depends="init">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-server.sar"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/presentation.sar"/>
</target>
<target name="tests" depends="init">
- <execute-tests>
- <x-sysproperty>
- <sysproperty key="test.root" value="${build.lib}"/>
- <sysproperty key="test.uri" value="/test/redirect/"/>
-<!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/>
--->
- </x-sysproperty>
- <x-test>
- <!-- Server side tests -->
- <test todir="${test.reports}" name="org.jboss.portal.test.server.CharsetTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.server.ParametersTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.server.ServletTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.server.ResponseTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.server.request.URLContextTestCase"/>
- </x-test>
- <x-classpath>
- <path refid="jboss.serialization.classpath"/>
- <path refid="jboss.remoting.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="apache.xerces.classpath"/>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </x-classpath>
- </execute-tests>
</target>
</project>
Copied: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation (from rev 8997, branches/UIServer/core/src/main/org/jboss/portal/core/presentation)
Modified: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java
===================================================================
--- branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-17 22:27:52 UTC (rev 8997)
+++ branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-18 13:34:30 UTC (rev 9005)
@@ -24,9 +24,7 @@
import org.apache.log4j.Logger;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.server.ServerException;
-import org.jboss.portal.server.RequestController;
import org.jboss.portal.presentation.RequestContext;
@@ -41,7 +39,7 @@
* @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
*
*/
-public class MainProcessor extends AbstractJBossService implements Processor
+public class MainProcessor implements Processor
{
/**
*
@@ -51,29 +49,6 @@
/**
*
*/
- private RequestController requestController = null;
-
- /**
- *
- * @return
- */
- public RequestController getRequestController()
- {
- return requestController;
- }
-
- /**
- *
- * @param requestController
- */
- public void setRequestController(RequestController requestController)
- {
- this.requestController = requestController;
- }
-
- /**
- *
- */
public ProcessorResponse process(RequestContext requestContext, ProcessorRequest request) throws ServerException
{
try
Added: branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml
===================================================================
--- branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml (rev 0)
+++ branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml 2007-11-18 13:34:30 UTC (rev 9005)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<server>
+
+ <mbean
+ code="org.jboss.portal.presentation.controller.UIController"
+ name="portal:service=Controller,type=Presentation"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="PresentationServer" proxy-type="attribute">portal:service=PresentationServer</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.server.impl.RequestControllerFactoryImpl"
+ name="portal:service=ControllerFactory,type=Presentation"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Controller"
+ proxy-type="attribute">portal:service=Controller,type=Presentation</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.presentation.impl.entry.EntryPointImpl"
+ name="portal:service=EntryPoint"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="InterceptorStackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Server</depends>
+ <depends optional-attribute-name="ControllerFactory" proxy-type="attribute">portal:service=ControllerFactory,type=Presentation</depends>
+ <depends optional-attribute-name="PortalServer" proxy-type="attribute">portal:service=Server</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.presentation.server.PresentationServerImpl"
+ name="portal:service=PresentationServer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="Processor" proxy-type="attribute">portal:service=Processor</depends>
+ <depends optional-attribute-name="ModelLoader" proxy-type="attribute">portal:container=ModelLoader</depends>
+ <depends optional-attribute-name="ControllerContextFactory" proxy-type="attribute">portal:service=Controller</depends>
+ <depends>portal:service=PageService</depends>
+ <depends>portal:commandFactory=DefaultPortal</depends>
+ <depends>portal:urlFactory=Delegating</depends>
+ <depends>portal:service=InterceptorStackFactory,type=Command</depends>
+ <depends>portal:container=Instance</depends>
+ <depends>portal:service=PortalAuthorizationManagerFactory</depends>
+ <depends>portal:service=CustomizationManager</depends>
+ <depends>portal:service=ContentProviderRegistry</depends>
+ <depends>portal:service=ResponseHandler,type=Selector</depends>
+ <depends>portal:service=ControlPolicy,type=Page</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.presentation.server.MainProcessor"
+ name="portal:service=Processor"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends>portal:container=PortalObject</depends>
+ <depends>portal:service=PageService</depends>
+ <depends>portal:commandFactory=DefaultPortal</depends>
+ <depends>portal:urlFactory=Delegating</depends>
+ <depends>portal:service=InterceptorStackFactory,type=Command</depends>
+ <depends>portal:container=Instance</depends>
+ <depends>portal:service=PortalAuthorizationManagerFactory</depends>
+ <depends>portal:service=CustomizationManager</depends>
+ <depends>portal:service=ContentProviderRegistry</depends>
+ <depends>portal:service=ResponseHandler,type=Selector</depends>
+ <depends>portal:service=ControlPolicy,type=Page</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.presentation.model.ModelLoaderImpl"
+ name="portal:container=ModelLoader"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends>portal:container=PortalObject</depends>
+ <depends>portal:service=PageService</depends>
+ <depends>portal:commandFactory=DefaultPortal</depends>
+ <depends>portal:urlFactory=Delegating</depends>
+ <depends>portal:service=InterceptorStackFactory,type=Command</depends>
+ <depends>portal:container=Instance</depends>
+ <depends>portal:service=PortalAuthorizationManagerFactory</depends>
+ <depends>portal:service=CustomizationManager</depends>
+ <depends>portal:service=ContentProviderRegistry</depends>
+ <depends>portal:service=ResponseHandler,type=Selector</depends>
+ <depends>portal:service=ControlPolicy,type=Page</depends>
+ </mbean>
+
+</server>
Modified: branches/UIServer/tools/etc/buildfragments/modules.ent
===================================================================
--- branches/UIServer/tools/etc/buildfragments/modules.ent 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/tools/etc/buildfragments/modules.ent 2007-11-18 13:34:30 UTC (rev 9005)
@@ -198,13 +198,7 @@
<property name="jboss.portal-uiserver.root" value="${project.root}/uiserver/output"/>
<property name="jboss.portal-uiserver.lib" value="${jboss.portal-uiserver.root}/lib"/>
<path id="jboss.portal-uiserver.classpath">
- <pathelement path="${jboss.portal-uiserver.lib}/portal-uiserver-lib.jar"/>
+ <pathelement path="${jboss.portal-uiserver.lib}/portal-presentation-lib.jar"/>
</path>
- <!-- core-uiserver -->
- <property name="jboss.portal-core-uiserver.root" value="${project.root}/core-uiserver/output"/>
- <property name="jboss.portal-core-uiserver.lib" value="${jboss.portal-core-uiserver.root}/lib"/>
- <path id="jboss.portal-core-uiserver.classpath">
- <pathelement path="${jboss.portal-core-uiserver.lib}/portal-core-uiserver-lib.jar"/>
- </path>
</target>
Modified: branches/UIServer/uiserver/build.xml
===================================================================
--- branches/UIServer/uiserver/build.xml 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/uiserver/build.xml 2007-11-18 13:34:30 UTC (rev 9005)
@@ -205,35 +205,33 @@
<mkdir dir="${build.lib}"/>
- <!-- portal-uiserver-lib.jar -->
- <jar jarfile="${build.lib}/portal-uiserver-lib.jar">
+ <!-- portal-presentation-lib.jar -->
+ <jar jarfile="${build.lib}/portal-presentation-lib.jar">
<fileset dir="${build.classes}">
</fileset>
- <fileset dir="../portlet/output/classes">
- </fileset>
</jar>
- <!-- portal-uiserver.war -->
+ <!-- presentation.war -->
<!-- compile the GWT Java code into JavaScript/Web resources -->
<!--
These are only standalone GWT prototypes
- <delete dir="${build.resources}/portal-uiserver.war/org.jboss.portal.uiserver.ajax.PortalLayout"/>
+ <delete dir="${build.resources}/presentation.war/org.jboss.portal.uiserver.ajax.PortalLayout"/>
<java classpathref="gwt.gwt.classpath" fork="true" classname="com.google.gwt.dev.GWTCompiler">
<classpath>
<pathelement path="src/main"/>
<pathelement path="src/resources/client/ajax/src"/>
</classpath>
- <arg line="-out ${build.resources}/portal-uiserver.war/"/>
+ <arg line="-out ${build.resources}/presentation.war/"/>
<arg line="org.jboss.portal.uiserver.ajax.PortalLayout"/>
</java>
- <delete dir="${build.resources}/portal-uiserver.war/org.jboss.portal.uiserver.ajax.PartialRefresh"/>
+ <delete dir="${build.resources}/presentation.war/org.jboss.portal.uiserver.ajax.PartialRefresh"/>
<java classpathref="gwt.gwt.classpath" fork="true" classname="com.google.gwt.dev.GWTCompiler">
<classpath>
<pathelement path="src/main"/>
<pathelement path="src/resources/client/ajax/src"/>
</classpath>
- <arg line="-out ${build.resources}/portal-uiserver.war/"/>
+ <arg line="-out ${build.resources}/presentation.war/"/>
<arg line="org.jboss.portal.uiserver.ajax.PartialRefresh"/>
</java>
-->
@@ -242,33 +240,24 @@
<path refid="gwt.gwt.classpath"/>
<path refid="mygwt.mygwt.classpath"/>
</path>
- <delete dir="${build.resources}/portal-uiserver.war/org.jboss.portal.presentation.ajax.Portal"/>
+ <delete dir="${build.resources}/presentation-war/org.jboss.portal.presentation.ajax.Portal"/>
<java classpathref="full.gwt.classpath" fork="true" classname="com.google.gwt.dev.GWTCompiler">
<classpath>
<pathelement path="src/main"/>
<pathelement path="src/resources/client/ajax/src"/>
</classpath>
- <arg line="-out ${build.resources}/portal-uiserver.war/"/>
+ <arg line="-out ${build.resources}/presentation-war/"/>
<arg line="org.jboss.portal.presentation.ajax.Portal"/>
</java>
- <jar jarfile="${build.lib}/portal-uiserver.war">
- <fileset dir="${build.resources}/portal-uiserver.war"></fileset>
+ <jar jarfile="${build.lib}/presentation.war">
+ <fileset dir="${build.resources}/presentation-war"></fileset>
</jar>
- <copy todir="${build.resources}/portal-uiserver.war">
- <fileset dir="${build.resources}/portal-uiserver.war/org.jboss.portal.presentation.ajax.Portal"/>
+ <copy todir="${build.resources}/presentation-war">
+ <fileset dir="${build.resources}/presentation-war/org.jboss.portal.presentation.ajax.Portal"/>
</copy>
- <delete dir="${build.resources}/portal-uiserver.war/org.jboss.portal.presentation.ajax.Portal"/>
+ <delete dir="${build.resources}/presentation-war/org.jboss.portal.presentation.ajax.Portal"/>
- <!-- portal-uiserver.sar -->
- <copy file="${gwt.gwt.root}/lib/gwt-user.jar" todir="${build.resources}/portal-uiserver.sar/lib" overwrite="true"/>
- <copy file="${build.lib}/portal-uiserver-lib.jar" todir="${build.resources}/portal-uiserver.sar/lib" overwrite="true"/>
- <copy todir="${build.resources}/portal-uiserver.sar/portal-uiserver.war">
- <fileset dir="${build.resources}/portal-uiserver.war"/>
- </copy>
- <jar jarfile="${build.lib}/portal-uiserver.sar">
- <fileset dir="${build.resources}/portal-uiserver.sar"></fileset>
- </jar>
</target>
<target name="output" depends="artifacts">
Copied: branches/UIServer/uiserver/src/resources/presentation-war (from rev 8997, branches/UIServer/uiserver/src/resources/portal-uiserver.war)
More information about the portal-commits
mailing list