gatein SVN: r1895 - in components/wsrp/trunk: admin-gui and 7 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-27 09:28:29 -0500 (Sat, 27 Feb 2010)
New Revision: 1895
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0-Beta09
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-02-27 14:20:24 UTC (rev 1894)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-02-27 14:28:29 UTC (rev 1895)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta09-SNAPSHOT</version>
+ <version>1.0.0-Beta09</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-02-27 14:20:24 UTC (rev 1894)
+++ components/wsrp/trunk/api/pom.xml 2010-02-27 14:28:29 UTC (rev 1895)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta09-SNAPSHOT</version>
+ <version>1.0.0-Beta09</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-02-27 14:20:24 UTC (rev 1894)
+++ components/wsrp/trunk/common/pom.xml 2010-02-27 14:28:29 UTC (rev 1895)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta09-SNAPSHOT</version>
+ <version>1.0.0-Beta09</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-02-27 14:20:24 UTC (rev 1894)
+++ components/wsrp/trunk/consumer/pom.xml 2010-02-27 14:28:29 UTC (rev 1895)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta09-SNAPSHOT</version>
+ <version>1.0.0-Beta09</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-02-27 14:20:24 UTC (rev 1894)
+++ components/wsrp/trunk/pom.xml 2010-02-27 14:28:29 UTC (rev 1895)
@@ -21,8 +21,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta09-SNAPSHOT</version>
+ <version>1.0.0-Beta09</version>
<packaging>pom</packaging>
@@ -41,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/1.0.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/1.0.0-Beta09</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/1.0.0-Beta09</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-02-27 14:20:24 UTC (rev 1894)
+++ components/wsrp/trunk/producer/pom.xml 2010-02-27 14:28:29 UTC (rev 1895)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta09-SNAPSHOT</version>
+ <version>1.0.0-Beta09</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-02-27 14:20:24 UTC (rev 1894)
+++ components/wsrp/trunk/test/pom.xml 2010-02-27 14:28:29 UTC (rev 1895)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta09-SNAPSHOT</version>
+ <version>1.0.0-Beta09</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-02-27 14:20:24 UTC (rev 1894)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-02-27 14:28:29 UTC (rev 1895)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta09-SNAPSHOT</version>
+ <version>1.0.0-Beta09</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-02-27 14:20:24 UTC (rev 1894)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-02-27 14:28:29 UTC (rev 1895)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta09-SNAPSHOT</version>
+ <version>1.0.0-Beta09</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
14 years, 10 months
gatein SVN: r1894 - in components/wsrp/trunk: producer/src/main/java/org/gatein/registration/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-27 09:20:24 -0500 (Sat, 27 Feb 2010)
New Revision: 1894
Modified:
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java
Log:
- GTNWSRP-5: properly save changes to consumer when reacting to registration properties changes on the producer.
- Updated to PC 2.1.0-CR05.
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-02-26 23:13:26 UTC (rev 1893)
+++ components/wsrp/trunk/pom.xml 2010-02-27 14:20:24 UTC (rev 1894)
@@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -46,7 +47,7 @@
</scm>
<properties>
- <version.gatein.pc>2.1.0-CR04</version.gatein.pc>
+ <version.gatein.pc>2.1.0-CR05</version.gatein.pc>
<version.gatein.common>2.0.0-CR03</version.gatein.common>
<version.gatein.wci>2.0.0-CR02</version.gatein.wci>
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2010-02-26 23:13:26 UTC (rev 1893)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2010-02-27 14:20:24 UTC (rev 1894)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2009, Red Hat Middleware, LLC, and individual
+ * Copyright 2010, 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.
@@ -338,6 +338,11 @@
// pending instead of invalid as technically, the registration is not yet invalid
reg.setStatus(RegistrationStatus.PENDING);
+
+ // make changes persistent
+ Consumer consumer = reg.getConsumer();
+ persistenceManager.saveChangesTo(consumer);
+
// reg.clearAssociatedState(); //todo: do we need to clear the associated state? If we do, should we wait until current operations are done?
}
14 years, 10 months
gatein SVN: r1893 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-26 18:13:26 -0500 (Fri, 26 Feb 2010)
New Revision: 1893
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
Log:
GTNPORTAL-180 : Nothing happens when check or un-check Show Infor bar, Show Portlet Mode and Show Window State in dashboard portlet
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-26 22:59:06 UTC (rev 1892)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-26 23:13:26 UTC (rev 1893)
@@ -452,6 +452,21 @@
owner.getName(),
null
);
+
+ //
+ boolean showInfoBar = false;
+ boolean showMode = false;
+ boolean showWindowState = false;
+ String theme = null;
+ if (srcContainer.isAdapted(Decorated.class))
+ {
+ Decorated decorated = srcContainer.adapt(Decorated.class);
+ showInfoBar = decorated.getShowInfoBar();
+ showMode = decorated.getShowMode();
+ showWindowState = decorated.getShowInfoBar();
+ theme = decorated.getTheme();
+ }
+
mo = new ApplicationData<Portlet>(
srcContainer.getObjectId(),
component.getName(),
@@ -461,12 +476,12 @@
null,
null,
null,
- false,
- false,
- false,
+ showInfoBar,
+ showWindowState,
+ showMode,
+ theme,
null,
null,
- null,
Collections.<String, String>emptyMap(),
Collections.singletonList(UserACL.EVERYONE));
// Julien : the everyone is not great but having null permission
@@ -661,6 +676,11 @@
{
UIContainer dstDashboard = session.findObjectById(ObjectType.CONTAINER, app.getStorageId());
srcChild = loadDashboard(dstDashboard);
+ Decorated decorated = dstDashboard.adapt(Decorated.class);
+ decorated.setShowWindowState(app.isShowApplicationState());
+ decorated.setShowInfoBar(app.isShowInfoBar());
+ decorated.setShowMode(app.isShowApplicationMode());
+ decorated.setTheme(app.getTheme());
}
else
{
14 years, 10 months
gatein SVN: r1892 - in portal/trunk/component/portal/src: main/java/org/exoplatform/portal/pom/data and 1 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-26 17:59:06 -0500 (Fri, 26 Feb 2010)
New Revision: 1892
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Container.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Dashboard.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
Log:
remove useless persistence of "decorator" container attribute
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Container.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Container.java 2010-02-26 22:29:58 UTC (rev 1891)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Container.java 2010-02-26 22:59:06 UTC (rev 1892)
@@ -29,10 +29,7 @@
import java.util.List;
/**
- * May 13, 2004
- * @author: Tuan Nguyen
- * @email: tuan08(a)users.sourceforge.net
- * @version: $Id: Container.java,v 1.8 2004/11/03 01:23:55 tuan08 Exp $
+ * @author Tuan Nguyen
**/
public class Container extends ModelObject
{
@@ -43,8 +40,6 @@
protected String icon;
- protected String decorator;
-
protected String template;
protected String factoryId;
@@ -57,6 +52,9 @@
protected String height;
+ // Here to please jibx binding but not used anymore
+ protected String decorator;
+
protected String[] accessPermissions;
protected ArrayList<ModelObject> children;
@@ -89,7 +87,6 @@
this.id = data.getId();
this.name = data.getName();
this.icon = data.getIcon();
- this.decorator = data.getDecorator();
this.template = data.getTemplate();
this.factoryId = data.getFactoryId();
this.title = data.getTitle();
@@ -160,16 +157,6 @@
this.width = width;
}
- public String getDecorator()
- {
- return decorator;
- }
-
- public void setDecorator(String s)
- {
- decorator = s;
- }
-
public String getDescription()
{
return description;
@@ -220,6 +207,18 @@
this.accessPermissions = accessPermissions;
}
+ public String getDecorator()
+ {
+ // Here to please jibx binding but not used anymore
+ return null;
+ }
+
+ // Here to please jibx binding but not used anymore
+ public void setDecorator(String decorator)
+ {
+ // Here to please jibx binding but not used anymore
+ }
+
@Override
public ContainerData build()
{
@@ -229,7 +228,6 @@
id,
name,
icon,
- decorator,
template,
factoryId,
title,
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Dashboard.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Dashboard.java 2010-02-26 22:29:58 UTC (rev 1891)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Dashboard.java 2010-02-26 22:59:06 UTC (rev 1892)
@@ -55,7 +55,6 @@
id,
name,
icon,
- decorator,
template,
factoryId,
title,
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-02-26 22:29:58 UTC (rev 1891)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-02-26 22:59:06 UTC (rev 1892)
@@ -158,7 +158,6 @@
id,
name,
icon,
- decorator,
template,
factoryId,
title,
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java 2010-02-26 22:29:58 UTC (rev 1891)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java 2010-02-26 22:59:06 UTC (rev 1892)
@@ -37,9 +37,6 @@
private final String icon;
/** . */
- private final String decorator;
-
- /** . */
private final String template;
/** . */
@@ -68,7 +65,6 @@
String id,
String name,
String icon,
- String decorator,
String template,
String factoryId,
String title,
@@ -84,7 +80,6 @@
this.id = id;
this.name = name;
this.icon = icon;
- this.decorator = decorator;
this.template = template;
this.factoryId = factoryId;
this.title = title;
@@ -110,11 +105,6 @@
return icon;
}
- public String getDecorator()
- {
- return decorator;
- }
-
public String getTemplate()
{
return template;
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java 2010-02-26 22:29:58 UTC (rev 1891)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java 2010-02-26 22:59:06 UTC (rev 1892)
@@ -34,7 +34,6 @@
String id,
String name,
String icon,
- String decorator,
String template,
String factoryId,
String title,
@@ -49,7 +48,6 @@
id,
name,
icon,
- decorator,
template,
factoryId,
title,
@@ -73,7 +71,6 @@
null,
null,
null,
- null,
"classpath:groovy/dashboard/webui/component/UIContainer.gtmpl",
null,
null,
@@ -90,7 +87,6 @@
null,
null,
null,
- null,
"classpath:groovy/dashboard/webui/component/UIColumnContainer.gtmpl",
null,
null,
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-02-26 22:29:58 UTC (rev 1891)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-02-26 22:59:06 UTC (rev 1892)
@@ -50,9 +50,6 @@
public static final Key<String> FACTORY_ID = Key.create("factory-id", ValueType.STRING);
/** . */
- public static final Key<String> DECORATOR = Key.create("decorator", ValueType.STRING);
-
- /** . */
public static final Key<Integer> PRIORITY = Key.create("priority", ValueType.INTEGER);
/** . */
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-26 22:29:58 UTC (rev 1891)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-26 22:59:06 UTC (rev 1892)
@@ -384,7 +384,6 @@
name,
null,
null,
- null,
attrs.getValue(MappedAttributes.FACTORY_ID),
described.getName(),
described.getDescription(),
@@ -418,7 +417,6 @@
attrs.getValue(MappedAttributes.ID),
attrs.getValue(MappedAttributes.NAME),
attrs.getValue(MappedAttributes.ICON),
- attrs.getValue(MappedAttributes.DECORATOR),
attrs.getValue(MappedAttributes.TEMPLATE),
attrs.getValue(MappedAttributes.FACTORY_ID),
described.getName(),
@@ -564,7 +562,6 @@
dstAttrs.setValue(MappedAttributes.ICON, src.getIcon());
dstAttrs.setValue(MappedAttributes.TEMPLATE, src.getTemplate());
dstAttrs.setValue(MappedAttributes.FACTORY_ID, src.getFactoryId());
- dstAttrs.setValue(MappedAttributes.DECORATOR, src.getDecorator());
dstAttrs.setValue(MappedAttributes.WIDTH, src.getWidth());
dstAttrs.setValue(MappedAttributes.HEIGHT, src.getHeight());
dstAttrs.setValue(MappedAttributes.NAME, src.getName());
@@ -1082,7 +1079,6 @@
attrs.getValue(MappedAttributes.ID),
attrs.getValue(MappedAttributes.NAME),
attrs.getValue(MappedAttributes.ICON),
- attrs.getValue(MappedAttributes.DECORATOR),
attrs.getValue(MappedAttributes.TEMPLATE),
attrs.getValue(MappedAttributes.FACTORY_ID),
described.getName(),
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java 2010-02-26 22:29:58 UTC (rev 1891)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java 2010-02-26 22:59:06 UTC (rev 1892)
@@ -41,7 +41,6 @@
String id,
String name,
String icon,
- String decorator,
String template,
String factoryId,
String title,
@@ -55,7 +54,7 @@
String editPermission,
boolean showMaxWindow)
{
- super(storageId, id, name, icon, decorator, template, factoryId, title, description, width, height, accessPermissions, children);
+ super(storageId, id, name, icon, template, factoryId, title, description, width, height, accessPermissions, children);
//
this.key = new PageKey(ownerType, ownerId, name);
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2010-02-26 22:29:58 UTC (rev 1891)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2010-02-26 22:59:06 UTC (rev 1892)
@@ -197,7 +197,6 @@
assertEquals("container_1_template", container1.getTemplate());
assertTrue(Arrays.equals(new String[]{"container_1_access_permissions"}, container1.getAccessPermissions()));
assertEquals("container_1_factory_id", container1.getFactoryId());
- assertEquals("container_1_decorator", container1.getDecorator());
assertEquals("container_1_description", container1.getDescription());
assertEquals("container_1_width", container1.getWidth());
assertEquals("container_1_height", container1.getHeight());
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-26 22:29:58 UTC (rev 1891)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-26 22:59:06 UTC (rev 1892)
@@ -25,7 +25,6 @@
import org.exoplatform.portal.mop.ProtectedResource;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.POMSessionManager;
-import org.exoplatform.test.BasicTestCase;
import org.gatein.mop.api.Attributes;
import org.gatein.mop.api.content.Customization;
import org.gatein.mop.api.workspace.Navigation;
@@ -203,7 +202,6 @@
assertEquals("container_1_icon", container1Attrs.getString("icon"));
assertEquals("container_1_template", container1Attrs.getString("template"));
assertEquals("container_1_factory_id", container1Attrs.getString("factory-id"));
- assertEquals("container_1_decorator", container1Attrs.getString("decorator"));
assertEquals("container_1_width", container1Attrs.getString("width"));
assertEquals("container_1_height", container1Attrs.getString("height"));
14 years, 10 months
gatein SVN: r1891 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/mop and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-26 17:29:58 -0500 (Fri, 26 Feb 2010)
New Revision: 1891
Added:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Decorated.java
Modified:
portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
added a Decorated mixin that gathers the properties of something visual that is decorated, will be useful for GTNPORTAL-180 (Nothing happens when check or un-check Show Infor bar, Show Portlet Mode and Show Window State in dashboard portlet)
Modified: portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml
===================================================================
--- portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml 2010-02-26 21:53:44 UTC (rev 1890)
+++ portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml 2010-02-26 22:29:58 UTC (rev 1891)
@@ -40,4 +40,21 @@
</propertyDefinitions>
</nodeType>
+ <nodeType name="gtn:decorated" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
+ <propertyDefinitions>
+ <propertyDefinition name="gtn:showinfobar" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="gtn:showwindowstate" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="gtn:showmode" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="gtn:theme" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
</nodeTypes>
Added: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Decorated.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Decorated.java (rev 0)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Decorated.java 2010-02-26 22:29:58 UTC (rev 1891)
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * 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.exoplatform.portal.mop;
+
+import org.chromattic.api.annotations.MixinType;
+import org.chromattic.api.annotations.Property;
+
+/**
+ * An object that has a surrounding configurable decoration.
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+@MixinType(name = "gtn:decorated")
+public abstract class Decorated
+{
+
+ @Property(name = "gtn:showinfobar", defaultValue = "false")
+ public abstract boolean getShowInfoBar();
+
+ public abstract void setShowInfoBar(boolean showInfoBar);
+
+ @Property(name = "gtn:showmode", defaultValue = "false")
+ public abstract boolean getShowMode();
+
+ public abstract void setShowMode(boolean showMode);
+
+ @Property(name = "gtn:showwindowstate", defaultValue = "false")
+ public abstract boolean getShowWindowState();
+
+ public abstract void setShowWindowState(boolean showWindowState);
+
+ @Property(name = "gtn:theme")
+ public abstract String getTheme();
+
+ public abstract void setTheme(String theme);
+
+}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-02-26 21:53:44 UTC (rev 1890)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-02-26 22:29:58 UTC (rev 1891)
@@ -74,15 +74,6 @@
public static final Key<String> VISIBILITY = Key.create("visibility", ValueType.STRING);
/** . */
- public static final Key<Boolean> SHOW_INFO_BAR = Key.create("show-info-bar", ValueType.BOOLEAN);
-
- /** . */
- public static final Key<Boolean> SHOW_STATE = Key.create("show-state", ValueType.BOOLEAN);
-
- /** . */
- public static final Key<Boolean> SHOW_MODE = Key.create("show-mode", ValueType.BOOLEAN);
-
- /** . */
public static final Key<String> LOCALE = Key.create("locale", ValueType.STRING);
/** . */
@@ -96,7 +87,4 @@
/** . */
public static final Key<String> TYPE = Key.create("type", ValueType.STRING);
-
- /** . */
- public static final Key<String> THEME = Key.create("theme", ValueType.STRING);
}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-26 21:53:44 UTC (rev 1890)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-26 22:29:58 UTC (rev 1891)
@@ -24,6 +24,7 @@
import org.exoplatform.portal.config.model.ApplicationState;
import org.exoplatform.portal.config.model.ApplicationType;
import org.exoplatform.portal.config.model.CloneApplicationState;
+import org.exoplatform.portal.mop.Decorated;
import org.exoplatform.portal.mop.Described;
import org.exoplatform.portal.mop.ProtectedResource;
import org.exoplatform.portal.config.model.PersistentApplicationState;
@@ -86,10 +87,6 @@
private static final Set<String> windowPropertiesBlackList =
Tools.set(
MappedAttributes.TYPE.getName(),
- MappedAttributes.THEME.getName(),
- MappedAttributes.SHOW_INFO_BAR.getName(),
- MappedAttributes.SHOW_STATE.getName(),
- MappedAttributes.SHOW_MODE.getName(),
MappedAttributes.ICON.getName(),
MappedAttributes.WIDTH.getName(),
MappedAttributes.HEIGHT.getName());
@@ -853,6 +850,20 @@
Described described = src.adapt(Described.class);
//
+ boolean showInfoBar = false;
+ boolean showWindowState = false;
+ boolean showMode = false;
+ String theme = null;
+ if (src.isAdapted(Decorated.class))
+ {
+ Decorated decorated = src.adapt(Decorated.class);
+ showInfoBar = decorated.getShowInfoBar();
+ showWindowState = decorated.getShowWindowState();
+ showMode = decorated.getShowMode();
+ theme = decorated.getTheme();
+ }
+
+ //
return new ApplicationData<S>(
src.getObjectId(),
src.getName(),
@@ -862,10 +873,10 @@
described.getName(),
attrs.getValue(MappedAttributes.ICON),
described.getDescription(),
- attrs.getValue(MappedAttributes.SHOW_INFO_BAR),
- attrs.getValue(MappedAttributes.SHOW_STATE),
- attrs.getValue(MappedAttributes.SHOW_MODE),
- attrs.getValue(MappedAttributes.THEME),
+ showInfoBar,
+ showWindowState,
+ showMode,
+ theme,
attrs.getValue(MappedAttributes.WIDTH),
attrs.getValue(MappedAttributes.HEIGHT),
Utils.safeImmutableMap(properties),
@@ -883,11 +894,14 @@
described.setName(src.getTitle());
described.setDescription(src.getDescription());
+ Decorated decorated = dst.adapt(Decorated.class);
+ decorated.setShowInfoBar(src.isShowInfoBar());
+ decorated.setShowMode(src.isShowApplicationMode());
+ decorated.setShowWindowState(src.isShowApplicationState());
+ decorated.setTheme(src.getTheme());
+
+ //
Attributes attrs = dst.getAttributes();
- attrs.setValue(MappedAttributes.THEME, src.getTheme());
- attrs.setValue(MappedAttributes.SHOW_INFO_BAR, src.isShowInfoBar());
- attrs.setValue(MappedAttributes.SHOW_STATE, src.isShowApplicationState());
- attrs.setValue(MappedAttributes.SHOW_MODE, src.isShowApplicationMode());
attrs.setValue(MappedAttributes.ICON, src.getIcon());
attrs.setValue(MappedAttributes.WIDTH, src.getWidth());
attrs.setValue(MappedAttributes.HEIGHT, src.getHeight());
Modified: portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
===================================================================
--- portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-02-26 21:53:44 UTC (rev 1890)
+++ portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-02-26 22:29:58 UTC (rev 1891)
@@ -180,6 +180,7 @@
<value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value>
<value>org.exoplatform.portal.mop.ProtectedResource</value>
<value>org.exoplatform.portal.mop.Described</value>
+ <value>org.exoplatform.portal.mop.Decorated</value>
</values-param>
</init-params>
</component-plugin>
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-26 21:53:44 UTC (rev 1890)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-26 22:29:58 UTC (rev 1891)
@@ -20,6 +20,7 @@
package org.exoplatform.portal.config;
import org.exoplatform.container.PortalContainer;
+import org.exoplatform.portal.mop.Decorated;
import org.exoplatform.portal.mop.Described;
import org.exoplatform.portal.mop.ProtectedResource;
import org.exoplatform.portal.pom.config.POMSession;
@@ -214,11 +215,12 @@
Described application1Described = application1.adapt(Described.class);
assertEquals("application_1_title", application1Described.getName());
assertEquals("application_1_description", application1Described.getDescription());
+ Decorated application1Decorated = application1.adapt(Decorated.class);
+ assertEquals("application_1_theme", application1Decorated.getTheme());
+ assertEquals(true, application1Decorated.getShowInfoBar());
+ assertEquals(true, application1Decorated.getShowMode());
+ assertEquals(true, application1Decorated.getShowWindowState());
Attributes application1Attrs = application1.getAttributes();
- assertEquals("application_1_theme", application1Attrs.getString("theme"));
- assertEquals(true, (boolean)application1Attrs.getBoolean("show-info-bar"));
- assertEquals(true, (boolean)application1Attrs.getBoolean("show-state"));
- assertEquals(true, (boolean)application1Attrs.getBoolean("show-mode"));
assertEquals("application_1_icon", application1Attrs.getString("icon"));
assertEquals("application_1_width", application1Attrs.getString("width"));
assertEquals("application_1_height", application1Attrs.getString("height"));
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-26 21:53:44 UTC (rev 1890)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-26 22:29:58 UTC (rev 1891)
@@ -265,6 +265,7 @@
<value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value>
<value>org.exoplatform.portal.mop.ProtectedResource</value>
<value>org.exoplatform.portal.mop.Described</value>
+ <value>org.exoplatform.portal.mop.Decorated</value>
</values-param>
<properties-param>
<name>options</name>
14 years, 10 months
gatein SVN: r1890 - in components/pc/trunk: api and 12 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-26 16:53:44 -0500 (Fri, 26 Feb 2010)
New Revision: 1890
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/docs/user-guide/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/mc/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/api/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/bridge/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/controller/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/docs/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/docs/user-guide/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -9,7 +9,7 @@
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>GateIn - Portlet Container (User Guide ${translation})</name>
@@ -64,10 +64,4 @@
</releases>
</pluginRepository>
</pluginRepositories>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/tools/maven/doc-parent/tags...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/tools/maven/doc-parent/tags/2....</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/tools/maven/doc-parent/tags/2.1.0-...</url>
- </scm>
</project>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/federation/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/jsr168api/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/management/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/mc/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -6,7 +6,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.1.0-CR05</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.1.0-CR05</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.1.0-CR05</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk/</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/portal/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/portlet/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/samples/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2010-02-26 21:53:12 UTC (rev 1889)
+++ components/pc/trunk/test/pom.xml 2010-02-26 21:53:44 UTC (rev 1890)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05</version>
+ <version>2.1.0-CR06-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
14 years, 10 months
gatein SVN: r1889 - components/pc/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-26 16:53:12 -0500 (Fri, 26 Feb 2010)
New Revision: 1889
Added:
components/pc/tags/2.1.0-CR05/
Log:
[maven-scm] copy for tag 2.1.0-CR05
Copied: components/pc/tags/2.1.0-CR05 (from rev 1888, components/pc/trunk)
14 years, 10 months
gatein SVN: r1888 - in components/pc/trunk: api and 12 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-26 16:52:45 -0500 (Fri, 26 Feb 2010)
New Revision: 1888
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/docs/user-guide/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/mc/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/pom.xml
Log:
[maven-release-plugin] prepare release 2.1.0-CR05
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/api/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/bridge/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/controller/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/docs/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/docs/user-guide/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -9,7 +9,7 @@
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
<packaging>jdocbook</packaging>
<name>GateIn - Portlet Container (User Guide ${translation})</name>
@@ -64,4 +64,10 @@
</releases>
</pluginRepository>
</pluginRepositories>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/tools/maven/doc-parent/tags...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/tools/maven/doc-parent/tags/2....</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/tools/maven/doc-parent/tags/2.1.0-...</url>
+ </scm>
</project>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/federation/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/jsr168api/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/management/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/mc/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -6,7 +6,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.1.0-CR05</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.1.0-CR05</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.1.0-CR05</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/portal/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/portlet/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/samples/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2010-02-26 18:34:18 UTC (rev 1887)
+++ components/pc/trunk/test/pom.xml 2010-02-26 21:52:45 UTC (rev 1888)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR05-SNAPSHOT</version>
+ <version>2.1.0-CR05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
14 years, 10 months
gatein SVN: r1887 - portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-26 13:34:18 -0500 (Fri, 26 Feb 2010)
New Revision: 1887
Modified:
portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java
portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java
Log:
GTNPORTAL-490 : Show invalid number of columns in Dasboard portlet when click edit portlet
Modified: portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java
===================================================================
--- portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java 2010-02-26 16:12:40 UTC (rev 1886)
+++ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java 2010-02-26 18:34:18 UTC (rev 1887)
@@ -55,7 +55,7 @@
{
UIPopupWindow popup = addChild(UIPopupWindow.class, null, GADGET_POPUP_ID + "-" + hashCode());
popup.setUIComponent(createUIComponent(UIDashboardSelectContainer.class, null, null));
- addChild(UIDashboardContainer.class, null, null).setColumns(3);
+ addChild(UIDashboardContainer.class, null, null);
}
public void setColumns(int num) throws Exception
Modified: portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java
===================================================================
--- portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java 2010-02-26 16:12:40 UTC (rev 1886)
+++ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java 2010-02-26 18:34:18 UTC (rev 1887)
@@ -111,7 +111,17 @@
return;
}
- addChild(UIContainer.class, null, null);
+ //
+ UIContainer uicontainer = addChild(UIContainer.class, null, null);
+
+ //
+ Container container = createContainer(COLUMN_CONTAINER, null);
+
+ //
+ PortalDataMapper.toUIContainer(uicontainer, container);
+
+ //
+ setColumns(3);
}
@Override
@@ -128,20 +138,18 @@
{
dashboard = service.loadDashboard(currentUIPortlet.getStorageId());
}
-
- if (dashboard == null)
- {
- dashboard = createContainer(COLUMN_CONTAINER, null);
- }
//
- UIContainer uiRoot = getChild(UIContainer.class);
+ if (dashboard != null)
+ {
+ UIContainer uiRoot = getChild(UIContainer.class);
- // Clear the children created by default as we get state from the storage
- uiRoot.getChildren().clear();
+ // Clear the children created by default as we get state from the storage
+ uiRoot.getChildren().clear();
- // Assemble the dashboard
- PortalDataMapper.toUIContainer(uiRoot, dashboard);
+ // Assemble the dashboard
+ PortalDataMapper.toUIContainer(uiRoot, dashboard);
+ }
//
super.processRender(context);
@@ -451,20 +459,27 @@
return;
}
- //
- DataStorage service = getApplicationComponent(DataStorage.class);
-
// Get current ui portlet containing this dashboard
UIPortlet currentUIPortlet = UIPortlet.getCurrentUIPortlet();
- // Build dashboard
- Dashboard dashboard = new Dashboard(currentUIPortlet.getStorageId());
+ // We save only if we have an existing storage id
+ // we would not have a storage id in the case where
+ // the dashboard portlet is initially dropped in the
+ // page
+ if (currentUIPortlet.getStorageId() != null)
+ {
+ // Build dashboard
+ Dashboard dashboard = new Dashboard(currentUIPortlet.getStorageId());
- // Assemble the dashboard
- PortalDataMapper.toContainer(dashboard, uiRoot);
+ // Assemble the dashboard
+ PortalDataMapper.toContainer(dashboard, uiRoot);
- // Get dashboard for merging
- service.saveDashboard(dashboard);
+ // Get data storage
+ DataStorage service = getApplicationComponent(DataStorage.class);
+
+ // Save
+ service.saveDashboard(dashboard);
+ }
}
public static class AddNewGadgetActionListener extends EventListener<UIDashboard>
14 years, 10 months
gatein SVN: r1886 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/application and 1 other directory.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-02-26 11:12:40 -0500 (Fri, 26 Feb 2010)
New Revision: 1886
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
Log:
Return the markup headers as strings instead of elements so that we can print the markup headers without the xml encoding line (GTNPORTAL-762).
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2010-02-26 14:54:09 UTC (rev 1885)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2010-02-26 16:12:40 UTC (rev 1886)
@@ -89,7 +89,7 @@
<script type="text/javascript" src="/eXoResources/javascript/eXo/i18n/MessageResource_<%=lang%>.js"></script>
<%
- def headerElements = rcontext.getExtraMarkupHeaders();
+ def headerElements = rcontext.getExtraMarkupHeadersAsStrings();
if (headerElements != null)
{
for (element in headerElements)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-02-26 14:54:09 UTC (rev 1885)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-02-26 16:12:40 UTC (rev 1886)
@@ -42,7 +42,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
import java.io.IOException;
+import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.net.URLDecoder;
@@ -355,6 +362,27 @@
}
}
+ public List<String> getExtraMarkupHeadersAsStrings() throws Exception
+ {
+ List<String> markupHeaders = new ArrayList<String>();
+
+ if (extraMarkupHeaders != null && !extraMarkupHeaders.isEmpty())
+ {
+ Transformer transformer = TransformerFactory.newInstance().newTransformer();
+ transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+
+ for (Element element : extraMarkupHeaders)
+ {
+ DOMSource source = new DOMSource(element);
+ StreamResult result = new StreamResult(new StringWriter());
+ transformer.transform(source, result);
+ markupHeaders.add(result.getWriter().toString());
+ }
+ }
+
+ return markupHeaders;
+ }
+
/**
* Get the extra markup headers to add to the head of the html.
* @return The markup to be added.
14 years, 10 months