[portal-commits] JBoss Portal SVN: r7775 - in trunk: core-wsrp and 1 other directories.
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 04:47:14 -0400 (Mon, 16 Jul 2007)
New Revision: 7775
Modified:
trunk/core-samples/src/resources/portal-basic-samples-sar/META-INF/jboss-service.xml
trunk/core-wsrp/build.xml
trunk/wsrp/build.xml
Log:
Fix wsrp build, fix build/distrib.xml, fix build/build.xml, JBPORTAL-1579: Change of
package for UserCounterListener
Modified:
trunk/core-samples/src/resources/portal-basic-samples-sar/META-INF/jboss-service.xml
===================================================================
---
trunk/core-samples/src/resources/portal-basic-samples-sar/META-INF/jboss-service.xml 2007-07-16
08:41:54 UTC (rev 7774)
+++
trunk/core-samples/src/resources/portal-basic-samples-sar/META-INF/jboss-service.xml 2007-07-16
08:47:14 UTC (rev 7775)
@@ -71,7 +71,7 @@
optional-attribute-name="Registry"
proxy-type="attribute">portal:service=ListenerRegistry</depends>
<attribute name="RegistryId">counter_listener</attribute>
- <attribute
name="ListenerClassName">org.jboss.portal.core.portlet.test.event.UserCounterListener</attribute>
+ <attribute
name="ListenerClassName">org.jboss.portal.core.samples.basic.event.UserCounterListener</attribute>
</mbean-->
</server>
Modified: trunk/core-wsrp/build.xml
===================================================================
--- trunk/core-wsrp/build.xml 2007-07-16 08:41:54 UTC (rev 7774)
+++ trunk/core-wsrp/build.xml 2007-07-16 08:47:14 UTC (rev 7775)
@@ -271,6 +271,7 @@
<!-- Deployment -->
<!-- ================================================================== -->
+ <!--
<target name="deploy" description="Deploy."
depends="output">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
<copy file="${build.lib}/portal-wsrp-admin.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
@@ -286,7 +287,8 @@
<require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
<copy file="${build.lib}/portal-wsrp-admin.war"
todir="${jboss.home}/server/${portal-ha.deploy.dir}"
overwrite="true"/>
- </target>
+ </target>
+ -->
<!-- ================================================================== -->
<!-- Tests -->
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2007-07-16 08:41:54 UTC (rev 7774)
+++ trunk/wsrp/build.xml 2007-07-16 08:47:14 UTC (rev 7775)
@@ -276,9 +276,6 @@
<target name="output" description="Generate WSRP Service
archive." depends="compile">
<mkdir dir="${build.lib}"/>
- <!-- Build Admin GUI... -->
- <ant antfile="../core-wsrp/build.xml" output="output.log"
dir="../core-wsrp" target="output"/>
-
<!-- -->
<jar jarfile="${build.lib}/portal-wsrp-client.jar">
<fileset dir="${build.resources}/portal-wsrp-client-jar"/>
@@ -296,6 +293,9 @@
<jar jarfile="${build.lib}/portal-wsrp.jse">
<fileset dir="${build.resources}/portal-wsrp-jse"/>
</jar>
+
+ <!-- Build Admin GUI... -->
+ <ant inheritAll="false" antfile="../core-wsrp/build.xml"
output="output.log" dir="../core-wsrp" target="output"/>
<copy todir="${build.resources}/portal-wsrp-sar"
overwrite="true">
<fileset dir="${build.lib}"
includes="portal-wsrp-client.jar"/>
<fileset dir="${build.lib}"
includes="portal-wsrp.jse"/>