gatein SVN: r7537 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-09-27 13:02:01 -0400 (Tue, 27 Sep 2011)
New Revision: 7537
Added:
components/wsrp/tags/2.1.0-Beta06/
Log:
[maven-scm] copy for tag 2.1.0-Beta06
12 years, 8 months
gatein SVN: r7536 - in components/wsrp/trunk: admin-gui and 14 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-09-27 13:01:35 -0400 (Tue, 27 Sep 2011)
New Revision: 7536
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/hibernate-impl/pom.xml
components/wsrp/trunk/jcr-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/ws-security/jboss5/pom.xml
components/wsrp/trunk/ws-security/pom.xml
components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
components/wsrp/trunk/ws-security/wss/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare release 2.1.0-Beta06
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/admin-gui/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</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 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/api/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</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 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/common/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/consumer/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/jcr-impl/pom.xml
===================================================================
--- components/wsrp/trunk/jcr-impl/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/jcr-impl/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -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>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</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/2.1.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-Beta06</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.0-Beta06</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/producer/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</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 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/test/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/ws-security/jboss5/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss-jboss5</artifactId>
Modified: components/wsrp/trunk/ws-security/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/ws-security/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<artifactId>wsrp-wss-parent</artifactId>
Modified: components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-jb5wss</artifactId>
Modified: components/wsrp/trunk/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/wss/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss</artifactId>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -22,12 +22,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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2011-09-27 16:49:08 UTC (rev 7535)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2011-09-27 17:01:35 UTC (rev 7536)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Beta06-SNAPSHOT</version>
+ <version>2.1.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
12 years, 8 months
gatein SVN: r7535 - components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-09-27 12:49:08 -0400 (Tue, 27 Sep 2011)
New Revision: 7535
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
Log:
- If an error occurs in getConsumer, bypass processing and redisplay page.
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 2011-09-27 15:38:59 UTC (rev 7534)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2011-09-27 16:49:08 UTC (rev 7535)
@@ -92,6 +92,12 @@
private DataModel existingExports;
private ExportInfoDisplay currentExport;
+ private static void bypassAndRedisplay()
+ {
+ // bypass the rest of the life cycle and re-display page
+ FacesContext.getCurrentInstance().renderResponse();
+ }
+
public void setManager(ConsumerManagerBean manager)
{
this.manager = manager;
@@ -157,6 +163,7 @@
if (id == null)
{
beanContext.createErrorMessage(NULL_ID_CONSUMER);
+ bypassAndRedisplay();
}
else
{
@@ -170,6 +177,7 @@
else
{
beanContext.createErrorMessage(CANNOT_FIND_CONSUMER, id);
+ bypassAndRedisplay();
}
}
@@ -850,16 +858,14 @@
}
}
- // bypass the rest of the life cycle and re-display page
- FacesContext.getCurrentInstance().renderResponse();
+ bypassAndRedisplay();
}
public void selectCurrentWindow(ValueChangeEvent event)
{
window = (String)event.getNewValue();
- // bypass the rest of the life cycle and re-display page
- FacesContext.getCurrentInstance().renderResponse();
+ bypassAndRedisplay();
}
public List<SelectItem> getPages()
@@ -887,8 +893,7 @@
{
selected = (Boolean)event.getNewValue();
- // bypass the rest of the life cycle and re-display page
- FacesContext.getCurrentInstance().renderResponse();
+ bypassAndRedisplay();
}
public int compareTo(SelectablePortletHandle o)
12 years, 8 months
gatein SVN: r7534 - components/wsrp/trunk.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-09-27 11:38:59 -0400 (Tue, 27 Sep 2011)
New Revision: 7534
Modified:
components/wsrp/trunk/pom.xml
Log:
- Updated to PC 2.3.0-Beta06.
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-09-27 15:38:21 UTC (rev 7533)
+++ components/wsrp/trunk/pom.xml 2011-09-27 15:38:59 UTC (rev 7534)
@@ -47,7 +47,7 @@
</scm>
<properties>
- <org.gatein.pc.version>2.3.0-Beta06-SNAPSHOT</org.gatein.pc.version>
+ <org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
<org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.version>
12 years, 8 months
gatein SVN: r7533 - components/wsrp/trunk/admin-gui/src/main/webapp/styles.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-09-27 11:38:21 -0400 (Tue, 27 Sep 2011)
New Revision: 7533
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css
Log:
- Minor improvement.
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2011-09-27 15:36:45 UTC (rev 7532)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2011-09-27 15:38:21 UTC (rev 7533)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * Copyright 2011, Red Hat Middleware, LLC, and individual
* contributors as indicated by the @authors tag. See the
* copyright.txt in the distribution for a full listing of
* individual contributors.
@@ -333,6 +333,10 @@
width: 20%;
}
+.wsrp-consumers-ui .registration-prop-table input[type="text"] {
+ width: 95%;
+}
+
.wsrp-consumers-ui .portlet-section-buttonrow {
margin-top: 6px;
margin-bottom: 6px;
12 years, 8 months
gatein SVN: r7532 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-09-27 11:36:45 -0400 (Tue, 27 Sep 2011)
New Revision: 7532
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
Log:
- Added WSDL url to exception logging.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2011-09-27 15:17:24 UTC (rev 7531)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2011-09-27 15:36:45 UTC (rev 7532)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * Copyright 2011, Red Hat Middleware, LLC, and individual
* contributors as indicated by the @authors tag. See the
* copyright.txt in the distribution for a full listing of
* individual contributors.
@@ -58,7 +58,6 @@
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.soap.SOAPHandler;
import javax.xml.ws.handler.soap.SOAPMessageContext;
-
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
@@ -100,7 +99,7 @@
private boolean failed;
private boolean available;
private int msBeforeTimeOut = DEFAULT_TIMEOUT_MS;
-
+
private boolean wssEnabled;
private void setTimeout(Map<String, Object> requestContext)
@@ -138,7 +137,7 @@
{
handlerChain.add(REQUEST_HEADER_CLIENT_HANDLER);
}
-
+
addWSSHandlers(handlerChain);
}
else
@@ -146,7 +145,7 @@
// otherwise, create a handler chain and add our handler to it
handlerChain = new ArrayList<Handler>(1);
handlerChain.add(REQUEST_HEADER_CLIENT_HANDLER);
-
+
addWSSHandlers(handlerChain);
}
binding.setHandlerChain(handlerChain);
@@ -414,7 +413,7 @@
}
catch (Exception e)
{
- log.info("Couldn't access WSDL information. Service won't be available", e);
+ log.info("Couldn't access WSDL information at" + wsdlDefinitionURL + ". Service won't be available", e);
setAvailable(false);
setFailed(true);
throw e;
@@ -518,7 +517,7 @@
{
return this.wssEnabled;
}
-
+
public boolean isWSSAvailable()
{
WebServiceSecurityFactory wssFactory = WebServiceSecurityFactory.getInstance();
@@ -531,7 +530,7 @@
return false;
}
}
-
+
protected void addWSSHandlers(List<Handler> handlerChain)
{
if (wssEnabled)
12 years, 8 months
gatein SVN: r7531 - components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-09-27 11:17:24 -0400 (Tue, 27 Sep 2011)
New Revision: 7531
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java
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/JSFBeanContext.java
Log:
- Make findBean look into session before attempting to resolve the bean from an EL expression.
- Use findBean to resolve manager in ConsumerBean.
Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java 2011-09-27 14:58:41 UTC (rev 7530)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java 2011-09-27 15:17:24 UTC (rev 7531)
@@ -260,8 +260,7 @@
* @param <T> type of the object to be retrieved
* @return the session object associated with the specified name
* @throws IllegalArgumentException if the value associated with the specified name is not <code>null</code> and
- * does
- * not match the specified expected class
+ * does not match the specified expected class
*/
public <T> T getFromSession(String name, Class<T> expectedClass)
{
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 2011-09-27 14:58:41 UTC (rev 7530)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2011-09-27 15:17:24 UTC (rev 7531)
@@ -777,7 +777,7 @@
{
if (manager == null)
{
- manager = beanContext.getFromSession("consumersMgr", ConsumerManagerBean.class);
+ manager = beanContext.findBean("consumersMgr", ConsumerManagerBean.class);
}
return manager;
}
Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/JSFBeanContext.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/JSFBeanContext.java 2011-09-27 14:58:41 UTC (rev 7530)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/JSFBeanContext.java 2011-09-27 15:17:24 UTC (rev 7531)
@@ -70,8 +70,14 @@
if (candidate == null)
{
- // try to get the bean from an EL expression
- candidate = facesContext.getApplication().evaluateExpressionGet(facesContext, "#{" + name + "}", type);
+ // try the session map
+ candidate = getFromSession(name, type);
+
+ if (candidate == null)
+ {
+ // try to get the bean from an EL expression
+ candidate = facesContext.getApplication().evaluateExpressionGet(facesContext, "#{" + name + "}", type);
+ }
}
if (candidate != null)
12 years, 8 months
gatein SVN: r7530 - in portal/trunk: component/common/src/main/java/conf and 1 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-09-27 10:58:41 -0400 (Tue, 27 Sep 2011)
New Revision: 7530
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java
portal/trunk/pom.xml
Log:
GTNPORTAL-2131 : Update to portlet container 2.3.0-Beta06
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-09-27 14:02:18 UTC (rev 7529)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-09-27 14:58:41 UTC (rev 7530)
@@ -60,6 +60,7 @@
gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
# Global portlet.xml
+gatein.portlet.validation=true
gatein.portlet.config=${gatein.conf.dir}/portlet.xml
# Portal configuration
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-09-27 14:02:18 UTC (rev 7529)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-09-27 14:58:41 UTC (rev 7530)
@@ -63,16 +63,14 @@
gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
# Global portlet.xml
+gatein.portlet.validation=true
gatein.portlet.config=${gatein.conf.dir}/portlet.xml
-# Web
-gatein.web.compressor.js.level=simple
-
# Portal configuration
gatein.portal.idm.createuserportal=false
gatein.portal.idm.destroyuserportal=true
gatein.portal.controller.config=${gatein.conf.dir}/controller.xml
-# key files for gadget
-gatein.gadgets.securityTokenKeyFile=${gatein.conf.dir}/gadgets/key.txt
-gatein.gadgets.signingKeyFile=${gatein.conf.dir}/gadgets/oauthkey.pem
+# Key files for gadget
+gatein.gadgets.securitytokenkeyfile=${gatein.conf.dir}/gadgets/key.txt
+gatein.gadgets.signingkeyfile=${gatein.conf.dir}/gadgets/oauthkey.pem
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-09-27 14:02:18 UTC (rev 7529)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-09-27 14:58:41 UTC (rev 7530)
@@ -63,6 +63,7 @@
gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
# Global portlet.xml
+gatein.portlet.validation=true
gatein.portlet.config=${gatein.conf.dir}/portlet.xml
# Portal configuration
Modified: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java
===================================================================
--- portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-09-27 14:02:18 UTC (rev 7529)
+++ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-09-27 14:58:41 UTC (rev 7530)
@@ -19,9 +19,12 @@
package org.exoplatform.portal.pc;
+import org.exoplatform.commons.utils.PropertyManager;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.services.resources.ResourceBundleService;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.PortletInvoker;
import org.gatein.pc.bridge.BridgeInterceptor;
import org.gatein.pc.federation.FederatingPortletInvoker;
@@ -54,6 +57,7 @@
public class ExoKernelIntegration implements Startable
{
+ /** . */
protected PortletApplicationDeployer portletApplicationRegistry;
/** Exo Context */
@@ -62,6 +66,9 @@
/** DO NOT REMOVE ME, OTHERWISE YOU'LL BREAK THINGS. */
private final ResourceBundleService resourceBundleService;
+ /** . */
+ private Logger log = LoggerFactory.getLogger(ExoKernelIntegration.class);
+
/**
* We enforce the dependency with the ResourceBundleService since it must be stared before the
* <code>portletApplicationRegistry</code>
@@ -84,6 +91,12 @@
portletApplicationRegistry = new ExoPortletApplicationDeployer();
portletApplicationRegistry.setContainerPortletInvoker(containerPortletInvoker);
+ //
+ String validation = PropertyManager.getProperty("gatein.portlet.validation");
+ boolean validated = validation == null || "true".equals(validation.trim().toLowerCase());
+ log.debug("portlet xml validation is " + (validated ? "enabled" : " disabled"));
+ portletApplicationRegistry.setSchemaValidated(validated);
+
//Container Stack
ContainerPortletDispatcher portletContainerDispatcher = new ContainerPortletDispatcher();
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-09-27 14:02:18 UTC (rev 7529)
+++ portal/trunk/pom.xml 2011-09-27 14:58:41 UTC (rev 7530)
@@ -45,7 +45,7 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
- <org.gatein.pc.version>2.3.0-Beta05</org.gatein.pc.version>
+ <org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha04</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta05</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta06</org.gatein.mop.version>
@@ -57,7 +57,7 @@
<javax.servlet.version>2.5</javax.servlet.version>
<version.chromattic>1.1.0-beta7</version.chromattic>
<version.reflext>1.1.0-beta12</version.reflext>
- <org.staxnav.version>0.9.4</org.staxnav.version>
+ <org.staxnav.version>0.9.6</org.staxnav.version>
<jcip.version>1.0</jcip.version>
<commons-dbcp.version>1.2.2</commons-dbcp.version>
12 years, 8 months
gatein SVN: r7529 - components/pc/tags/2.3.0-Beta06/test/core/src/main/resources.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-09-27 10:02:18 -0400 (Tue, 27 Sep 2011)
New Revision: 7529
Modified:
components/pc/tags/2.3.0-Beta06/test/core/src/main/resources/common.xml
Log:
better xml
Modified: components/pc/tags/2.3.0-Beta06/test/core/src/main/resources/common.xml
===================================================================
--- components/pc/tags/2.3.0-Beta06/test/core/src/main/resources/common.xml 2011-09-27 13:56:35 UTC (rev 7528)
+++ components/pc/tags/2.3.0-Beta06/test/core/src/main/resources/common.xml 2011-09-27 14:02:18 UTC (rev 7529)
@@ -1,5 +1,5 @@
-<!-- e754d4e043e2e9e8a4c136bacda890ad -->
<?xml version="1.0"?>
+<!-- e754d4e043e2e9e8a4c136bacda890ad -->
<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/>
12 years, 8 months
gatein SVN: r7528 - components/pc/tags/2.3.0-Beta06/test/core/src/main/resources.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-09-27 09:56:35 -0400 (Tue, 27 Sep 2011)
New Revision: 7528
Modified:
components/pc/tags/2.3.0-Beta06/test/core/src/main/resources/common.xml
Log:
added a random comment to trick nexus
Modified: components/pc/tags/2.3.0-Beta06/test/core/src/main/resources/common.xml
===================================================================
--- components/pc/tags/2.3.0-Beta06/test/core/src/main/resources/common.xml 2011-09-27 13:04:35 UTC (rev 7527)
+++ components/pc/tags/2.3.0-Beta06/test/core/src/main/resources/common.xml 2011-09-27 13:56:35 UTC (rev 7528)
@@ -1,3 +1,4 @@
+<!-- e754d4e043e2e9e8a4c136bacda890ad -->
<?xml version="1.0"?>
<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
12 years, 8 months