gatein SVN: r7743 - in epp/docs/branches/5.2/User_Guide/en-US: modules/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-10-13 18:56:18 -0400 (Thu, 13 Oct 2011)
New Revision: 7743
Added:
epp/docs/branches/5.2/User_Guide/en-US/images/Search_button.png
epp/docs/branches/5.2/User_Guide/en-US/images/Select_page_icon.png
Removed:
epp/docs/branches/5.2/User_Guide/en-US/images/NewSearch2.png
Modified:
epp/docs/branches/5.2/User_Guide/en-US/images/ManagePage.png
epp/docs/branches/5.2/User_Guide/en-US/images/NewSearch1.png
epp/docs/branches/5.2/User_Guide/en-US/images/SelectPage1.png
epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml
Log:
Porting GateIn revision 7742
Modified: epp/docs/branches/5.2/User_Guide/en-US/images/ManagePage.png
===================================================================
(Binary files differ)
Modified: epp/docs/branches/5.2/User_Guide/en-US/images/NewSearch1.png
===================================================================
(Binary files differ)
Deleted: epp/docs/branches/5.2/User_Guide/en-US/images/NewSearch2.png
===================================================================
(Binary files differ)
Added: epp/docs/branches/5.2/User_Guide/en-US/images/Search_button.png
===================================================================
(Binary files differ)
Property changes on: epp/docs/branches/5.2/User_Guide/en-US/images/Search_button.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: epp/docs/branches/5.2/User_Guide/en-US/images/SelectPage1.png
===================================================================
(Binary files differ)
Added: epp/docs/branches/5.2/User_Guide/en-US/images/Select_page_icon.png
===================================================================
(Binary files differ)
Property changes on: epp/docs/branches/5.2/User_Guide/en-US/images/Select_page_icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2011-10-13 21:15:32 UTC (rev 7742)
+++ epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2011-10-13 22:56:18 UTC (rev 7743)
@@ -17,7 +17,7 @@
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/EditNavigation.png" format="PNG" align="center" scale="120"/>
+ <imagedata fileref="images/EditNavigation.png" format="PNG" align="center" scale="110"/>
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/EditNavigation.png" format="PNG" align="center" contentwidth="150mm" />
@@ -26,16 +26,16 @@
</step>
<step>
<para>
- Select a node from list (to create a new sub-node of the selected node) or click the <emphasis role="bold">Up</emphasis> icon to create a new node at the root level of the portal.
+ Select a node from list (to create a new node like sub-node of the selected node) or click the <emphasis role="bold">Up</emphasis> icon to create a new node at the root level of the portal.
</para>
</step>
<step>
<para>
- Once the chosen parent node is selected, either click on <emphasis role="bold">Add Node</emphasis> at the bottom of the <emphasis role="bold">Navigation Management</emphasis> window or right-click the selected node and select the <emphasis role="bold">Add new Node</emphasis> option.
+ Right-click on the selected navigation or node and select <emphasis role="bold">Add new Node</emphasis> option. The <emphasis role="bold">Add new node</emphasis> form appears:
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/AddNode4.png" format="PNG" align="center" scale="100" />
+ <imagedata fileref="images/AddNode4.png" format="PNG" align="center" scale="110" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/AddNode4.png" format="PNG" align="center" contentwidth="150mm" />
@@ -51,7 +51,7 @@
<term><emphasis role="bold">Uri</emphasis></term>
<listitem>
<para>
- An identification of the node. The URI is automatically created after adding a new node
+ An identification of the node. The Uri is automatically created after adding a new node
</para>
</listitem>
</varlistentry>
@@ -75,7 +75,7 @@
<term><emphasis role="bold">Visible</emphasis></term>
<listitem>
<para>
- This check box allows administrators to hide (and show) the page and its node at the navigation bar, the page navigation and the site map.
+ This check box allows administrators to hide (and show) the page and its node at the navigation bar, the page navigation and the site map
</para>
</listitem>
</varlistentry>
@@ -91,7 +91,7 @@
<term><emphasis role="bold">Start Publication Date</emphasis></term>
<listitem>
<para>
- The start date and time to publish the node. <emphasis role="bold">This field is only visible if the <emphasis>Publication date & time</emphasis> box is checked</emphasis>
+ The start date and time to publish the node.
</para>
</listitem>
</varlistentry>
@@ -99,7 +99,7 @@
<term><emphasis role="bold">End Publication Date</emphasis></term>
<listitem>
<para>
- The end date and time to publish the node.<emphasis role="bold">This field is only visible if the <emphasis>Publication date & time</emphasis> box is checked</emphasis>
+ The end date and time to publish the node.
</para>
</listitem>
</varlistentry>
@@ -109,7 +109,7 @@
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/PageSelector.png" format="PNG" align="center" scale="100" />
+ <imagedata fileref="images/PageSelector.png" format="PNG" align="center" scale="110" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/PageSelector.png" format="PNG" align="center" contentwidth="150mm"/>
@@ -145,26 +145,28 @@
You do not have to enter values in these fields. They are automatically populated after selecting an existing page by clicking the <emphasis role="bold">Search and Select Page</emphasis> button.
</para>
<para>
- The <emphasis role="bold">Select a page</emphasis> form appears:
+ The <emphasis role="bold">Select Page</emphasis> form appears:
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/SelectPage1.png" format="PNG" align="center" scale="100" />
+ <imagedata fileref="images/SelectPage1.png" format="PNG" align="center" scale="110" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/SelectPage1.png" format="PNG" align="center" contentwidth="150mm"/>
</imageobject>
</mediaobject>
<para>
- This window lists of all existing pages, each displayed with basic information. You can follow this guide to select a page for creating a node:
+ This window lists all existing pages of <emphasis role="bold">Portal</emphasis> or <emphasis role="bold">Group</emphasis> with basic information for each page.
</para>
<para>
- Select a page from list or search a specific page :
+ To select a page for creating a node, simply select a page from the list or search for a specific page as follows:
</para>
<procedure id="proc-User_Guide-Manage_Navigation_Nodes-Search_for_a_page">
<step>
<para>
- Enter a search term related to the page you want to search for:
+ Enter your page title into the
+ <emphasis role="bold">Title</emphasis>
+ field to do search to Title;
</para>
<mediaobject>
<imageobject role="html">
@@ -174,56 +176,60 @@
<imagedata fileref="images/NewSearch1.png" format="PNG" align="center" contentwidth="150mm"/>
</imageobject>
</mediaobject>
- </step>
- <step>
<para>
- Choose the field you wish to search in:
+ Or, enter the site name into the
+ <emphasis role="bold">Site Name</emphasis>
+ field to do search to the page's site name;
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/NewSearch2.png" format="PNG" align="center" scale="130"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/NewSearch2.png" format="PNG" contentwidth="150mm"/>
- </imageobject>
- </mediaobject>
+
+ <para>
+ Or, enter values into both fields to futher limit your search results by both
+ <emphasis role="bold">Title</emphasis>
+ and <emphasis role="bold">Site Name</emphasis>.
+ </para>
</step>
<step>
<para>
- Click the 'find' icon to perform the search. All pages matching with search term will be listed.
+ Select the area in which you wish to search into the <emphasis role="bold">Type</emphasis> field.
</para>
</step>
<step>
<para>
- Click the OK icon on the row of the page you wish to select.
+ Click
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/Search_button.png" format="PNG"/>
+ </imageobject>
+ </inlinemediaobject>
+ to perform your search. All pages matching your search criteria will be listed.
</para>
</step>
<step>
<para>
- After selecting a page, the details of this page will be displayed in the <emphasis role="bold">Page Selector</emphasis> form.
+ Click
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/Select_page_icon.png" format="PNG"/>
+ </imageobject>
+ </inlinemediaobject>
+ on the row of the page you wish to select.
</para>
</step>
</procedure>
</step>
- <step>
- <para>
- Click on the third tab in the <emphasis role="bold">Add/Edit Page Node</emphasis> window to select an icon for the new node from the categorized icons available.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/NodeIcons.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/NodeIcons.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
- After configuring the page node settings, the page selector and the node's icon, click the <emphasis role="bold">Save</emphasis> button to accept or the <emphasis role="bold">Cancel</emphasis> button to quit without creating a new node.
- </para>
- </step>
</procedure>
+ <para>
+ After selecting a page, the details of this page will be displayed in the
+ <emphasis role="bold">Page Selector</emphasis>
+ form.
+ </para>
+ <para>
+ After configuring the page node settings, the page selector and the node's icon, click the
+ <emphasis role="bold">Save</emphasis>
+ button to accept or the
+ <emphasis role="bold">Cancel</emphasis>
+ button to quit without creating a new node.
+ </para>
</section>
<section id="sect-User_Guide-Manage_Navigation_Nodes-Edit_a_node">
@@ -231,7 +237,7 @@
<procedure>
<step>
<para>
- Click on <emphasis role="bold">Site</emphasis> then click on <emphasis role="bold">Edit Navigation</emphasis> of the portal you want to modify.
+ Click <emphasis role="bold">Site</emphasis>, then click <emphasis role="bold">Edit Navigation</emphasis> of the portal you want to modify.
</para>
</step>
<step>
@@ -247,12 +253,9 @@
This will display a form to edit this node:
</para>
<mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/PageNodeSetting.png" format="PNG" align="center" scale="100" />
+ <imageobject>
+ <imagedata fileref="images/PageNodeSetting.png" format="PNG" align="center" width="444" />
</imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/PageNodeSetting.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
</mediaobject>
</step>
<step>
@@ -309,7 +312,7 @@
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/CopyNode3.png" format="PNG" align="center" scale="100" />
+ <imagedata fileref="images/CopyNode3.png" format="PNG" align="center" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/CopyNode3.png" format="PNG" align="center" contentwidth="130mm"/>
@@ -318,11 +321,11 @@
</step>
<step>
<para>
- Right click on the position that you want to paste this node to and select <emphasis role="bold">Paste Node</emphasis> option. Click the <emphasis role="bold">Save</emphasis> button.
+ Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. Click the mark icon to <emphasis role="bold">Save</emphasis>.
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/PasteNode3.png" format="PNG" align="center" scale="100" />
+ <imagedata fileref="images/PasteNode3.png" format="PNG" align="center" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/PasteNode3.png" format="PNG" align="center" contentwidth="130mm"/>
@@ -333,7 +336,7 @@
</section>
<section id="sect-User_Guide-Manage_Navigation_Nodes-Clone_nodes">
- <title>Clone a node</title>
+ <title>Clone nodes</title>
<para>
The <emphasis role="bold">Clone node</emphasis> function allows you to copy a node.
</para>
@@ -355,7 +358,7 @@
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/CloneNode2.png" format="PNG" align="center" scale="100" />
+ <imagedata fileref="images/CloneNode2.png" format="PNG" align="center" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/CloneNode2.png" format="PNG" align="center" contentwidth="130mm"/>
@@ -364,21 +367,16 @@
</step>
<step>
<para>
- Right click on the position that you want to paste this node to and select <emphasis role="bold">Paste Node</emphasis> option. Click the <emphasis role="bold">Save</emphasis> button.
+ Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. Click the mark icon to <emphasis role="bold">Save</emphasis>.
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/PasteNode3.png" format="PNG" align="center" scale="100" />
+ <imagedata fileref="images/PasteNode3.png" format="PNG" align="center" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/PasteNode3.png" format="PNG" align="center" contentwidth="130mm"/>
</imageobject>
</mediaobject>
- <!-- <mediaobject>
- <imageobject>
- <imagedata fileref="images/ManagePage2.png" format="PNG" align="center" width="444" />
- </imageobject>
- </mediaobject> -->
</step>
</procedure>
</section>
@@ -397,7 +395,7 @@
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/CutNode4.png" format="PNG" align="center" scale="100"/>
+ <imagedata fileref="images/CutNode4.png" format="PNG" align="center" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/CutNode4.png" format="PNG" align="center" contentwidth="130mm"/>
@@ -406,11 +404,11 @@
</step>
<step>
<para>
- Right click on the position that you want to paste this node to and select <emphasis role="bold">Paste Node</emphasis> option. Click the <emphasis role="bold">Save</emphasis> button.
+ Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. mark icon to <emphasis role="bold">Save</emphasis>.
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/PasteNode3.png" format="PNG" align="center" scale="100" />
+ <imagedata fileref="images/PasteNode3.png" format="PNG" align="center" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/PasteNode3.png" format="PNG" align="center" contentwidth="130mm" />
@@ -434,7 +432,7 @@
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/DeleteNode2.png" format="PNG" align="center" scale="100"/>
+ <imagedata fileref="images/DeleteNode2.png" format="PNG" align="center" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/DeleteNode2.png" format="PNG" align="center" contentwidth="130mm" />
@@ -445,7 +443,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/httpNode.png" format="PNG" align="center" />
+ <imagedata fileref="images/http.png" format="PNG" align="center" />
</imageobject>
</mediaobject>
</step>
@@ -468,12 +466,9 @@
Select the node that you want to move. Right click on the selected node and then click on <emphasis role="bold">Move up</emphasis> or <emphasis role="bold">Move down</emphasis>
</para>
<mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/MoveUpDown.png" format="PNG" align="center" scale="100" />
+ <imageobject>
+ <imagedata fileref="images/MoveUpDown.png" format="PNG" />
</imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/MoveUpDown.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
</mediaobject>
</step>
<step>
14 years, 6 months
- 1
- 0
gatein SVN: r7742 - in components/wsrp/trunk: producer/src/main/java/org/gatein/registration and 2 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-10-13 17:15:32 -0400 (Thu, 13 Oct 2011)
New Revision: 7742
Modified:
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java
components/wsrp/trunk/producer/src/test/java/org/gatein/registration/AbstractRegistrationPersistenceManagerTestCase.java
Log:
- Added RegistrationPersistenceManager.isConsumerGroupExisting to avoid creating a ConsumerGroup when we just want to check its existence.
- Improved error handling and added more test cases.
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-10-13 19:39:42 UTC (rev 7741)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-10-13 21:15:32 UTC (rev 7742)
@@ -298,12 +298,18 @@
return group;
}
+ @Override
public boolean isConsumerExisting(String consumerId) throws RegistrationException
{
+ return exists(consumerId);
+ }
+
+ private boolean exists(String name)
+ {
ChromatticSession session = persister.getSession();
try
{
- return session.getJCRSession().itemExists(rootNodePath + ConsumersAndGroupsMapping.NODE_NAME + "/" + consumerId);
+ return session.getJCRSession().itemExists(rootNodePath + ConsumersAndGroupsMapping.NODE_NAME + "/" + name);
}
catch (RepositoryException e)
{
@@ -314,4 +320,10 @@
persister.closeSession(false);
}
}
+
+ @Override
+ public boolean isConsumerGroupExisting(String consumerGroupId) throws RegistrationException
+ {
+ return exists(consumerGroupId);
+ }
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java 2011-10-13 19:39:42 UTC (rev 7741)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java 2011-10-13 21:15:32 UTC (rev 7742)
@@ -105,4 +105,6 @@
Collection<? extends Registration> getRegistrations() throws RegistrationException;
boolean isConsumerExisting(String consumerId) throws RegistrationException;
+
+ boolean isConsumerGroupExisting(String consumerGroupId) throws RegistrationException;
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java 2011-10-13 19:39:42 UTC (rev 7741)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java 2011-10-13 21:15:32 UTC (rev 7742)
@@ -52,10 +52,17 @@
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(consumerId, "Consumer identity", null);
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(consumerName, "Consumer name", null);
- ConsumerSPI consumer = internalCreateConsumer(consumerId, consumerName);
- internalAddConsumer(consumer);
+ if (isConsumerExisting(consumerId))
+ {
+ throw new DuplicateRegistrationException("A Consumer with identifier '" + consumerId + "' has already been registered.");
+ }
+ else
+ {
+ ConsumerSPI consumer = internalCreateConsumer(consumerId, consumerName);
+ internalAddConsumer(consumer);
- return consumer;
+ return consumer;
+ }
}
public void saveChangesTo(Consumer consumer) throws RegistrationException
@@ -83,15 +90,16 @@
public ConsumerGroup createConsumerGroup(String name) throws RegistrationException
{
- ConsumerGroup group = getConsumerGroup(name);
- if (group != null)
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(name, "ConsumerGroup name", null);
+
+ if (isConsumerGroupExisting(name))
{
throw new DuplicateRegistrationException("A ConsumerGroup named '" + name + "' has already been registered.");
}
else
{
- group = internalCreateConsumerGroup(name);
- internalAddConsumerGroup((ConsumerGroupSPI)group);
+ final ConsumerGroupSPI group = internalCreateConsumerGroup(name);
+ internalAddConsumerGroup(group);
return group;
}
}
@@ -177,6 +185,11 @@
return getConsumerById(consumerId) != null;
}
+ public boolean isConsumerGroupExisting(String consumerGroupId) throws RegistrationException
+ {
+ return getConsumerGroup(consumerGroupId) != null;
+ }
+
// internal methods: extension points for subclasses
protected abstract void internalAddRegistration(RegistrationSPI registration) throws RegistrationException;
Modified: components/wsrp/trunk/producer/src/test/java/org/gatein/registration/AbstractRegistrationPersistenceManagerTestCase.java
===================================================================
--- components/wsrp/trunk/producer/src/test/java/org/gatein/registration/AbstractRegistrationPersistenceManagerTestCase.java 2011-10-13 19:39:42 UTC (rev 7741)
+++ components/wsrp/trunk/producer/src/test/java/org/gatein/registration/AbstractRegistrationPersistenceManagerTestCase.java 2011-10-13 21:15:32 UTC (rev 7742)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * Copyright 2011, Red Hat Middleware, LLC, and individual
* contributors as indicated by the @authors tag. See the
* copyright.txt in the distribution for a full listing of
* individual contributors.
@@ -83,9 +83,12 @@
public void testCreateConsumer() throws Exception
{
startInteraction();
- Consumer consumer = getManager().createConsumer("Bar", "Bar");
+ Consumer consumer = getManager().createConsumer("BarId", "BarName");
+ assertTrue(getManager().isConsumerExisting("BarId"));
+ assertFalse(getManager().isConsumerExisting("BarName"));
+
assertNotNull(consumer);
- assertEquals("Bar", consumer.getName());
+ assertEquals("BarName", consumer.getName());
assertTrue(consumer.getRegistrations().isEmpty());
assertNull(consumer.getGroup());
assertNotNull(consumer.getPersistentKey());
@@ -95,6 +98,51 @@
stopInteraction();
}
+ public void testCreateConsumerThrowsIAE() throws Exception
+ {
+ startInteraction();
+ try
+ {
+ getManager().createConsumer(null, "foo");
+ fail();
+ }
+ catch (IllegalArgumentException expected)
+ {
+ }
+
+ try
+ {
+ getManager().createConsumer("foo", null);
+ fail();
+ }
+ catch (IllegalArgumentException expected)
+ {
+ }
+ stopInteraction();
+ }
+
+ public void testCreateDuplicatedConsumer() throws Exception
+ {
+ startInteraction();
+ getManager().createConsumer("id", "name");
+ assertTrue(getManager().isConsumerExisting("id"));
+ assertFalse(getManager().isConsumerExisting("name"));
+
+ try
+ {
+ getManager().createConsumer("id", "different name");
+ fail();
+ }
+ catch (DuplicateRegistrationException expected)
+ {
+ }
+
+ getManager().createConsumer("different id", "name");
+ assertTrue(getManager().isConsumerExisting("different id"));
+
+ stopInteraction();
+ }
+
public void testCreateGroup() throws Exception
{
startInteraction();
@@ -107,6 +155,20 @@
stopInteraction();
}
+ public void testCreateGroupThrowsIAE() throws Exception
+ {
+ startInteraction();
+ try
+ {
+ getManager().createConsumerGroup(null);
+ fail();
+ }
+ catch (IllegalArgumentException expected)
+ {
+ }
+ stopInteraction();
+ }
+
public void testAddGroup() throws Exception
{
startInteraction();
14 years, 6 months
- 1
- 0
gatein SVN: r7741 - in portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management: exportimport and 2 other directories.
by do-not-reply＠jboss.org
Author: nscavell
Date: 2011-10-13 15:39:42 -0400 (Thu, 13 Oct 2011)
New Revision: 7741
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/MopManagementExtension.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutExportTask.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/site/SiteReadResource.java
Log:
GTNPORTAL-2152: Fix site layout file name for MOP export and import.
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/MopManagementExtension.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/MopManagementExtension.java 2011-10-13 16:30:15 UTC (rev 7740)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/MopManagementExtension.java 2011-10-13 19:39:42 UTC (rev 7741)
@@ -79,7 +79,7 @@
private void siteLayoutManagementRegistration(ManagedResource.Registration sites)
{
// This allows us to filter based on path template site-layout.
- ManagedResource.Registration siteLayout = sites.registerSubResource("{site-layout: portal}", description("Management resource responsible for handling management operations for a site's layout."));
+ ManagedResource.Registration siteLayout = sites.registerSubResource("{site-layout: portal|group|user}", description("Management resource responsible for handling management operations for a site's layout."));
siteLayout.registerOperationHandler(OperationNames.READ_RESOURCE, new SiteLayoutReadResource(), description("The site layout resource."));
siteLayout.registerOperationHandler(OperationNames.READ_CONFIG_AS_XML, new SiteLayoutReadConfigAsXml(), description("Reads site layout data for a specific site as configuration xml."));
siteLayout.registerOperationHandler(OperationNames.EXPORT_RESOURCE, new SiteLayoutExportResource(), description("Exports site layout configuration xml as a zip file."));
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutExportTask.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutExportTask.java 2011-10-13 16:30:15 UTC (rev 7740)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutExportTask.java 2011-10-13 19:39:42 UTC (rev 7741)
@@ -25,15 +25,14 @@
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.mop.SiteKey;
-import org.exoplatform.portal.pom.config.POMSession;
-import org.exoplatform.portal.pom.config.tasks.PortalConfigTask;
-import org.exoplatform.portal.pom.data.PortalData;
-import org.exoplatform.portal.pom.data.PortalKey;
+import org.exoplatform.portal.mop.SiteType;
import org.gatein.management.api.binding.Marshaller;
import org.gatein.management.api.operation.model.ExportTask;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.HashSet;
+import java.util.Set;
/**
* @author <a href="mailto:nscavell@redhat.com">Nick Scavelli</a>
@@ -41,7 +40,15 @@
*/
public class SiteLayoutExportTask extends AbstractExportTask implements ExportTask
{
- public static final String FILE = "portal.xml";
+ public static final Set<String> FILES;
+ static
+ {
+ HashSet<String> tmp = new HashSet<String>(3);
+ tmp.add("portal.xml");
+ tmp.add("group.xml");
+ tmp.add("user.xml");
+ FILES = tmp;
+ }
private final DataStorage dataStorage;
private final Marshaller<PortalConfig> marshaller;
@@ -56,7 +63,22 @@
@Override
protected String getXmlFileName()
{
- return FILE;
+ if (siteKey.getType() == SiteType.PORTAL)
+ {
+ return "portal.xml";
+ }
+ else if (siteKey.getType() == SiteType.GROUP)
+ {
+ return "group.xml";
+ }
+ else if (siteKey.getType() == SiteType.USER)
+ {
+ return "user.xml";
+ }
+ else
+ {
+ throw new RuntimeException("Unknown site type " + siteKey.getType());
+ }
}
@Override
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java 2011-10-13 16:30:15 UTC (rev 7740)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java 2011-10-13 19:39:42 UTC (rev 7741)
@@ -136,7 +136,7 @@
importMap.put(siteKey, mopImport);
}
- if (file.equals(SiteLayoutExportTask.FILE))
+ if (SiteLayoutExportTask.FILES.contains(file))
{
// Unmarshal site layout data
Marshaller<PortalConfig> marshaller = operationContext.getBindingProvider().getMarshaller(PortalConfig.class, ContentType.XML);
@@ -314,7 +314,7 @@
private static String[] parseEntry(ZipEntry entry) throws IOException
{
String name = entry.getName();
- if (name.endsWith(SiteLayoutExportTask.FILE) || name.endsWith(PageExportTask.FILE) || name.endsWith(NavigationExportTask.FILE))
+ if (isSiteLayoutEntry(name) || name.endsWith(PageExportTask.FILE) || name.endsWith(NavigationExportTask.FILE))
{
String[] parts = new String[3];
parts[0] = name.substring(0, name.indexOf("/"));
@@ -328,6 +328,16 @@
}
}
+ private static boolean isSiteLayoutEntry(String zipEntryName)
+ {
+ for (String file : SiteLayoutExportTask.FILES)
+ {
+ if (zipEntryName.endsWith(file)) return true;
+ }
+
+ return false;
+ }
+
// Bug in SUN's JDK XMLStreamReader implementation closes the underlying stream when
// it finishes reading an XML document. This is no good when we are using a ZipInputStream.
// See http://bugs.sun.com/view_bug.do?bug_id=6539065 for more information.
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/site/SiteReadResource.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/site/SiteReadResource.java 2011-10-13 16:30:15 UTC (rev 7740)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/site/SiteReadResource.java 2011-10-13 19:39:42 UTC (rev 7741)
@@ -64,7 +64,22 @@
if (pageOrNav)
{
- children.add("portal");
+ if (site.getObjectType() == ObjectType.PORTAL_SITE)
+ {
+ children.add("portal");
+ }
+ else if (site.getObjectType() == ObjectType.GROUP_SITE)
+ {
+ children.add("group");
+ }
+ else if (site.getObjectType() == ObjectType.USER_SITE)
+ {
+ children.add("user");
+ }
+ else
+ {
+ throw new OperationException(operationContext.getOperationName(), "Unknown site type " + site.getObjectType());
+ }
}
else
{
14 years, 6 months
- 1
- 0
gatein SVN: r7740 - in components/wsrp/trunk/jcr-impl/src: main/java/org/gatein/wsrp/consumer/registry/mapping and 4 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-10-13 12:30:15 -0400 (Thu, 13 Oct 2011)
New Revision: 7740
Modified:
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/BaseMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerGroupMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java
components/wsrp/trunk/jcr-impl/src/test/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManagerTestCase.java
Log:
- Improved and fixed JCRRegistrationPersistenceManager.remove method.
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java 2011-10-13 10:20:10 UTC (rev 7739)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java 2011-10-13 16:30:15 UTC (rev 7740)
@@ -140,4 +140,10 @@
return new ExportInfo(getExportTime(), errorCodesToHandles, states, IOTools.safeGetBytes(getExportContext()));
}
+
+ public Class<ExportInfo> getModelClass()
+ {
+ return ExportInfo.class;
+ }
+
}
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java 2011-10-13 10:20:10 UTC (rev 7739)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java 2011-10-13 16:30:15 UTC (rev 7740)
@@ -88,6 +88,11 @@
return initial;
}
+ public Class<EndpointConfigurationInfo> getModelClass()
+ {
+ return EndpointConfigurationInfo.class;
+ }
+
@Override
public WSSEndpointEnabled getMixin()
{
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-10-13 10:20:10 UTC (rev 7739)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-10-13 16:30:15 UTC (rev 7740)
@@ -146,6 +146,11 @@
return info;
}
+ public Class<ProducerInfo> getModelClass()
+ {
+ return ProducerInfo.class;
+ }
+
private ModifyRegistrationRequired getCreatedModifyRegistrationRequiredMixin()
{
ModifyRegistrationRequired mmr = getModifyRegistrationRequiredMixin();
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java 2011-10-13 10:20:10 UTC (rev 7739)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java 2011-10-13 16:30:15 UTC (rev 7740)
@@ -123,4 +123,10 @@
return initial;
}
+
+ public Class<RegistrationInfo> getModelClass()
+ {
+ return RegistrationInfo.class;
+ }
+
}
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/BaseMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/BaseMapping.java 2011-10-13 10:20:10 UTC (rev 7739)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/BaseMapping.java 2011-10-13 16:30:15 UTC (rev 7740)
@@ -29,7 +29,15 @@
*/
public interface BaseMapping<T, R>
{
+ /**
+ * Must match constant used by implementations to identify the JCR node name/type that the implementation
+ * represents.
+ */
+ public static final String JCR_TYPE_NAME_CONSTANT_NAME = "NODE_NAME";
+
void initFrom(T model);
T toModel(T initial, R registry);
+
+ Class<T> getModelClass();
}
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-10-13 10:20:10 UTC (rev 7739)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-10-13 16:30:15 UTC (rev 7740)
@@ -26,7 +26,6 @@
import org.chromattic.api.ChromatticSession;
import org.gatein.common.util.ParameterValidation;
import org.gatein.registration.Consumer;
-import org.gatein.registration.ConsumerGroup;
import org.gatein.registration.Registration;
import org.gatein.registration.RegistrationException;
import org.gatein.registration.impl.RegistrationPersistenceManagerImpl;
@@ -34,6 +33,7 @@
import org.gatein.registration.spi.ConsumerSPI;
import org.gatein.registration.spi.RegistrationSPI;
import org.gatein.wsrp.jcr.ChromatticPersister;
+import org.gatein.wsrp.jcr.mapping.BaseMapping;
import org.gatein.wsrp.registration.mapping.ConsumerCapabilitiesMapping;
import org.gatein.wsrp.registration.mapping.ConsumerGroupMapping;
import org.gatein.wsrp.registration.mapping.ConsumerMapping;
@@ -42,6 +42,9 @@
import org.gatein.wsrp.registration.mapping.RegistrationPropertiesMapping;
import javax.jcr.RepositoryException;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryResult;
+import javax.jcr.query.RowIterator;
import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.Collections;
@@ -110,11 +113,15 @@
}
}
+ protected ChromatticPersister getPersister()
+ {
+ return persister;
+ }
+
@Override
protected RegistrationSPI internalRemoveRegistration(String registrationId) throws RegistrationException
{
- Registration registration = getRegistration(registrationId);
- remove(registration.getPersistentKey(), RegistrationMapping.class);
+ remove(registrationId, RegistrationMapping.class, RegistrationSPI.class);
return super.internalRemoveRegistration(registrationId);
}
@@ -144,20 +151,49 @@
@Override
protected ConsumerSPI internalRemoveConsumer(String consumerId) throws RegistrationException
{
- remove(consumerId, ConsumerMapping.class);
-
+ remove(consumerId, ConsumerMapping.class, ConsumerSPI.class);
return super.internalRemoveConsumer(consumerId);
}
- private <T> T remove(String id, Class<T> clazz)
+ private <T extends BaseMapping, U> U remove(String name, Class<T> mappingClass, Class<U> modelClass)
{
ChromatticSession session = persister.getSession();
try
{
- T toRemove = session.findById(clazz, id);
+ String jcrType = (String)mappingClass.getField(BaseMapping.JCR_TYPE_NAME_CONSTANT_NAME).get(null);
+ String id;
+ final Query query = session.getJCRSession().getWorkspace().getQueryManager().createQuery("select jcr:uuid from " + jcrType + " where jcr:path = '/%/" + name + "'", Query.SQL);
+ final QueryResult queryResult = query.execute();
+ final RowIterator rows = queryResult.getRows();
+ final long size = rows.getSize();
+ if (size == 0)
+ {
+ return null;
+ }
+ else
+ {
+ if (size != 1)
+ {
+ throw new IllegalArgumentException("There should be only one " + modelClass.getSimpleName() + " named " + name);
+ }
+
+ id = rows.nextRow().getValue("jcr:uuid").getString();
+
+ }
+
+ T toRemove = session.findById(mappingClass, id);
+ Class aClass = toRemove.getModelClass();
+ if (!modelClass.isAssignableFrom(aClass))
+ {
+ throw new IllegalArgumentException("Cannot convert a " + mappingClass.getSimpleName() + " to a " + modelClass.getSimpleName());
+ }
+
+ final U result = modelClass.cast(toRemove.toModel(null, this));
+
session.remove(toRemove);
persister.closeSession(true);
- return toRemove;
+
+ return result;
}
catch (Exception e)
{
@@ -234,23 +270,7 @@
@Override
protected ConsumerGroupSPI internalRemoveConsumerGroup(String name) throws RegistrationException
{
- try
- {
- ConsumerGroup group = getConsumerGroup(name);
- if (group == null)
- {
- return super.internalRemoveConsumerGroup(name);
- }
- else
- {
- remove(group.getPersistentKey(), ConsumerGroupMapping.class);
- }
- }
- catch (RegistrationException e)
- {
- throw new IllegalArgumentException("Couldn't remove ConsumerGroup '" + name + "'", e);
- }
-
+ remove(name, ConsumerGroupMapping.class, ConsumerGroupSPI.class);
return super.internalRemoveConsumerGroup(name);
}
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerGroupMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerGroupMapping.java 2011-10-13 10:20:10 UTC (rev 7739)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerGroupMapping.java 2011-10-13 16:30:15 UTC (rev 7740)
@@ -123,4 +123,10 @@
throw new RuntimeException(e);
}
}
+
+ public Class<ConsumerGroupSPI> getModelClass()
+ {
+ return ConsumerGroupSPI.class;
+ }
+
}
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerMapping.java 2011-10-13 10:20:10 UTC (rev 7739)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerMapping.java 2011-10-13 16:30:15 UTC (rev 7740)
@@ -182,4 +182,10 @@
return consumer;
}
+
+ public Class<ConsumerSPI> getModelClass()
+ {
+ return ConsumerSPI.class;
+ }
+
}
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java 2011-10-13 10:20:10 UTC (rev 7739)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java 2011-10-13 16:30:15 UTC (rev 7740)
@@ -161,6 +161,11 @@
return initial;
}
+ public Class<RegistrationSPI> getModelClass()
+ {
+ return RegistrationSPI.class;
+ }
+
public RegistrationSPI toRegistration(ConsumerSPI consumer, JCRRegistrationPersistenceManager persistenceManager) throws RegistrationException
{
RegistrationPropertiesMapping rpm = getProperties();
Modified: components/wsrp/trunk/jcr-impl/src/test/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManagerTestCase.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/test/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManagerTestCase.java 2011-10-13 10:20:10 UTC (rev 7739)
+++ components/wsrp/trunk/jcr-impl/src/test/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManagerTestCase.java 2011-10-13 16:30:15 UTC (rev 7740)
@@ -1,24 +1,25 @@
/*
-* JBoss, a division of Red Hat
-* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, a division of Red Hat
+ * Copyright 2011, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.gatein.wsrp.registration;
@@ -26,7 +27,12 @@
import org.gatein.registration.AbstractRegistrationPersistenceManagerTestCase;
import org.gatein.registration.RegistrationPersistenceManager;
import org.gatein.wsrp.jcr.BaseChromatticPersister;
+import org.gatein.wsrp.jcr.ChromatticPersister;
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.Session;
+
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
@@ -51,10 +57,29 @@
}
};
persister.initializeBuilderFor(JCRRegistrationPersistenceManager.mappingClasses);
- persistenceManager = new JCRRegistrationPersistenceManager(persister);
+ persistenceManager = new JCRRegistrationPersistenceManager(persister, workspaceName);
}
+
@Override
+ protected void tearDown() throws Exception
+ {
+ // remove node containing consumer informations so that we can start with a clean state
+ final ChromatticPersister persister = persistenceManager.getPersister();
+ final Session session = persister.getSession().getJCRSession();
+ final Node rootNode = session.getRootNode();
+ final NodeIterator nodes = rootNode.getNodes();
+ while (nodes.hasNext())
+ {
+ nodes.nextNode().remove();
+ }
+
+ // then save
+ persister.closeSession(true);
+ }
+
+
+ @Override
public RegistrationPersistenceManager getManager() throws Exception
{
return persistenceManager;
14 years, 6 months
- 1
- 0
gatein SVN: r7739 - portal/trunk/component/web/server/src/main/java/org/exoplatform/upload.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-10-13 06:20:10 -0400 (Thu, 13 Oct 2011)
New Revision: 7739
Modified:
portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java
Log:
GTNPORTAL-2156 broken display name when upload a file with French language
Modified: portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java
===================================================================
--- portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2011-10-13 08:31:33 UTC (rev 7738)
+++ portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2011-10-13 10:20:10 UTC (rev 7739)
@@ -19,19 +19,6 @@
package org.exoplatform.upload;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.ProgressListener;
@@ -44,6 +31,17 @@
import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.text.EntityEncoder;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
public class UploadService
{
/** . */
@@ -258,6 +256,7 @@
// Create a new file upload handler
ServletFileUpload upload = new ServletFileUpload(factory);
+ upload.setHeaderEncoding("UTF-8");
ProgressListener listener = new ProgressListener()
{
public void update(long pBytesRead, long pContentLength, int pItems)
14 years, 6 months
- 1
- 0
gatein SVN: r7738 - in portal/trunk/docs/user-guide/en-US: modules/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2011-10-13 04:31:33 -0400 (Thu, 13 Oct 2011)
New Revision: 7738
Added:
portal/trunk/docs/user-guide/en-US/images/Search_button.png
portal/trunk/docs/user-guide/en-US/images/Select_page_icon.png
Removed:
portal/trunk/docs/user-guide/en-US/images/ManagePage2.png
portal/trunk/docs/user-guide/en-US/images/NewSearch2.png
Modified:
portal/trunk/docs/user-guide/en-US/images/ManagePage.png
portal/trunk/docs/user-guide/en-US/images/NewSearch1.png
portal/trunk/docs/user-guide/en-US/images/SelectPage1.png
portal/trunk/docs/user-guide/en-US/modules/portal/Manage_Navigation_Nodes.xml
Log:
GTNPORTAL-2168 Update documentation for Scalability Page Loading improvement
Modified: portal/trunk/docs/user-guide/en-US/images/ManagePage.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/user-guide/en-US/images/ManagePage2.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en-US/images/NewSearch1.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/user-guide/en-US/images/NewSearch2.png
===================================================================
(Binary files differ)
Added: portal/trunk/docs/user-guide/en-US/images/Search_button.png
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/user-guide/en-US/images/Search_button.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: portal/trunk/docs/user-guide/en-US/images/SelectPage1.png
===================================================================
(Binary files differ)
Added: portal/trunk/docs/user-guide/en-US/images/Select_page_icon.png
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/user-guide/en-US/images/Select_page_icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: portal/trunk/docs/user-guide/en-US/modules/portal/Manage_Navigation_Nodes.xml
===================================================================
--- portal/trunk/docs/user-guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2011-10-13 02:39:04 UTC (rev 7737)
+++ portal/trunk/docs/user-guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2011-10-13 08:31:33 UTC (rev 7738)
@@ -145,7 +145,7 @@
You do not have to enter values in these fields. They are automatically populated after selecting an existing page by clicking the <emphasis role="bold">Search and Select Page</emphasis> button.
</para>
<para>
- The <emphasis role="bold">Select a page</emphasis> form appears:
+ The <emphasis role="bold">Select Page</emphasis> form appears:
</para>
<mediaobject>
<imageobject role="html">
@@ -156,15 +156,17 @@
</imageobject>
</mediaobject>
<para>
- This window lists of all existing pages, each displayed with basic information. You can follow this guide to select a page for creating a node:
+ This window lists all existing pages of <emphasis role="bold">Portal</emphasis> or <emphasis role="bold">Group</emphasis> with basic information for each page.
</para>
<para>
- Select a page from list or search a specific page :
+ To select a page for creating a node, simply select a page from the list or search for a specific page as follows:
</para>
<procedure id="proc-User_Guide-Manage_Navigation_Nodes-Search_for_a_page">
<step>
<para>
- Enter a search term related to the page which you want to search for:
+ Enter your page title into the
+ <emphasis role="bold">Title</emphasis>
+ field to do search to Title;
</para>
<mediaobject>
<imageobject role="html">
@@ -174,41 +176,60 @@
<imagedata fileref="images/NewSearch1.png" format="PNG" align="center" contentwidth="150mm"/>
</imageobject>
</mediaobject>
- </step>
- <step>
<para>
- Choose the field you wish to search in:
+ Or, enter the site name into the
+ <emphasis role="bold">Site Name</emphasis>
+ field to do search to the page's site name;
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/NewSearch2.png" format="PNG" align="center" scale="130"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/NewSearch2.png" format="PNG" contentwidth="150mm"/>
- </imageobject>
- </mediaobject>
+
+ <para>
+ Or, enter values into both fields to futher limit your search results by both
+ <emphasis role="bold">Title</emphasis>
+ and <emphasis role="bold">Site Name</emphasis>.
+ </para>
</step>
<step>
<para>
- Click the 'find' icon to perform the search. All pages matching with search term will be listed.
+ Select the area in which you wish to search into the <emphasis role="bold">Type</emphasis> field.
</para>
</step>
<step>
<para>
- Click the OK icon on the row of the page you wish to select.
+ Click
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/Search_button.png" format="PNG"/>
+ </imageobject>
+ </inlinemediaobject>
+ to perform your search. All pages matching your search criteria will be listed.
</para>
</step>
<step>
<para>
- After selecting a page, the details of this page will be displayed in the <emphasis role="bold">Page Selector</emphasis> form.
+ Click
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/Select_page_icon.png" format="PNG"/>
+ </imageobject>
+ </inlinemediaobject>
+ on the row of the page you wish to select.
</para>
</step>
</procedure>
- <para>
- After configuring the page node settings, the page selector and the node's icon, click the <emphasis role="bold">Save</emphasis> button to accept or the <emphasis role="bold">Cancel</emphasis> button to quit without creating a new node.
- </para>
</step>
</procedure>
+ <para>
+ After selecting a page, the details of this page will be displayed in the
+ <emphasis role="bold">Page Selector</emphasis>
+ form.
+ </para>
+ <para>
+ After configuring the page node settings, the page selector and the node's icon, click the
+ <emphasis role="bold">Save</emphasis>
+ button to accept or the
+ <emphasis role="bold">Cancel</emphasis>
+ button to quit without creating a new node.
+ </para>
</section>
<section id="sect-User_Guide-Manage_Navigation_Nodes-Edit_a_node">
@@ -216,7 +237,7 @@
<procedure>
<step>
<para>
- Click on <emphasis role="bold">Site</emphasis> then click on <emphasis role="bold">Edit Navigation</emphasis> of the portal you want to modify.
+ Click <emphasis role="bold">Site</emphasis>, then click <emphasis role="bold">Edit Navigation</emphasis> of the portal you want to modify.
</para>
</step>
<step>
@@ -356,14 +377,6 @@
<imagedata fileref="images/PasteNode3.png" format="PNG" align="center" contentwidth="130mm"/>
</imageobject>
</mediaobject>
- <para>
- The new pages will appear in the page lists:
- </para>
- <!-- <mediaobject>
- <imageobject>
- <imagedata fileref="images/ManagePage2.png" format="PNG" align="center" width="444" />
- </imageobject>
- </mediaobject> -->
</step>
</procedure>
</section>
14 years, 6 months
- 1
- 0
gatein SVN: r7737 - in portal/trunk: web/eXoResources/src/main/webapp/javascript/eXo/gadget and 1 other directory.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2011-10-12 22:39:04 -0400 (Wed, 12 Oct 2011)
New Revision: 7737
Modified:
portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/ExoBasedUserPrefStore.js
Log:
GTNPORTAL-2110 Gadget Wrapper portlets default horoscope gadget doesnt work propertly
Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java
===================================================================
--- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2011-10-12 16:53:52 UTC (rev 7736)
+++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2011-10-13 02:39:04 UTC (rev 7737)
@@ -26,14 +26,18 @@
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.portal.webui.application.GadgetUtil;
import org.exoplatform.portal.webui.application.UIGadget;
+import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiApplication;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.application.portlet.PortletRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
+import org.exoplatform.webui.config.annotation.EventConfig;
import org.exoplatform.webui.core.UIApplication;
import org.exoplatform.webui.core.UIPortletApplication;
import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle;
+import org.exoplatform.webui.event.Event;
+import org.exoplatform.webui.event.EventListener;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
import org.json.JSONArray;
@@ -49,7 +53,8 @@
* tungcnw(a)gmail.com
* June 27, 2008
*/
-@ComponentConfig(lifecycle = UIApplicationLifecycle.class, template = "app:/groovy/gadget/webui/component/UIGadgetPortlet.gtmpl")
+@ComponentConfig(lifecycle = UIApplicationLifecycle.class, template = "app:/groovy/gadget/webui/component/UIGadgetPortlet.gtmpl", events = {
+ @EventConfig(listeners = UIGadgetPortlet.SaveUserPrefActionListener.class)})
public class UIGadgetPortlet extends UIPortletApplication
{
final static public String LOCAL_STRING = "local://";
@@ -68,36 +73,12 @@
{
return userPref;
}
-
- @Override
- public void processAction(WebuiRequestContext context) throws Exception
+
+ public void setUserPref(String pref)
{
- super.processAction(context);
-
- //
- PortletRequest req = context.getRequest();
-
- //
- userPref = req.getParameter("userPref");
- if (userPref != null && !userPref.isEmpty())
- {
- PortletPreferences prefs = req.getPreferences();
- prefs.setValue("userPref", userPref);
- prefs.store();
- }
+ this.userPref = pref;
}
- @Override
- public void processRender(WebuiApplication app, WebuiRequestContext context) throws Exception
- {
- PortletRequest req = context.getRequest();
- PortletPreferences prefs = req.getPreferences();
- userPref = prefs.getValue("userPref", null);
-
- //
- super.processRender(app, context);
- }
-
public String getUrl()
{
PortletRequestContext pcontext = (PortletRequestContext)WebuiRequestContext.getCurrentInstance();
@@ -162,4 +143,23 @@
}
return metadata_.toString();
}
+
+ static public class SaveUserPrefActionListener extends EventListener<UIGadgetPortlet>
+ {
+ public void execute(Event<UIGadgetPortlet> event) throws Exception
+ {
+ PortletRequest req = event.getRequestContext().getRequest();
+ String userPref = req.getParameter("userPref");
+ if (userPref != null && !userPref.isEmpty())
+ {
+ PortletPreferences prefs = req.getPreferences();
+ prefs.setValue("userPref", userPref);
+ prefs.store();
+
+ UIGadgetPortlet gadgetPortlet = (UIGadgetPortlet) event.getSource();
+ gadgetPortlet.setUserPref(userPref);
+ }
+ Util.getPortalRequestContext().setResponseComplete(true);
+ }
+ }
}
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/ExoBasedUserPrefStore.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/ExoBasedUserPrefStore.js 2011-10-12 16:53:52 UTC (rev 7736)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/ExoBasedUserPrefStore.js 2011-10-13 02:39:04 UTC (rev 7737)
@@ -17,7 +17,6 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-
gadgets.ExoBasedUserPrefStore = function() {
gadgets.UserPrefStore.call(this);
};
@@ -35,12 +34,16 @@
var DOMUtil = eXo.core.DOMUtil;
var gadget = document.getElementById("gadget_" + gadget.id) ;
if(gadget != null ) {
+ var uicomponent = gadget.parentNode.id.replace(/^content-/,"");
var portletFragment = DOMUtil.findAncestorByClass(gadget, "PORTLET-FRAGMENT");
- var uiGadget = gadget.parentNode;
+ var gadgetPortlet = DOMUtil.findAncestorByClass(gadget, "UIGadgetPortlet");
+ if(gadgetPortlet != null) {
+ uicomponent = gadgetPortlet.id;
+ }
if (portletFragment != null) {
var compId = portletFragment.parentNode.id;
var href = eXo.env.server.portalBaseURL + "?portal:componentId=" + compId;
- href += "&portal:type=action&uicomponent=" + uiGadget.id.replace(/^content-/,"");
+ href += "&portal:type=action&uicomponent=" + uicomponent;
href += "&op=SaveUserPref";
href += "&ajaxRequest=true";
href += "&userPref=" + prefs;
@@ -49,11 +52,9 @@
var params = [
{name : "userPref", value : prefs}
] ;
- ajaxGet(eXo.env.server.createPortalURL(uiGadget.id.replace(/^content-/,""), "SaveUserPref", true, params),true) ;
+ ajaxGet(eXo.env.server.createPortalURL(uicomponent, "SaveUserPref", true, params),true) ;
}
}
};
-gadgets.Container.prototype.userPrefStore =
- new gadgets.ExoBasedUserPrefStore();
-//}
\ No newline at end of file
+gadgets.Container.prototype.userPrefStore = new gadgets.ExoBasedUserPrefStore();
\ No newline at end of file
14 years, 6 months
- 1
- 0
gatein SVN: r7736 - in epp/portal/branches/EPP_5_2_Branch: component and 107 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-10-12 12:53:52 -0400 (Wed, 12 Oct 2011)
New Revision: 7736
Modified:
epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-packager/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml
Log:
Next development version
Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>gatein</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>integration</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -27,4 +27,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -27,4 +27,4 @@
<mead.patch.path>patches/org.exoplatform.portal-exo.portal.parent/branches/EPP_5_1</mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -27,4 +27,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -27,4 +27,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-packager/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-packager/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-packager/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -27,4 +27,4 @@
<mead.patch.path>patches/org.gatein.pc-pc-parent/tags/2.2.0-CR02</mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path>patches/org.gatein.wci-wci-parent/tags/2.0.0-GA</mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path>patches/org.gatein.wsrp-wsrp-parent/tags/epp-5.1.0-ER03</mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
@@ -25,4 +25,4 @@
<mead.patch.path></mead.patch.path>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<artifactId>mead-tools</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -84,4 +84,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<groupId>org.exoplatform.portal.mead</groupId>
@@ -301,4 +301,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>distribution.parent</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -38,23 +38,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -38,29 +38,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>gatein-api</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>skins-parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gwtGadgets</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<packaging>pom</packaging>
<name>EPP GateIn - Portal - ${project.version}</name>
@@ -465,74 +465,74 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.controller</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.security</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.server</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.resources</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
@@ -542,85 +542,85 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.management</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.framework</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portlet</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.dashboard</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss.plugin</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
<!-- Chromattic -->
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.integration</artifactId>
<packaging>war</packaging>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.jar</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<groupId>org.jboss.gatein</groupId>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -26,7 +26,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -26,7 +26,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>extension-config</artifactId>
@@ -37,4 +37,4 @@
<finalName>extension-config</finalName>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -28,7 +28,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>extension-ear</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.integration</groupId>
<artifactId>gatein-wsrp-integration-parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>extension-ear-as5</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -27,7 +27,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<artifactId>extension-war</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-10-12 15:11:32 UTC (rev 7735)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-10-12 16:53:52 UTC (rev 7736)
@@ -34,7 +34,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.ER04-SNAPSHOT</version>
+ <version>5.2.0.ER05-SNAPSHOT</version>
</parent>
<description>GateIn WSRP Integration extension parent</description>
14 years, 6 months
- 1
- 0
gatein SVN: r7735 - in components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp: registration and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-10-12 11:11:32 -0400 (Wed, 12 Oct 2011)
New Revision: 7735
Modified:
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerGroupMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java
Log:
- GTNWSRP-248: extended use of BaseMapping for more coherence.
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java 2011-10-12 14:52:32 UTC (rev 7734)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java 2011-10-12 15:11:32 UTC (rev 7735)
@@ -30,6 +30,8 @@
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.gatein.wsrp.consumer.EndpointConfigurationInfo;
+import org.gatein.wsrp.consumer.ProducerInfo;
+import org.gatein.wsrp.jcr.mapping.BaseMapping;
import org.gatein.wsrp.jcr.mapping.mixins.MixinHolder;
import org.gatein.wsrp.jcr.mapping.mixins.WSSEndpointEnabled;
@@ -38,7 +40,7 @@
* @version $Revision$
*/
@PrimaryType(name = EndpointInfoMapping.NODE_NAME)
-public abstract class EndpointInfoMapping extends MixinHolder<WSSEndpointEnabled>
+public abstract class EndpointInfoMapping extends MixinHolder<WSSEndpointEnabled> implements BaseMapping<EndpointConfigurationInfo, ProducerInfo>
{
public static final String NODE_NAME = "wsrp:endpointinfo";
@@ -78,7 +80,7 @@
setWSSEnabled(info.getWSSEnabled());
}
- EndpointConfigurationInfo toEndpointConfigurationInfo(EndpointConfigurationInfo initial)
+ public EndpointConfigurationInfo toModel(EndpointConfigurationInfo initial, ProducerInfo registry)
{
initial.setWsdlDefinitionURL(getWSDLURL());
initial.setWSOperationTimeOut(getWSTimeoutMilliseconds());
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-10-12 14:52:32 UTC (rev 7734)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-10-12 15:11:32 UTC (rev 7735)
@@ -136,11 +136,11 @@
info.setModifyRegistrationRequired(getModifyRegistrationRequired());
// endpoint
- EndpointConfigurationInfo endInfo = getEndpointInfo().toEndpointConfigurationInfo(info.getEndpointConfigurationInfo());
+ EndpointConfigurationInfo endInfo = getEndpointInfo().toModel(info.getEndpointConfigurationInfo(), info);
info.setEndpointConfigurationInfo(endInfo);
// registration
- RegistrationInfo regInfo = getRegistrationInfo().toRegistrationInfo(info.getRegistrationInfo());
+ RegistrationInfo regInfo = getRegistrationInfo().toModel(info.getRegistrationInfo(), info);
info.setRegistrationInfo(regInfo);
return info;
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java 2011-10-12 14:52:32 UTC (rev 7734)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java 2011-10-12 15:11:32 UTC (rev 7735)
@@ -29,9 +29,11 @@
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.gatein.common.io.IOTools;
+import org.gatein.wsrp.consumer.ProducerInfo;
import org.gatein.wsrp.consumer.RegistrationInfo;
import org.gatein.wsrp.consumer.RegistrationProperty;
import org.gatein.wsrp.jcr.ChromatticPersister;
+import org.gatein.wsrp.jcr.mapping.BaseMapping;
import org.gatein.wsrp.registration.RegistrationPropertyDescription;
import org.gatein.wsrp.registration.mapping.RegistrationPropertyDescriptionMapping;
@@ -45,7 +47,7 @@
*/
@PrimaryType(name = RegistrationInfoMapping.NODE_NAME)
@FormattedBy(ChromatticPersister.QNameFormatter.class)
-public abstract class RegistrationInfoMapping
+public abstract class RegistrationInfoMapping implements BaseMapping<RegistrationInfo, ProducerInfo>
{
public static final String NODE_NAME = "wsrp:registrationinfo";
@@ -95,7 +97,7 @@
}
}
- RegistrationInfo toRegistrationInfo(RegistrationInfo initial)
+ public RegistrationInfo toModel(RegistrationInfo initial, ProducerInfo registry)
{
initial.setConsumerName(getConsumerName());
initial.setRegistrationHandle(getRegistrationHandle());
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-10-12 14:52:32 UTC (rev 7734)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-10-12 15:11:32 UTC (rev 7735)
@@ -89,12 +89,12 @@
for (ConsumerGroupMapping cgm : mappings.getConsumerGroups())
{
- internalAddConsumerGroup(cgm.toConsumerGroup(this));
+ internalAddConsumerGroup(cgm.toModel(newConsumerGroupSPI(cgm.getName()), this));
}
for (ConsumerMapping cm : mappings.getConsumers())
{
- ConsumerSPI consumer = cm.toConsumer(this);
+ ConsumerSPI consumer = cm.toModel(newConsumerSPI(cm.getId(), cm.getName()), this);
internalAddConsumer(consumer);
// get the registrations and add them to local map.
@@ -149,11 +149,21 @@
return super.internalRemoveConsumer(consumerId);
}
- private void remove(String id, Class clazz)
+ private <T> T remove(String id, Class<T> clazz)
{
ChromatticSession session = persister.getSession();
- session.remove(session.findById(clazz, id));
- persister.closeSession(true);
+ try
+ {
+ T toRemove = session.findById(clazz, id);
+ session.remove(toRemove);
+ persister.closeSession(true);
+ return toRemove;
+ }
+ catch (Exception e)
+ {
+ persister.closeSession(false);
+ throw new RuntimeException(e);
+ }
}
@Override
@@ -189,7 +199,7 @@
try
{
ConsumerMapping cm = session.findById(ConsumerMapping.class, consumer.getPersistentKey());
- cm.initFrom(consumer);
+ cm.initFrom(consumerSPI);
persister.closeSession(true);
}
catch (Exception e)
@@ -209,7 +219,7 @@
try
{
RegistrationMapping cm = session.findById(RegistrationMapping.class, registration.getPersistentKey());
- cm.initFrom(registration);
+ cm.initFrom(registrationSPI);
persister.closeSession(true);
}
catch (Exception e)
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerGroupMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerGroupMapping.java 2011-10-12 14:52:32 UTC (rev 7734)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerGroupMapping.java 2011-10-12 15:11:32 UTC (rev 7735)
@@ -32,10 +32,11 @@
import org.chromattic.api.annotations.Property;
import org.gatein.common.util.ParameterValidation;
import org.gatein.registration.Consumer;
-import org.gatein.registration.ConsumerGroup;
import org.gatein.registration.RegistrationException;
import org.gatein.registration.RegistrationStatus;
import org.gatein.registration.spi.ConsumerGroupSPI;
+import org.gatein.registration.spi.ConsumerSPI;
+import org.gatein.wsrp.jcr.mapping.BaseMapping;
import org.gatein.wsrp.registration.JCRRegistrationPersistenceManager;
import java.util.Collection;
@@ -45,7 +46,7 @@
* @version $Revision$
*/
@PrimaryType(name = ConsumerGroupMapping.NODE_NAME)
-public abstract class ConsumerGroupMapping
+public abstract class ConsumerGroupMapping implements BaseMapping<ConsumerGroupSPI, JCRRegistrationPersistenceManager>
{
public static final String NODE_NAME = "wsrp:consumergroup";
@@ -69,7 +70,7 @@
@FindById
public abstract ConsumerMapping findConsumerById(String id);
- public void initFrom(ConsumerGroup group)
+ public void initFrom(ConsumerGroupSPI group)
{
setName(group.getName());
setStatus(group.getStatus());
@@ -82,7 +83,7 @@
ConsumerMapping cm = findConsumerById(id);
ParameterValidation.throwIllegalArgExceptionIfNull(cm, "ConsumerMapping (no such mapping with id: " + id + ")");
getConsumers().add(cm);
- cm.initFrom(consumer);
+ cm.initFrom((ConsumerSPI)consumer);
}
}
catch (RegistrationException e)
@@ -91,9 +92,9 @@
}
}
- public ConsumerGroupSPI toConsumerGroup(JCRRegistrationPersistenceManager persistenceManager) throws RegistrationException
+ public ConsumerGroupSPI toModel(ConsumerGroupSPI initial, JCRRegistrationPersistenceManager persistenceManager)
{
- ConsumerGroupSPI group = persistenceManager.newConsumerGroupSPI(getName());
+ ConsumerGroupSPI group = (initial != null ? initial : persistenceManager.newConsumerGroupSPI(getName()));
group.setPersistentKey(getPersistentKey());
RegistrationStatus status = getStatus();
if (status == null)
@@ -102,16 +103,24 @@
}
group.setStatus(status);
- for (ConsumerMapping cm : getConsumers())
+ try
{
- Consumer consumer = persistenceManager.getConsumerById(cm.getPersistentKey());
- if (consumer == null)
+ for (ConsumerMapping cm : getConsumers())
{
- consumer = cm.toConsumer(persistenceManager);
+ Consumer consumer = persistenceManager.getConsumerById(cm.getPersistentKey());
+ if (consumer == null)
+ {
+ consumer = cm.toModel((ConsumerSPI)consumer, persistenceManager);
+ }
+
+ group.addConsumer(consumer);
}
- group.addConsumer(consumer);
+ return group;
}
- return group;
+ catch (RegistrationException e)
+ {
+ throw new RuntimeException(e);
+ }
}
}
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerMapping.java 2011-10-12 14:52:32 UTC (rev 7734)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/ConsumerMapping.java 2011-10-12 15:11:32 UTC (rev 7735)
@@ -34,11 +34,12 @@
import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
-import org.gatein.registration.Consumer;
import org.gatein.registration.ConsumerGroup;
import org.gatein.registration.Registration;
import org.gatein.registration.RegistrationException;
import org.gatein.registration.spi.ConsumerSPI;
+import org.gatein.registration.spi.RegistrationSPI;
+import org.gatein.wsrp.jcr.mapping.BaseMapping;
import org.gatein.wsrp.registration.JCRRegistrationPersistenceManager;
import java.util.List;
@@ -48,7 +49,7 @@
* @version $Revision$
*/
@PrimaryType(name = ConsumerMapping.NODE_NAME)
-public abstract class ConsumerMapping
+public abstract class ConsumerMapping implements BaseMapping<ConsumerSPI, JCRRegistrationPersistenceManager>
{
public static final String NODE_NAME = "wsrp:consumer";
@@ -112,7 +113,7 @@
}
// then init
- rm.initFrom(registration);
+ rm.initFrom((RegistrationSPI)registration);
}
else
{
@@ -124,7 +125,7 @@
return rm;
}
- public void initFrom(Consumer consumer)
+ public void initFrom(ConsumerSPI consumer)
{
setName(consumer.getName());
setId(consumer.getId());
@@ -153,23 +154,30 @@
}
}
- public ConsumerSPI toConsumer(JCRRegistrationPersistenceManager persistenceManager) throws RegistrationException
+ public ConsumerSPI toModel(ConsumerSPI initial, JCRRegistrationPersistenceManager persistenceManager)
{
- ConsumerSPI consumer = persistenceManager.newConsumerSPI(getId(), getName());
+ ConsumerSPI consumer = (initial != null ? initial : persistenceManager.newConsumerSPI(getId(), getName()));
consumer.setConsumerAgent(getConsumerAgent());
consumer.setPersistentKey(getPersistentKey());
consumer.setCapabilities(getCapabilities().toConsumerCapabilities());
- ConsumerGroupMapping cgm = getGroup();
- if (cgm != null)
+ try
{
- consumer.setGroup(persistenceManager.getConsumerGroup(cgm.getName()));
+ ConsumerGroupMapping cgm = getGroup();
+ if (cgm != null)
+ {
+ consumer.setGroup(persistenceManager.getConsumerGroup(cgm.getName()));
+ }
+
+ for (RegistrationMapping rm : getRegistrations())
+ {
+ consumer.addRegistration(rm.toRegistration(consumer, persistenceManager));
+ }
}
-
- for (RegistrationMapping rm : getRegistrations())
+ catch (RegistrationException e)
{
- consumer.addRegistration(rm.toRegistration(persistenceManager, consumer));
+ throw new RuntimeException(e);
}
return consumer;
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java 2011-10-12 14:52:32 UTC (rev 7734)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java 2011-10-12 15:11:32 UTC (rev 7735)
@@ -36,11 +36,11 @@
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletStateType;
import org.gatein.pc.api.StatefulPortletContext;
-import org.gatein.registration.Registration;
import org.gatein.registration.RegistrationException;
import org.gatein.registration.RegistrationStatus;
import org.gatein.registration.spi.ConsumerSPI;
import org.gatein.registration.spi.RegistrationSPI;
+import org.gatein.wsrp.jcr.mapping.BaseMapping;
import org.gatein.wsrp.registration.JCRRegistrationPersistenceManager;
import javax.xml.namespace.QName;
@@ -53,7 +53,7 @@
* @version $Revision$
*/
@PrimaryType(name = RegistrationMapping.NODE_NAME)
-public abstract class RegistrationMapping
+public abstract class RegistrationMapping implements BaseMapping<RegistrationSPI, JCRRegistrationPersistenceManager>
{
public static final String NODE_NAME = "wsrp:registration";
@@ -91,7 +91,7 @@
*
* @param registration
*/
- public void initFrom(Registration registration)
+ public void initFrom(RegistrationSPI registration)
{
setStatus(registration.getStatus());
setRegistrationHandle(registration.getRegistrationHandle());
@@ -136,27 +136,41 @@
}
}
- public RegistrationSPI toRegistration(JCRRegistrationPersistenceManager persistenceManager, ConsumerSPI consumer) throws RegistrationException
+ public RegistrationSPI toModel(RegistrationSPI initial, JCRRegistrationPersistenceManager persistenceManager)
{
- RegistrationPropertiesMapping rpm = getProperties();
- Map<QName, Object> props = Collections.emptyMap();
- if (rpm != null)
- {
- props = rpm.toPropMap();
- }
+ ParameterValidation.throwIllegalArgExceptionIfNull(initial, "RegistrationSPI");
- RegistrationSPI reg = persistenceManager.newRegistrationSPI(consumer, props);
- reg.setStatus(getStatus());
- reg.setRegistrationHandle(getRegistrationHandle());
- reg.setPersistentKey(getPersistentKey());
+ initial.setStatus(getStatus());
+ initial.setRegistrationHandle(getRegistrationHandle());
+ initial.setPersistentKey(getPersistentKey());
Collection<PortletContextMapping> pcms = getPortletContexts();
for (PortletContextMapping pcm : pcms)
{
PortletContext pc = PortletContext.createPortletContext(pcm.getId(), IOTools.safeGetBytes(pcm.getState()));
- reg.addPortletContext(pc, false); // no need to save since we're loading from persistence :)
+ try
+ {
+ initial.addPortletContext(pc, false); // no need to save since we're loading from persistence :)
+ }
+ catch (RegistrationException e)
+ {
+ throw new RuntimeException(e);
+ }
}
- return reg;
+ return initial;
}
+
+ public RegistrationSPI toRegistration(ConsumerSPI consumer, JCRRegistrationPersistenceManager persistenceManager) throws RegistrationException
+ {
+ RegistrationPropertiesMapping rpm = getProperties();
+ Map<QName, Object> props = Collections.emptyMap();
+ if (rpm != null)
+ {
+ props = rpm.toPropMap();
+ }
+
+ RegistrationSPI reg = persistenceManager.newRegistrationSPI(consumer, props);
+ return toModel(reg, persistenceManager);
+ }
}
14 years, 6 months
- 1
- 0
gatein SVN: r7734 - components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-10-12 10:52:32 -0400 (Wed, 12 Oct 2011)
New Revision: 7734
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java
Log:
- Moved implementation of internalCreate methods to AbstractRegistrationPersistenceManager.
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java 2011-10-12 12:34:21 UTC (rev 7733)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/AbstractRegistrationPersistenceManager.java 2011-10-12 14:52:32 UTC (rev 7734)
@@ -31,6 +31,7 @@
import org.gatein.registration.Registration;
import org.gatein.registration.RegistrationException;
import org.gatein.registration.RegistrationPersistenceManager;
+import org.gatein.registration.RegistrationStatus;
import org.gatein.registration.spi.ConsumerGroupSPI;
import org.gatein.registration.spi.ConsumerSPI;
import org.gatein.registration.spi.RegistrationSPI;
@@ -44,6 +45,8 @@
*/
public abstract class AbstractRegistrationPersistenceManager implements RegistrationPersistenceManager
{
+ private long lastRegistrationId;
+
public Consumer createConsumer(String consumerId, String consumerName) throws RegistrationException
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(consumerId, "Consumer identity", null);
@@ -180,13 +183,23 @@
protected abstract RegistrationSPI internalRemoveRegistration(String registrationId) throws RegistrationException;
- protected abstract RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map<QName, Object> registrationProperties) throws RegistrationException;
+ protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map<QName, Object> registrationProperties) throws RegistrationException
+ {
+ RegistrationSPI registrationSPI = newRegistrationSPI(consumer, registrationProperties);
+ registrationSPI.setPersistentKey("" + lastRegistrationId++);
+ return registrationSPI;
+ }
protected abstract void internalAddConsumer(ConsumerSPI consumer) throws RegistrationException;
protected abstract ConsumerSPI internalRemoveConsumer(String consumerId) throws RegistrationException;
- protected abstract ConsumerSPI internalCreateConsumer(String consumerId, String consumerName) throws RegistrationException;
+ protected ConsumerSPI internalCreateConsumer(String consumerId, String consumerName) throws RegistrationException
+ {
+ ConsumerSPI consumerSPI = newConsumerSPI(consumerId, consumerName);
+ consumerSPI.setPersistentKey(consumerId);
+ return consumerSPI;
+ }
protected abstract ConsumerSPI internalSaveChangesTo(Consumer consumer) throws RegistrationException;
@@ -196,7 +209,27 @@
protected abstract ConsumerGroupSPI internalRemoveConsumerGroup(String name) throws RegistrationException;
- protected abstract ConsumerGroupSPI internalCreateConsumerGroup(String name) throws RegistrationException;
+ protected ConsumerGroupSPI internalCreateConsumerGroup(String name) throws RegistrationException
+ {
+ ConsumerGroupSPI groupSPI = newConsumerGroupSPI(name);
+ groupSPI.setPersistentKey(name);
+ return groupSPI;
+ }
protected abstract ConsumerSPI getConsumerSPIById(String consumerId) throws RegistrationException;
+
+ public RegistrationSPI newRegistrationSPI(ConsumerSPI consumer, Map<QName, Object> registrationProperties)
+ {
+ return new RegistrationImpl(consumer, RegistrationStatus.PENDING, registrationProperties, this);
+ }
+
+ public ConsumerSPI newConsumerSPI(String consumerId, String consumerName)
+ {
+ return new ConsumerImpl(consumerId, consumerName);
+ }
+
+ public ConsumerGroupSPI newConsumerGroupSPI(String name)
+ {
+ return new ConsumerGroupImpl(name);
+ }
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java 2011-10-12 12:34:21 UTC (rev 7733)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java 2011-10-12 14:52:32 UTC (rev 7734)
@@ -28,12 +28,10 @@
import org.gatein.registration.ConsumerGroup;
import org.gatein.registration.Registration;
import org.gatein.registration.RegistrationException;
-import org.gatein.registration.RegistrationStatus;
import org.gatein.registration.spi.ConsumerGroupSPI;
import org.gatein.registration.spi.ConsumerSPI;
import org.gatein.registration.spi.RegistrationSPI;
-import javax.xml.namespace.QName;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -46,7 +44,6 @@
*/
public class RegistrationPersistenceManagerImpl extends AbstractRegistrationPersistenceManager
{
- private long lastRegistrationId;
private Map<String, ConsumerSPI> consumers = new HashMap<String, ConsumerSPI>();
private Map<String, ConsumerGroupSPI> groups = new HashMap<String, ConsumerGroupSPI>();
private Map<String, RegistrationSPI> registrations = new HashMap<String, RegistrationSPI>();
@@ -100,19 +97,6 @@
}
@Override
- protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map<QName, Object> registrationProperties) throws RegistrationException
- {
- RegistrationSPI registrationSPI = newRegistrationSPI(consumer, registrationProperties);
- registrationSPI.setPersistentKey("" + lastRegistrationId++);
- return registrationSPI;
- }
-
- public RegistrationSPI newRegistrationSPI(ConsumerSPI consumer, Map<QName, Object> registrationProperties)
- {
- return new RegistrationImpl(consumer, RegistrationStatus.PENDING, registrationProperties, this);
- }
-
- @Override
protected void internalAddConsumer(ConsumerSPI consumer) throws RegistrationException
{
consumers.put(consumer.getId(), consumer);
@@ -125,19 +109,6 @@
}
@Override
- protected ConsumerSPI internalCreateConsumer(String consumerId, String consumerName) throws RegistrationException
- {
- ConsumerSPI consumerSPI = newConsumerSPI(consumerId, consumerName);
- consumerSPI.setPersistentKey(consumerId);
- return consumerSPI;
- }
-
- public ConsumerSPI newConsumerSPI(String consumerId, String consumerName)
- {
- return new ConsumerImpl(consumerId, consumerName);
- }
-
- @Override
protected void internalAddConsumerGroup(ConsumerGroupSPI group) throws RegistrationException
{
groups.put(group.getName(), group);
@@ -150,19 +121,6 @@
}
@Override
- protected ConsumerGroupSPI internalCreateConsumerGroup(String name) throws RegistrationException
- {
- ConsumerGroupSPI groupSPI = newConsumerGroupSPI(name);
- groupSPI.setPersistentKey(name);
- return groupSPI;
- }
-
- public ConsumerGroupSPI newConsumerGroupSPI(String name)
- {
- return new ConsumerGroupImpl(name);
- }
-
- @Override
protected ConsumerSPI getConsumerSPIById(String consumerId) throws RegistrationException
{
return (ConsumerSPI)getConsumerById(consumerId);
14 years, 6 months
- 1
- 0