Author: chris.laprun(a)jboss.com Date: 2008-03-20 13:51:02 -0400 (Thu, 20 Mar 2008) New Revision: 10354 Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java Log: - Use container name as there might not be a JBossPortletMetaData to get the name from (plus it should be the same name anyway). Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-03-20 17:39:47 UTC (rev 10353) +++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-03-20 17:51:02 UTC (rev 10354) @@ -123,7 +123,7 @@ <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> <!-- jbpm integration --> <path refid="jbpm.jaronly.classpath"/> - <path refid="sun.jaxb.classpath"/> + <path refid="sun.jaxb.classpath"/> </path> <!-- Configure modules --> @@ -168,7 +168,7 @@ <path id="aop.classpath"> <pathelement path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/> - <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/> + <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/> <path refid="javassist.javassist.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="trove.trove.classpath"/> @@ -189,10 +189,10 @@ <pathelement location="${project.tools}/lib/explode.jar"/> <path refid="apache.ant.classpath"/> </path> - <taskdef - name="explode" - classname="org.jboss.portal.common.ant.Explode" - classpathref="explode.task.classpath"/> + <taskdef + name="explode" + classname="org.jboss.portal.common.ant.Explode" + classpathref="explode.task.classpath"/> </target> <target name="configure-jbossaop"> @@ -328,6 +328,7 @@ <include name="portal-portlet-management-lib.jar"/> <include name="portal-portlet-bridge-lib.jar"/> </fileset> + <fileset dir="${portlet.portlet.lib}" includes="portlet-api.jar"/> <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-server.root}/lib" includes="portal-server-lib.jar"/> @@ -346,7 +347,6 @@ <fileset dir="${tagsoup.tagsoup.lib}" includes="tagsoup.jar"/> <fileset dir="${jboss/backport.concurrent.lib}" includes="jboss-backport-concurrent.jar"/> <fileset dir="${jbpm.jaronly.lib}" includes="jbpm.jar,jbpm-identity.jar"/> - <fileset dir="${portlet.portlet.lib}" includes="portlet-api.jar"/> </copy> <copy todir="${build.resources}/jboss-portal/lib" failonerror="false"> @@ -372,41 +372,41 @@ <!-- Build the jboss-portal-ha.sar --> <target name="output-ha" depends="artifacts"> - <copy todir="${build.resources}/jboss-portal-ha.sar"> - <fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/> - </copy> + <copy todir="${build.resources}/jboss-portal-ha.sar"> + <fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/> + </copy> - <copy todir="${build.resources}/jboss-portal-ha.sar"> - <filterset> - <filtersfile file="../build/etc/clustered.properties"/> - </filterset> - <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/> - </copy> + <copy todir="${build.resources}/jboss-portal-ha.sar"> + <filterset> + <filtersfile file="../build/etc/clustered.properties"/> + </filterset> + <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/> + </copy> - <implode - dir="${build.resources}/jboss-portal-ha.sar" - tofile="${build.lib}/jboss-portal-ha.sar"/> + <implode + dir="${build.resources}/jboss-portal-ha.sar" + tofile="${build.lib}/jboss-portal-ha.sar"/> - </target> + </target> <!-- Build the jboss-portal.sar --> <target name="output" depends="artifacts"> - <!-- Build configurations --> + <!-- Build configurations --> <copy todir="${build.resources}/jboss-portal.sar"> - <fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/> - </copy> + <fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/> + </copy> - <copy todir="${build.resources}/jboss-portal.sar"> - <filterset> - <filtersfile file="../build/etc/single.properties"/> - </filterset> - <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/> - </copy> + <copy todir="${build.resources}/jboss-portal.sar"> + <filterset> + <filtersfile file="../build/etc/single.properties"/> + </filterset> + <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/> + </copy> <!-- Build archives --> <implode dir="${build.resources}/jboss-portal.sar" tofile="${build.lib}/jboss-portal.sar"/> - </target> + </target> <!-- create artifacts for running the portlet tests (except TCK) target output should have already been executed --> <target name="package-tests" depends="init"> @@ -522,8 +522,8 @@ <target name="deploy-ha" description="Deploy high availability." depends="output-ha"> - <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> - <copy file="${build.lib}/jboss-portal-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <copy file="${build.lib}/jboss-portal-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/> </target> <!-- @@ -539,8 +539,8 @@ <target name="undeploy-ha" description="Undeploy." depends="init"> - <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar"/> + <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar"/> </target> <target name="tests" depends="init, _buildmagic:configure:deployment"> @@ -551,10 +551,10 @@ <execute-tests> <x-sysproperty> -<!-- - <jvmarg value="-Xdebug"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/> ---> + <!-- + <jvmarg value="-Xdebug"/> + <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/> + --> <sysproperty key="jboss.aop.path" @@ -638,7 +638,7 @@ <zest todir="${test.reports}" name="org.jboss.portal.test.core.state.RegistrationPersistenceManagerTestCase" outfile="TEST-RegistrationPersistenceManagerTestCase"> </zest> - + <test todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalObjectPermissionTestCase"/> <test todir="${test.reports}" @@ -697,7 +697,7 @@ <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="build.resources" value="${build.resources}"/> - <classpath> + <classpath> <path refid="apache.xerces.classpath"/> <path refid="jboss.jbossxb.classpath"/> <pathelement location="${build.lib}/portal-core-lib.jar"/> @@ -743,32 +743,32 @@ Some convenience build targets to help deployment during development --> <target name="deploy-explode" depends="output,explode"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar" overwrite="true"> - <fileset dir="${build.lib}/jboss-portal-exploded.sar"/> - </copy> - </target> - <target name="explode-ha" depends="init"> - <explode - file="${build.lib}/jboss-portal-ha.sar" - todir="${build.lib}" - name="jboss-portal-ha-exploded.sar" - /> - </target> - <target name="deploy-ha-explode" description="Deploy high availability." depends="output-ha,explode-ha"> - <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> - <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar" overwrite="true"> - <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/> - </copy> - </target> + <require file="${jboss.home}/server/${portal.deploy.dir}"/> + <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar" overwrite="true"> + <fileset dir="${build.lib}/jboss-portal-exploded.sar"/> + </copy> + </target> + <target name="explode-ha" depends="init"> + <explode + file="${build.lib}/jboss-portal-ha.sar" + todir="${build.lib}" + name="jboss-portal-ha-exploded.sar" + /> + </target> + <target name="deploy-ha-explode" description="Deploy high availability." depends="output-ha,explode-ha"> + <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar" overwrite="true"> + <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/> + </copy> + </target> - <target name="deploy-ha-explode-dev" description="Deploy high availability." depends="output-ha,explode-ha"> - <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> - <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar" overwrite="true"> - <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/> - </copy> - <copy todir="${jboss.home}/server/ports-02/deploy/jboss-portal-ha.sar" overwrite="true"> - <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/> - </copy> - </target> + <target name="deploy-ha-explode-dev" description="Deploy high availability." depends="output-ha,explode-ha"> + <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar" overwrite="true"> + <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/> + </copy> + <copy todir="${jboss.home}/server/ports-02/deploy/jboss-portal-ha.sar" overwrite="true"> + <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/> + </copy> + </target> </project> Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java 2008-03-20 17:39:47 UTC (rev 10353) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java 2008-03-20 17:51:02 UTC (rev 10354) @@ -95,35 +95,36 @@ // for (ContainerPortletInfo containerInfo : builder.getPortlets()) { - org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData jbPortletMD = (org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData)jbossApplicationMetaData.getPortlets().get(containerInfo.getName()); + String name = containerInfo.getName(); + org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData jbPortletMD = jbossApplicationMetaData.getPortlets().get(name); if (jbPortletMD instanceof JBossPortletMetaData) { JBossPortletMetaData jbossPortletMD = (JBossPortletMetaData)jbPortletMD; - + AjaxMetaData ajaxMD = jbossPortletMD.getAjax(); if (ajaxMD != null) { containerInfo.setAttachment(AjaxInfo.class, new AjaxInfoImpl(ajaxMD)); } - + HeaderContentMetaData headerContentMD = jbossPortletMD.getHeaderContent(); if (headerContentMD != null) { containerInfo.setAttachment(MarkupHeaderInfo.class, new MarkupHeaderInfoImpl(headerContentMD)); } - + PortletInfoMetaData portletInfoMD = jbossPortletMD.getPortletInfo(); if (portletInfoMD != null) { containerInfo.setAttachment(PortletInfoInfo.class, new PortletInfoInfoImpl(new PortletApplicationContextImpl(builderContext.getWebApp()), portletInfoMD)); } - + Transactions.Type txType = jbossPortletMD.getTxType(); if (txType != null) { containerInfo.setAttachment(TransactionInfo.class, new TransactionInfoImpl(jbossPortletMD.getTxType())); } - + Boolean distributed = jbossPortletMD.getDistributed(); if (distributed != null) { @@ -131,7 +132,7 @@ } } - portlets.put(jbPortletMD.getName(), containerInfo); + portlets.put(name, containerInfo); } }