[portal-commits] JBoss Portal SVN: r7776 - in branches/JBoss_Portal_Branch_2_6: wsrp and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 05:43:25 -0400 (Mon, 16 Jul 2007)
New Revision: 7776
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
Log:
Fix wsrp build (oups)
Remove core-admin sar isolation
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml 2007-07-16
08:47:14 UTC (rev 7775)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml 2007-07-16
09:43:25 UTC (rev 7776)
@@ -23,10 +23,6 @@
<server>
- <loader-repository>
- org.jboss.portal:loader=core-admin
- </loader-repository>
-
<mbean
code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
name="portal:commandFactory=Configurator"
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-16 08:47:14 UTC (rev 7775)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-16 09:43:25 UTC (rev 7776)
@@ -295,7 +295,10 @@
</jar>
<!-- Build Admin GUI... -->
- <ant inheritAll="false" antfile="../core-wsrp/build.xml"
output="output.log" dir="../core-wsrp" target="output"/>
+ <ant inheritAll="false" antfile="../core-wsrp/build.xml"
output="output.log" dir="../core-wsrp" target="output">
+ <property name="build.lib" value="${build.lib}"/>
+ <property name="build.resources"
value="${build.resources}"/>
+ </ant>
<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"/>
@@ -321,6 +324,7 @@
<!-- Clean up all build output -->
<target name="clean" depends="_default:clean">
+ <ant inheritAll="false" antfile="../core-wsrp/build.xml"
output="output.log" dir="../core-wsrp" target="clean"/>
<!-- Add module specific elements here. -->
</target>