[portal-commits] JBoss Portal SVN: r7687 - in branches/JBoss_Portal_Branch_2_6/demo: conf and 1 other directory.

Author: chris.laprun(a)jboss.com Date: 2007-07-06 13:03:44 -0400 (Fri, 06 Jul 2007) New Revision: 7687 Added: branches/JBoss_Portal_Branch_2_6/demo/conf/demo-wsrp.xml Modified: branches/JBoss_Portal_Branch_2_6/demo/build.xml Log: - Added demo-wsrp.xml to override self definition and to add more consumers. - Updated build (but needs to be tested for proper behavior wrt default-wsrp.xml). Modified: branches/JBoss_Portal_Branch_2_6/demo/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/demo/build.xml 2007-07-06 14:31:35 UTC (rev 7686) +++ branches/JBoss_Portal_Branch_2_6/demo/build.xml 2007-07-06 17:03:44 UTC (rev 7687) @@ -21,13 +21,28 @@ <target name="delete-objectsdescriptors"> <delete> - <fileset dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar" includes="**/*-object.xml"/> + <fileset dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar" + includes="**/*-object.xml"/> </delete> </target> <target name="install-objectsdescriptor"> - <copy file="conf/default-object.xml" todir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/conf/data"/> + <copy file="conf/default-object.xml" + todir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/conf/data"/> </target> + + <target name="install-wsrpdescriptor"> + <copy file="conf/demo-wsrp.xml" todir="${destination.dir}/${portal.name.dir}/server/default/deploy"/> + </target> + + <target name="delete-wsrpdescriptors"> + <!-- + Would that delete default-wsrp.xml in jboss-portal.sar/portal-wspr.sar/? This would be nice so that we can + override the self definition with the one that's in demo-wsrp.xml. + --> + <delete dir="${destination.dir}/${portal.name.dir}/server/default/deploy" includes="**/*-wsrp.xml"/> + </target> + <target name="clean"> <delete dir="${destination.dir}/${portal.name.dir}"/> @@ -38,7 +53,8 @@ <target name="update-context"> <delete dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war"/> - <copy overwrite="true" file="conf/jboss-web.xml" todir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF"/> + <copy overwrite="true" file="conf/jboss-web.xml" + todir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF"/> </target> <target name="install-flickrportlet"> @@ -58,9 +74,9 @@ <fileset dir="portlets/jbossforums"/> </copy> </target> - - <!-- Fix WS issues on JBoss 4.0.x --> - <target name="update-ws"> + + <!-- Fix WS issues on JBoss 4.0.x --> + <target name="update-ws"> <unzip src="${jbossws.location}" dest="${tmp.dir}/jbossws"/> <ant inheritAll="false" dir="${tmp.dir}/jbossws" antfile="build.xml" target="deploy-jboss40-jdk14"> <property name="jboss40.home" value="${destination.dir}/${portal.name.dir}"/> @@ -74,8 +90,12 @@ </copy> </target> - <target name="main" depends="unzip-bundle, delete-docs, delete-jmxconsole, delete-objectsdescriptors, update-context, update-ws, install-objectsdescriptor, install-jbossforums, activate-workflow, install-flickrportlet"> - <tar destfile="${destination.dir}/${portal.name.dir}.tar" basedir="${destination.dir}/${portal.name.dir}" longfile="gnu"/> + <target name="main" + depends="unzip-bundle, delete-docs, delete-jmxconsole, delete-objectsdescriptors, delete-wsrpdescriptors, + update-context, update-ws, install-objectsdescriptor, install-wsrpdescriptor, install-jbossforums, activate-workflow, + install-flickrportlet"> + <tar destfile="${destination.dir}/${portal.name.dir}.tar" basedir="${destination.dir}/${portal.name.dir}" + longfile="gnu"/> <gzip zipfile="${destination.dir}/${portal.name.dir}.tgz" src="${destination.dir}/${portal.name.dir}.tar"/> <delete file="${destination.dir}/${portal.name.dir}.tar"/> </target> Copied: branches/JBoss_Portal_Branch_2_6/demo/conf/demo-wsrp.xml (from rev 7686, branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml) =================================================================== --- branches/JBoss_Portal_Branch_2_6/demo/conf/demo-wsrp.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/demo/conf/demo-wsrp.xml 2007-07-06 17:03:44 UTC (rev 7687) @@ -0,0 +1,86 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2007, 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE deployments PUBLIC "-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-wsrp-consumer_2_6.dtd"> + +<deployments> + <deployment> + <wsrp-producer id="self" expiration-cache="300"> + <!-- + we need to use the individual endpoint configuration because the configuration via wsdl forces an + immediate attempt to access the web service description which is not available yet at this point of deployment + --> + <endpoint-config> + <service-description-url>http://portal.demo.jboss.com:8080/portal-wsrp/ServiceDescriptionService</service-description-url> + <markup-url>http://portal.demo.jboss.com:8080/portal-wsrp/MarkupService</markup-url> + <registration-url>http://portal.demo.jboss.com:8080/portal-wsrp/RegistrationService</registration-url> + <portlet-management-url>http://portal.demo.jboss.com:8080/portal-wsrp/PortletManagementService</portlet-management-url> + </endpoint-config> + <registration-data/> + </wsrp-producer> + </deployment> + <deployment> + <wsrp-producer id="NetUnity Public Producer" expiration-cache="3000"> + <endpoint-wsdl-url>http://wsrp.netunitysoftware.com/WSRPTestService/WSR... + <registration-data/> + </wsrp-producer> + </deployment> + <!--<deployment> + <wsrp-producer id="vignette" expiration-cache="300"> + <endpoint-wsdl-url>http://wsrpdemo.vignette.com:8080/producer/wsdl</endpoint-wsdl-url> + <registration-data> + <property> + <name>com.vignette.wsrp.registration.username</name> + <lang>en</lang> + <value>test</value> + </property> + <property> + <name>com.vignette.wsrp.registration.password</name> + <lang>en</lang> + <value>test</value> + </property> + </registration-data> + </wsrp-producer> + </deployment>--> + <deployment> + <wsrp-producer id="BEA Public Producer" expiration-cache="3000"> + <endpoint-wsdl-url>http://wsrp.bea.com:7001/producer/producer?WSDL</endpoint-wsdl-url> + <registration-data> + <property> + <name>registration/consumerRole</name> + <lang>en</lang> + <value>public</value> + </property> + </registration-data> + </wsrp-producer> + </deployment> + <deployment> + <wsrp-producer id="Oracle Public Producer" expiration-cache="3000"> + <endpoint-wsdl-url>http://portalstandards.oracle.com/portletapp/portlet... + <registration-data/> + </wsrp-producer> + </deployment> +</deployments> \ No newline at end of file