gatein SVN: r7948 - in components/wsrp/trunk: admin-gui and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-11-02 17:26:52 -0400 (Wed, 02 Nov 2011)
New Revision: 7948
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/pom.xml
Log:
- GTNWSRP-260, GTNWSRP-261: Updated to use PortletBridge 2.2.0.Final and PC 2.3.0-GA.
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2011-11-02 20:41:16 UTC (rev 7947)
+++ components/wsrp/trunk/admin-gui/pom.xml 2011-11-02 21:26:52 UTC (rev 7948)
@@ -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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -68,12 +69,12 @@
<dependency>
<groupId>org.jboss.portletbridge</groupId>
<artifactId>portletbridge-api</artifactId>
- <version>2.2.0-CR01</version>
+ <version>2.2.0.FINAL</version>
</dependency>
<dependency>
<groupId>org.jboss.portletbridge</groupId>
<artifactId>portletbridge-impl</artifactId>
- <version>2.2.0-CR01</version>
+ <version>2.2.0.FINAL</version>
</dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-11-02 20:41:16 UTC (rev 7947)
+++ components/wsrp/trunk/pom.xml 2011-11-02 21:26:52 UTC (rev 7948)
@@ -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>
@@ -53,7 +54,7 @@
</scm>
<properties>
- <org.gatein.pc.version>2.3.0-Beta08</org.gatein.pc.version>
+ <org.gatein.pc.version>2.3.0-GA</org.gatein.pc.version>
<org.gatein.common.version>2.0.4-GA</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-GA</org.gatein.wci.version>
13 years, 1 month
gatein SVN: r7947 - epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-11-02 16:41:16 -0400 (Wed, 02 Nov 2011)
New Revision: 7947
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultStylesheet.css
Log:
JBEPP-1270: fix css issue where the height when editing personal information is too short and cuts off parts of the information in some browsers. Fix css issue where the table field is too short in some browsers and causes the icon to be placed on a new line when adding new users to a group.
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultStylesheet.css
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultStylesheet.css 2011-11-02 20:40:12 UTC (rev 7946)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultStylesheet.css 2011-11-02 20:41:16 UTC (rev 7947)
@@ -106,11 +106,11 @@
}
.UIOrganizationPortlet .UIPersonalInfo .UIItemSelector .ItemDetailList {
- height: 320px;
+ height: 345px;
}
.UIOrganizationPortlet .UIPersonalInfo .UIItemSelector .ItemList {
- height: 300px;
+ height: 324px;
}
.UIOrganizationPortlet .UIPersonalInfo .UIFormInputSet {
@@ -292,7 +292,7 @@
}
.UIOrganizationPortlet .UIGroupManagement .UIGroupMembershipForm td.FieldComponent {
- width: 278px;
+ width: auto;
}
/*####################### UIMemberShipManagement #################################*/
@@ -309,4 +309,4 @@
.UIOrganizationPortlet .UIMembershipManagement .UIGrid {
margin: auto;
-}
\ No newline at end of file
+}
13 years, 1 month
gatein SVN: r7946 - portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-11-02 16:40:12 -0400 (Wed, 02 Nov 2011)
New Revision: 7946
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultStylesheet.css
Log:
GTNPORTAL-2252: fix css issue where the height when editing personal information is too short and cuts off parts of the information in some browsers. Fix css issue where the table field is too short in some browsers and causes the icon to be placed on a new line when adding new users to a group.
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultStylesheet.css 2011-11-02 20:29:57 UTC (rev 7945)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/organization/webui/component/UIOrganizationPortlet/DefaultStylesheet.css 2011-11-02 20:40:12 UTC (rev 7946)
@@ -124,11 +124,11 @@
}
.UIOrganizationPortlet .UIPersonalInfo .UIItemSelector .ItemDetailList {
- height: 320px;
+ height: 345px;
}
.UIOrganizationPortlet .UIPersonalInfo .UIItemSelector .ItemList {
- height: 300px;
+ height: 324px;
}
.UIOrganizationPortlet .UIPersonalInfo .UIFormInputSet {
@@ -310,7 +310,7 @@
}
.UIOrganizationPortlet .UIGroupManagement .UIGroupMembershipForm td.FieldComponent {
- width: 278px;
+ width: auto;
}
/*####################### UIMemberShipManagement #################################*/
13 years, 1 month
gatein SVN: r7945 - epp/portal/branches/EPP_5_2_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-11-02 16:29:57 -0400 (Wed, 02 Nov 2011)
New Revision: 7945
Modified:
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
JBEPP-1315 Upgrade eXo JCR to 1.14.3 (and dependencies)
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-11-02 20:29:10 UTC (rev 7944)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-11-02 20:29:57 UTC (rev 7945)
@@ -38,11 +38,11 @@
<properties>
<org.exoplatform.parent.version>9</org.exoplatform.parent.version>
- <org.exoplatform.kernel.version>2.3.2-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.3.3-GA</org.exoplatform.kernel.version>
<org.exoplatform.kernel.junit.version>1.2.1-GA</org.exoplatform.kernel.junit.version> <!-- from exo.kernel -->
- <org.exoplatform.core.version>2.4.2-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.2.2-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.14.2-GA</org.exoplatform.jcr.version>
+ <org.exoplatform.core.version>2.4.3-GA</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.2.3-GA</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.14.3-GA</org.exoplatform.jcr.version>
<org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>2.0.2-Beta03</org.shindig.version>
13 years, 1 month
gatein SVN: r7944 - epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/META-INF.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-11-02 16:29:10 -0400 (Wed, 02 Nov 2011)
New Revision: 7944
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/META-INF/MANIFEST.MF
Log:
JBEPP-1140 EPP startup message
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/META-INF/MANIFEST.MF
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/META-INF/MANIFEST.MF 2011-11-02 20:24:18 UTC (rev 7943)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/META-INF/MANIFEST.MF 2011-11-02 20:29:10 UTC (rev 7944)
@@ -9,6 +9,6 @@
Main-Class: org.jboss.Main
Implementation-Title: JBoss [EPP]
Specification-Vendor: JBoss (http://www.jboss.org/)
-Implementation-Version: @cvstag@ (build: SVNTag=@cvstag@ date=@build-date@@build-time@)
+Implementation-Version: JBoss-EPP @build_version@ (build: SVNTag=@cvstag@ date=@build-date@@build-time@)
Implementation-Vendor: JBoss Inc.
13 years, 1 month
gatein SVN: r7943 - in epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp: gatein-management and 1 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-11-02 16:24:18 -0400 (Wed, 02 Nov 2011)
New Revision: 7943
Added:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/src/
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/src/assemble.xml
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
Log:
JBEPP-1333 Include gatein-management CLI in packaging
Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/pom.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/pom.xml 2011-11-02 20:24:18 UTC (rev 7943)
@@ -0,0 +1,52 @@
+
+<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>
+ <parent>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>distribution.parent</artifactId>
+ <version>5.2.0.ER06-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.exoplatform.portal.distribution.root</groupId>
+ <artifactId>gatein-management</artifactId>
+ <packaging>pom</packaging>
+ <name>Distribution portletbridge</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.gatein.management</groupId>
+ <artifactId>gatein-management-cli</artifactId>
+ <version>${org.gatein.mgmt.version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bin</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/assemble.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/src/assemble.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/src/assemble.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/src/assemble.xml 2011-11-02 20:24:18 UTC (rev 7943)
@@ -0,0 +1,20 @@
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>*:*:war</include>
+ </includes>
+ <outputDirectory></outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+</assembly>
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-11-02 18:30:54 UTC (rev 7942)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-11-02 20:24:18 UTC (rev 7943)
@@ -18,6 +18,7 @@
<module>serverAddon</module>
<module>portletbridge</module>
<module>examples</module>
+ <module>gatein-management</module>
</modules>
<dependencies>
@@ -27,14 +28,21 @@
<version>${project.version}</version>
<type>zip</type>
</dependency>
-
+
<dependency>
+ <groupId>org.exoplatform.portal.distribution.root</groupId>
+ <artifactId>gatein-management</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+
+ <dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-packaging</artifactId>
<version>${sso.version}</version>
<type>zip</type>
</dependency>
-
+
<dependency>
<groupId>org.exoplatform.portal.distribution.deploy</groupId>
<artifactId>serverAddon</artifactId>
13 years, 1 month
gatein SVN: r7942 - epp/portal/branches/EPP_5_2_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-11-02 14:30:54 -0400 (Wed, 02 Nov 2011)
New Revision: 7942
Modified:
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
Upgrade PicketLink IDM
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-11-02 18:23:12 UTC (rev 7941)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-11-02 18:30:54 UTC (rev 7942)
@@ -52,7 +52,7 @@
<org.gatein.dep.version>1.1.0-GA</org.gatein.dep.version>
<org.gatein.wci.version>2.1.0-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta07</org.gatein.pc.version>
- <org.picketlink.idm>1.3.0.Alpha09</org.picketlink.idm>
+ <org.picketlink.idm>1.3.0.GA</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-EPP520-Beta08</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta07</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.0-GA</org.gatein.mgmt.version>
13 years, 1 month
gatein SVN: r7941 - in epp/portal/branches/EPP_5_2_Branch: distribution and 3 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-11-02 14:23:12 -0400 (Wed, 02 Nov 2011)
New Revision: 7941
Modified:
epp/portal/branches/EPP_5_2_Branch/component/
epp/portal/branches/EPP_5_2_Branch/distribution/
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/ExoBasedUserPrefStore.js
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/
Log:
JBEPP-1054 Remove gadget wrapper portlet from default applications
Property changes on: epp/portal/branches/EPP_5_2_Branch/component
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4868,4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1790/component:5871
/portal/branches/branch-GTNPORTAL-1822/component:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916
/portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7748,7780,7877
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4868,4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1790/component:5871
/portal/branches/branch-GTNPORTAL-1822/component:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916
/portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7877,7906
Property changes on: epp/portal/branches/EPP_5_2_Branch/distribution
___________________________________________________________________
Added: svn:ignore
+ target
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2011-11-02 18:15:04 UTC (rev 7940)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2011-11-02 18:23:12 UTC (rev 7941)
@@ -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,17 +73,20 @@
{
return userPref;
}
+
+ public void setUserPref(String pref)
+ {
+ this.userPref = pref;
+ }
@Override
public void processAction(WebuiRequestContext context) throws Exception
{
super.processAction(context);
- //
PortletRequest req = context.getRequest();
+ userPref = req.getParameter("userPref");
- //
- userPref = req.getParameter("userPref");
if (userPref != null && !userPref.isEmpty())
{
PortletPreferences prefs = req.getPreferences();
@@ -86,15 +94,14 @@
prefs.store();
}
}
-
+
@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);
}
@@ -162,4 +169,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: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/ExoBasedUserPrefStore.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/ExoBasedUserPrefStore.js 2011-11-02 18:15:04 UTC (rev 7940)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/ExoBasedUserPrefStore.js 2011-11-02 18:23:12 UTC (rev 7941)
@@ -17,7 +17,6 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-
gadgets.ExoBasedUserPrefStore = function() {
gadgets.UserPrefStore.call(this);
};
@@ -34,12 +33,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;
@@ -48,11 +51,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
Property changes on: epp/portal/branches/EPP_5_2_Branch/wsrp-integration
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7748,7780,7877
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7877,7906
13 years, 1 month
gatein SVN: r7940 - epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-11-02 14:15:04 -0400 (Wed, 02 Nov 2011)
New Revision: 7940
Modified:
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/
Log:
JBEPP-1331 Problem with gadgets when the host name includes the word "portal"
Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7741,7748,7780,7877
/portal/trunk/src/main/java/org:7451
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7877,7906
/portal/trunk/src/main/java/org:7451
13 years, 1 month
gatein SVN: r7939 - epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/core.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-11-02 12:46:17 -0400 (Wed, 02 Nov 2011)
New Revision: 7939
Modified:
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js
Log:
JBEPP-1310: Fix Javascript for Opera browser
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js 2011-11-02 16:42:51 UTC (rev 7938)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js 2011-11-02 16:46:17 UTC (rev 7939)
@@ -287,6 +287,15 @@
this.getBrowserWidth = function() {
return document.body.clientWidth ;
}
+ this.eventListener = function(object, event, operation) {
+ object.addEventListener(event, operation, false);
+ }
+ this.setOpacity = function(component, value) {
+ component.style.opacity = value/100 ;
+ }
+ this.getEventSource = function(e) {
+ return e.target ;
+ }
} ;
Browser.prototype.isIE6 = function() {
13 years, 1 month