JBoss Portal SVN: r10668 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-04-20 21:55:20 -0400 (Sun, 20 Apr 2008)
New Revision: 10668
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.4.1. Defining a new Portal Page
minor revisions to my additions
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-21 01:33:04 UTC (rev 10667)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-21 01:55:20 UTC (rev 10668)
@@ -1714,7 +1714,7 @@
</orderedlist>
</para>
<para>
- The HelloWorldPortalPage portlet is hot-deployable, so the JBoss EAP or JBoss AS server do not have to be restarted. The following is an example of the <filename>helloworldportalpage.war/WEB-INF/helloworld-object.xml</filename> descriptor:
+ The HelloWorldPortalPage portlet is hot-deployable, so the JBoss EAP or JBoss AS server does not have to be restarted. The following is an example of the <filename>helloworldportalpage.war/WEB-INF/helloworld-object.xml</filename> descriptor:
</para>
<para>
<screen><![CDATA[
18 years
- 1
- 0
JBoss Portal SVN: r10667 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-04-20 21:33:04 -0400 (Sun, 20 Apr 2008)
New Revision: 10667
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
revising text, added 'default profile' example when
deploying portlets
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-04-21 01:19:51 UTC (rev 10666)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-04-21 01:33:04 UTC (rev 10667)
@@ -596,7 +596,7 @@
<sect3>
<title>Deploying your Portlet</title>
<para>
- If you did not expand the <filename>helloworldportlet.war</filename> file, copy the <filename>HelloWorldPortlet/helloworldportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldportlet.war</filename> file, copy the <filename>HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using JBoss AS, copy the WAR file or the expanded directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
+ If you did not expand the <filename>helloworldportlet.war</filename> file, copy the <filename>HelloWorldPortlet/helloworldportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldportlet.war</filename> file, copy the <filename>HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using the <computeroutput>default</computeroutput> JBoss AS profile, copy the WAR file or the expanded directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
</para>
<para>
Performing this step on a running instance of JBoss AS or JBoss EAP, and JBoss Portal, triggers a hot-deploy of the portlet:
@@ -952,7 +952,7 @@
<sect3>
<title>Deploying your JSP Portlet</title>
<para>
- If you did not expand the <filename>helloworldjspportlet.war</filename> file, copy the <filename>HelloWorldJSPPortlet/helloworldjspportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldjspportlet.war</filename> file, copy the <filename>HelloWorldJSPPortlet/output/lib/exploded/helloworldjspportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using JBoss AS, copy the WAR file or the expanded directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
+ If you did not expand the <filename>helloworldjspportlet.war</filename> file, copy the <filename>HelloWorldJSPPortlet/helloworldjspportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldjspportlet.war</filename> file, copy the <filename>HelloWorldJSPPortlet/output/lib/exploded/helloworldjspportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using the <computeroutput>default</computeroutput> JBoss AS profile, copy the WAR file or the expanded directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
</para>
<para>
Performing this step on a running instance of JBoss AS or JBoss EAP, and JBoss Portal, triggers a hot-deploy of the portlet:
@@ -1235,7 +1235,7 @@
<sect3>
<title>Deploying your JSF Portlet</title>
<para>
- If you did not expand the <filename>helloworldjsfsunriportlet.war</filename> file, copy the <filename>HelloWorldJSFSunRIPortlet/helloworldjsfsunriportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldjsfsunriportlet.war</filename> file, copy the <filename>HelloWorldJSFSunRIPortlet/output/lib/exploded/helloworldjsfsunriportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using JBoss AS, copy the WAR file or the expanded directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
+ If you did not expand the <filename>helloworldjsfsunriportlet.war</filename> file, copy the <filename>HelloWorldJSFSunRIPortlet/helloworldjsfsunriportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldjsfsunriportlet.war</filename> file, copy the <filename>HelloWorldJSFSunRIPortlet/output/lib/exploded/helloworldjsfsunriportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using <computeroutput>default</computeroutput> JBoss AS profile, copy the WAR file or the expanded directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
</para>
<para>
Performing this step on a running instance of JBoss AS or JBoss EAP, and JBoss Portal, triggers a hot-deploy of the portlet:
@@ -1540,7 +1540,7 @@
<sect3>
<title>Deploying your Apache MyFaces JSF Portlet</title>
<para>
- If you did not expand the <filename>helloworldjsfmyfacesportlet.war</filename> file, copy the <filename>HelloWorldJSFMyFaces42Portlet/helloworldjsfmyfacesportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldjsfmyfacesportlet.war</filename> file, copy the <filename>HelloWorldJSFMyFaces42Portlet/output/lib/exploded/helloworldjsfmyfacesportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using JBoss AS, copy the WAR file or the expanded directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
+ If you did not expand the <filename>helloworldjsfmyfacesportlet.war</filename> file, copy the <filename>HelloWorldJSFMyFaces42Portlet/helloworldjsfmyfacesportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldjsfmyfacesportlet.war</filename> file, copy the <filename>HelloWorldJSFMyFaces42Portlet/output/lib/exploded/helloworldjsfmyfacesportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using the <computeroutput>default</computeroutput> JBoss AS profile, copy the WAR file or the expanded directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
</para>
<para>
Performing this step on a running instance of JBoss AS or JBoss EAP, and JBoss Portal, triggers a hot-deploy of the portlet.
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-21 01:19:51 UTC (rev 10666)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-21 01:33:04 UTC (rev 10667)
@@ -1687,7 +1687,7 @@
<sect2 id="desc_example_page">
<title>Defining a new Portal Page</title>
<para>
- The sample application descriptor in this section creates a new page, <computeroutput>MyPage</computeroutput>, in your portal. To illustrate this example, download the <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorld Page</ulink> portlet. To use the helloworldportalpage portlet:
+ The sample application descriptor in this section creates a new page, <computeroutput>MyPage</computeroutput>, in a portal. To illustrate this example, download the <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorldPortalPage</ulink> portlet. To use the HelloWorldPortalPage portlet:
</para>
<para>
<orderedlist>
@@ -1698,7 +1698,7 @@
</listitem>
<listitem>
<para>
- Unzip the <filename>HelloWorldPortalPage.zip</filename> ZIP file.
+ Unzip the <filename>HelloWorldPortalPage</filename> ZIP file.
</para>
</listitem>
<listitem>
@@ -1708,13 +1708,13 @@
</listitem>
<listitem>
<para>
- If you did not expand the <filename>helloworldportalpage.war</filename> file, copy the <filename>helloworldportalpage.war</filename> file into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory. If you expanded the <filename>helloworldportalpage.war</filename> file, copy the <filename>HelloWorldPortalPage/output/lib/exploded/helloworldportalpage.war/</filename> directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
+ If you did not expand the <filename>helloworldportalpage.war</filename> file, copy the <filename>helloworldportalpage.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldportalpage.war</filename> file, copy the <filename>HelloWorldPortalPage/output/lib/exploded/helloworldportalpage.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using the <computeroutput>default</computeroutput> JBoss AS profile, copy the WAR file or the expanded directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
</para>
</listitem>
</orderedlist>
</para>
<para>
- The helloworldportalpage portlet is hot-deployable, so the JBoss EAP or JBoss AS server do not have to be restarted. The following is an example of the <filename>helloworldportalpage.war/WEB-INF/helloworld-object.xml</filename> descriptor:
+ The HelloWorldPortalPage portlet is hot-deployable, so the JBoss EAP or JBoss AS server do not have to be restarted. The following is an example of the <filename>helloworldportalpage.war/WEB-INF/helloworld-object.xml</filename> descriptor:
</para>
<para>
<screen><![CDATA[
18 years
- 1
- 0
JBoss Portal SVN: r10666 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-04-20 21:19:51 -0400 (Sun, 20 Apr 2008)
New Revision: 10666
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.4.1. Defining a new Portal Page
finished adding content
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-21 01:02:11 UTC (rev 10665)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-21 01:19:51 UTC (rev 10666)
@@ -1751,6 +1751,7 @@
</para>
<para>
The following list describes the elements in the <filename>helloworldportalpage.war/WEB-INF/helloworld-object.xml</filename> file:
+ </para>
<para>
<itemizedlist>
<listitem>
@@ -1764,7 +1765,7 @@
<listitem>
<screen>
<parent-ref>
-<screen>
+</screen>
<para>
The <computeroutput><parent-ref></computeroutput> element contains a reference to the parent object. The naming convention for naming objects is to concatenate the names of the path to the object, and separate the names using a period. If the path is empty, the empty string must be used. The <computeroutput><parent-ref></computeroutput> element tells the portal where the portlet appears. The syntax for the <computeroutput><parent-ref></computeroutput> element is <computeroutput><replaceable>portal-instance</replaceable>.<replaceable>portal-page</replaceable></computeroutput>.
</para>
@@ -1905,87 +1906,26 @@
</itemizedlist>
</para>
<para>
- <screen><![CDATA[
- <!ELEMENT unchecked EMPTY>]]>
- </screen>
+<screen>
+<unchecked/>
+</screen>
</para>
<para>
If present, the <computeroutput><unchecked></computeroutput> element defines that anyone can view the instance.
</para>
<para>
- <screen><![CDATA[
- <!ELEMENT role-name (#PCDATA)>]]>
- </screen>
- </para>
+<screen>
+<role-name>
+</screen>
+ </para>
+ <para>
+ The <computeroutput><role-name></computeroutput> element defines a role that the security constraint will apply to. The following example only allows users that are part of the <computeroutput>EXAMPLEROLE</computeroutput> role to access the instance:
+ </para>
<para>
- The <computeroutput><role-name></computeroutput> element defines a role that the security constraint will apply to. The following example only allows users that are part of the <computeroutput>EXAMPLEROLE</computeroutput> role to access the instance:
- </para>
- <para>
- <screen><![CDATA[
- <role-name>EXAMPLEROLE</role-name>]]>
- </screen>
- </para>
-
-
-
-
-
-
-
-
-
- Takes the name of
- the application followed by the name of the portlet, as defined in the
- <emphasis>portlet.xml</emphasis>
- </listitem>
- <listitem>
- <para>
- <programlisting><![CDATA[<security-constraint>
- <policy-permission>
- <action-name>viewrecursive</action-name>
- <unchecked/>
- </policy-permission>
-</security-constraint>]]></programlisting>
- The security contraint portion is worth taking a look at, in an isolated fashion. It allows you to
- secure a specific page/portal based on a user's role.
- </para>
- <para>
- <emphasis role="bold">Role definition:</emphasis>
- You must define a role that this security constraint will apply to. Possible values are:
- <itemizedlist>
- <listitem>
- <emphasis role="bold"><unchecked/></emphasis>
- Anyone can view this page.
- </listitem>
- <listitem>
- <emphasis role="bold"><role-name>SOMEROLE</role-name></emphasis>
- Access to this page is limited to the defined role.
- </listitem>
- </itemizedlist>
- <emphasis role="bold">Access Rights:</emphasis>
- You must define the access rights given to the role defined. Possible values are:
- <itemizedlist>
- <listitem>
- <emphasis role="bold">view</emphasis>
- Users can view the page.
- </listitem>
- <listitem>
- <emphasis role="bold">viewrecursive</emphasis>
- Users can view the page and child pages.
- </listitem>
- <listitem>
- <emphasis role="bold">personalize</emphasis>
- Users are able to personalize the page's theme.
- </listitem>
- <listitem>
- <emphasis role="bold">personalizerecursive</emphasis>
- Users are able to personalize the page AND its children's themes.
- </listitem>
- </itemizedlist>
- </para>
- </listitem>
- </itemizedlist>
- </para>
+<screen>
+<role-name>EXAMPLEROLE</role-name>
+</screen>
+ </para>
</sect2>
<sect2 id="desc_example_portal">
<title>Defining a new portal instance</title>
18 years
- 1
- 0
JBoss Portal SVN: r10665 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-04-20 21:02:11 -0400 (Sun, 20 Apr 2008)
New Revision: 10665
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.4.1. Defining a new Portal Page
adding content, fixing my passive voice
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-21 00:38:37 UTC (rev 10664)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-21 01:02:11 UTC (rev 10665)
@@ -327,7 +327,7 @@
</screen>
</para>
<para>
- The <computeroutput><if-exists></computeroutput> element is defines the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option destroys the existing object, and creates a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option maintains the existing object deployment, or creates a new one if it does not exist.
+ The <computeroutput><if-exists></computeroutput> element defines the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option destroys the existing object, and creates a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option maintains the existing object deployment, or creates a new one if it does not exist.
</para>
</listitem>
</varlistentry>
@@ -337,7 +337,7 @@
</screen></term>
<listitem>
<para>
- The <computeroutput><instance></computeroutput> element is used in the <filename>WEB-INF/portlet-instances.xml</filename> file, which is used to create instances of portlets. The portlet will only be created and configured if the portlet is present, and an instance with the same name does not already exist.
+ The <computeroutput><instance></computeroutput> element is used in the <filename>WEB-INF/portlet-instances.xml</filename> file, which creates instances of portlets. The portlet will only be created and configured if the portlet is present, and an instance with the same name does not already exist.
</para>
<para>
The following is an example of the <computeroutput><instance></computeroutput> element, which also contains the <computeroutput><security-constraint></computeroutput> element. Descriptions of each element follow afterwards:
@@ -444,7 +444,7 @@
</screen></term>
<listitem>
<para>
- The <computeroutput><policy-permission></computeroutput> element is used to secure a specific portlet instance based on a user's role.
+ The <computeroutput><policy-permission></computeroutput> element secures a specific portlet instance based on a user's role.
</para>
<para>
<screen><![CDATA[
@@ -452,7 +452,7 @@
</screen>
</para>
<para>
- The <computeroutput><action-name></computeroutput> element is used to define the access rights given to the role defined. Accepted values are:
+ The <computeroutput><action-name></computeroutput> element defines the access rights given to the role defined. Accepted values are:
</para>
<para>
<itemizedlist>
@@ -484,7 +484,7 @@
</screen>
</para>
<para>
- If present, the <computeroutput><unchecked></computeroutput> element is used to define that anyone can view the instance.
+ If present, the <computeroutput><unchecked></computeroutput> element defines anyone can view the instance.
</para>
<para>
<screen><![CDATA[
@@ -492,7 +492,7 @@
</screen>
</para>
<para>
- The <computeroutput><role-name></computeroutput> element is used to define a role that the security constraint will apply to. The following example only allows users that are part of the <computeroutput>EXAMPLEROLE</computeroutput> role to access the instance:
+ The <computeroutput><role-name></computeroutput> element defines a role that the security constraint will apply to. The following example only allows users that are part of the <computeroutput>EXAMPLEROLE</computeroutput> role to access the instance:
</para>
<para>
<screen><![CDATA[
@@ -600,7 +600,7 @@
</screen>
</para>
<para>
- The <computeroutput><if-exists></computeroutput> element is defines the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option destroys the existing object, and creates a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option matains the existing object deployment, or creates a new one if it does not exist.
+ The <computeroutput><if-exists></computeroutput> element defines the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option destroys the existing object, and creates a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option matains the existing object deployment, or creates a new one if it does not exist.
</para>
</listitem>
</varlistentry>
@@ -875,7 +875,7 @@
</screen></term>
<listitem>
<para>
- The <computeroutput><policy-permission></computeroutput> element is used to secure a specific portlet instance based on a user's role.
+ The <computeroutput><policy-permission></computeroutput> element is secures a specific portlet instance based on a user's role.
</para>
<para>
<screen><![CDATA[
@@ -883,7 +883,7 @@
</screen>
</para>
<para>
- The <computeroutput><action-name></computeroutput> element is used to define the access rights given to the role defined. Accepted values are:
+ The <computeroutput><action-name></computeroutput> element defines the access rights given to the role defined. Accepted values are:
</para>
<para>
<itemizedlist>
@@ -915,7 +915,7 @@
</screen>
</para>
<para>
- If present, the <computeroutput><unchecked></computeroutput> element is used to define that anyone can view the instance.
+ If present, the <computeroutput><unchecked></computeroutput> element defines that anyone can view the instance.
</para>
<para>
<screen><![CDATA[
@@ -960,9 +960,7 @@
</para>
<para>
When a web application is deployed, the context path under which it is deployed
- is taken as the application name. The application name value in the <computeroutput><app-name></computeroutput> element is
- used to override it. When a component references a portlet, it needs to
- reference the application too, and if the portlet application WAR file is renamed,
+ is taken as the application name. The application name value in the <computeroutput><app-name></computeroutput> element overrides it. When a component references a portlet, it needs to reference the application too, and if the portlet application WAR file is renamed,
the reference is no longer valid; therefore, the <computeroutput><app-name></computeroutput> element is used to have an application name that does not depend upon the context path, under which the application is deployed.
</para>
</listitem>
@@ -974,12 +972,12 @@
<sect1 id="descriptors_portlet">
<title>Portlet Descriptors</title>
<para>
- The following sections describe the descriptors used to define portal objects, such as portals, pages, portlet instances, windows, and portlets. Refer to <xref linkend="tutorials_tutorials"/> and <xref linkend="desc_examples"/> for examples on using these descriptors within a portlet application.
+ The following sections describe the descriptors that define portal objects, such as portals, pages, portlet instances, windows, and portlets. Refer to <xref linkend="tutorials_tutorials"/> and <xref linkend="desc_examples"/> for examples on using these descriptors within a portlet application.
</para>
<sect2 id="desc_objectxml">
<title><filename>*-object.xml</filename> Descriptors</title>
<para>
- The <filename>*-object.xml</filename> descriptors are used to define portal instances, pages, windows, and the window layout. As well, themes and layouts for specific portal instances, pages, and windows, can be defined. The following example defines a portlet window being added to the <computeroutput>default</computeroutput> page, in the <computeroutput>default</computeroutput> portal. For advanced functionality using these descriptors, refer to <xref linkend="desc_examples"/>:
+ The <filename>*-object.xml</filename> descriptors define portal instances, pages, windows, and the window layout. As well, themes and layouts for specific portal instances, pages, and windows, can be defined. The following example defines a portlet window being added to the <computeroutput>default</computeroutput> page, in the <computeroutput>default</computeroutput> portal. For advanced functionality using these descriptors, refer to <xref linkend="desc_examples"/>:
</para>
<para>
<programlisting><![CDATA[
@@ -1040,7 +1038,7 @@
<programlisting><![CDATA[<window>...</window>]]></programlisting>
</para>
<para>
- The <computeroutput><window></computeroutput> element defines a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which is used to assign a portal instance to a window.
+ The <computeroutput><window></computeroutput> element defines a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which assigns a portal instance to a window.
</para>
</listitem>
<listitem>
@@ -1167,7 +1165,7 @@
</deployment>]]></programlisting>
</para>
<para>
- The <computeroutput><deployment></computeroutput> element, and the embedded <computeroutput><instance></computeroutput> element, specify a portlet instance. The <computeroutput><deployment></computeroutput> element specifies object deployments, such as portals, pages, windows, and so on. The <computeroutput><instance></computeroutput> element is used to create instances of portlets. The portlet will only be created and configured if the portlet is present, and an instance with the same name does not already exist.
+ The <computeroutput><deployment></computeroutput> element, and the embedded <computeroutput><instance></computeroutput> element, specify a portlet instance. The <computeroutput><deployment></computeroutput> element specifies object deployments, such as portals, pages, windows, and so on. The <computeroutput><instance></computeroutput> element creates instances of portlets. The portlet will only be created and configured if the portlet is present, and an instance with the same name does not already exist.
</para>
</listitem>
<listitem>
@@ -1225,7 +1223,7 @@
The <computeroutput><security-constraint></computeroutput> element is a container for <computeroutput><policy-permission></computeroutput> elements. This example demonstrates the <computeroutput><security-constraint></computeroutput> and <computeroutput><policy-permission></computeroutput> elements.
</para>
<para>
- The <computeroutput><action-name></computeroutput> element is used to define the access rights given to the role defined. Accepted values are:
+ The <computeroutput><action-name></computeroutput> element defines the access rights given to the role defined. Accepted values are:
</para>
<para>
<itemizedlist>
@@ -1760,7 +1758,7 @@
<if-exists>
</screen>
<para>
- The <computeroutput><if-exists></computeroutput> element is defines the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option destroys the existing object, and creates a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option matains the existing object deployment, or creates a new one if it does not exist.
+ The <computeroutput><if-exists></computeroutput> element defines the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option destroys the existing object, and creates a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option matains the existing object deployment, or creates a new one if it does not exist.
</para>
</listitem>
<listitem>
@@ -1784,7 +1782,7 @@
<page>
</screen>
<para>
- The start of a page definition. Among others, the <computeroutput><page></computeroutput> element is a container for the <computeroutput><page-name></computeroutput>, <computeroutput><window></computeroutput>, and <computeroutput><security-contraint></computeroutput> elements.
+ The start of a page definition. Among others, the <computeroutput><page></computeroutput> element is a container for the <computeroutput><page-name></computeroutput>, <computeroutput><window></computeroutput>, and <computeroutput><security-constraint></computeroutput> elements.
</para>
</listitem>
<listitem>
@@ -1800,7 +1798,7 @@
<window>
</screen>
<para>
- The <computeroutput><window></computeroutput> element defines a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which is used to assign a portal instance to a window.
+ The <computeroutput><window></computeroutput> element defines a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which assigns a portal instance to a window.
</para>
</listitem>
<listitem>
@@ -1828,19 +1826,114 @@
The <computeroutput><region></computeroutput> and <computeroutput><height></computeroutput> elements define where the window appears within the page layout. The <computeroutput><region></computeroutput> element specifies where the window appears on the page. The <computeroutput><region></computeroutput> element often depends on other regions defined in the portal layout. The <computeroutput><height></computeroutput> element can be assigned a value between one and <replaceable>X</replaceable>.
</para>
</listitem>
- </listitem>
- <listitem>
- <emphasis role="bold"><instance></emphasis>
- The start of an instance
- definition. page.
- </listitem>
- <listitem>
- <emphasis role="bold"><instance-name></emphasis>
- Maps to the above
- <instance-ref> variable.
- </listitem>
- <listitem>
- <emphasis role="bold"><component-ref></emphasis>
+ <listitem>
+<screen>
+<instance>
+</screen>
+ <para>
+ The <computeroutput><instance></computeroutput> element creates instances of portlets. The portlet will only be created and configured if the portlet is present, and an instance with the same name does not already exist.
+ </para>
+ </listitem>
+ <listitem>
+<screen>
+<instance-name>
+</screen>
+ <para>
+ The <computeroutput><instance-name></computeroutput> maps to the <computeroutput><instance-ref></computeroutput> element.
+ </para>
+ </listitem>
+ <listitem>
+<screen>
+<component-ref>
+</screen>
+ <para>
+ The <computeroutput><component-ref></computeroutput> element takes the name of the application, followed by the name of the portlet, as defined in the <filename>WEB-INF/portlet.xml</filename> file.
+ </para>
+ </listitem>
+ </itemizedlist>
+</para>
+<para>
+ The <computeroutput><security-constraint></computeroutput> element is a container for <computeroutput><policy-permission></computeroutput> elements. The following is an example of the <computeroutput><security-constraint></computeroutput> and <computeroutput><policy-permission></computeroutput> elements:
+</para>
+<para>
+<screen><![CDATA[
+<security-constraint>
+ <policy-permission>
+ <role-name>User</role-name>
+ <action-name>view</action-name>
+ </policy-permission>
+</security-constraint>
+
+<security-constraint>
+ <policy-permission>
+ <unchecked/>
+ <action-name>view</action-name>
+ </policy-permission>
+</security-constraint>]]>
+</screen>
+</para>
+<para>
+<screen>
+<action-name>
+</screen>
+ </para>
+ <para>
+ The <computeroutput><action-name></computeroutput> element defines the access rights given to the role defined. Accepted values are:
+ </para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <computeroutput>view</computeroutput>: users can view the page.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <computeroutput>viewrecursive</computeroutput>: users can view the page and child pages.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <computeroutput>personalize</computeroutput>: users are able personalize the page's theme.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <computeroutput>personalizerecursive</computeroutput>: users are able personalize the page and child pages themes.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para>
+ <screen><![CDATA[
+ <!ELEMENT unchecked EMPTY>]]>
+ </screen>
+ </para>
+ <para>
+ If present, the <computeroutput><unchecked></computeroutput> element defines that anyone can view the instance.
+ </para>
+ <para>
+ <screen><![CDATA[
+ <!ELEMENT role-name (#PCDATA)>]]>
+ </screen>
+ </para>
+ <para>
+ The <computeroutput><role-name></computeroutput> element defines a role that the security constraint will apply to. The following example only allows users that are part of the <computeroutput>EXAMPLEROLE</computeroutput> role to access the instance:
+ </para>
+ <para>
+ <screen><![CDATA[
+ <role-name>EXAMPLEROLE</role-name>]]>
+ </screen>
+ </para>
+
+
+
+
+
+
+
+
+
Takes the name of
the application followed by the name of the portlet, as defined in the
<emphasis>portlet.xml</emphasis>
18 years
- 1
- 0
JBoss Portal SVN: r10664 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-04-20 20:38:37 -0400 (Sun, 20 Apr 2008)
New Revision: 10664
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.4.1. Defining a new Portal Page
- periodic backup
- revising descriptions with text from 6.2. Portlet Descriptors
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-21 00:27:09 UTC (rev 10663)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-21 00:38:37 UTC (rev 10664)
@@ -1783,36 +1783,53 @@
<screen>
<page>
</screen>
- <para>
- The start of a page definition. Among others, the <computeroutput><page></computeroutput> element is a container for the <computeroutput><page-name></computeroutput>, <computeroutput><window></computeroutput>, and <computeroutput><security-contraint></computeroutput> elements.
- </para>
- </listitem>
+ <para>
+ The start of a page definition. Among others, the <computeroutput><page></computeroutput> element is a container for the <computeroutput><page-name></computeroutput>, <computeroutput><window></computeroutput>, and <computeroutput><security-contraint></computeroutput> elements.
+ </para>
+ </listitem>
<listitem>
- <emphasis role="bold"><page-name></emphasis>
- The name of the page.
- </listitem>
+<screen>
+<page-name>
+</screen>
+ <para>
+ The page name.
+ </para>
+ </listitem>
+ <listitem>
+<screen>
+<window>
+</screen>
+ <para>
+ The <computeroutput><window></computeroutput> element defines a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which is used to assign a portal instance to a window.
+ </para>
+ </listitem>
+ <listitem>
+<screen>
+<window-name>
+</screen>
+ <para>
+ The <computeroutput><window-name></computeroutput> element defines the <emphasis role="bold">unique name</emphasis> given to a portlet window. This can be named anything.
+ </para>
+ </listitem>
+ <listitem>
+<screen>
+<instance-ref>
+</screen>
+ <para>
+ The <computeroutput><instance-ref></computeroutput> elements define the portlet instances that windows represent. This value is the ID of a portlet instance, and must match the value of one of the <computeroutput><instance-id></computeroutput> elements in the <filename>WEB-INF/portlet-instances.xml</filename> file.
+ </para>
+ </listitem>
<listitem>
- <emphasis role="bold"><window></emphasis>
- The start of a window
- definition.
+<screen>
+<region>...</region>
+<height>...</height>
+</screen>
+ <para>
+ The <computeroutput><region></computeroutput> and <computeroutput><height></computeroutput> elements define where the window appears within the page layout. The <computeroutput><region></computeroutput> element specifies where the window appears on the page. The <computeroutput><region></computeroutput> element often depends on other regions defined in the portal layout. The <computeroutput><height></computeroutput> element can be assigned a value between one and <replaceable>X</replaceable>.
+ </para>
+ </listitem>
</listitem>
<listitem>
- <emphasis role="bold"><window-name></emphasis>
- The name of the
- window.
- </listitem>
- <listitem>
- <emphasis role="bold"><instance-ref></emphasis>
- The instance
- reference used by this window. Should correspond with the
- <instance-name> variable.
- </listitem>
- <listitem>
- <emphasis role="bold"><height></emphasis>
- The vertical position of
- this window within the region defined in the layout.
- </listitem>
- <listitem>
<emphasis role="bold"><instance></emphasis>
The start of an instance
definition. page.
18 years
- 1
- 0
JBoss Portal SVN: r10663 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-04-20 20:27:09 -0400 (Sun, 20 Apr 2008)
New Revision: 10663
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.4.1. Defining a new Portal Page
revising list
*** this will breakt he book ***
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-20 23:40:07 UTC (rev 10662)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-21 00:27:09 UTC (rev 10663)
@@ -327,7 +327,7 @@
</screen>
</para>
<para>
- The <computeroutput><if-exists></computeroutput> element is used to define the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option destroys the existing object, and creates a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option maintains the existing object deployment, or creates a new one if it does not exist.
+ The <computeroutput><if-exists></computeroutput> element is defines the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option destroys the existing object, and creates a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option maintains the existing object deployment, or creates a new one if it does not exist.
</para>
</listitem>
</varlistentry>
@@ -525,7 +525,7 @@
</screen></term>
<listitem>
<para>
- The <computeroutput><deployment></computeroutput> element is a generic container for portal object elements. The <computeroutput><parent-ref></computeroutput> child element gives the name of the parent object that the current object will use as parent. The optional <computeroutput><if-exists></computeroutput> element is used to define the action to take if an instance with the same name already exists. The default behavior of the <computeroutput><if-exists></computeroutput> element is to keep the existing object, and not to create a new object.
+ The <computeroutput><deployment></computeroutput> element is a generic container for portal object elements. The <computeroutput><parent-ref></computeroutput> child element gives the name of the parent object that the current object will use as parent. The optional <computeroutput><if-exists></computeroutput> element defines the action to take if an instance with the same name already exists. The default behavior of the <computeroutput><if-exists></computeroutput> element is to keep the existing object, and not to create a new object.
</para>
<para>
The following is an example of the <computeroutput><deployment></computeroutput> and <computeroutput><parent-ref></computeroutput> elements:
@@ -600,7 +600,7 @@
</screen>
</para>
<para>
- The <computeroutput><if-exists></computeroutput> element is used to define the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option destroys the existing object, and creates a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option matains the existing object deployment, or creates a new one if it does not exist.
+ The <computeroutput><if-exists></computeroutput> element is defines the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option destroys the existing object, and creates a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option matains the existing object deployment, or creates a new one if it does not exist.
</para>
</listitem>
</varlistentry>
@@ -814,7 +814,7 @@
</screen></term>
<listitem>
<para>
- A set of generic properties for the portal object.
+ A set of generic properties for the portal object. Property definitions specific to a page. This is commonly used to define the specific theme and layout to use. If not defined, the default portal theme and layout will be used.
</para>
<para>
<screen><![CDATA[
@@ -1689,12 +1689,9 @@
<sect2 id="desc_example_page">
<title>Defining a new Portal Page</title>
<para>
- The sample application descriptor in this section creates a new page, <computeroutput>MyPage</computeroutput>, in your portal. To illustrate this example, download the <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorld Page</ulink> portlet.
+ The sample application descriptor in this section creates a new page, <computeroutput>MyPage</computeroutput>, in your portal. To illustrate this example, download the <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorld Page</ulink> portlet. To use the helloworldportalpage portlet:
</para>
<para>
- To use the helloworldportalpage portlet:
- </para>
- <para>
<orderedlist>
<listitem>
<para>
@@ -1721,78 +1718,76 @@
<para>
The helloworldportalpage portlet is hot-deployable, so the JBoss EAP or JBoss AS server do not have to be restarted. The following is an example of the <filename>helloworldportalpage.war/WEB-INF/helloworld-object.xml</filename> descriptor:
</para>
- <para>Our sample includes a descriptor to define this new portal page,
- <emphasis>helloworld-object.xml</emphasis>
- , located under
- <emphasis>helloworldportalpage.war/WEB-INF/</emphasis>
- , and it looks like this:
- <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ <para>
+<screen><![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE deployments PUBLIC
"-//JBoss Portal//DTD Portal Object 2.6//EN"
"http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
<deployments>
<deployment>
- <parent-ref>default</parent-ref>
<if-exists>overwrite</if-exists>
+ <parent-ref>default</parent-ref>
<properties/>
<page>
<page-name>MyPage</page-name>
- <security-constraint>
- <policy-permission>
- <action-name>viewrecursive</action-name>
- <unchecked/>
- </policy-permission>
- </security-constraint>
<window>
<window-name>HelloWorldPortletPageWindow</window-name>
<instance-ref>HelloWorldPortletPageInstance</instance-ref>
<region>center</region>
<height>0</height>
</window>
+ <security-constraint>
+ <policy-permission>
+ <unchecked/>
+ <action-name>viewrecursive</action-name>
+ </policy-permission>
+ </security-constraint>
</page>
</deployment>
</deployments>]]>
- </programlisting>
+</screen>
</para>
- <para>A deployment file can be composed of a set of <deployments>. In our
- example file, above, we are defining a page, placing the portlet as a window
- on that page, and creating an instance of that portlet. You can then use the Management
- Portlet (bundled with JBoss Portal) to modify the instances of this portlet, reposition
- it, and so on...</para>
<para>
- <itemizedlist>
+ A depoloyment is composed of a single or multiple <computeroutput><deployments></computeroutput> elements, which are a container for the <computeroutput><deployment></computeroutput> element. In the previous example, a page is defined, the portlet is placed as a window on a page, and an instance of the portlet is created. The Mangement Portlet (bundled with JBoss Portal) can modify portal instances, page position, and so on.
+ </para>
+ <para>
+ The following list describes the elements in the <filename>helloworldportalpage.war/WEB-INF/helloworld-object.xml</filename> file:
+ <para>
+ <itemizedlist>
+ <listitem>
+<screen>
+<if-exists>
+</screen>
+ <para>
+ The <computeroutput><if-exists></computeroutput> element is defines the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option destroys the existing object, and creates a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option matains the existing object deployment, or creates a new one if it does not exist.
+ </para>
+ </listitem>
+ <listitem>
+<screen>
+<parent-ref>
+<screen>
+ <para>
+ The <computeroutput><parent-ref></computeroutput> element contains a reference to the parent object. The naming convention for naming objects is to concatenate the names of the path to the object, and separate the names using a period. If the path is empty, the empty string must be used. The <computeroutput><parent-ref></computeroutput> element tells the portal where the portlet appears. The syntax for the <computeroutput><parent-ref></computeroutput> element is <computeroutput><replaceable>portal-instance</replaceable>.<replaceable>portal-page</replaceable></computeroutput>.
+ </para>
+ </listitem>
+ <listitem>
+<screen>
+<properties>
+</screen>
+ <para>
+ A set of generic properties for the portal object. Property definitions specific to a page. This is commonly used to define the specific theme and layout to use. If not defined, the default portal theme and layout will be used.
+ </para>
+ </listitem>
<listitem>
- <emphasis role="bold"><if-exists></emphasis>
- Possible values are
- <emphasis>overwrite</emphasis>
- or
- <emphasis>keep</emphasis>
- .
- <emphasis>Overwrite</emphasis>
- Fwill destroy the existing object and create a
- new one based on the content of the deployment.
- <emphasis>Keep</emphasis>
- will
- maintain the existing objct deployment or create a new one if it does not yet
- exist.
+<screen>
+<page>
+</screen>
+ <para>
+ The start of a page definition. Among others, the <computeroutput><page></computeroutput> element is a container for the <computeroutput><page-name></computeroutput>, <computeroutput><window></computeroutput>, and <computeroutput><security-contraint></computeroutput> elements.
+ </para>
</listitem>
<listitem>
- <emphasis role="bold"><parent-ref></emphasis>
- Indicates whether the
- object should be hooked in to the portal tree.
- </listitem>
- <listitem>
- <emphasis role="bold"><properties></emphasis>
- Properties definition
- specific to this page, commonly used to define the specific theme and layout to
- use. If not defined, the default portal layouts/theme combination will be used.
- </listitem>
- <listitem>
- <emphasis role="bold"><page></emphasis>
- The start of a page
- definition.
- </listitem>
- <listitem>
<emphasis role="bold"><page-name></emphasis>
The name of the page.
</listitem>
18 years
- 1
- 0
JBoss Portal SVN: r10662 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-04-20 19:40:07 -0400 (Sun, 20 Apr 2008)
New Revision: 10662
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.4.1. Defining a new Portal Page
- changing zip to ZIP
- adding more detailed steps for helloworldportalpage
6.4.1. Defining a new Portal Page
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-04-20 23:27:36 UTC (rev 10661)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-04-20 23:40:07 UTC (rev 10662)
@@ -92,7 +92,7 @@
<orderedlist>
<listitem>
<para>
- Change into the directory where the <filename>JBoss Portal Source Code</filename> zip file was extracted to, or where the source from SVN was checked out to. Copy the <filename>build/etc/local.properties-example</filename> file and save it as <filename>build/local.properties</filename>.
+ Change into the directory where the <filename>JBoss Portal Source Code</filename> ZIP file was extracted to, or where the source from SVN was checked out to. Copy the <filename>build/etc/local.properties-example</filename> file and save it as <filename>build/local.properties</filename>.
</para>
</listitem>
<listitem>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-04-20 23:27:36 UTC (rev 10661)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-04-20 23:40:07 UTC (rev 10662)
@@ -20,7 +20,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Extract the bundle:</emphasis> extract the zip archive. It does not matter which directory is used. On Microsoft Windows, the recommended directory is <filename>C:\jboss-<replaceable>version-number</replaceable></filename>.
+ <emphasis role="bold">Extract the bundle:</emphasis> extract the ZIP archive. It does not matter which directory is used. On Microsoft Windows, the recommended directory is <filename>C:\jboss-<replaceable>version-number</replaceable></filename>.
</para>
</listitem>
<listitem>
@@ -62,7 +62,7 @@
<sect3 id="install_binarydownload">
<title>Getting the Binary</title>
<para>
- The binary download is available from the <ulink url="http://labs.jboss.com/portal/jbossportal/download/index.html">JBoss Portal Downloads</ulink> page. Look for the <computeroutput>JBoss Portal Binary</computeroutput> package. Once the binary zip file has been downloaded and extracted, the folder hierarchy will look similar to the following:
+ The binary download is available from the <ulink url="http://labs.jboss.com/portal/jbossportal/download/index.html">JBoss Portal Downloads</ulink> page. Look for the <computeroutput>JBoss Portal Binary</computeroutput> package. Once the binary ZIP file has been downloaded and extracted, the folder hierarchy will look similar to the following:
</para>
<para>
<mediaobject>
@@ -72,7 +72,7 @@
</mediaobject>
</para>
<para>
- Files contained in this download are used in later sections. Download and extract the JBoss Portal binary zip file before proceeding.
+ Files contained in this download are used in later sections. Download and extract the JBoss Portal binary ZIP file before proceeding.
</para>
</sect3>
<sect3>
@@ -80,9 +80,9 @@
<para>Before deploying JBoss Portal, make sure you have JBoss EAP or JBoss AS installed. Customers who have access to the <ulink url="https://support.redhat.com/portal/login.html">JBoss Customer Support Portal (CSP)</ulink> are advised to download and install JBoss EAP 4.2. Customers who do not have access to the JBoss CSP are advised to use <ulink url="http://labs.jboss.com/jbossas/downloads/">JBoss AS</ulink>. For JBoss AS installation instructions, please refer to the <ulink url="http://labs.jboss.com/jbossas/docs/index.html">JBoss AS Installation Guide</ulink>.
</para>
<warning>
- <title>Use the JBoss EAP and JBoss AS zip file</title>
+ <title>Use the JBoss EAP and JBoss AS ZIP file</title>
<para>
- Only use the JBoss EAP and JBoss AS zip file versions. <emphasis role="bold">DO NOT ATTEMPT to deploy JBoss Portal on the installer version of JBoss EAP or JBoss AS.</emphasis>
+ Only use the JBoss EAP and JBoss AS ZIP file versions. <emphasis role="bold">DO NOT ATTEMPT to deploy JBoss Portal on the installer version of JBoss EAP or JBoss AS.</emphasis>
</para>
</warning>
</sect3>
@@ -237,7 +237,7 @@
</itemizedlist>
</para>
<para>
- After checking out the source from SVN, or after extracting the <filename>JBoss Portal Source Code</filename> zip file, a directory structure similar to the following will be created:
+ After checking out the source from SVN, or after extracting the <filename>JBoss Portal Source Code</filename> ZIP file, a directory structure similar to the following will be created:
</para>
<mediaobject>
<imageobject>
@@ -255,9 +255,9 @@
<para>Before deploying JBoss Portal, make sure you have JBoss EAP or JBoss AS installed. Customers who have access to the <ulink url="https://support.redhat.com/portal/login.html">JBoss Customer Support Portal (CSP)</ulink> are advised to download and install JBoss EAP 4.2. Customers who do not have access to the JBoss CSP are advised to use <ulink url="http://labs.jboss.com/jbossas/downloads/">JBoss AS</ulink>. For JBoss AS installation instructions, please refer to the <ulink url="http://labs.jboss.com/jbossas/docs/index.html">JBoss AS Installation Guide</ulink>.
</para>
<warning>
- <title>Use the JBoss EAP and JBoss AS zip file</title>
+ <title>Use the JBoss EAP and JBoss AS ZIP file</title>
<para>
- Only use the JBoss EAP and JBoss AS zip file versions. <emphasis role="bold">DO NOT ATTEMPT to deploy JBoss Portal on the installer version of JBoss EAP or JBoss AS.</emphasis> We are currently working on aligning the Application installer with JBoss Portal.
+ Only use the JBoss EAP and JBoss AS ZIP file versions. <emphasis role="bold">DO NOT ATTEMPT to deploy JBoss Portal on the installer version of JBoss EAP or JBoss AS.</emphasis> We are currently working on aligning the Application installer with JBoss Portal.
</para>
</warning>
</sect3>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-20 23:27:36 UTC (rev 10661)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-20 23:40:07 UTC (rev 10662)
@@ -1687,22 +1687,40 @@
<sect1 id="desc_examples">
<title>Descriptor Examples</title>
<sect2 id="desc_example_page">
- <title>Defining a new portal page</title>
- <para>This sample application and descriptor will create a new page, named
- <emphasis>MyPage</emphasis>
- in your portal. To illustrate our example, we have made available a portlet with a page descriptor that you
- can download
- here:
- <ulink
- url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl..."
- >HelloWorld Page</ulink>
- .
- </para>
- <note>
- To use this example, simply extract the zip, and deploy the
- <emphasis>helloworldportalpage.war</emphasis>
- where your portal is running (hot-deployment supported).
- </note>
+ <title>Defining a new Portal Page</title>
+ <para>
+ The sample application descriptor in this section creates a new page, <computeroutput>MyPage</computeroutput>, in your portal. To illustrate this example, download the <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorld Page</ulink> portlet.
+ </para>
+ <para>
+ To use the helloworldportalpage portlet:
+ </para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>
+ Download the <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorldPortalPage</ulink> portlet.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Unzip the <filename>HelloWorldPortalPage.zip</filename> ZIP file.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ To expand the WAR file, which will give you access to the XML descriptors, change into the <filename>HelloWorldPortalPage/</filename> directory, and run the <command>ant explode</command> command.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ If you did not expand the <filename>helloworldportalpage.war</filename> file, copy the <filename>helloworldportalpage.war</filename> file into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory. If you expanded the <filename>helloworldportalpage.war</filename> file, copy the <filename>HelloWorldPortalPage/output/lib/exploded/helloworldportalpage.war/</filename> directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>
+ The helloworldportalpage portlet is hot-deployable, so the JBoss EAP or JBoss AS server do not have to be restarted. The following is an example of the <filename>helloworldportalpage.war/WEB-INF/helloworld-object.xml</filename> descriptor:
+ </para>
<para>Our sample includes a descriptor to define this new portal page,
<emphasis>helloworld-object.xml</emphasis>
, located under
18 years
- 1
- 0
JBoss Portal SVN: r10661 - modules/portlet/trunk/portal/src/assemble.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-20 19:27:36 -0400 (Sun, 20 Apr 2008)
New Revision: 10661
Removed:
modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml
Modified:
modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml
modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml
Log:
remove unused assembly descriptor
Modified: modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml
===================================================================
--- modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml 2008-04-20 23:21:30 UTC (rev 10660)
+++ modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml 2008-04-20 23:27:36 UTC (rev 10661)
@@ -7,7 +7,6 @@
<componentDescriptors>
<componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
- <!--<componentDescriptor>src/assemble/simple-portal-lib.xml</componentDescriptor>-->
</componentDescriptors>
<dependencySets>
Deleted: modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml
===================================================================
--- modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml 2008-04-20 23:21:30 UTC (rev 10660)
+++ modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml 2008-04-20 23:27:36 UTC (rev 10661)
@@ -1,19 +0,0 @@
-<component>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
-<!--
- <include>org.jboss.portal.common:common-common</include>
- <include>org.jboss.portal.common:common-portal</include>
- <include>org.jboss.portal.web:web-web</include>
- <include>org.jboss.portal.portlet:portlet-portlet</include>
- <include>javax.portlet:portlet-api</include>
- <include>javax.ccpp:ccpp</include>
--->
- </includes>
- </dependencySet>
- </dependencySets>
-
-</component>
\ No newline at end of file
Modified: modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml
===================================================================
--- modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2008-04-20 23:21:30 UTC (rev 10660)
+++ modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2008-04-20 23:27:36 UTC (rev 10661)
@@ -7,7 +7,6 @@
<componentDescriptors>
<componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
- <!--<componentDescriptor>src/assemble/simple-portal-lib.xml</componentDescriptor>-->
</componentDescriptors>
<dependencySets>
18 years
- 1
- 0
JBoss Portal SVN: r10660 - in modules/web/trunk/web: src/test and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-20 19:21:30 -0400 (Sun, 20 Apr 2008)
New Revision: 10660
Modified:
modules/web/trunk/web/pom.xml
modules/web/trunk/web/src/test/build.xml
Log:
- remove javassist and trove not used anymore
- fix test suite for jboss
Modified: modules/web/trunk/web/pom.xml
===================================================================
--- modules/web/trunk/web/pom.xml 2008-04-20 22:59:46 UTC (rev 10659)
+++ modules/web/trunk/web/pom.xml 2008-04-20 23:21:30 UTC (rev 10660)
@@ -183,7 +183,6 @@
<!-- JBoss Microcontainer -->
<property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
- <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
<property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
@@ -193,7 +192,6 @@
<property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
<property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/>
<property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
<property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
<property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
<property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
Modified: modules/web/trunk/web/src/test/build.xml
===================================================================
--- modules/web/trunk/web/src/test/build.xml 2008-04-20 22:59:46 UTC (rev 10659)
+++ modules/web/trunk/web/src/test/build.xml 2008-04-20 23:21:30 UTC (rev 10660)
@@ -157,13 +157,12 @@
<path id="jboss-4.2">
<path refid="portal-common"/>
+ <path refid="jboss-unit"/>
<path refid="jboss-microcontainer"/>
</path>
<path id="jboss-4.2-shared">
<path refid="portal-common-shared"/>
- <path location="${dependency.jboss-unit.jar}"/>
- <path location="${dependency.jboss-unit-remote.jar}"/>
<path location="${target}/web-web-${project.version}.jar"/>
</path>
@@ -172,11 +171,9 @@
<path refid="jboss-unit"/>
<path refid="jboss-microcontainer"/>
<pathelement path="${dependency.log4j.jar}"/>
- <pathelement path="${dependency.javassist.jar}"/>
<pathelement path="${dependency.xercesImpl.jar}"/>
<pathelement path="${dependency.resolver.jar}"/>
<pathelement path="${dependency.xml-apis.jar}"/>
- <pathelement path="${dependency.trove.jar}"/>
<pathelement path="${dependency.concurrent.jar}"/>
</path>
18 years
- 1
- 0
JBoss Portal SVN: r10659 - in modules/portlet/trunk: build/distrib and 7 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-20 18:59:46 -0400 (Sun, 20 Apr 2008)
New Revision: 10659
Added:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/log4j.properties
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/logging.properties
Modified:
modules/portlet/trunk/build/distrib/distrib.xml
modules/portlet/trunk/build/pom.xml
modules/portlet/trunk/controller/pom.xml
modules/portlet/trunk/portal/pom.xml
modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml
modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml
modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml
modules/portlet/trunk/portal/src/assemble/simple-portal-war.xml
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml
modules/portlet/trunk/test/pom.xml
modules/portlet/trunk/test/src/test/build.xml
Log:
update portlet container to MC 2.0.0.Beta13
Modified: modules/portlet/trunk/build/distrib/distrib.xml
===================================================================
--- modules/portlet/trunk/build/distrib/distrib.xml 2008-04-20 22:55:30 UTC (rev 10658)
+++ modules/portlet/trunk/build/distrib/distrib.xml 2008-04-20 22:59:46 UTC (rev 10659)
@@ -224,8 +224,7 @@
<echo message="Useful variables:"/>
<echo message="no-doc: do not generate documentation if set to true. Currently: ${no-doc}"/>
<echo message="no-zip: do not compress packages if set to true. Currently: ${no-zip}"/>
- <echo
- message="no-tomcat: do not generate Tomcat distribution even if Tomcat path is set. Currently: ${no-tomcat}"/>
+ <echo message="no-tomcat: do not generate Tomcat distribution even if Tomcat path is set. Currently: ${no-tomcat}"/>
<echo message="no-jboss: do not generate JBoss distribution even if JBoss path is set. Currently: ${no-jboss}"/>
</target>
</project>
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2008-04-20 22:55:30 UTC (rev 10658)
+++ modules/portlet/trunk/build/pom.xml 2008-04-20 22:59:46 UTC (rev 10659)
@@ -30,8 +30,8 @@
<version.javax.servlet>2.5</version.javax.servlet>
<version.javax.servlet.jsp>2.1</version.javax.servlet.jsp>
<version.apache.tomcat>5.5.12</version.apache.tomcat>
- <version.jboss-logging>2.0.3.GA</version.jboss-logging>
- <version.jbossxb>2.0.0.CR5</version.jbossxb>
+ <version.jboss-logging>2.0.4.GA</version.jboss-logging>
+ <version.jbossxb>2.0.0.CR8</version.jbossxb>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
<version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common>
<version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web>
@@ -39,14 +39,15 @@
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
- <version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer>
+ <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
+ <version.jboss.reflect>2.0.0.Beta12</version.jboss.reflect>
<version.cargo>0.9-portal</version.cargo>
<version.junit>3.8.1</version.junit>
<version.ant>1.7.0</version.ant>
<version.sun-jaxb>2.1.4</version.sun-jaxb>
<version.portlet-api>2.0</version.portlet-api>
<version.ccpp-api>1.0</version.ccpp-api>
- <version.xerces>2.7.1</version.xerces>
+ <version.xerces>2.9.1</version.xerces>
</properties>
<repositories>
@@ -176,10 +177,17 @@
<version>${version.jboss.portal.common}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.portal.common</groupId>
+ <artifactId>common-mc</artifactId>
+ <version>${version.jboss.portal.common}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.portal.web</groupId>
<artifactId>web-web</artifactId>
<version>${version.jboss.portal.web}</version>
</dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -197,16 +205,12 @@
</dependency>
<dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>${version.concurrent}</version>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>${version.jboss-remoting}</version>
</dependency>
+
<dependency>
- <groupId>org.jboss.portal.common</groupId>
- <artifactId>common-mc</artifactId>
- <version>${version.jboss.portal.common}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
<version>${version.jboss.unit}</version>
@@ -236,107 +240,46 @@
<artifactId>portal-test-generic</artifactId>
<version>${version.jboss.unit}</version>
</dependency>
+
<dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${version.concurrent}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<version>${version.jbossxb}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-jdk</artifactId>
- <version>${version.jboss-logging}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss-logging}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-remoting</artifactId>
- <version>${version.jboss-remoting}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
+ <artifactId>jboss-kernel</artifactId>
<version>${version.jboss.microcontainer}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-classloader</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>${version.jboss.reflect}</version>
</dependency>
+
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${version.log4j}</version>
</dependency>
+
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-jdk</artifactId>
+ <version>${version.jboss-logging}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
+ <version>${version.jboss-logging}</version>
</dependency>
+
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-metatype</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${version.apache.commons-logging}</version>
Modified: modules/portlet/trunk/controller/pom.xml
===================================================================
--- modules/portlet/trunk/controller/pom.xml 2008-04-20 22:55:30 UTC (rev 10658)
+++ modules/portlet/trunk/controller/pom.xml 2008-04-20 22:59:46 UTC (rev 10659)
@@ -33,6 +33,7 @@
<artifactId>portlet-portlet</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
+ <!--<scope>test</scope>-->
</dependency>
<!--TEST SCOPE-->
@@ -50,18 +51,6 @@
<artifactId>xml-apis</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.jboss.portal.portlet</groupId>
- <artifactId>portlet-jsr168api</artifactId>
- <version>${project.version}</version>
- </dependency>
- -->
- <!--dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- </dependency-->
-
</dependencies>
<build>
Modified: modules/portlet/trunk/portal/pom.xml
===================================================================
--- modules/portlet/trunk/portal/pom.xml 2008-04-20 22:55:30 UTC (rev 10658)
+++ modules/portlet/trunk/portal/pom.xml 2008-04-20 22:59:46 UTC (rev 10659)
@@ -14,6 +14,17 @@
<dependencies>
<dependency>
+ <groupId>org.jboss.portal.common</groupId>
+ <artifactId>common-mc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.portal.web</groupId>
+ <artifactId>web-web</artifactId>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>portlet-portlet</artifactId>
<version>${project.version}</version>
@@ -22,125 +33,39 @@
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>portlet-controller</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.portal.portlet</groupId>
+ <artifactId>portlet-portlet</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>portlet-mc</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
</dependency>
+
<dependency>
- <groupId>org.jboss.portal.common</groupId>
- <artifactId>common-mc</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
</dependency>
+
<dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-remote</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-mc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling-ant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>portal-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>portal-test-generic</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-logging-jdk</artifactId>
+ <artifactId>jboss-common-logging-jdk</artifactId>
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
</dependency>
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-remoting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-classloader</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-managed</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-metatype</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -148,18 +73,8 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
+
<dependency>
- <groupId>cargo</groupId>
- <artifactId>cargo-manager</artifactId>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.web</groupId>
- <artifactId>web-web</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>javax.ccpp</groupId>
<artifactId>ccpp</artifactId>
</dependency>
Modified: modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml
===================================================================
--- modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml 2008-04-20 22:55:30 UTC (rev 10658)
+++ modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml 2008-04-20 22:59:46 UTC (rev 10659)
@@ -7,7 +7,41 @@
<componentDescriptors>
<componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
- <componentDescriptor>src/assemble/simple-portal-lib.xml</componentDescriptor>
+ <!--<componentDescriptor>src/assemble/simple-portal-lib.xml</componentDescriptor>-->
</componentDescriptors>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+
+ <include>org.jboss.portal.common:common-common</include>
+ <include>org.jboss.portal.common:common-portal</include>
+ <include>org.jboss.portal.web:web-web</include>
+ <include>org.jboss.portal.portlet:portlet-portlet</include>
+
+ <include>javax.ccpp:ccpp</include>
+ <include>javax.portlet:portlet-api</include>
+
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
+ <includes>
+
+ <include>org.jboss.portal.common:common-mc</include>
+ <include>org.jboss.portal.portlet:portlet-controller</include>
+ <include>org.jboss.portal.portlet:portlet-mc</include>
+
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss.microcontainer:jboss-kernel</include>
+ <include>org.jboss.microcontainer:jboss-dependency</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>org.jboss:jbossxb</include>
+
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
</assembly>
Modified: modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml
===================================================================
--- modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml 2008-04-20 22:55:30 UTC (rev 10658)
+++ modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml 2008-04-20 22:59:46 UTC (rev 10659)
@@ -4,12 +4,14 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
+<!--
<include>org.jboss.portal.common:common-common</include>
<include>org.jboss.portal.common:common-portal</include>
<include>org.jboss.portal.web:web-web</include>
<include>org.jboss.portal.portlet:portlet-portlet</include>
<include>javax.portlet:portlet-api</include>
<include>javax.ccpp:ccpp</include>
+-->
</includes>
</dependencySet>
</dependencySets>
Modified: modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml
===================================================================
--- modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2008-04-20 22:55:30 UTC (rev 10658)
+++ modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2008-04-20 22:59:46 UTC (rev 10659)
@@ -7,25 +7,56 @@
<componentDescriptors>
<componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
- <componentDescriptor>src/assemble/simple-portal-lib.xml</componentDescriptor>
+ <!--<componentDescriptor>src/assemble/simple-portal-lib.xml</componentDescriptor>-->
</componentDescriptors>
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>log4j:log4j</include>
- <include>concurrent:concurrent</include>
+
+ <include>org.jboss.portal.common:common-common</include>
+ <include>org.jboss.portal.common:common-portal</include>
+ <include>org.jboss.portal.web:web-web</include>
+ <include>org.jboss.portal.portlet:portlet-portlet</include>
+
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>apache-log4j:log4j</include>
+ <include>javax.ccpp:ccpp</include>
<include>javax.activation:activation</include>
- <include>javax.xml.bind:jaxb-api</include>
+ <include>javax.portlet:portlet-api</include>
+
<include>apache-xerces:xercesImpl</include>
- <include>jboss:jboss-logging-spi</include>
- <include>jboss:jboss-logging-jdk</include>
- <include>jboss:jboss-logging-log4j</include>
+ <include>apache-xerces:resolver</include>
+ <include>apache-xerces:xml-apis</include>
+
<include>apache-taglibs:jstl</include>
<include>apache-taglibs:standard</include>
+
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
+ <includes>
+
+ <include>org.jboss.portal.common:common-mc</include>
+ <include>org.jboss.portal.portlet:portlet-controller</include>
+ <include>org.jboss.portal.portlet:portlet-mc</include>
+
+ <include>jboss:jboss-common-logging-spi</include>
+ <include>jboss:jboss-common-logging-log4j</include>
+ <include>jboss:jboss-common-logging-jdk</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss.microcontainer:jboss-kernel</include>
+ <include>org.jboss.microcontainer:jboss-dependency</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>org.jboss:jbossxb</include>
+
+ <include>concurrent:concurrent</include>
+
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
Modified: modules/portlet/trunk/portal/src/assemble/simple-portal-war.xml
===================================================================
--- modules/portlet/trunk/portal/src/assemble/simple-portal-war.xml 2008-04-20 22:55:30 UTC (rev 10658)
+++ modules/portlet/trunk/portal/src/assemble/simple-portal-war.xml 2008-04-20 22:59:46 UTC (rev 10659)
@@ -14,36 +14,4 @@
</fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
- <includes>
- <include>org.jboss.portal.common:common-mc</include>
- <include>org.jboss.portal.portlet:portlet-controller</include>
- <include>org.jboss.portal.portlet:portlet-mc</include>
- <include>trove:trove</include>
- <include>org.jboss:jboss-common-core</include>
- <include>org.jboss:jboss-vfs</include>
- <include>org.jboss:javassist</include>
- <include>org.jboss:jbossxb</include>
- <include>org.jboss.aop:jboss-aop</include>
- <include>org.jboss.microcontainer:jboss-aop-mc-int</include>
- <include>org.jboss.microcontainer:jboss-classloader</include>
- <include>org.jboss.microcontainer:jboss-dependency</include>
- <include>org.jboss.microcontainer:jboss-container</include>
- <include>org.jboss.microcontainer:jboss-deployers-client-spi</include>
- <include>org.jboss.microcontainer:jboss-deployers-client</include>
- <include>org.jboss.microcontainer:jboss-deployers-core-spi</include>
- <include>org.jboss.microcontainer:jboss-deployers-core</include>
- <include>org.jboss.microcontainer:jboss-deployers-impl</include>
- <include>org.jboss.microcontainer:jboss-deployers-spi</include>
- <include>org.jboss.microcontainer:jboss-deployers-structure-spi</include>
- <include>org.jboss.microcontainer:jboss-deployers-vfs-spi</include>
- <include>org.jboss.microcontainer:jboss-deployers-vfs</include>
- <include>org.jboss.microcontainer:jboss-kernel</include>
- <include>org.jboss.microcontainer:jboss-managed</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
</component>
\ No newline at end of file
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/log4j.properties
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/log4j.properties (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/log4j.properties 2008-04-20 22:59:46 UTC (rev 10659)
@@ -0,0 +1,13 @@
+### ====================================================================== ###
+## ##
+## JBoss Bootstrap Log4j Configuration ##
+## ##
+### ====================================================================== ###
+
+log4j.rootCategory=ALL, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=DEBUG
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/logging.properties
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/logging.properties (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/logging.properties 2008-04-20 22:59:46 UTC (rev 10659)
@@ -0,0 +1,13 @@
+handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+org.apache.juli.FileHandler.level = FINE
+org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+org.apache.juli.FileHandler.prefix = servlet-examples.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-04-20 22:55:30 UTC (rev 10658)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-04-20 22:59:46 UTC (rev 10659)
@@ -24,6 +24,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.mc.PortletApplicationDeployer">
+ <alias>PortletApplicationRegistry</alias>
<property name="servletContainer"><inject bean="ServletContainer"/></property>
<property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
</bean>
Modified: modules/portlet/trunk/test/pom.xml
===================================================================
--- modules/portlet/trunk/test/pom.xml 2008-04-20 22:55:30 UTC (rev 10658)
+++ modules/portlet/trunk/test/pom.xml 2008-04-20 22:59:46 UTC (rev 10659)
@@ -14,6 +14,16 @@
<dependencies>
<dependency>
+ <groupId>org.jboss.portal.common</groupId>
+ <artifactId>common-mc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.portal.web</groupId>
+ <artifactId>web-web</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>portlet-portlet</artifactId>
<version>${project.version}</version>
@@ -34,15 +44,13 @@
<artifactId>portlet-mc</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
+
<dependency>
- <groupId>org.jboss.portal.common</groupId>
- <artifactId>common-mc</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
</dependency>
@@ -66,83 +74,38 @@
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
</dependency>
+
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-logging-jdk</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
+
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-classloader</artifactId>
+ <artifactId>jboss-kernel</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-jdk</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
</dependency>
+
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-managed</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-metatype</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -165,13 +128,6 @@
<groupId>javax.ccpp</groupId>
<artifactId>ccpp</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.jboss.portal.portlet</groupId>
- <artifactId>portlet-jsr168api</artifactId>
- <version>${project.version}</version>
- </dependency>
- -->
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
@@ -255,66 +211,56 @@
<property name="runtime_classpath" refid="maven.runtime.classpath"/>
<property name="test_classpath" refid="maven.test.classpath"/>
<property name="plugin_classpath" refid="maven.plugin.classpath"/>
-
<property name="project.version" value="${project.version}"/>
- <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
- <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-vfs.jar" value="${maven.dependency.org.jboss.jboss-vfs.jar.path}"/>
- <property name="dependency.jboss-aop-mc-int.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/>
- <property name="dependency.jboss-classloader.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-classloader.jar.path}"/>
- <property name="dependency.jboss-container.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-container.jar.path}"/>
- <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-deployers-client-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client-spi.jar.path}"/>
- <property name="dependency.jboss-deployers-client.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client.jar.path}"/>
- <property name="dependency.jboss-deployers-core-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core-spi.jar.path}"/>
- <property name="dependency.jboss-deployers-core.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core.jar.path}"/>
- <property name="dependency.jboss-deployers-impl.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-impl.jar.path}"/>
- <property name="dependency.jboss-deployers-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-spi.jar.path}"/>
- <property name="dependency.jboss-deployers-structure-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-structure-spi.jar.path}"/>
- <property name="dependency.jboss-deployers-vfs-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs-spi.jar.path}"/>
- <property name="dependency.jboss-deployers-vfs.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs.jar.path}"/>
- <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-managed.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-managed.jar.path}"/>
- <property name="dependency.jboss-metatype.jar" value="${maven.dependency.org.jboss.microcontainer.jboss.metatype.jar.path}"/>
- <property name="dependency.jboss-aop.jar" value="${maven.dependency.org.jboss.aop.jboss-aop.jar.path}"/>
- <property name="dependency.pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.pluggable-instrumentor.jar.path}"/>
- <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
- <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
- <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/>
- <property name="dependency.portal-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-portal.jar" value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/>
- <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/>
- <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}"/>
+ <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
<property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
<property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
<property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/>
<property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <property name="dependency.portal-web.jar" value="${maven.dependency.org.jboss.portal.web.web-web.jar.path}"/>
<property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
- <property name="dependency.portal-portlet.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/>
+ <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/>
+
+ <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/>
+ <property name="dependency.portal-common-portal.jar" value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/>
+ <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/>
+
+ <property name="dependency.portal-web-web.jar" value="${maven.dependency.org.jboss.portal.web.web-web.jar.path}"/>
+
+ <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/>
<property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-controller.jar.path}"/>
<property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-mc.jar.path}"/>
<property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-jar.path}"/>
+
+ <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
+ <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
+ <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
+ <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
+ <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/>
+
+ <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
+ <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
+ <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
+ <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
+ <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
+ <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
+ <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
+ <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/>
+ <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
+ <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
+ <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
+ <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
+ <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
+ <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
+
<property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.cargo.cargo-core-uberjar.jar.path}"/>
<property name="dependency.cargo-ant.jar" value="${maven.dependency.cargo.cargo-ant.jar.path}"/>
- <property name="dependency.jaxb-api.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/>
+ <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <!-- JSTL for Tomcat -->
<property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
<property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2008-04-20 22:55:30 UTC (rev 10658)
+++ modules/portlet/trunk/test/src/test/build.xml 2008-04-20 22:59:46 UTC (rev 10659)
@@ -45,93 +45,102 @@
<echo message="Preparing environment"/>
- <!--Paths-->
- <path id="mc.concurrent">
- <pathelement path="${dependency.concurrent.jar}"/>
- </path>
- <path id="mc.trove">
- <pathelement path="${dependency.trove.jar}"/>
- </path>
- <path id="mc.xerces">
- <pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
- <pathelement path="${dependency.xml-apis.jar}"/>
- </path>
- <path id="mc.javassist">
- <pathelement path="${dependency.javassist.jar}"/>
- </path>
- <path id="mc.jboss_common_logging_spi">
+ <path id="jboss-logging">
<pathelement path="${dependency.jboss-logging-spi.jar}"/>
- </path>
- <path id="mc.jboss_common_logging_jdk">
<pathelement path="${dependency.jboss-logging-jdk.jar}"/>
- </path>
- <path id="mc.jboss_common_logging_log4j">
<pathelement path="${dependency.jboss-logging-log4j.jar}"/>
</path>
- <path id="mc.jboss_common_core">
- <pathelement path="${dependency.jboss-common-core.jar}"/>
+
+ <path id="jboss-microcontainer">
+ <pathelement path="${dependency.jboss-kernel.jar}"/>
+ <pathelement path="${dependency.jboss-dependency.jar}"/>
+ <pathelement path="${dependency.jboss-reflect.jar}"/>
+ <pathelement path="${dependency.jboss-mdr.jar}"/>
+ <pathelement path="${dependency.jbossxb.jar}"/>
</path>
- <path id="mc.jboss_vfs">
- <pathelement path="${dependency.jboss-vfs.jar}"/>
+
+ <path id="portal-common">
+ <pathelement path="${dependency.portal-common-mc.jar}"/>
</path>
- <path id="mc.jboss_xb">
- <pathelement path="${dependency.jbossxb.jar}"/>
+
+ <path id="portal-common-shared">
+ <pathelement path="${dependency.portal-common-portal.jar}"/>
+ <pathelement path="${dependency.portal-common-common.jar}"/>
</path>
- <path id="mc.jboss_aop">
- <pathelement path="${dependency.jboss-aop.jar}"/>
+
+ <path id="portal-web">
</path>
- <path id="mc.jboss_microcontainer">
- <pathelement path="${dependency.jboss-aop-mc-int.jar}"/>
- <pathelement path="${dependency.jboss-classloader.jar}"/>
- <pathelement path="${dependency.jboss-container.jar}"/>
- <pathelement path="${dependency.jboss-dependency.jar}"/>
- <pathelement path="${dependency.jboss-container-metadata.jar}"/>
- <pathelement path="${dependency.jboss-container-metadata-spi.jar}"/>
- <pathelement path="${dependency.jboss-deployers-core.jar}"/>
- <pathelement path="${dependency.jboss-deployers-core-spi.jar}"/>
- <pathelement path="${dependency.jboss-deployers-client.jar}"/>
- <pathelement path="${dependency.jboss-deployers-client-spi.jar}"/>
- <pathelement path="${dependency.jboss-deployers-impl.jar}"/>
- <pathelement path="${dependency.jboss-deployers-spi.jar}"/>
- <pathelement path="${dependency.jboss-deployers-structure-spi.jar}"/>
- <pathelement path="${dependency.jboss-deployers-vfs.jar}"/>
- <pathelement path="${dependency.jboss-deployers-vfs-spi.jar}"/>
- <pathelement path="${dependency.jboss-managed.jar}"/>
- <pathelement path="${dependency.jboss-metatype.jar}"/>
- <pathelement path="${dependency.jboss-kernel.jar}"/>
+
+ <path id="portal-web-shared">
+ <pathelement path="${dependency.portal-web-web.jar}"/>
</path>
- <path id="mc.portal-common">
- <pathelement path="${dependency.portal-common-mc.jar}"/>
+
+ <path id="portal-portlet">
+ <pathelement path="${dependency.portal-portlet-controller.jar}"/>
+ <pathelement path="${dependency.portal-portlet-mc.jar}"/>
+ <pathelement path="${dependency.portal-portlet-tests.jar}"/>
</path>
- <path id="mc.jboss-unit">
+
+ <path id="portal-portlet-shared">
+ <path location="${dependency.portal-portlet-portlet.jar}"/>
+ <path location="${dependency.jsr168api.jar}"/>
+ </path>
+
+ <path id="jboss-unit">
+ </path>
+
+ <path id="jboss-unit-shared">
<pathelement path="${dependency.jboss-unit.jar}"/>
<pathelement path="${dependency.jboss-unit-mc.jar}"/>
<pathelement path="${dependency.jboss-unit-remote.jar}"/>
<pathelement path="${dependency.portal-test-generic.jar}"/>
<pathelement path="${dependency.portal-test.jar}"/>
- </path>
- <path id="mc.portal-test-generic">
- <pathelement path="${dependency.portal-test-generic.jar}"/>
- </path>
- <path id="mc.jboss-remoting">
<pathelement path="${dependency.jboss-remoting.jar}"/>
</path>
- <path id="mc.log4j">
- <pathelement path="${dependency.log4j.jar}"/>
+
+ <path id="jboss-4.2">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-microcontainer"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
</path>
- <path id="mc.portal-portlet">
- <pathelement path="${dependency.portal-portlet.jar}"/>
+
+ <path id="jboss-4.2-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path location="${dependency.ccpp.jar}"/>
</path>
- <path id="mc.portal-portlet-controller">
- <pathelement path="${dependency.portal-portlet-controller.jar}"/>
+
+ <path id="tomcat-6.0">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-microcontainer"/>
+ <pathelement path="${dependency.javassist.jar}"/>
+ <pathelement path="${dependency.xercesImpl.jar}"/>
+ <pathelement path="${dependency.resolver.jar}"/>
+ <pathelement path="${dependency.xml-apis.jar}"/>
+ <pathelement path="${dependency.trove.jar}"/>
</path>
- <path id="mc.portal-portlet-mc">
- <pathelement path="${dependency.portal-portlet-mc.jar}"/>
+
+ <path id="tomcat-6.0-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path refid="jboss-logging"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
+ <path location="${dependency.log4j.jar}"/>
+ <path location="${dependency.concurrent.jar}"/>
+ <path location="${dependency.activation.jar}"/>
+ <path location="${dependency.jaxb.jar}"/>
+ <path location="${dependency.ccpp.jar}"/>
</path>
- <path id="mc.jaxb-api">
- <pathelement path="${dependency.jaxb-api.jar}"/>
- </path>
+
</target>
<!--Lets make the check in one place so the build fail in the beggining instead of end-->
@@ -300,11 +309,11 @@
<!-- JSR 168 TLD -->
<zipfileset
- src="${dependency.portal-portlet.jar}"
+ src="${dependency.portal-portlet-portlet.jar}"
includes="META-INF/portlet.tld"
fullpath="META-INF/portlet.tld"/>
<zipfileset
- src="${dependency.portal-portlet.jar}"
+ src="${dependency.portal-portlet-portlet.jar}"
includes="META-INF/portlet_2_0.tld"
fullpath="META-INF/portlet_2_0.tld"/>
</jar>
@@ -394,31 +403,8 @@
<fileset dir="${target}/test-classes/jboss-4.2/portlet-test-war"/>
</copy>
<copy todir="${test.temp.dir}/jboss-4.2/portlet-test-war/WEB-INF/lib" flatten="true">
-
- <!-- -->
<fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
-
- <!-- -->
- <path refid="mc.portal-common"/>
-
- <path refid="mc.portal-portlet-controller"/>
- <path refid="mc.portal-portlet-mc"/>
-
- <!-- Remote plugin -->
- <path refid="mc.jboss-remoting"/>
- <path refid="mc.portal-test-generic"/>
-
-
- <!-- MC 2.0.0.Beta4 -->
- <path refid="mc.trove"/>
- <path refid="mc.javassist"/>
- <path refid="mc.jboss_common_core"/>
- <path refid="mc.jboss_vfs"/>
- <path refid="mc.jboss_xb"/>
- <path refid="mc.jboss_aop"/>
- <path refid="mc.jboss_microcontainer"/>
- <path refid="mc.jaxb-api"/>
-
+ <path refid="jboss-4.2"/>
</copy>
<mkdir dir="${test.temp.lib}/jboss-4.2"/>
<jar jarfile="${test.temp.lib}/jboss-4.2/portlet-test.war">
@@ -431,30 +417,8 @@
<fileset dir="${target}/test-classes/tomcat-6.0/portlet-test-war"/>
</copy>
<copy todir="${test.temp.dir}/tomcat-6.0/portlet-test-war/WEB-INF/lib" flatten="true">
-
- <!-- -->
<fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
-
- <!-- -->
- <path refid="mc.portal-common"/>
-
- <path refid="mc.portal-portlet-controller"/>
- <path refid="mc.portal-portlet-mc"/>
-
- <!-- Remote plugin -->
- <path refid="mc.jboss-remoting"/>
- <path refid="mc.portal-test-generic"/>
-
- <!-- MC 2.0.0.Beta4 -->
- <path refid="mc.trove"/>
- <path refid="mc.xerces"/>
- <path refid="mc.javassist"/>
- <path refid="mc.jboss_common_core"/>
- <path refid="mc.jboss_vfs"/>
- <path refid="mc.jboss_xb"/>
- <path refid="mc.jboss_aop"/>
- <path refid="mc.jboss_microcontainer"/>
-
+ <path refid="tomcat-6.0"/>
</copy>
<mkdir dir="${test.temp.lib}/tomcat-6.0"/>
<jar jarfile="${test.temp.lib}/tomcat-6.0/portlet-test.war">
@@ -495,17 +459,8 @@
<!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>-->
<sharedClasspath>
- <path location="${dependency.portal-common.jar}"/>
- <path location="${dependency.portal-common-portal.jar}"/>
- <path location="${dependency.portal-portlet.jar}"/>
- <path location="${dependency.portal-web.jar}"/>
- <path location="${dependency.jsr168api.jar}"/>
- <path location="${dependency.ccpp.jar}"/>
+ <path refid="jboss-4.2-shared"/>
- <path location="${dependency.jboss-unit.jar}"/>
- <path location="${dependency.jboss-unit-remote.jar}"/>
- <path location="${dependency.portal-test.jar}"/>
-
</sharedClasspath>
<configuration home="${test.jboss-4.2.tempdir}">
<property name="cargo.servlet.port" value="8080"/>
@@ -602,25 +557,8 @@
wait="${cargo.wait}">
<sharedClasspath>
- <path location="${dependency.log4j.jar}"/>
- <path location="${dependency.concurrent.jar}"/>
- <path location="${dependency.activation.jar}"/>
- <path location="${dependency.jaxb-api.jar}"/>
+ <path refid="tomcat-6.0-shared"/>
- <path refid="mc.jboss_common_logging_spi"/>
- <path refid="mc.jboss_common_logging_jdk"/>
-
- <path location="${dependency.portal-common.jar}"/>
- <path location="${dependency.portal-common-portal.jar}"/>
- <path location="${dependency.portal-portlet.jar}"/>
- <path location="${dependency.portal-web.jar}"/>
- <path location="${dependency.jsr168api.jar}"/>
- <path location="${dependency.ccpp.jar}"/>
-
- <path location="${dependency.jboss-unit.jar}"/>
- <path location="${dependency.jboss-unit-remote.jar}"/>
- <path location="${dependency.portal-test.jar}"/>
-
</sharedClasspath>
<configuration>
<property name="cargo.servlet.port" value="8080"/>
@@ -718,23 +656,15 @@
<fileset dir="${target}/test-classes/jboss-4.2/portlet-tck-war"/>
</copy>
+<!--
<copy todir="${tck-jboss}/portlet-tck-war/WEB-INF/lib" flatten="true">
- <!-- -->
<fileset dir="${target}" includes="portlet-test-lib.jar"/>
-
- <!-- -->
<path refid="mc.portal-common"/>
-
<path refid="mc.portal-portlet-controller"/>
<path refid="mc.portal-portlet-mc"/>
-
- <!-- Remote plugin -->
<path refid="mc.jboss-remoting"/>
<path refid="mc.portal-test-generic"/>
-
-
- <!-- MC 2.0.0.Beta4 -->
<path refid="mc.trove"/>
<path refid="mc.javassist"/>
<path refid="mc.jboss_common_core"/>
@@ -745,6 +675,7 @@
</copy>
+-->
<mkdir dir="${tck-jboss}/tck-portal"/>
@@ -752,24 +683,24 @@
<fileset dir="${tck-jboss}/portlet-tck-war"/>
</jar>
+<!--
<copy todir="${tck-jboss}/tck-portal" flatten="true">
- <!--Stuff from shared classpath-->
<path location="${dependency.portal-common.jar}"/>
<path location="${dependency.portal-common-portal.jar}"/>
<path location="${dependency.portal-portlet.jar}"/>
<path location="${dependency.portal-web.jar}"/>
<path location="${dependency.jsr168api.jar}"/>
<path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.jaxb-api.jar}"/>
+ <path location="${dependency.jaxb.jar}"/>
<path location="${dependency.jboss-unit.jar}"/>
<path location="${dependency.jboss-unit-remote.jar}"/>
<path location="${dependency.portal-test.jar}"/>
-
+
</copy>
+-->
-
<!--TOMCAT-->
<copy todir="${tck-tomcat}/portlet-tck-war">
@@ -779,22 +710,15 @@
<fileset dir="${target}/test-classes/tomcat-6.0/portlet-tck-war"/>
</copy>
+<!--
<copy todir="${tck-tomcat}/portlet-tck-war/WEB-INF/lib" flatten="true">
- <!-- -->
<fileset dir="${target}" includes="portlet-test-lib.jar"/>
-
- <!-- -->
<path refid="mc.portal-common"/>
-
<path refid="mc.portal-portlet-controller"/>
<path refid="mc.portal-portlet-mc"/>
-
- <!-- Remote plugin -->
<path refid="mc.jboss-remoting"/>
<path refid="mc.portal-test-generic"/>
-
- <!-- MC 2.0.0.Beta4 -->
<path refid="mc.trove"/>
<path refid="mc.xerces"/>
<path refid="mc.javassist"/>
@@ -804,8 +728,8 @@
<path refid="mc.jboss_aop"/>
<path refid="mc.jboss_microcontainer"/>
-
</copy>
+-->
<mkdir dir="${tck-tomcat}/tck-portal"/>
@@ -813,32 +737,28 @@
<fileset dir="${tck-tomcat}/portlet-tck-war"/>
</jar>
+<!--
<copy todir="${tck-tomcat}/tck-portal" flatten="true">
- <!--Stuff from shared classpath-->
<path location="${dependency.log4j.jar}"/>
<path location="${dependency.concurrent.jar}"/>
<path location="${dependency.activation.jar}"/>
- <path location="${dependency.jaxb-api.jar}"/>
-
+ <path location="${dependency.jaxb.jar}"/>
<path refid="mc.jboss_common_logging_spi"/>
<path refid="mc.jboss_common_logging_jdk"/>
-
<path location="${dependency.portal-common.jar}"/>
<path location="${dependency.portal-common-portal.jar}"/>
<path location="${dependency.portal-portlet.jar}"/>
<path location="${dependency.portal-web.jar}"/>
<path location="${dependency.jsr168api.jar}"/>
<path location="${dependency.ccpp.jar}"/>
-
<path location="${dependency.jboss-unit.jar}"/>
<path location="${dependency.jboss-unit-remote.jar}"/>
<path location="${dependency.portal-test.jar}"/>
</copy>
+-->
-
-
<delete file="${target}/portlet-test-lib.jar"/>
</target>
18 years
- 1
- 0