JBoss Portal SVN: r7775 - in trunk: core-wsrp and 1 other directories.
by portal-commits＠lists.jboss.org
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"/>
16 years, 11 months
JBoss Portal SVN: r7774 - trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 04:41:54 -0400 (Mon, 16 Jul 2007)
New Revision: 7774
Modified:
trunk/build/build.xml
trunk/build/distrib.xml
Log:
Fix wsrp build, fix build/distrib.xml, fix build/build.xml, JBPORTAL-1579: Change of package for UserCounterListener
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-07-16 08:36:58 UTC (rev 7773)
+++ trunk/build/build.xml 2007-07-16 08:41:54 UTC (rev 7774)
@@ -144,7 +144,7 @@
<group name="portal">
<include
- modules="common, test, api, web, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-wsrp, core-admin, core-cms, core-management, core-samples, widget"/>
+ modules="common, test, api, web, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/>
</group>
<group name="cms">
Modified: trunk/build/distrib.xml
===================================================================
--- trunk/build/distrib.xml 2007-07-16 08:36:58 UTC (rev 7773)
+++ trunk/build/distrib.xml 2007-07-16 08:41:54 UTC (rev 7774)
@@ -142,6 +142,16 @@
</sequential>
</target>
+ <target name="package-samples">
+ <sequential>
+ <mkdir dir="${todir}"/>
+ <copy todir="${todir}">
+ <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-basic-samples.sar"/>
+ </copy>
+ <copy file="${docs.dir}/readmeFiles/samples-readme.txt" tofile="${todir}/readme.txt"/>
+ </sequential>
+ </target>
+
<!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc-->
<target name="package-bin" unless="no-doc">
<sequential>
@@ -229,7 +239,6 @@
<fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/>
<fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/>
<fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/>
- <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/>
</copy>
<copy todir="${portal.build.normal.bin}/jboss-portal.sar/samples">
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/>
@@ -260,7 +269,6 @@
<fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/>
<fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/>
<fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/>
- <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/>
</copy>
<copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/samples">
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/>
16 years, 11 months
JBoss Portal SVN: r7773 - in branches/JBoss_Portal_Branch_2_6: core-wsrp and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 04:36:58 -0400 (Mon, 16 Jul 2007)
New Revision: 7773
Modified:
branches/JBoss_Portal_Branch_2_6/build/build.xml
branches/JBoss_Portal_Branch_2_6/build/distrib.xml
branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml
branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
Log:
Fix wsrp/wsrp-admin build
Fix build/distrib.xml and build/build.xml
Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-07-16 08:09:12 UTC (rev 7772)
+++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-07-16 08:36:58 UTC (rev 7773)
@@ -144,7 +144,7 @@
<group name="portal">
<include
- modules="common, test, api, web, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-wsrp, core-admin, core-cms, core-management, core-samples, widget"/>
+ modules="common, test, api, web, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/>
</group>
<group name="cms">
Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-16 08:09:12 UTC (rev 7772)
+++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-16 08:36:58 UTC (rev 7773)
@@ -245,7 +245,6 @@
<fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/>
<fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/>
<fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/>
- <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/>
</copy>
<copy todir="${portal.build.normal.bin}/jboss-portal.sar/samples">
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/>
@@ -276,7 +275,6 @@
<fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/>
<fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/>
<fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/>
- <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/>
</copy>
<copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/samples">
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-16 08:09:12 UTC (rev 7772)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-16 08:36:58 UTC (rev 7773)
@@ -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: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-16 08:09:12 UTC (rev 7772)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-16 08:36:58 UTC (rev 7773)
@@ -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"/>
16 years, 11 months
JBoss Portal SVN: r7772 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 04:09:12 -0400 (Mon, 16 Jul 2007)
New Revision: 7772
Modified:
branches/JBoss_Portal_Branch_2_6/build/distrib.xml
Log:
Fix distrib.xml
Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-16 07:59:38 UTC (rev 7771)
+++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-16 08:09:12 UTC (rev 7772)
@@ -148,9 +148,7 @@
<copy todir="${todir}">
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-basic-samples.sar"/>
</copy>
- <copy tofile="${todir}/readme.txt">
- <fileset dir="${docs.dir}/readmeFiles/samples-readme.txt"/>
- </copy>
+ <copy file="${docs.dir}/readmeFiles/samples-readme.txt" tofile="${todir}/readme.txt"/>
</sequential>
</target>
16 years, 11 months
JBoss Portal SVN: r7771 - branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-sar/META-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 03:59:38 -0400 (Mon, 16 Jul 2007)
New Revision: 7771
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-sar/META-INF/jboss-service.xml
Log:
JBPORTAL-1579: Change of package for UserCounterListener
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-sar/META-INF/jboss-service.xml 2007-07-16 07:37:13 UTC (rev 7770)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-sar/META-INF/jboss-service.xml 2007-07-16 07:59:38 UTC (rev 7771)
@@ -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>
16 years, 11 months
JBoss Portal SVN: r7770 - trunk.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 03:37:13 -0400 (Mon, 16 Jul 2007)
New Revision: 7770
Removed:
trunk/demo/
Log:
Removing demo module of trunk
16 years, 11 months
JBoss Portal SVN: r7769 - demo and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 03:34:16 -0400 (Mon, 16 Jul 2007)
New Revision: 7769
Added:
demo/trunk/
Removed:
branches/JBoss_Portal_Branch_2_6/demo/
Log:
Moving demo to a seperate SVN 'module'
Copied: demo/trunk (from rev 7768, branches/JBoss_Portal_Branch_2_6/demo)
16 years, 11 months
JBoss Portal SVN: r7768 - /.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 03:31:05 -0400 (Mon, 16 Jul 2007)
New Revision: 7768
Added:
demo/
Log:
new demo svn module
16 years, 11 months
JBoss Portal SVN: r7767 - branches/JBoss_Portal_Branch_2_6/wsrp.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 23:43:56 -0400 (Fri, 13 Jul 2007)
New Revision: 7767
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
Log:
- Fixed build.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-14 03:42:22 UTC (rev 7766)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-14 03:43:56 UTC (rev 7767)
@@ -189,7 +189,7 @@
<property name="javadoc.protected" value="false"/>
<property name="jboss.deploy.dir" value="${jboss.home}/server/${portal.deploy.dir}"/>
- <property name="log.dir" value="${module.output}/logs"/>
+ <property name="log.dir" value="${module.output}/logs"/>
<property name="reports.dir" value="${module.output}/reports"/>
<property name="test.reports" value="${module.output}/tests"/>
<property name="build.resources.test" value="${build.resources}/tests"/>
@@ -302,7 +302,7 @@
</copy>
<copy todir="${build.resources}/portal-wsrp-sar" overwrite="true">
<fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/>
- <fileset dir="../core-wsrp/output/lib" includes="portal-wsrp-admin.war"/>
+ <fileset dir="./output/lib" includes="portal-wsrp-admin.war"/>
</copy>
<jar jarfile="${build.lib}/portal-wsrp.sar">
<fileset dir="${build.resources}/portal-wsrp-sar" includes="**/*"/>
@@ -574,7 +574,7 @@
</target>
<!-- Test portlets -->
- <target name="package-test-portlets" description="Generate the test portlets archives" depends="compile">
+ <target name="package-test-portlets" description="Generate the test portlets archives" depends="compile">
<!-- Simple test portlet -->
<package-test-portlet archiveName="basic" portletName="Basic"/>
@@ -860,4 +860,4 @@
</sequential>
</macrodef>
-</project>
\ No newline at end of file
+</project>
16 years, 11 months
JBoss Portal SVN: r7766 - trunk/wsrp.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 23:42:22 -0400 (Fri, 13 Jul 2007)
New Revision: 7766
Modified:
trunk/wsrp/build.xml
Log:
- Fixed build.
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2007-07-13 23:05:27 UTC (rev 7765)
+++ trunk/wsrp/build.xml 2007-07-14 03:42:22 UTC (rev 7766)
@@ -302,7 +302,7 @@
</copy>
<copy todir="${build.resources}/portal-wsrp-sar" overwrite="true">
<fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/>
- <fileset dir="../core-wsrp/output/lib" includes="portal-wsrp-admin.war"/>
+ <fileset dir="./output/lib" includes="portal-wsrp-admin.war"/>
</copy>
<jar jarfile="${build.lib}/portal-wsrp.sar">
<fileset dir="${build.resources}/portal-wsrp-sar" includes="**/*"/>
16 years, 11 months