gatein SVN: r2855 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-04-28 00:39:34 -0400 (Wed, 28 Apr 2010)
New Revision: 2855
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html
Log:
Change script for Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html 2010-04-28 01:24:35 UTC (rev 2854)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html 2010-04-28 04:39:34 UTC (rev 2855)
@@ -207,18 +207,23 @@
<td></td>
</tr>
<tr>
- <td>click</td>
- <td>//img[@title='Edit Page']</td>
+ <td>waitForElementPresent</td>
+ <td>xpath=//img[@title='Edit Page']</td>
<td></td>
</tr>
<tr>
+ <td>clickAt</td>
+ <td>xpath=//img[@title='Edit Page']</td>
+ <td></td>
+</tr>
+<tr>
<td>echo</td>
<td>-- Go to editing portal page's properties--</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>//div[@id='UIPageEditor']/div[3]/div/div/div[1]/table/tbody/tr/td/div[1]/div/div/div/div</td>
+ <td>xpath=//div[@id='UIPageEditor']/div[3]/div/div/div[1]/table/tbody/tr/td/div[1]/div/div/div/div</td>
<td></td>
</tr>
<tr>
@@ -228,7 +233,7 @@
</tr>
<tr>
<td>clickAt</td>
- <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=PermissionSetting')"]</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=PermissionSetting')"]</td>
<td></td>
</tr>
<tr>
@@ -308,7 +313,7 @@
</tr>
<tr>
<td>clickAt</td>
- <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td>
+ <td>xpath=//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td>
<td></td>
</tr>
<tr>
14 years, 8 months
gatein SVN: r2854 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US: images and 1 other directory.
by do-not-reply＠jboss.org
Author: benlc
Date: 2010-04-27 21:24:35 -0400 (Tue, 27 Apr 2010)
New Revision: 2854
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Author_Group.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Revision_History.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Test_Your_Installation.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/images/test_install.png
Log:
'committing revision details and alpha channel addition to image'
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Author_Group.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Author_Group.xml 2010-04-28 01:03:03 UTC (rev 2853)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Author_Group.xml 2010-04-28 01:24:35 UTC (rev 2854)
@@ -24,6 +24,15 @@
</affiliation>
<email>theute(a)redhat.com</email>
</editor>
+ <editor>
+ <firstname>Ben</firstname>
+ <surname>Clare</surname>
+ <affiliation>
+ <shortaffil>Red Hat</shortaffil>
+ <orgdiv>Engineering Content Services</orgdiv>
+ </affiliation>
+ <email>bclare(a)redhat.com</email>
+ </editor>
<othercredit>
<affiliation>
<orgname><emphasis role="bold"><ulink type="http" url="http://www.jboss.org/gatein/">GateIn</ulink></emphasis> and <emphasis role="bold"><ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink></emphasis></orgname>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Revision_History.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Revision_History.xml 2010-04-28 01:03:03 UTC (rev 2853)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Revision_History.xml 2010-04-28 01:24:35 UTC (rev 2854)
@@ -24,6 +24,21 @@
</simplelist>
</revdescription>
</revision>
+
+ <revision>
+ <revnumber>2</revnumber>
+ <date>Tue Apr 13 2010</date>
+ <author>
+ <firstname>Ben</firstname>
+ <surname>Clare</surname>
+ <email>bclare(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Updates as described in JBEPP-288 for the verison 5.0 release.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
</revhistory>
</simpara>
</appendix>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Test_Your_Installation.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Test_Your_Installation.xml 2010-04-28 01:03:03 UTC (rev 2853)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Test_Your_Installation.xml 2010-04-28 01:24:35 UTC (rev 2854)
@@ -91,7 +91,7 @@
<imagedata fileref="images/test_install.png" format="PNG" align="center" scale="90" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/test_install.png" format="PNG" align="center" contentwidth="150m" />
+ <imagedata fileref="images/test_install.png" format="PNG" align="center" contentwidth="444px" />
</imageobject>
</mediaobject>
</figure>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/images/test_install.png
===================================================================
(Binary files differ)
14 years, 8 months
gatein SVN: r2853 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-27 21:03:03 -0400 (Tue, 27 Apr 2010)
New Revision: 2853
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
Log:
GTNPORTAL-1091: Correct the edit permission check
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-27 21:18:53 UTC (rev 2852)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-28 01:03:03 UTC (rev 2853)
@@ -337,36 +337,31 @@
{
UISiteManagement uicomp = event.getSource();
String portalName = event.getRequestContext().getRequestParameter(OBJECTID);
- UserPortalConfigService service = uicomp.getApplicationComponent(UserPortalConfigService.class);
DataStorage dataService = uicomp.getApplicationComponent(DataStorage.class);
PortalRequestContext prContext = Util.getPortalRequestContext();
WebuiRequestContext context = event.getRequestContext();
UIApplication uiApplication = context.getUIApplication();
- UserPortalConfig userConfig = service.getUserPortalConfig(portalName, prContext.getRemoteUser());
- if (userConfig == null)
+ PageNavigation originalNavi = dataService.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName);
+ if (originalNavi == null)
{
uiApplication.addMessage(new ApplicationMessage("UISiteManagement.msg.portal-not-exist",
new String[]{portalName}));
return;
}
- PortalConfig portalConfig = userConfig.getPortalConfig();
-
+
UserACL userACL = uicomp.getApplicationComponent(UserACL.class);
- if (!userACL.hasEditPermission(portalConfig))
+ if (!userACL.hasEditPermission(originalNavi))
{
uiApplication.addMessage(new ApplicationMessage("UISiteManagement.msg.Invalid-editPermission", null));;
return;
}
UIPopupWindow popUp = uicomp.getChild(UIPopupWindow.class);
-
UINavigationManagement naviManager = popUp.createUIComponent(UINavigationManagement.class, null, null, popUp);
-
naviManager.setOwner(portalName);
naviManager.setOwnerType(PortalConfig.PORTAL_TYPE);
- PageNavigation originalNavi = dataService.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName);
PageNavigation filteredNavi = null;
try{
filteredNavi = PageNavigationUtils.filterNavigation(originalNavi, prContext.getRemoteUser(), true);
@@ -378,11 +373,8 @@
uicomp.setOriginalSelectedNavigation(originalNavi);
UINavigationNodeSelector selector = naviManager.getChild(UINavigationNodeSelector.class);
- //ArrayList<PageNavigation> list = new ArrayList<PageNavigation>();
- //list.add(navi);
- //selector.initNavigations(list);
selector.setOriginalEdittedNavigation(originalNavi);
- //selector.setFilteredEdittedNavigation(filteredNavi);
+ //TODO: Set the filteredNavi instead
selector.setFilteredEdittedNavigation(originalNavi);
selector.initTreeData();
14 years, 8 months
gatein SVN: r2852 - in portal/branches/EPP_5_0_Branch: component/common and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-27 17:18:53 -0400 (Tue, 27 Apr 2010)
New Revision: 2852
Modified:
portal/branches/EPP_5_0_Branch/component/common/pom.xml
portal/branches/EPP_5_0_Branch/component/resources/pom.xml
portal/branches/EPP_5_0_Branch/component/test/jcr/pom.xml
portal/branches/EPP_5_0_Branch/pom.xml
Log:
Upgrade of components
Modified: portal/branches/EPP_5_0_Branch/component/common/pom.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/component/common/pom.xml 2010-04-27 21:01:53 UTC (rev 2851)
+++ portal/branches/EPP_5_0_Branch/component/common/pom.xml 2010-04-27 21:18:53 UTC (rev 2852)
@@ -56,6 +56,10 @@
<artifactId>exo.jcr.component.core</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.ext</artifactId>
</dependency>
Modified: portal/branches/EPP_5_0_Branch/component/resources/pom.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/component/resources/pom.xml 2010-04-27 21:01:53 UTC (rev 2851)
+++ portal/branches/EPP_5_0_Branch/component/resources/pom.xml 2010-04-27 21:18:53 UTC (rev 2852)
@@ -69,6 +69,11 @@
</dependency>
<dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.ext</artifactId>
</dependency>
Modified: portal/branches/EPP_5_0_Branch/component/test/jcr/pom.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/component/test/jcr/pom.xml 2010-04-27 21:01:53 UTC (rev 2851)
+++ portal/branches/EPP_5_0_Branch/component/test/jcr/pom.xml 2010-04-27 21:18:53 UTC (rev 2852)
@@ -38,6 +38,11 @@
</dependency>
<dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
Modified: portal/branches/EPP_5_0_Branch/pom.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/pom.xml 2010-04-27 21:01:53 UTC (rev 2851)
+++ portal/branches/EPP_5_0_Branch/pom.xml 2010-04-27 21:18:53 UTC (rev 2852)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-GA</version>
+ <version>1.0.1-GA</version>
</parent>
<groupId>org.exoplatform.portal</groupId>
@@ -37,24 +37,24 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.1-CR1</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.1-CR1</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.1-CR1</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.1-CR1</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.1-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.1-GA</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.1-GA</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.1-GA</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch02</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
- <org.gatein.common.version>2.0.0-GA</org.gatein.common.version>
- <org.gatein.wci.version>2.0.0-GA</org.gatein.wci.version>
- <org.gatein.pc.version>2.1.0-GA</org.gatein.pc.version>
+ <org.gatein.common.version>2.0.2-GA</org.gatein.common.version>
+ <org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version>
+ <org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.2.CR01</org.picketlink.idm>
- <org.gatein.wsrp.version>1.1.0-CR01</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.0.1-CR01</org.gatein.mop.version>
+ <org.gatein.wsrp.version>1.1.0-GA</org.gatein.wsrp.version>
+ <org.gatein.mop.version>1.0.2-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <version.chromattic>1.0.1-cr1</version.chromattic>
+ <version.chromattic>1.0.1</version.chromattic>
<version.reflect>1.0.0</version.reflect>
<jcip.version>1.0</jcip.version>
@@ -218,8 +218,19 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.core</artifactId>
<version>${org.exoplatform.jcr.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>3.2.4.GA</version>
+ </dependency>
+ <dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.ext</artifactId>
<version>${org.exoplatform.jcr.version}</version>
@@ -909,6 +920,20 @@
<!-- To be removed and replaced by settings in user config -->
<repositories>
<repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
<id>repository.jboss.org</id>
<url>http://repository.jboss.org/maven2</url>
<releases>
14 years, 8 months
gatein SVN: r2851 - portal/trunk.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-04-27 17:01:53 -0400 (Tue, 27 Apr 2010)
New Revision: 2851
Modified:
portal/trunk/pom.xml
Log:
update mop to 1.0.2
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-04-27 20:49:36 UTC (rev 2850)
+++ portal/trunk/pom.xml 2010-04-27 21:01:53 UTC (rev 2851)
@@ -49,7 +49,7 @@
<org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.2.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>1.1.0-GA</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.0.1-CR01</org.gatein.mop.version>
+ <org.gatein.mop.version>1.0.2-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version>
14 years, 8 months
gatein SVN: r2850 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-04-27 16:49:36 -0400 (Tue, 27 Apr 2010)
New Revision: 2850
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-04-27 20:49:21 UTC (rev 2849)
+++ components/mop/trunk/api/pom.xml 2010-04-27 20:49:36 UTC (rev 2850)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.2-GA</version>
+ <version>1.0.3-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-04-27 20:49:21 UTC (rev 2849)
+++ components/mop/trunk/core/pom.xml 2010-04-27 20:49:36 UTC (rev 2850)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.2-GA</version>
+ <version>1.0.3-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-04-27 20:49:21 UTC (rev 2849)
+++ components/mop/trunk/pom.xml 2010-04-27 20:49:36 UTC (rev 2850)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.2-GA</version>
+ <version>1.0.3-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.2-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.2-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.2-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-04-27 20:49:21 UTC (rev 2849)
+++ components/mop/trunk/spi/pom.xml 2010-04-27 20:49:36 UTC (rev 2850)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.2-GA</version>
+ <version>1.0.3-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
14 years, 8 months
gatein SVN: r2849 - components/mop/tags.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-04-27 16:49:21 -0400 (Tue, 27 Apr 2010)
New Revision: 2849
Added:
components/mop/tags/1.0.2-GA/
Log:
[maven-scm] copy for tag 1.0.2-GA
Copied: components/mop/tags/1.0.2-GA (from rev 2848, components/mop/trunk)
14 years, 8 months
gatein SVN: r2848 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-04-27 16:48:57 -0400 (Tue, 27 Apr 2010)
New Revision: 2848
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.2-GA
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-04-27 20:45:20 UTC (rev 2847)
+++ components/mop/trunk/api/pom.xml 2010-04-27 20:48:57 UTC (rev 2848)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.2-GA-SNAPSHOT</version>
+ <version>1.0.2-GA</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-04-27 20:45:20 UTC (rev 2847)
+++ components/mop/trunk/core/pom.xml 2010-04-27 20:48:57 UTC (rev 2848)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.2-GA-SNAPSHOT</version>
+ <version>1.0.2-GA</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-04-27 20:45:20 UTC (rev 2847)
+++ components/mop/trunk/pom.xml 2010-04-27 20:48:57 UTC (rev 2848)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.2-GA-SNAPSHOT</version>
+ <version>1.0.2-GA</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.2-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.2-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.2-GA</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-04-27 20:45:20 UTC (rev 2847)
+++ components/mop/trunk/spi/pom.xml 2010-04-27 20:48:57 UTC (rev 2848)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.2-GA-SNAPSHOT</version>
+ <version>1.0.2-GA</version>
</parent>
<!-- ****************** -->
14 years, 8 months
gatein SVN: r2847 - in components/mop/trunk/core/src: test/java/org/gatein/mop/core/api/workspace and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-04-27 16:45:20 -0400 (Tue, 27 Apr 2010)
New Revision: 2847
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java
Log:
GTNMOP-24: Implement getName() method on a few mop objects
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-04-27 19:15:47 UTC (rev 2846)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-04-27 20:45:20 UTC (rev 2847)
@@ -61,6 +61,11 @@
return model.getAdapter(this, adaptedType, false) != null;
}
+ public String getName()
+ {
+ return getNodeName();
+ }
+
@Override
public String toString()
{
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java 2010-04-27 19:15:47 UTC (rev 2846)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java 2010-04-27 20:45:20 UTC (rev 2847)
@@ -50,6 +50,7 @@
Workspace workspace = model.getWorkspace();
Site site = workspace.addSite(ObjectType.GROUP_SITE, "site");
assertNotNull(site);
+ assertEquals("site", site.getName());
Site s2 = model.findObjectById(ObjectType.SITE, site.getObjectId());
assertEquals(site, s2);
assertEquals(workspace, site.getWorkspace());
14 years, 8 months
gatein SVN: r2846 - in portal/trunk: component/common and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-27 15:15:47 -0400 (Tue, 27 Apr 2010)
New Revision: 2846
Modified:
portal/trunk/component/common/pom.xml
portal/trunk/component/resources/pom.xml
portal/trunk/component/test/jcr/pom.xml
portal/trunk/pom.xml
Log:
Updating components (Except mop)
Modified: portal/trunk/component/common/pom.xml
===================================================================
--- portal/trunk/component/common/pom.xml 2010-04-27 16:42:05 UTC (rev 2845)
+++ portal/trunk/component/common/pom.xml 2010-04-27 19:15:47 UTC (rev 2846)
@@ -56,6 +56,10 @@
<artifactId>exo.jcr.component.core</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.ext</artifactId>
</dependency>
Modified: portal/trunk/component/resources/pom.xml
===================================================================
--- portal/trunk/component/resources/pom.xml 2010-04-27 16:42:05 UTC (rev 2845)
+++ portal/trunk/component/resources/pom.xml 2010-04-27 19:15:47 UTC (rev 2846)
@@ -69,6 +69,11 @@
</dependency>
<dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.ext</artifactId>
</dependency>
Modified: portal/trunk/component/test/jcr/pom.xml
===================================================================
--- portal/trunk/component/test/jcr/pom.xml 2010-04-27 16:42:05 UTC (rev 2845)
+++ portal/trunk/component/test/jcr/pom.xml 2010-04-27 19:15:47 UTC (rev 2846)
@@ -38,6 +38,11 @@
</dependency>
<dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-04-27 16:42:05 UTC (rev 2845)
+++ portal/trunk/pom.xml 2010-04-27 19:15:47 UTC (rev 2846)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-GA</version>
+ <version>1.0.1-GA</version>
</parent>
<groupId>org.exoplatform.portal</groupId>
@@ -37,24 +37,24 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.1-CR1</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.1-CR1</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.1-CR1</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.1-CR1</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.1-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.1-GA</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.1-GA</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.1-GA</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch02</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
- <org.gatein.common.version>2.0.0-GA</org.gatein.common.version>
- <org.gatein.wci.version>2.0.0-GA</org.gatein.wci.version>
- <org.gatein.pc.version>2.1.0-GA</org.gatein.pc.version>
+ <org.gatein.common.version>2.0.2-GA</org.gatein.common.version>
+ <org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version>
+ <org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.2.CR01</org.picketlink.idm>
- <org.gatein.wsrp.version>1.1.0-CR01</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>1.1.0-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.1-CR01</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <version.chromattic>1.0.1-cr1</version.chromattic>
+ <version.chromattic>1.0.1</version.chromattic>
<version.reflect>1.0.0</version.reflect>
<jcip.version>1.0</jcip.version>
@@ -198,8 +198,19 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.core</artifactId>
<version>${org.exoplatform.jcr.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>3.2.4.GA</version>
+ </dependency>
+ <dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.ext</artifactId>
<version>${org.exoplatform.jcr.version}</version>
@@ -883,6 +894,20 @@
<!-- To be removed and replaced by settings in user config -->
<repositories>
<repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
<id>repository.jboss.org</id>
<url>http://repository.jboss.org/maven2</url>
<releases>
14 years, 8 months