JBoss Portal SVN: r11654 - in docs/tags/JBoss_Portal_2_7_0_BETA1/referenceGuide/en: modules and 1 other directory.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-30 06:58:23 -0400 (Wed, 30 Jul 2008)
New Revision: 11654
Added:
docs/tags/JBoss_Portal_2_7_0_BETA1/referenceGuide/en/modules/coordination.xml
Modified:
docs/tags/JBoss_Portal_2_7_0_BETA1/referenceGuide/en/master.xml
Log:
Adding coordination chapter
Modified: docs/tags/JBoss_Portal_2_7_0_BETA1/referenceGuide/en/master.xml
===================================================================
--- docs/tags/JBoss_Portal_2_7_0_BETA1/referenceGuide/en/master.xml 2008-07-30 10:50:28 UTC (rev 11653)
+++ docs/tags/JBoss_Portal_2_7_0_BETA1/referenceGuide/en/master.xml 2008-07-30 10:58:23 UTC (rev 11654)
@@ -50,6 +50,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/tutorials.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/xmldescriptors.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/urls.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/coordination.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/errorhandling.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/contentintegration.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/widgetintegration.xml" />
Copied: docs/tags/JBoss_Portal_2_7_0_BETA1/referenceGuide/en/modules/coordination.xml (from rev 11653, docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/coordination.xml)
===================================================================
--- docs/tags/JBoss_Portal_2_7_0_BETA1/referenceGuide/en/modules/coordination.xml (rev 0)
+++ docs/tags/JBoss_Portal_2_7_0_BETA1/referenceGuide/en/modules/coordination.xml 2008-07-30 10:58:23 UTC (rev 11654)
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<chapter id="coordination">
+ <chapterinfo>
+ <author>
+ <firstname>Boleslaw</firstname>
+ <surname>Dawidowicz</surname>
+ </author>
+ </chapterinfo>
+ <title>JBoss Portal Explicit Coordination</title>
+ <sect1>
+ <title>Explicit vs implicit coordination</title>
+ <para>
+ Portlet 2.0 coordination features are mediated by the portal between several
+ portlet windows, therefore the portal at runtime needs to be able to define
+ relationships between windows. Relationship can be established from an implicit
+ model (i.e a set of predicates applied on some state that will answer TRUE/FALSE
+ to the question are the portlet windows foo and bar in a relationship) or from an
+ explicit model (that states that foo and bar have a relationship). The implicit
+ model is very good for defining default configuration as it does not require much
+ configuration but is not able to cover the exceptional case, that's why we need
+ to combine it with an explicit model that will take precedence over the implicit
+ model, it is the well known principle of convention over configuration.
+ </para>
+ <para>
+ Currently all explicit coordination happens only in the scope of the same page.
+ </para>
+ </sect1>
+ <sect1>
+ <title>Bindings and wirings</title>
+
+ <sect2>
+ <title>Event wiring</title>
+
+ <para>
+ Wires JSR-286 events. With implicit wirings the event producer and the
+ consumer declares the same event namespace and local name to get event
+ delivered in the scope of the same page. With explicit wiring any pairs of
+ Window:Event can be connected.
+ </para>
+ </sect2>
+ <sect2>
+ <title>Parameter binding</title>
+
+ <para>
+ Binds JSR-286 shared parameters. With implicit binding parameters with the
+ same public name are shared. With explicit binding any public parameters can
+ share values. Windows for which such binding applies are explicitly defined.
+ </para>
+ </sect2>
+ <sect2>
+ <title>Alias binding</title>
+
+ <para>
+ Explicit alias binding define a name of page scoped parameter that will apply
+ value to specified portlet windows public parameters.
+ </para>
+
+ <programlisting><![CDATA[http://localhost:8080/portal/portal/default/Coordination+Samples?aliasBinding1=someValue]]></programlisting>
+ </sect2>
+ </sect1>
+ <sect1>
+ <title>Coordination configuration</title>
+
+ <para>
+ Configuration takes place in -object.xml file. The <coordination> tag
+ can be used in both <page> and <portal> tags. When used in
+ <portal> tag only <implicit-mode> tag can be defined for wirings
+ and bindings:
+ </para>
+
+ <programlisting role="XML"><![CDATA[<portal>
+
+ ...
+
+ <coordination>
+ <bindings>
+ <implicit-mode>TRUE</implicit-mode>
+ </bindings>
+ <wirings>
+ <implicit-mode>FALSE</implicit-mode>
+ </wirings>
+ </coordination>
+
+</portal>]]></programlisting>
+ <para>
+ When used within the <page> tag coordination event wirings and bindings
+ can be defined:</page></para>
+
+ <programlisting role="XML"><![CDATA[<coordination>
+
+ <wirings>
+ <implicit-mode>TRUE</implicit-mode>
+ <event-wiring>
+ <name>eventWiring1</name>
+ <sources>
+ <window-coordination>
+ <window-name>ShoppingCatalogPortletWindow1</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </sources>
+ <destinations>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow2</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow3</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </destinations>
+ </event-wiring>
+ <event-wiring>
+ <name>eventWiring2</name>
+ <sources>
+ <window-coordination>
+ <window-name>ShoppingCatalogPortletWindow2</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </sources>
+ <destinations>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow1</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow4</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </destinations>
+ </event-wiring>
+ </wirings>
+
+
+ <bindings>
+ <implicit-mode>FALSE</implicit-mode>
+
+ <parameter-binding>
+ <id>parameterBinding1</id>
+ <window-coordination>
+ <window-name>SomePortletWindow1</window-name>
+ <qname>foo</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>SomePortletWindow2</window-name>
+ <qname>foo</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>SomePortletWindow3</window-name>
+ <qname>foo</qname>
+ </window-coordination>
+ </parameter-binding>
+
+ <parameter-binding>
+ <id>parameterBinding2</id>
+ <window-coordination>
+ <window-name>SomePortletWindow1</window-name>
+ <qname>bar1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>SomePortletWindow2</window-name>
+ <qname>{urn:jboss:portal:samples:daa1}daa1</qname>
+ </window-coordination>
+ </parameter-binding>
+
+ <alias-binding>
+ <id>aliasBinding1</id>
+ <qname>foo</qname>
+ </alias-binding>
+
+ <alias-binding>
+ <id>aliasBinding2</id>
+ <qname>bar1</qname>
+ <qname>{urn:jboss:portal:samples:daa2}daa2</qname>
+ </alias-binding>
+
+ </bindings>
+</coordination>]]></programlisting>
+
+ <sect2>
+ <title><implicit-mode></title>
+
+ <para>
+ This tag can be applied for both <bindings> and <wirings>
+ tags. It defines if implicit coordination is enabled or disabled for
+ this given portal object. Value of this setting is cascaded to all
+ children in portal object tree unless overwritten somewhere in the
+ hierarchy. If no <implicit-mode> is defined in portal object tree
+ default value is TRUE.
+ </para>
+ </sect2>
+ </sect1>
+ <sect1>
+ <title>Coordination Samples</title>
+ <para>
+ JBoss Portal comes with several examples in 'Coordination Samples' page. Its good
+ to follow them looking at the configuration file that can be found in
+ portal-coordination-samples.war/WEB-INF/default-object.xml
+ </para>
+ </sect1>
+</chapter>
\ No newline at end of file
15 years, 11 months
JBoss Portal SVN: r11653 - in docs/branches/JBoss_Portal_Branch_2_7/referenceGuide: en and 1 other directories.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-30 06:50:28 -0400 (Wed, 30 Jul 2008)
New Revision: 11653
Added:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/coordination.xml
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/master.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/pom.xml
Log:
Adding coordination chapter
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/master.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/master.xml 2008-07-30 10:06:12 UTC (rev 11652)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/master.xml 2008-07-30 10:50:28 UTC (rev 11653)
@@ -50,6 +50,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/tutorials.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/xmldescriptors.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/urls.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/coordination.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/errorhandling.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/contentintegration.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/widgetintegration.xml" />
Added: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/coordination.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/coordination.xml (rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/coordination.xml 2008-07-30 10:50:28 UTC (rev 11653)
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<chapter id="coordination">
+ <chapterinfo>
+ <author>
+ <firstname>Boleslaw</firstname>
+ <surname>Dawidowicz</surname>
+ </author>
+ </chapterinfo>
+ <title>JBoss Portal Explicit Coordination</title>
+ <sect1>
+ <title>Explicit vs implicit coordination</title>
+ <para>
+ Portlet 2.0 coordination features are mediated by the portal between several
+ portlet windows, therefore the portal at runtime needs to be able to define
+ relationships between windows. Relationship can be established from an implicit
+ model (i.e a set of predicates applied on some state that will answer TRUE/FALSE
+ to the question are the portlet windows foo and bar in a relationship) or from an
+ explicit model (that states that foo and bar have a relationship). The implicit
+ model is very good for defining default configuration as it does not require much
+ configuration but is not able to cover the exceptional case, that's why we need
+ to combine it with an explicit model that will take precedence over the implicit
+ model, it is the well known principle of convention over configuration.
+ </para>
+ <para>
+ Currently all explicit coordination happens only in the scope of the same page.
+ </para>
+ </sect1>
+ <sect1>
+ <title>Bindings and wirings</title>
+
+ <sect2>
+ <title>Event wiring</title>
+
+ <para>
+ Wires JSR-286 events. With implicit wirings the event producer and the
+ consumer declares the same event namespace and local name to get event
+ delivered in the scope of the same page. With explicit wiring any pairs of
+ Window:Event can be connected.
+ </para>
+ </sect2>
+ <sect2>
+ <title>Parameter binding</title>
+
+ <para>
+ Binds JSR-286 shared parameters. With implicit binding parameters with the
+ same public name are shared. With explicit binding any public parameters can
+ share values. Windows for which such binding applies are explicitly defined.
+ </para>
+ </sect2>
+ <sect2>
+ <title>Alias binding</title>
+
+ <para>
+ Explicit alias binding define a name of page scoped parameter that will apply
+ value to specified portlet windows public parameters.
+ </para>
+
+ <programlisting><![CDATA[http://localhost:8080/portal/portal/default/Coordination+Samples?aliasBinding1=someValue]]></programlisting>
+ </sect2>
+ </sect1>
+ <sect1>
+ <title>Coordination configuration</title>
+
+ <para>
+ Configuration takes place in -object.xml file. The <coordination> tag
+ can be used in both <page> and <portal> tags. When used in
+ <portal> tag only <implicit-mode> tag can be defined for wirings
+ and bindings:
+ </para>
+
+ <programlisting role="XML"><![CDATA[<portal>
+
+ ...
+
+ <coordination>
+ <bindings>
+ <implicit-mode>TRUE</implicit-mode>
+ </bindings>
+ <wirings>
+ <implicit-mode>FALSE</implicit-mode>
+ </wirings>
+ </coordination>
+
+</portal>]]></programlisting>
+ <para>
+ When used within the <page> tag coordination event wirings and bindings
+ can be defined:</page></para>
+
+ <programlisting role="XML"><![CDATA[<coordination>
+
+ <wirings>
+ <implicit-mode>TRUE</implicit-mode>
+ <event-wiring>
+ <name>eventWiring1</name>
+ <sources>
+ <window-coordination>
+ <window-name>ShoppingCatalogPortletWindow1</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </sources>
+ <destinations>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow2</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow3</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </destinations>
+ </event-wiring>
+ <event-wiring>
+ <name>eventWiring2</name>
+ <sources>
+ <window-coordination>
+ <window-name>ShoppingCatalogPortletWindow2</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </sources>
+ <destinations>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow1</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow4</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </destinations>
+ </event-wiring>
+ </wirings>
+
+
+ <bindings>
+ <implicit-mode>FALSE</implicit-mode>
+
+ <parameter-binding>
+ <id>parameterBinding1</id>
+ <window-coordination>
+ <window-name>SomePortletWindow1</window-name>
+ <qname>foo</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>SomePortletWindow2</window-name>
+ <qname>foo</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>SomePortletWindow3</window-name>
+ <qname>foo</qname>
+ </window-coordination>
+ </parameter-binding>
+
+ <parameter-binding>
+ <id>parameterBinding2</id>
+ <window-coordination>
+ <window-name>SomePortletWindow1</window-name>
+ <qname>bar1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>SomePortletWindow2</window-name>
+ <qname>{urn:jboss:portal:samples:daa1}daa1</qname>
+ </window-coordination>
+ </parameter-binding>
+
+ <alias-binding>
+ <id>aliasBinding1</id>
+ <qname>foo</qname>
+ </alias-binding>
+
+ <alias-binding>
+ <id>aliasBinding2</id>
+ <qname>bar1</qname>
+ <qname>{urn:jboss:portal:samples:daa2}daa2</qname>
+ </alias-binding>
+
+ </bindings>
+</coordination>]]></programlisting>
+
+ <sect2>
+ <title><implicit-mode></title>
+
+ <para>
+ This tag can be applied for both <bindings> and <wirings>
+ tags. It defines if implicit coordination is enabled or disabled for
+ this given portal object. Value of this setting is cascaded to all
+ children in portal object tree unless overwritten somewhere in the
+ hierarchy. If no <implicit-mode> is defined in portal object tree
+ default value is TRUE.
+ </para>
+ </sect2>
+ </sect1>
+ <sect1>
+ <title>Coordination Samples</title>
+ <para>
+ JBoss Portal comes with several examples in 'Coordination Samples' page. Its good
+ to follow them looking at the configuration file that can be found in
+ portal-coordination-samples.war/WEB-INF/default-object.xml
+ </para>
+ </sect1>
+</chapter>
\ No newline at end of file
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/pom.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/pom.xml 2008-07-30 10:06:12 UTC (rev 11652)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/pom.xml 2008-07-30 10:50:28 UTC (rev 11653)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.portal</groupId>
<artifactId>jboss-portal-docs-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.jboss.portal</groupId>
15 years, 11 months
JBoss Portal SVN: r11652 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-30 06:06:12 -0400 (Wed, 30 Jul 2008)
New Revision: 11652
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml
Log:
minor
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml 2008-07-30 09:06:13 UTC (rev 11651)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml 2008-07-30 10:06:12 UTC (rev 11652)
@@ -57,7 +57,7 @@
<title>Rendering Modes</title>
<para>
A portlet can have different view modes. Three modes are defined by the
- JSR-288 specification:
+ JSR-286 specification:
</para>
<para>
<itemizedlist>
@@ -1113,6 +1113,13 @@
</mediaobject>
</para>
</sect3>
+ <sect3>
+ <title>
+ <trademark class="trade">JSF</trademark>
+ example using the JBoss Portlet Bridge
+ </title>
+ <bridgehead>TODO.</bridgehead>
+ </sect3>
</sect2>
</sect1>
</chapter>
\ No newline at end of file
15 years, 11 months
JBoss Portal SVN: r11651 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-30 05:06:13 -0400 (Wed, 30 Jul 2008)
New Revision: 11651
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java
Log:
Reduced prefix's size
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-07-30 08:18:10 UTC (rev 11650)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-07-30 09:06:13 UTC (rev 11651)
@@ -63,7 +63,7 @@
public static final String BINDING = "binding";
- public static final String PREFIX = "org.jboss.portal.core.controller.coordination";
+ public static final String PREFIX = "coordination";
public static final String QNAME_SEPARATOR = ";";
15 years, 11 months
JBoss Portal SVN: r11649 - in tags/JBoss_Portal_2_7_0_BETA1/build: ide and 1 other directory.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-30 04:12:22 -0400 (Wed, 30 Jul 2008)
New Revision: 11649
Removed:
tags/JBoss_Portal_2_7_0_BETA1/build/ide/eclipse/
Modified:
tags/JBoss_Portal_2_7_0_BETA1/build/distrib.xml
Log:
minor
Modified: tags/JBoss_Portal_2_7_0_BETA1/build/distrib.xml
===================================================================
--- tags/JBoss_Portal_2_7_0_BETA1/build/distrib.xml 2008-07-30 08:09:57 UTC (rev 11648)
+++ tags/JBoss_Portal_2_7_0_BETA1/build/distrib.xml 2008-07-30 08:12:22 UTC (rev 11649)
@@ -1,9 +1,9 @@
<project default="main" name="JBoss Portal">
<property name="source.dir" value=".."/>
- <property name="docs.dir" value="${source.dir}/../doc"/>
+ <property name="docs.dir" value="${source.dir}/../docs"/>
<property name="examples.dir" value="${source.dir}/../examples"/>
- <property name="release.version" value="2.7.B1"/>
+ <property name="release.version" value="2.7.0.B1"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
@@ -178,7 +178,7 @@
<antcall target="package-samples">
<param name="todir" value="${todir}/samples"/>
</antcall>
- <antcall target="package-examples"/>
+ <antcall target="package-examples">
<param name="todir" value="${todir}/examples"/>
</antcall>
<copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
@@ -200,7 +200,7 @@
<antcall target="package-samples">
<param name="todir" value="${todir}/samples"/>
</antcall>
- <antcall target="package-examples"/>
+ <antcall target="package-examples">
<param name="todir" value="${todir}/examples"/>
</antcall>
<copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
15 years, 11 months
JBoss Portal SVN: r11648 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-30 04:09:57 -0400 (Wed, 30 Jul 2008)
New Revision: 11648
Modified:
branches/JBoss_Portal_Branch_2_7/build/distrib.xml
Log:
minor
Modified: branches/JBoss_Portal_Branch_2_7/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/distrib.xml 2008-07-30 07:24:42 UTC (rev 11647)
+++ branches/JBoss_Portal_Branch_2_7/build/distrib.xml 2008-07-30 08:09:57 UTC (rev 11648)
@@ -1,8 +1,9 @@
<project default="main" name="JBoss Portal">
- <property name="source.dir" value="../../jboss-portal-2.6"/>
- <property name="docs.dir" value="${source.dir}-docs"/>
- <property name="release.version" value="2.6.SNAPSHOT"/>
+ <property name="source.dir" value=".."/>
+ <property name="docs.dir" value="${source.dir}/../docs"/>
+ <property name="examples.dir" value="${source.dir}/../examples"/>
+ <property name="release.version" value="2.7.0.B1"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
@@ -85,15 +86,8 @@
<ant dir="${source.dir}/wsrp" antfile="build.xml" target="explode"/>
</target>
- <!-- Build JBoss Portal documentation -->
- <target name="doc.build" depends="_normal.build" unless="no-doc">
- <ant dir="${docs.dir}/referenceGuide" antfile="build.xml"/>
- <ant dir="${docs.dir}/userGuide" antfile="build.xml"/>
- <ant dir="${docs.dir}/quickstartuser" antfile="build.xml"/>
- </target>
-
<!-- Build JBoss Portal -->
- <target name="build" depends="source.build,doc.build"/>
+ <target name="build" depends="source.build"/>
<!--<macrodef name="package-doc">
@@ -120,19 +114,29 @@
<mkdir dir="${todir}"/>
<mkdir dir="${todir}/referenceGuide"/>
<copy todir="${todir}/referenceGuide">
- <fileset dir="${docs.dir}/referenceGuide/build/en/"/>
+ <fileset dir="${docs.dir}/referenceGuide/target/docbook/publish/en-US"/>
</copy>
<mkdir dir="${todir}/userGuide"/>
<copy todir="${todir}/userGuide">
- <fileset dir="${docs.dir}/userGuide/build/en/"/>
+ <fileset dir="${docs.dir}/userGuide/target/docbook/publish/en-US"/>
</copy>
<mkdir dir="${todir}/quickstartuser"/>
<copy todir="${todir}/quickstartuser">
- <fileset dir="${docs.dir}/quickstartuser/build/en/"/>
+ <fileset dir="${docs.dir}/quickstartuser/target/docbook/publish/en-US"/>
</copy>
</sequential>
</target>
+ <target name="package-examples">
+ <sequential>
+ <mkdir dir="${todir}"/>
+ <copy todir="${todir}">
+ <fileset dir="${examples.dir}"/>
+ </copy>
+ </sequential>
+ </target>
+
+
<target name="package-ds">
<sequential>
<mkdir dir="${todir}"/>
@@ -173,7 +177,10 @@
</antcall>
<antcall target="package-samples">
<param name="todir" value="${todir}/samples"/>
- </antcall>
+ </antcall>
+ <antcall target="package-examples">
+ <param name="todir" value="${todir}/examples"/>
+ </antcall>
<copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
<copy todir="${todir}/docs/portal/licenses">
<fileset dir="output/docs/licenses"/>
@@ -193,6 +200,9 @@
<antcall target="package-samples">
<param name="todir" value="${todir}/samples"/>
</antcall>
+ <antcall target="package-examples">
+ <param name="todir" value="${todir}/examples"/>
+ </antcall>
<copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
<copy todir="${todir}/docs/portal/licenses">
<fileset dir="output/docs/licenses"/>
@@ -402,4 +412,4 @@
<!-- Build and compress everything -->
<target name="main" depends="licenses,build,package,zip" description="do everything - build source, doc, distro"/>
-</project>
+</project>
\ No newline at end of file
15 years, 11 months
JBoss Portal SVN: r11647 - tags.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-30 03:24:42 -0400 (Wed, 30 Jul 2008)
New Revision: 11647
Added:
tags/JBoss_Portal_2_7_0_BETA1/
Removed:
tags/JBoss_Portal_2_7_BETA1/
Log:
Oups
Copied: tags/JBoss_Portal_2_7_0_BETA1 (from rev 11646, tags/JBoss_Portal_2_7_BETA1)
15 years, 11 months
JBoss Portal SVN: r11646 - examples/tags.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-29 16:53:04 -0400 (Tue, 29 Jul 2008)
New Revision: 11646
Added:
examples/tags/JBoss_Portal_2_7_0_BETA1/
Log:
Tagging
Copied: examples/tags/JBoss_Portal_2_7_0_BETA1 (from rev 11645, examples/trunk)
15 years, 11 months
JBoss Portal SVN: r11645 - examples.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-29 16:52:04 -0400 (Tue, 29 Jul 2008)
New Revision: 11645
Added:
examples/tags/
Log:
Create tag directory
15 years, 11 months