Author: julien(a)jboss.com Date: 2007-09-11 03:32:23 -0400 (Tue, 11 Sep 2007) New Revision: 8215 Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/faces/faces.iml branches/JBoss_Portal_Branch_2_6/core-admin/build.xml branches/JBoss_Portal_Branch_2_6/core-identity/build.xml branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml branches/JBoss_Portal_Branch_2_6/core/build.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_6/faces/build.xml branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent Log: update 2.6 to use portlet bridge integration from portlet module Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-09-11 07:27:07 UTC (rev 8214) +++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-09-11 07:32:23 UTC (rev 8215) @@ -118,7 +118,6 @@ <module name="server"/> <module name="portlet-server"/> <module name="theme"/> - <module name="bridge"/> <module name="cms"/> <module name="format"/> <module name="core"/> @@ -139,7 +138,7 @@ <group name="portal"> <include - modules="api, jems, server, security, search, format, portlet-server, bridge, faces, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-identity, core-samples, widget"/> + modules="api, jems, server, security, search, format, portlet-server, faces, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-identity, core-samples, widget"/> </group> <group name="cms"> @@ -350,9 +349,6 @@ <packageset dir="../jems/src/main"> <exclude name="org/jboss/portal/test/**"/> </packageset> - <packageset dir="../bridge/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> <packageset dir="../faces/src/main"> <exclude name="org/jboss/portal/test/**"/> </packageset> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml 2007-09-11 07:27:07 UTC (rev 8214) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-admin/core-admin.iml 2007-09-11 07:32:23 UTC (rev 8215) @@ -107,7 +107,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="bridge" /> <orderEntry type="module" module-name="server" /> <orderEntryProperties /> </component> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/faces/faces.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/faces/faces.iml 2007-09-11 07:27:07 UTC (rev 8214) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/faces/faces.iml 2007-09-11 07:32:23 UTC (rev 8215) @@ -75,7 +75,6 @@ </orderEntry> <orderEntry type="module" module-name="api" /> <orderEntry type="module" module-name="server" /> - <orderEntry type="module" module-name="bridge" /> <orderEntry type="module-library"> <library> <CLASSES> @@ -94,6 +93,24 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-bridge-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-09-11 07:27:07 UTC (rev 8214) +++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-09-11 07:32:23 UTC (rev 8215) @@ -318,10 +318,15 @@ <fileset dir="${jboss.portal-format.root}/lib" includes="portal-format-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar,portal-common-portal-lib.jar"/> <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> - <fileset dir="${jboss.portal/modules/portlet.lib}" includes="portal-portlet-lib.jar,portal-portlet-federation-lib.jar,portal-portlet-jsr168api-lib.jar"/> + <fileset dir="${jboss.portal/modules/portlet.lib}"> + <include name="portal-portlet-lib.jar"/> + <include name="portal-portlet-federation-lib.jar"/> + <include name="portal-portlet-jsr168api-lib.jar"/> + <include name="portal-portlet-management-lib.jar"/> + <include name="portal-portlet-bridge-lib.jar"/> + </fileset> <fileset dir="${jboss.portal/modules/identity.root}/lib" includes="portal-identity-lib.jar"/> <fileset dir="${jboss.portal/modules/identity.root}/lib" includes="portal-identity-sso-lib.jar"/> - <fileset dir="${jboss.portal-bridge.root}/lib" includes="portal-bridge-lib.jar"/> <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/> <fileset dir="${jboss.portal-portlet-server.root}/lib" includes="portal-portlet-server-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-09-11 07:27:07 UTC (rev 8214) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-09-11 07:32:23 UTC (rev 8215) @@ -339,7 +339,7 @@ <xmbean/> </mbean> <mbean - code="org.jboss.portal.bridge.BridgeInterceptor" + code="org.jboss.portal.portlet.bridge.BridgeInterceptor" name="portal:service=Interceptor,type=Portlet,name=Bridge" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-09-11 07:27:07 UTC (rev 8214) +++ branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-09-11 07:32:23 UTC (rev 8215) @@ -108,7 +108,6 @@ <path id="dependentmodule.classpath"> <path refid="jboss.portal-format.classpath"/> <path refid="jboss.portal-faces.classpath"/> - <path refid="jboss.portal-bridge.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-registration.classpath"/> <path refid="jboss.portal-jems.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/build.xml 2007-09-11 07:27:07 UTC (rev 8214) +++ branches/JBoss_Portal_Branch_2_6/core-identity/build.xml 2007-09-11 07:32:23 UTC (rev 8215) @@ -115,7 +115,6 @@ <path id="dependentmodule.classpath"> <path refid="jboss.portal-format.classpath"/> <path refid="jboss.portal-faces.classpath"/> - <path refid="jboss.portal-bridge.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-registration.classpath"/> <path refid="jboss.portal-jems.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-09-11 07:27:07 UTC (rev 8214) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-09-11 07:32:23 UTC (rev 8215) @@ -109,7 +109,6 @@ <path id="dependentmodule.classpath"> <path refid="jboss.portal-wsrp.classpath"/> <path refid="jboss.portal-faces.classpath"/> - <path refid="jboss.portal-bridge.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-registration.classpath"/> <path refid="jboss.portal-jems.classpath"/> Modified: branches/JBoss_Portal_Branch_2_6/faces/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/faces/build.xml 2007-09-11 07:27:07 UTC (rev 8214) +++ branches/JBoss_Portal_Branch_2_6/faces/build.xml 2007-09-11 07:32:23 UTC (rev 8215) @@ -103,7 +103,6 @@ <call target="configure-modules"/> <path id="dependentmodule.classpath"> <path refid="jboss.portal-server.classpath"/> - <path refid="jboss.portal-bridge.classpath"/> </path> <!--+=======================================+--> Modified: branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2007-09-11 07:27:07 UTC (rev 8214) +++ branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2007-09-11 07:32:23 UTC (rev 8215) @@ -28,6 +28,7 @@ import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.bridge.JBossServletContextProvider; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.invocation.ActionInvocation; @@ -46,7 +47,6 @@ import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.bridge.JBossServletContextProvider; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent =================================================================== --- branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-09-11 07:27:07 UTC (rev 8214) +++ branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-09-11 07:32:23 UTC (rev 8215) @@ -52,13 +52,6 @@ <pathelement path="${jboss.portal-portlet-server.lib}/portal-portlet-server-lib.jar"/> </path> - <!-- bridge --> - <property name="jboss.portal-bridge.root" value="${project.root}/bridge/output"/> - <property name="jboss.portal-bridge.lib" value="${jboss.portal-bridge.root}/lib"/> - <path id="jboss.portal-bridge.classpath"> - <pathelement path="${jboss.portal-bridge.lib}/portal-bridge-lib.jar"/> - </path> - <!-- format --> <property name="jboss.portal-format.root" value="${project.root}/format/output"/> <property name="jboss.portal-format.lib" value="${jboss.portal-format.root}/lib"/>