gatein SVN: r8582 - in components/wsrp/branches/2.1.x: admin-gui and 14 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-13 12:26:00 -0400 (Tue, 13 Mar 2012)
New Revision: 8582
Modified:
components/wsrp/branches/2.1.x/admin-gui/pom.xml
components/wsrp/branches/2.1.x/api/pom.xml
components/wsrp/branches/2.1.x/common/pom.xml
components/wsrp/branches/2.1.x/consumer/pom.xml
components/wsrp/branches/2.1.x/hibernate-impl/pom.xml
components/wsrp/branches/2.1.x/jcr-impl/pom.xml
components/wsrp/branches/2.1.x/pom.xml
components/wsrp/branches/2.1.x/producer/pom.xml
components/wsrp/branches/2.1.x/test/pom.xml
components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml
components/wsrp/branches/2.1.x/ws-security/pom.xml
components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
components/wsrp/branches/2.1.x/ws-security/wss/pom.xml
components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml
components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml
components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare release 2.1.1-GA
Modified: components/wsrp/branches/2.1.x/admin-gui/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/branches/2.1.x/api/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/api/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/api/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/branches/2.1.x/common/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/common/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/common/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/branches/2.1.x/consumer/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/consumer/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/consumer/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/branches/2.1.x/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/hibernate-impl/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/hibernate-impl/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/branches/2.1.x/jcr-impl/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/jcr-impl/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/jcr-impl/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -36,7 +36,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
<packaging>pom</packaging>
@@ -47,9 +47,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/branches/2....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/branches/2.1.x/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/branches/2.1.x/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.1.1-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.1-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.1-GA</url>
</scm>
<properties>
Modified: components/wsrp/branches/2.1.x/producer/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/producer/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/producer/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/branches/2.1.x/test/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/test/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/test/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss-jboss5</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/ws-security/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<artifactId>wsrp-wss-parent</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-jb5wss</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/wss/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/ws-security/wss/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss</artifactId>
Modified: components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml 2012-03-13 16:18:06 UTC (rev 8581)
+++ components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml 2012-03-13 16:26:00 UTC (rev 8582)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-CR03-SNAPSHOT</version>
+ <version>2.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
12 years, 9 months
gatein SVN: r8581 - components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-13 12:18:06 -0400 (Tue, 13 Mar 2012)
New Revision: 8581
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml
Log:
- Improved display of WSRP version.
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2012-03-13 16:17:17 UTC (rev 8580)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2012-03-13 16:18:06 UTC (rev 8581)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2011, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2012, 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.
@@ -55,8 +55,8 @@
</div>
</div>
+ <p align="right" style="font-size: 8px;width:98%;margin: .5em auto">WSRP version #{version.version}</p>
</div>
</div>
- <p align="right" style="font-size: 8px">WSRP version #{version.version}</p>
</div>
</ui:composition>
\ No newline at end of file
12 years, 9 months
gatein SVN: r8580 - components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/common.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-13 12:17:17 -0400 (Tue, 13 Mar 2012)
New Revision: 8580
Modified:
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/common/template.xhtml
Log:
- Improved display of WSRP version.
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/common/template.xhtml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/common/template.xhtml 2012-03-13 16:16:36 UTC (rev 8579)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/common/template.xhtml 2012-03-13 16:17:17 UTC (rev 8580)
@@ -55,8 +55,8 @@
</div>
</div>
+ <p align="right" style="font-size: 8px;width:98%;margin: .5em auto">WSRP version #{version.version}</p>
</div>
</div>
- <p align="right" style="font-size: 8px">WSRP version #{version.version}</p>
</div>
</ui:composition>
\ No newline at end of file
12 years, 9 months
gatein SVN: r8579 - in components/wsrp/branches/2.1.x/admin-gui/src/main: webapp/WEB-INF and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-13 12:16:36 -0400 (Tue, 13 Mar 2012)
New Revision: 8579
Modified:
components/wsrp/branches/2.1.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml
Log:
- GTNWSRP-250: Make portletHandles, existingExports and currentExport transient and regenerate the data from persistence instead. Re-activated distributable mode. Needs to be more thoroughly tested.
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2012-03-13 16:15:00 UTC (rev 8578)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2012-03-13 16:16:36 UTC (rev 8579)
@@ -88,9 +88,9 @@
private static final String FAILED_PORTLETS = "bean_consumer_import_failed_portlets";
private static final String CONSUMER_TYPE = "CONSUMER_TYPE";
- private DataModel portletHandles;
- private DataModel existingExports;
- private ExportInfoDisplay currentExport;
+ private transient DataModel portletHandles;
+ private transient DataModel existingExports;
+ private transient ExportInfoDisplay currentExport;
private static void bypassAndRedisplay()
{
@@ -571,7 +571,7 @@
public boolean isReadyForExport()
{
- List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)portletHandles.getWrappedData();
+ List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)getPortlets().getWrappedData();
for (SelectablePortletHandle handle : handles)
{
if (handle.isSelected())
@@ -588,7 +588,7 @@
final WSRPConsumer consumer = getConsumer();
if (consumer != null)
{
- List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)portletHandles.getWrappedData();
+ List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)getPortlets().getWrappedData();
List<String> selectedHandles = new ArrayList<String>(handles.size());
for (SelectablePortletHandle selectablePortletHandle : handles)
{
@@ -737,7 +737,7 @@
public void selectExport()
{
- currentExport = (ExportInfoDisplay)existingExports.getRowData();
+ currentExport = (ExportInfoDisplay)getExistingExports().getRowData();
}
public boolean isSupportsExport()
Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-13 16:15:00 UTC (rev 8578)
+++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-13 16:16:36 UTC (rev 8579)
@@ -79,7 +79,7 @@
<location>/faces/jsf/error.xhtml</location>
</error-page>
- <!--<distributable/>-->
+ <distributable/>
</web-app>
12 years, 9 months
gatein SVN: r8578 - in components/wsrp/trunk/admin-gui/src/main: webapp/WEB-INF and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-13 12:15:00 -0400 (Tue, 13 Mar 2012)
New Revision: 8578
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
Log:
- GTNWSRP-250: Make portletHandles, existingExports and currentExport transient and regenerate the data from persistence instead. Re-activated distributable mode. Needs to be more thoroughly tested.
Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2012-03-13 15:53:47 UTC (rev 8577)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2012-03-13 16:15:00 UTC (rev 8578)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2011, Red Hat Middleware, LLC, and individual
+ * Copyright 2012, 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.
@@ -88,9 +88,9 @@
private static final String FAILED_PORTLETS = "bean_consumer_import_failed_portlets";
private static final String CONSUMER_TYPE = "CONSUMER_TYPE";
- private DataModel portletHandles;
- private DataModel existingExports;
- private ExportInfoDisplay currentExport;
+ private transient DataModel portletHandles;
+ private transient DataModel existingExports;
+ private transient ExportInfoDisplay currentExport;
private static void bypassAndRedisplay()
{
@@ -571,7 +571,7 @@
public boolean isReadyForExport()
{
- List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)portletHandles.getWrappedData();
+ List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)getPortlets().getWrappedData();
for (SelectablePortletHandle handle : handles)
{
if (handle.isSelected())
@@ -588,7 +588,7 @@
final WSRPConsumer consumer = getConsumer();
if (consumer != null)
{
- List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)portletHandles.getWrappedData();
+ List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)getPortlets().getWrappedData();
List<String> selectedHandles = new ArrayList<String>(handles.size());
for (SelectablePortletHandle selectablePortletHandle : handles)
{
@@ -737,7 +737,7 @@
public void selectExport()
{
- currentExport = (ExportInfoDisplay)existingExports.getRowData();
+ currentExport = (ExportInfoDisplay)getExistingExports().getRowData();
}
public boolean isImportExportSupported()
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-13 15:53:47 UTC (rev 8577)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-13 16:15:00 UTC (rev 8578)
@@ -79,7 +79,7 @@
<location>/faces/jsf/error.xhtml</location>
</error-page>
- <!--<distributable/>-->
+ <distributable/>
</web-app>
12 years, 9 months
gatein SVN: r8577 - in epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src: main/resources/eap and 1 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-03-13 11:53:47 -0400 (Tue, 13 Mar 2012)
New Revision: 8577
Added:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-fastinfoset-provider.jar
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-jaxb-provider.jar
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-jaxrs.jar
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-jettison-provider.jar
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml
Log:
Bug 794461 - (JBEPP-1501) Patch required for CVE-2012-0818
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2012-03-13 12:53:37 UTC (rev 8576)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2012-03-13 15:53:47 UTC (rev 8577)
@@ -78,7 +78,7 @@
</zip>
</target>
- <target name="finalTasks" depends="modifyStartupMessage,jbossws-native-PATCH">
+ <target name="finalTasks" depends="modifyStartupMessage,jbossws-native-PATCH,patch-RESTEasy-CVE-2012-081">
</target>
<!-- Patching startup message in log when starting portal -->
<target name="modifyStartupMessage">
@@ -126,4 +126,18 @@
<copy overwrite="true" file="${resource_jar}" tofile="${epp.path}/jboss-as/server/production/deployers/jbossws.deployer/jbossws-common.jar"/>
<copy overwrite="true" file="${resource_jar}" tofile="${epp.path}/jboss-as/server/all/deployers/jbossws.deployer/jbossws-common.jar"/>
</target>
+
+ <target name="patch-RESTEasy-CVE-2012-081">
+ <echo>Patch for CVE-2012-081</echo>
+ <property name="resteasy_resource_jar" value="${basedir}/src/main/resources/eap/CVE-2012-0818" />
+ <copy overwrite="true" file="${resteasy_resource_jar}/resteasy-fastinfoset-provider.jar" tofile="${epp.path}/resteasy/lib/resteasy-fastinfoset-provider.jar"/>
+ <copy overwrite="true" file="${resteasy_resource_jar}/resteasy-jaxb-provider.jar" tofile="${epp.path}/resteasy/lib/resteasy-jaxb-provider.jar"/>
+ <copy overwrite="true" file="${resteasy_resource_jar}/resteasy-jaxrs.jar" tofile="${epp.path}/resteasy/lib/resteasy-jaxrs.jar"/>
+ <copy overwrite="true" file="${resteasy_resource_jar}/resteasy-jettison-provider.jar" tofile="${epp.path}/resteasy/lib/resteasy-jettison-provider.jar"/>
+
+ <copy overwrite="true" file="${resteasy_resource_jar}/resteasy-fastinfoset-provider.jar" tofile="${epp.path}/seam/lib/resteasy-fastinfoset-provider.jar"/>
+ <copy overwrite="true" file="${resteasy_resource_jar}/resteasy-jaxb-provider.jar" tofile="${epp.path}/seam/lib/resteasy-jaxb-provider.jar"/>
+ <copy overwrite="true" file="${resteasy_resource_jar}/resteasy-jaxrs.jar" tofile="${epp.path}/seam/lib/resteasy-jaxrs.jar"/>
+ <copy overwrite="true" file="${resteasy_resource_jar}/resteasy-jettison-provider.jar" tofile="${epp.path}/seam/lib/resteasy-jettison-provider.jar"/>
+ </target>
</project>
\ No newline at end of file
Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-fastinfoset-provider.jar
===================================================================
(Binary files differ)
Property changes on: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-fastinfoset-provider.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-jaxb-provider.jar
===================================================================
(Binary files differ)
Property changes on: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-jaxb-provider.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-jaxrs.jar
===================================================================
(Binary files differ)
Property changes on: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-jaxrs.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-jettison-provider.jar
===================================================================
(Binary files differ)
Property changes on: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-0818/resteasy-jettison-provider.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
12 years, 9 months
gatein SVN: r8576 - epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-03-13 08:53:37 -0400 (Tue, 13 Mar 2012)
New Revision: 8576
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java
Log:
Bug 793635 - (JBEPP-714) WCM portlets are registered twice after import from within ecmdemo
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2012-03-13 11:42:35 UTC (rev 8575)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2012-03-13 12:53:37 UTC (rev 8576)
@@ -266,23 +266,24 @@
return;
}
- UIFormRadioBoxInput uiRadio = uiForm.getUIInput("application");
- String displayName = uiForm.getUIStringInput(FIELD_NAME).getValue();
if (uiForm.getApplications().size() == 0)
{
ctx.getUIApplication().addMessage(new ApplicationMessage("UIAddApplicationForm.msg.appNotExists", null));
ctx.addUIComponentToUpdateByAjax(uiOrganizer);
return;
}
+ UIFormRadioBoxInput uiRadio = uiForm.getUIInput("application");
+ String displayName = uiForm.getUIStringInput(FIELD_NAME).getValue();
Application tmp = uiForm.getApplications().get(Integer.parseInt(uiRadio.getValue()));
-
+
// check portet name is exist
- if (appRegService.getApplication(selectedCate.getName(), tmp.getApplicationName()) != null)
+ for (Application application : appRegService.getApplications(selectedCate))
{
- WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
- UIApplication uiApp = context.getUIApplication();
- uiApp.addMessage(new ApplicationMessage("UIAddApplicationForm.msg.PortletExist", null));
- return;
+ if (application.getContentId().equals(tmp.getContentId()))
+ {
+ ctx.getUIApplication().addMessage(new ApplicationMessage("UIAddApplicationForm.msg.PortletExist", null));
+ return;
+ }
}
Application app = cloneApplication(tmp);
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java 2012-03-13 11:42:35 UTC (rev 8575)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java 2012-03-13 12:53:37 UTC (rev 8576)
@@ -102,9 +102,12 @@
for (ApplicationCategory category : allCategories)
{
- if (appRegService.getApplication(category.getName(), portlet_.getName()) != null)
+ for (Application application : appRegService.getApplications(category))
{
- nameList.add(category.getDisplayName());
+ if (application.getContentId().equals(portlet_.getId()))
+ {
+ nameList.add(category.getDisplayName());
+ }
}
}
StringBuffer names = new StringBuffer("");
12 years, 9 months
gatein SVN: r8575 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/jcr and 1 other directory.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-03-13 07:42:35 -0400 (Tue, 13 Mar 2012)
New Revision: 8575
Modified:
portal/trunk/
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
Log:
GTNPORTAL-2372 The RPCService is missing in the JCR configuration
Property changes on: portal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_Branch:6841
/epp/portal/branches/EPP_5_2_Branch:7155,7160
/portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/branch-GTNPORTAL-1872:6327-6594
/portal/branches/branch-GTNPORTAL-1921:6597-6803
/portal/branches/branch-GTNPORTAL-1963:6902-6986
/portal/branches/decoupled-webos:6214-6243
/portal/branches/dom:7272-7349
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/wsrp-extraction:5828-6031
/portal/branches/xss:7377-7595,7597
/portal/branches/xss-issues:7350-7351,7358
+ /epp/portal/branches/EPP_5_1_Branch:6841
/epp/portal/branches/EPP_5_2_Branch:7155,7160,8574
/portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/branch-GTNPORTAL-1872:6327-6594
/portal/branches/branch-GTNPORTAL-1921:6597-6803
/portal/branches/branch-GTNPORTAL-1963:6902-6986
/portal/branches/decoupled-webos:6214-6243
/portal/branches/dom:7272-7349
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/wsrp-extraction:5828-6031
/portal/branches/xss:7377-7595,7597
/portal/branches/xss-issues:7350-7351,7358
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2012-03-13 07:57:45 UTC (rev 8574)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2012-03-13 11:42:35 UTC (rev 8575)
@@ -89,6 +89,25 @@
</value-param>
</init-params>
</component>
+
+ <component profiles="cluster">
+ <key>org.exoplatform.services.rpc.RPCService</key>
+ <type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>jgroups-configuration</name>
+ <value>${gatein.jcr.jgroups.config}</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-cluster-name</name>
+ <value>RPCService-Cluster</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-default-timeout</name>
+ <value>0</value>
+ </value-param>
+ </init-params>
+ </component>
<external-component-plugins>
<target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
12 years, 9 months
gatein SVN: r8574 - epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-03-13 03:57:45 -0400 (Tue, 13 Mar 2012)
New Revision: 8574
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
Log:
Bug 802481 - Missing JCR configuration for cluster support
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2012-03-12 19:37:41 UTC (rev 8573)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2012-03-13 07:57:45 UTC (rev 8574)
@@ -100,6 +100,25 @@
</value-param>
</init-params>
</component>
+
+ <component profiles="cluster">
+ <key>org.exoplatform.services.rpc.RPCService</key>
+ <type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>jgroups-configuration</name>
+ <value>${gatein.jcr.jgroups.config}</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-cluster-name</name>
+ <value>RPCService-Cluster</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-default-timeout</name>
+ <value>0</value>
+ </value-param>
+ </init-params>
+ </component>
<external-component-plugins>
<target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
12 years, 9 months
gatein SVN: r8573 - in components/wsrp/trunk/consumer/src: main/java/org/gatein/wsrp/consumer/registry and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-12 15:37:41 -0400 (Mon, 12 Mar 2012)
New Revision: 8573
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/InMemoryConsumerRegistry.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java
Log:
- GTNWSRP-279: Avoid updating ProducerInfo when not needed and added changes detection.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2012-03-12 19:37:32 UTC (rev 8572)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2012-03-12 19:37:41 UTC (rev 8573)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2011, Red Hat Middleware, LLC, and individual
+ * Copyright 2012, 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.
@@ -107,7 +107,6 @@
/** The activated status of the associated Consumer */
private boolean persistentActive;
- // GTNWSRP-239: information that's currently transient but should probably be persistent
/**
* GTNWSRP-239: whether or not this ProducerInfo requires ModifyRegistration to be called, currently persisted via
* mixin
@@ -180,7 +179,7 @@
{
return false;
}
- if (!persistentId.equals(that.persistentId))
+ if (!getId().equals(that.getId()))
{
return false;
}
@@ -192,7 +191,7 @@
public int hashCode()
{
int result = key != null ? key.hashCode() : 0;
- result = 31 * result + persistentId.hashCode();
+ result = 31 * result + getId().hashCode();
return result;
}
@@ -202,7 +201,7 @@
final StringBuilder sb = new StringBuilder();
sb.append("ProducerInfo");
sb.append("{key='").append(key).append('\'');
- sb.append(", id='").append(persistentId).append('\'');
+ sb.append(", id='").append(getId()).append('\'');
sb.append('}');
return sb.toString();
}
@@ -302,13 +301,46 @@
*/
public void setActive(boolean active)
{
+ setInternalActive(active);
+ }
+
+ private boolean setInternalActive(boolean active)
+ {
+ final boolean modified = modifyNowIfNeeded(persistentActive, active);
this.persistentActive = active;
+ return modified;
}
+ public String getId()
+ {
+ return persistentId;
+ }
+
+ public void setId(String id)
+ {
+ modifyNowIfNeeded(persistentId, id);
+ this.persistentId = id;
+ }
+
+ private boolean modifyNowIfNeeded(Object oldValue, Object newValue)
+ {
+ if (ParameterValidation.isOldAndNewDifferent(oldValue, newValue))
+ {
+ modifyNow();
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
public void setActiveAndSave(boolean active)
{
- setActive(active);
- registry.updateProducerInfo(this);
+ if (setInternalActive(active))
+ {
+ registry.updateProducerInfo(this);
+ }
}
public boolean isModifyRegistrationRequired()
@@ -320,6 +352,7 @@
public void setModifyRegistrationRequired(boolean modifyRegistrationRequired)
{
+ modifyNowIfNeeded(isModifyRegistrationRequired, modifyRegistrationRequired);
this.isModifyRegistrationRequired = modifyRegistrationRequired;
}
@@ -574,16 +607,16 @@
}
result.setRegistrationResult(registrationResult);
-
- return result;
}
else
{
log.debug("Registration not required");
persistentRegistrationInfo = new RegistrationInfo(this, false);
extractOfferedPortlets(serviceDescription);
- return result;
}
+
+ modifyNow();
+ return result;
}
private Map<String, ItemDescription> toMap(List<ItemDescription> itemDescriptions)
@@ -603,16 +636,6 @@
}
}
- public String getId()
- {
- return persistentId;
- }
-
- public void setId(String id)
- {
- this.persistentId = id;
- }
-
/**
* Extracts a map of offered Portlet objects from ServiceDescription
*
@@ -673,7 +696,7 @@
{
log.warn("Portlet '" + portletHandle
+ "' uses the GET method in forms. Since we don't handle this, this portlet will be excluded from " +
- "the list of offered portlets for producer " + persistentId);
+ "the list of offered portlets for producer " + getId());
}
else
{
@@ -749,7 +772,7 @@
}
catch (Exception e)
{
- log.debug("Couldn't get portlet via getPortletDescription for producer '" + persistentId
+ log.debug("Couldn't get portlet via getPortletDescription for producer '" + getId()
+ "'. Attempting to retrieve it from the service description as this producer might not support the PortletManagement interface.", e);
justRefreshed = refresh(true);
@@ -831,24 +854,26 @@
public void setExpirationCacheSeconds(Integer expirationCacheSeconds)
{
- // record the previous cache expiration duration
- Integer previousMS = getSafeExpirationCacheSeconds() * 1000;
+ if (modifyNowIfNeeded(persistentExpirationCacheSeconds, expirationCacheSeconds))
+ {
+ // record the previous cache expiration duration
+ Integer previousMS = getSafeExpirationCacheSeconds() * 1000;
- // assign the new value
- this.persistentExpirationCacheSeconds = expirationCacheSeconds;
+ // assign the new value
+ this.persistentExpirationCacheSeconds = expirationCacheSeconds;
- // recompute the expiration time based on previous value and new one
- long lastExpirationTimeChange = expirationTimeMillis - previousMS;
- int newMS = getSafeExpirationCacheSeconds() * 1000;
- if (lastExpirationTimeChange > 0)
- {
- expirationTimeMillis = lastExpirationTimeChange + newMS;
+ // recompute the expiration time based on previous value and new one
+ long lastExpirationTimeChange = expirationTimeMillis - previousMS;
+ int newMS = getSafeExpirationCacheSeconds() * 1000;
+ if (lastExpirationTimeChange > 0)
+ {
+ expirationTimeMillis = lastExpirationTimeChange + newMS;
+ }
+ else
+ {
+ expirationTimeMillis = System.currentTimeMillis();
+ }
}
- else
- {
- expirationTimeMillis = System.currentTimeMillis();
- }
-
}
/**
@@ -1006,7 +1031,7 @@
{
Throwable cause = e.getCause();
throw new InvokerUnavailableException("Problem getting service description for producer "
- + persistentId + ", please see the logs for more information. ", cause == null ? e : cause);
+ + getId() + ", please see the logs for more information. ", cause == null ? e : cause);
}
public RegistrationContext getRegistrationContext() throws PortletInvokerException
@@ -1024,9 +1049,15 @@
persistentRegistrationInfo.resetRegistration();
invalidateCache();
+ modifyNow();
registry.updateProducerInfo(this);
}
+ void modifyNow()
+ {
+ setLastModified(System.nanoTime());
+ }
+
// make package only after package reorg
public PortletPropertyDescriptionResponse getPropertyDescriptionsFor(String portletHandle)
@@ -1116,7 +1147,7 @@
if (serviceDescription.isRequiresRegistration())
{
// check if the configured registration information is correct and if we can get the service description
- RefreshResult result = persistentRegistrationInfo.refresh(serviceDescription, persistentId, true, forceRefresh, false);
+ RefreshResult result = persistentRegistrationInfo.refresh(serviceDescription, getId(), true, forceRefresh, false);
if (!result.hasIssues())
{
try
@@ -1144,7 +1175,7 @@
if (debug)
{
- String msg = "Consumer with id '" + persistentId + "' successfully registered with handle: '"
+ String msg = "Consumer with id '" + getId() + "' successfully registered with handle: '"
+ registrationContext.getRegistrationHandle() + "'";
log.debug(msg);
}
@@ -1158,7 +1189,7 @@
{
persistentRegistrationInfo.resetRegistration();
setActive(false);
- throw new PortletInvokerException("Couldn't register with producer '" + persistentId + "'", e);
+ throw new PortletInvokerException("Couldn't register with producer '" + getId() + "'", e);
}
}
else
@@ -1183,11 +1214,11 @@
{
RegistrationContext registrationContext = getRegistrationContext();
persistentEndpointInfo.getRegistrationService().deregister(registrationContext, UserAccess.getUserContext());
- log.info("Consumer with id '" + persistentId + "' deregistered.");
+ log.info("Consumer with id '" + getId() + "' deregistered.");
}
catch (Exception e)
{
- throw new PortletInvokerException("Couldn't deregister with producer '" + persistentId + "'", e);
+ throw new PortletInvokerException("Couldn't deregister with producer '" + getId() + "'", e);
}
finally
{
@@ -1196,7 +1227,7 @@
}
else
{
- throw new IllegalStateException("Cannot deregister producer '" + persistentId + "' as it's not registered");
+ throw new IllegalStateException("Cannot deregister producer '" + getId() + "' as it's not registered");
}
}
@@ -1244,20 +1275,20 @@
// update state
persistentRegistrationInfo.setRegistrationState(registrationState.value);
- log.info("Consumer with id '" + persistentId + "' sucessfully modified its registration.");
+ log.info("Consumer with id '" + getId() + "' sucessfully modified its registration.");
// reset cache to be able to see new offered portlets on the next refresh
invalidateCache();
}
catch (Exception e)
{
- throw new PortletInvokerException("Couldn't modify registration with producer '" + persistentId + "'", e);
+ throw new PortletInvokerException("Couldn't modify registration with producer '" + getId() + "'", e);
}
}
}
else
{
- throw new IllegalStateException("Cannot modify registration for producer '" + persistentId
+ throw new IllegalStateException("Cannot modify registration for producer '" + getId()
+ "' as it's not registered");
}
}
@@ -1273,9 +1304,9 @@
private RefreshResult internalRefreshRegistration(ServiceDescription serviceDescription, boolean mergeWithLocalInfo, boolean forceRefresh, boolean forceCheckOfExtraProps) throws PortletInvokerException
{
RefreshResult result =
- persistentRegistrationInfo.refresh(serviceDescription, persistentId, mergeWithLocalInfo, forceRefresh, forceCheckOfExtraProps);
+ persistentRegistrationInfo.refresh(serviceDescription, getId(), mergeWithLocalInfo, forceRefresh, forceCheckOfExtraProps);
- log.debug("Refreshed registration information for consumer with id '" + persistentId + "'");
+ log.debug("Refreshed registration information for consumer with id '" + getId() + "'");
return result;
}
@@ -1287,7 +1318,7 @@
|| persistentEndpointInfo.isRefreshNeeded();
if (result)
{
- log.debug("Refresh needed for producer '" + persistentId + "'");
+ log.debug("Refresh needed for producer '" + getId() + "'");
}
return result;
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2012-03-12 19:37:32 UTC (rev 8572)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2012-03-12 19:37:41 UTC (rev 8573)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2011, Red Hat Middleware, LLC, and individual
+ * Copyright 2012, 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.
@@ -745,6 +745,9 @@
}
regenerateRegistrationData = true;
+
+ // make sure that the parent is marked as modified so that changes can be properly saved
+ parent.modifyNow();
}
private void setModifyRegistrationNeeded(boolean modifyRegistrationNeeded)
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2012-03-12 19:37:32 UTC (rev 8572)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2012-03-12 19:37:41 UTC (rev 8573)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2011, Red Hat Middleware, LLC, and individual
+ * Copyright 2012, 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.
@@ -65,7 +65,7 @@
private static final String CONSUMER_WITH_ID = "Consumer with id '";
private static final String RELEASE_SESSIONS_LISTENER = "release_sessions_listener_";
- private static final Logger log = LoggerFactory.getLogger(AbstractConsumerRegistry.class);
+ protected static final Logger log = LoggerFactory.getLogger(AbstractConsumerRegistry.class);
protected ConsumerCache consumerCache;
@@ -268,7 +268,7 @@
ProducerInfo producerInfo = loadProducerInfo(id);
if (producerInfo == null)
{
- return Long.MAX_VALUE;
+ return Long.MIN_VALUE;
}
else
{
@@ -280,25 +280,33 @@
{
ParameterValidation.throwIllegalArgExceptionIfNull(producerInfo, "ProducerInfo");
- String oldId = update(producerInfo);
-
- // if we updated and oldId is not null, we need to update the local information
- if (oldId != null)
+ // only save producer info if we have local modifications that postdate last persisted change
+ if (producerInfo.getLastModified() > getPersistedLastModifiedForProducerInfoWith(producerInfo.getId()))
{
- WSRPConsumer consumer = createConsumerFrom(producerInfo, true);
+ String oldId = update(producerInfo);
- // update the federating portlet invoker if needed
- if (federatingPortletInvoker.isResolved(oldId))
+ // if we updated and oldId is not null, we need to update the local information
+ if (oldId != null)
{
- federatingPortletInvoker.unregisterInvoker(oldId);
+ WSRPConsumer consumer = createConsumerFrom(producerInfo, true);
+
+ // update the federating portlet invoker if needed
+ if (federatingPortletInvoker.isResolved(oldId))
+ {
+ federatingPortletInvoker.unregisterInvoker(oldId);
+ }
+
+ // update cache
+ consumerCache.removeConsumer(oldId);
+ consumerCache.putConsumer(producerInfo.getId(), consumer);
}
- // update cache
- consumerCache.removeConsumer(oldId);
- consumerCache.putConsumer(producerInfo.getId(), consumer);
+ return oldId;
}
-
- return oldId;
+ else
+ {
+ return null;
+ }
}
public void start() throws Exception
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/InMemoryConsumerRegistry.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/InMemoryConsumerRegistry.java 2012-03-12 19:37:32 UTC (rev 8572)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/InMemoryConsumerRegistry.java 2012-03-12 19:37:41 UTC (rev 8573)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2011, Red Hat Middleware, LLC, and individual
+ * Copyright 2012, 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.
@@ -134,7 +134,8 @@
{
if (keysToIds.containsValue(id))
{
- return consumers.get(id).getProducerInfo();
+ final WSRPConsumer consumer = consumers.get(id);
+ return consumer != null ? consumer.getProducerInfo() : null;
}
else
{
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java 2012-03-12 19:37:32 UTC (rev 8572)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java 2012-03-12 19:37:41 UTC (rev 8573)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2011, Red Hat Middleware, LLC, and individual
+ * Copyright 2012, 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.
@@ -84,6 +84,64 @@
info.setEndpointConfigurationInfo(eci);
}
+ public void testSettersWithoutModificationShouldNotChangeLastModified()
+ {
+ final long initial = info.getLastModified();
+
+ info.setActive(info.isActive());
+ assertEquals(initial, info.getLastModified());
+
+ info.setActiveAndSave(info.isActive());
+ assertEquals(initial, info.getLastModified());
+
+ info.setExpirationCacheSeconds(info.getExpirationCacheSeconds());
+ assertEquals(initial, info.getLastModified());
+
+ info.setId(info.getId());
+ assertEquals(initial, info.getLastModified());
+
+ info.setModifyRegistrationRequired(info.isModifyRegistrationRequired());
+ assertEquals(initial, info.getLastModified());
+ }
+
+ public void testSettersWithModificationShouldChangeLastModified() throws InterruptedException
+ {
+ long initial = info.getLastModified();
+ Thread.sleep(10); // to allow for System.currentTimeMillis() to catch up
+ info.setActive(!info.isActive());
+
+ initial = info.getLastModified();
+ Thread.sleep(10); // to allow for System.currentTimeMillis() to catch up
+ info.setActiveAndSave(!info.isActive());
+ assertTrue(initial != info.getLastModified());
+
+ initial = info.getLastModified();
+ Thread.sleep(10); // to allow for System.currentTimeMillis() to catch up
+ info.setExpirationCacheSeconds(info.getExpirationCacheSeconds() + 1);
+ assertTrue(initial != info.getLastModified());
+
+ initial = info.getLastModified();
+ Thread.sleep(10); // to allow for System.currentTimeMillis() to catch up
+ info.setId(info.getId() + "other");
+ assertTrue(initial != info.getLastModified());
+
+ initial = info.getLastModified();
+ Thread.sleep(10); // to allow for System.currentTimeMillis() to catch up
+ info.setModifyRegistrationRequired(!info.isModifyRegistrationRequired());
+ assertTrue(initial != info.getLastModified());
+ }
+
+ public void testSetKeyDoesNotChangeLastModified()
+ {
+ long initial = info.getLastModified();
+ info.setKey(info.getKey());
+ assertEquals(initial, info.getLastModified());
+
+ initial = info.getLastModified();
+ info.setKey(info.getKey() + "other");
+ assertEquals(initial, info.getLastModified());
+ }
+
public void testSetRegistrationInfo()
{
RegistrationInfo regInfo = new RegistrationInfo(info);
12 years, 9 months