gatein SVN: r4825 - portal/trunk/packaging/tomcat/pkg.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-10-25 17:33:52 -0400 (Mon, 25 Oct 2010)
New Revision: 4825
Modified:
portal/trunk/packaging/tomcat/pkg/pom.xml
Log:
minor
Modified: portal/trunk/packaging/tomcat/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-25 21:11:24 UTC (rev 4824)
+++ portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-25 21:33:52 UTC (rev 4825)
@@ -799,63 +799,55 @@
<!-- War files -->
<dependency>
<?rename portal.war?>
- <!--portal.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web.portal</artifactId>
<type>war</type>
</dependency>
<dependency>
<?rename eXoGadgetServer.war?>
- <!--eXoGadgetServer.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-server</artifactId>
<type>war</type>
</dependency>
<dependency>
<?rename eXoGadgets.war?>
- <!--eXoGadgets.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.eXoGadgets</artifactId>
<type>war</type>
</dependency>
<dependency>
<?rename web.war?>
- <!--web.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet.web</artifactId>
<type>war</type>
</dependency>
<dependency>
<?rename rest.war?>
- <!--rest.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web.rest</artifactId>
<type>war</type>
</dependency>
<dependency>
<?rename exoadmin.war?>
- <!--exoadmin.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet.exoadmin</artifactId>
<type>war</type>
</dependency>
<dependency>
<?rename eXoResources.war?>
- <!--eXoResources.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web.eXoResources</artifactId>
<type>war</type>
</dependency>
<dependency>
<?rename dashboard.war?>
- <!--dashboard.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet.dashboard</artifactId>
<type>war</type>
</dependency>
<dependency>
- <!--<?rename integration.war?>-->
+ <?rename integration.war?>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging.tomcat.integration</artifactId>
<version>3.2.0-Beta01-SNAPSHOT</version>
14 years, 2 months
gatein SVN: r4824 - portal/trunk/packaging/tomcat/pkg.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-10-25 17:11:24 -0400 (Mon, 25 Oct 2010)
New Revision: 4824
Modified:
portal/trunk/packaging/tomcat/pkg/pom.xml
Log:
GTNPORTAL-1591 : port enforcer plugin for enforcing paths
Modified: portal/trunk/packaging/tomcat/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-25 21:03:43 UTC (rev 4823)
+++ portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-25 21:11:24 UTC (rev 4824)
@@ -867,8 +867,41 @@
<build>
<plugins>
+ <!-- Ensure your environment is correctly setup -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tomcat-check-environment-ready</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>exo.projects.directory.dependencies</property>
+ <message>"You must define the property exo.projects.directory.dependencies to give the path to the directory where you store your applications servers"</message>
+ </requireProperty>
+ <requireProperty>
+ <property>exo.projects.app.tomcat.version</property>
+ <message>"You must define the property exo.projects.app.tomcat.version to give the name of the directory where is stored tomcat"</message>
+ </requireProperty>
+ <requireFilesExist>
+ <files>
+ <file>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}/</file>
+ </files>
+ <message>"The following Tomcat directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}"</message>
+ </requireFilesExist>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<executions>
14 years, 2 months
gatein SVN: r4823 - portal/trunk/packaging/tomcat/pkg.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-10-25 17:03:43 -0400 (Mon, 25 Oct 2010)
New Revision: 4823
Modified:
portal/trunk/packaging/tomcat/pkg/pom.xml
Log:
bye bye assembly plugin
Modified: portal/trunk/packaging/tomcat/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-25 16:22:03 UTC (rev 4822)
+++ portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-25 21:03:43 UTC (rev 4823)
@@ -917,30 +917,6 @@
</execution>
</executions>
</plugin>
-
-<!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/tomcat-init.xml</descriptor>
- </descriptors>
- <finalName>tomcat</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- <version>2.2</version>
- <executions>
- <execution>
- <id>init-assembly</id>
- <phase>process-resources</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
--->
</plugins>
</build>
14 years, 2 months
gatein SVN: r4822 - in components/pc/trunk: controller and 4 other directories.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-25 12:22:03 -0400 (Mon, 25 Oct 2010)
New Revision: 4822
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/mc/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/test/pom.xml
Log:
GTNPC-39: Maven build should fail if there is an error
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2010-10-25 16:06:08 UTC (rev 4821)
+++ components/pc/trunk/api/pom.xml 2010-10-25 16:22:03 UTC (rev 4822)
@@ -55,6 +55,7 @@
</execution>
</executions>
<configuration>
+ <failOnError>true</failOnError>
<testsuites>
<testsuite>
<config>jboss-unit.xml</config>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2010-10-25 16:06:08 UTC (rev 4821)
+++ components/pc/trunk/controller/pom.xml 2010-10-25 16:22:03 UTC (rev 4822)
@@ -69,6 +69,7 @@
</execution>
</executions>
<configuration>
+ <failOnError>true</failOnError>
<testsuites>
<testsuite>
<config>local-jboss-unit.xml</config>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2010-10-25 16:06:08 UTC (rev 4821)
+++ components/pc/trunk/federation/pom.xml 2010-10-25 16:22:03 UTC (rev 4822)
@@ -49,6 +49,7 @@
</execution>
</executions>
<configuration>
+ <failOnError>true</failOnError>
<testsuites>
<testsuite>
<config>jboss-unit.xml</config>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2010-10-25 16:06:08 UTC (rev 4821)
+++ components/pc/trunk/mc/pom.xml 2010-10-25 16:22:03 UTC (rev 4822)
@@ -46,6 +46,7 @@
</execution>
</executions>
<configuration>
+ <failOnError>true</failOnError>
<testsuites>
<testsuite>
<config>local-jboss-unit.xml</config>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2010-10-25 16:06:08 UTC (rev 4821)
+++ components/pc/trunk/portlet/pom.xml 2010-10-25 16:22:03 UTC (rev 4822)
@@ -187,7 +187,7 @@
<!--<jpda>false</jpda>-->
<!--<jpdaPort>9000</jpdaPort>-->
<!--<jpdaSuspend>true</jpdaSuspend>-->
- <!--<failOnError>false</failOnError>-->
+ <failOnError>true</failOnError>
<!--<assertions>true</assertions>-->
<testsuites>
<testsuite>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2010-10-25 16:06:08 UTC (rev 4821)
+++ components/pc/trunk/test/pom.xml 2010-10-25 16:22:03 UTC (rev 4822)
@@ -292,7 +292,7 @@
<!--<jpda>false</jpda>-->
<!--<jpdaPort>9000</jpdaPort>-->
<!--<jpdaSuspend>true</jpdaSuspend>-->
- <!--<failOnError>false</failOnError>-->
+ <failOnError>true</failOnError>
<!--<assertions>true</assertions>-->
<testsuites>
<testsuite>
14 years, 2 months
gatein SVN: r4821 - components/pc/trunk/api/src/main/java/org/gatein/pc/api.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-25 12:06:08 -0400 (Mon, 25 Oct 2010)
New Revision: 4821
Modified:
components/pc/trunk/api/src/main/java/org/gatein/pc/api/Mode.java
components/pc/trunk/api/src/main/java/org/gatein/pc/api/WindowState.java
Log:
- GTNPC-38: Constructors need to be public for JAXB unmarshalling done by SupportsMetaData.
Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/Mode.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/Mode.java 2010-10-25 15:38:26 UTC (rev 4820)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/Mode.java 2010-10-25 16:06:08 UTC (rev 4821)
@@ -53,7 +53,12 @@
/** . */
private String name;
- private Mode(String name)
+ /**
+ * This NEEDS to be public for JAXB unmarshalling done by SupportsMetaData.
+ *
+ * @param name
+ */
+ public Mode(String name)
{
this(name, false);
}
Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/WindowState.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/WindowState.java 2010-10-25 15:38:26 UTC (rev 4820)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/WindowState.java 2010-10-25 16:06:08 UTC (rev 4821)
@@ -47,7 +47,12 @@
/** . */
private String name;
- private WindowState(String name)
+ /**
+ * This NEEDS to be public for JAXB unmarshalling done by SupportsMetaData.
+ *
+ * @param name
+ */
+ public WindowState(String name)
{
this(name, false);
}
14 years, 2 months
gatein SVN: r4820 - in portal/trunk/packaging/tomcat/pkg: src and 1 other directory.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-10-25 11:38:26 -0400 (Mon, 25 Oct 2010)
New Revision: 4820
Removed:
portal/trunk/packaging/tomcat/pkg/src/assembly/
Modified:
portal/trunk/packaging/tomcat/pkg/pom.xml
portal/trunk/packaging/tomcat/pkg/transform.xsl
Log:
GTNPORTAL-1591 : replace assembly with ant
Modified: portal/trunk/packaging/tomcat/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-25 14:12:45 UTC (rev 4819)
+++ portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-25 15:38:26 UTC (rev 4820)
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<?rename tofile="portal.war"?>
<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">
@@ -797,48 +798,56 @@
<!-- War files -->
<dependency>
+ <?rename portal.war?>
<!--portal.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web.portal</artifactId>
<type>war</type>
</dependency>
<dependency>
+ <?rename eXoGadgetServer.war?>
<!--eXoGadgetServer.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-server</artifactId>
<type>war</type>
</dependency>
<dependency>
+ <?rename eXoGadgets.war?>
<!--eXoGadgets.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.eXoGadgets</artifactId>
<type>war</type>
</dependency>
<dependency>
+ <?rename web.war?>
<!--web.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet.web</artifactId>
<type>war</type>
</dependency>
<dependency>
+ <?rename rest.war?>
<!--rest.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web.rest</artifactId>
<type>war</type>
</dependency>
<dependency>
+ <?rename exoadmin.war?>
<!--exoadmin.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet.exoadmin</artifactId>
<type>war</type>
</dependency>
<dependency>
+ <?rename eXoResources.war?>
<!--eXoResources.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web.eXoResources</artifactId>
<type>war</type>
</dependency>
<dependency>
+ <?rename dashboard.war?>
<!--dashboard.war-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet.dashboard</artifactId>
@@ -846,7 +855,7 @@
</dependency>
<dependency>
- <!--integration.war-->
+ <!--<?rename integration.war?>-->
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging.tomcat.integration</artifactId>
<version>3.2.0-Beta01-SNAPSHOT</version>
@@ -876,16 +885,6 @@
<copy todir="target/tomcat">
<fileset dir="${tomcat.dir}"/>
</copy>
-<!--
- <chmod perm="0644">
- <fileset dir="${tomcat.dir}"/>
- </chmod>
- <chmod perm="0755">
- <fileset dir="${tomcat.dir}">
- <include name="**/*.sh"/>
- </fileset>
- </chmod>
--->
<!-- Copy the dependencies -->
<dependencyfilesets/>
@@ -898,6 +897,21 @@
<ant antfile="${project.basedir}/target/pom.xml" inheritRefs="true">
<target name="foo" />
</ant>
+
+ <!-- Copy configuration -->
+ <copy todir="target/tomcat">
+ <fileset dir="${project.basedir}/src/main/resources/tomcat"/>
+ </copy>
+
+ <!-- Copy configuration -->
+ <copy tofile="target/tomcat/gatein/conf/configuration.properties">
+ <fileset dir="${project.basedir}/../../../component/common/src/main/java/conf" includes="configuration-tomcat.properties"/>
+ </copy>
+
+ <!-- File permissions -->
+ <chmod perm="0644" type="file" dir="target/tomcat" excludes="**/*.sh"/>
+ <chmod perm="0755" type="file" dir="target/tomcat" includes="**/*.sh"/>
+
</target>
</configuration>
</execution>
Modified: portal/trunk/packaging/tomcat/pkg/transform.xsl
===================================================================
--- portal/trunk/packaging/tomcat/pkg/transform.xsl 2010-10-25 14:12:45 UTC (rev 4819)
+++ portal/trunk/packaging/tomcat/pkg/transform.xsl 2010-10-25 15:38:26 UTC (rev 4820)
@@ -7,7 +7,7 @@
<xsl:template match="/" >
<project name="foo">
<target name="foo">
- <copy todir="target/tomcat/libs">
+ <copy todir="target/tomcat/lib">
<xsl:for-each select="//foo:dependencies/foo:dependency[count(foo:type)=0 or foo:type/text()='jar']">
<xsl:element name="fileset">
<xsl:attribute name="refid"><xsl:value-of select="./foo:groupId"/>:<xsl:value-of select="./foo:artifactId"/>:jar</xsl:attribute>
@@ -15,12 +15,30 @@
</xsl:for-each>
</copy>
<xsl:for-each select="//foo:dependencies/foo:dependency[foo:type/text()='war']">
- <xsl:element name="copy">
- <xsl:attribute name="tofile">target/tomcat/webapps/<xsl:value-of select="./comment()"/></xsl:attribute>
- <xsl:element name="fileset">
- <xsl:attribute name="refid"><xsl:value-of select="./foo:groupId"/>:<xsl:value-of select="./foo:artifactId"/>:war</xsl:attribute>
- </xsl:element>
- </xsl:element>
+ <xsl:variable name="bilto">
+ <xsl:for-each select="processing-instruction()[name()='rename']">
+ <xsl:value-of select="."/>
+ </xsl:for-each>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="$bilto=''">
+ <xsl:element name="copy">
+ <xsl:attribute name="todir">target/tomcat/webapps</xsl:attribute>
+ <xsl:element name="fileset">
+ <xsl:attribute name="refid"><xsl:value-of select="./foo:groupId"/>:<xsl:value-of select="./foo:artifactId"/>:war</xsl:attribute>
+ </xsl:element>
+ </xsl:element>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:element name="copy">
+ <xsl:attribute name="tofile">target/tomcat/webapps/<xsl:value-of select="$bilto"/></xsl:attribute>
+ <xsl:element name="fileset">
+ <xsl:attribute name="refid"><xsl:value-of select="./foo:groupId"/>:<xsl:value-of select="./foo:artifactId"/>:war</xsl:attribute>
+ </xsl:element>
+ </xsl:element>
+ </xsl:otherwise>
+ </xsl:choose>
+
</xsl:for-each>
</target>
</project>
14 years, 2 months
gatein SVN: r4819 - components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-25 10:12:45 -0400 (Mon, 25 Oct 2010)
New Revision: 4819
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml
Log:
- GTNWSRP-110: Removed display of expiration time as it's not currently used.
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2010-10-25 13:52:20 UTC (rev 4818)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2010-10-25 14:12:45 UTC (rev 4819)
@@ -33,11 +33,13 @@
<th>#{i18n.export_detail_export_time}</th>
<td>#{consumer.currentExport.exportTime}</td>
</tr>
+ <ui:remove>
+ <tr>
+ <th>#{i18n.export_detail_expiration_time}</th>
+ <td>#{consumer.currentExport.expirationTime}</td>
+ </tr>
+ </ui:remove>
<tr>
- <th>#{i18n.export_detail_expiration_time}</th>
- <td>#{consumer.currentExport.expirationTime}</td>
- </tr>
- <tr>
<th>#{i18n.export_detail_portlets}</th>
<td>
<h:dataTable id="exported-portlets" value="#{consumer.currentExport.exportedPortlets}" var="portlet"
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml 2010-10-25 13:52:20 UTC (rev 4818)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml 2010-10-25 14:12:45 UTC (rev 4819)
@@ -36,10 +36,12 @@
#{export.exportTime}
</h:column>
- <h:column>
- <f:facet name="header">#{i18n.export_detail_expiration_time}</f:facet>
- #{export.expirationTime}
- </h:column>
+ <ui:remove>
+ <h:column>
+ <f:facet name="header">#{i18n.export_detail_expiration_time}</f:facet>
+ #{export.expirationTime}
+ </h:column>
+ </ui:remove>
<h:column>
<f:facet name="header">#{i18n.export_detail_has_failed}</f:facet>
14 years, 2 months
gatein SVN: r4818 - 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: 2010-10-25 09:52:20 -0400 (Mon, 25 Oct 2010)
New Revision: 4818
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
Log:
- GTNWSRP-109: Properly catch all exceptions so that we can display an error message instead of crashing.
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 2010-10-25 13:23:48 UTC (rev 4817)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-10-25 13:52:20 UTC (rev 4818)
@@ -636,7 +636,7 @@
return ConsumerManagerBean.CONSUMERS;
}
- catch (PortletInvokerException e)
+ catch (Exception e)
{
beanContext.createErrorMessageFrom(e);
return null;
14 years, 2 months
gatein SVN: r4817 - 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: 2010-10-25 09:23:48 -0400 (Mon, 25 Oct 2010)
New Revision: 4817
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/JSFBeanContext.java
Log:
- GTNWSRP-116: avoid NPE when there's no cause in the parent exception.
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 2010-10-25 11:12:16 UTC (rev 4816)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/JSFBeanContext.java 2010-10-25 13:23:48 UTC (rev 4817)
@@ -97,10 +97,17 @@
}
String details = message;
+
+ // todo: this should be more generic
if (additionalParams != null && additionalParams.length > 0)
{
- details = ((Exception)additionalParams[0]).getLocalizedMessage();
+ Exception exception = (Exception)additionalParams[0];
+ if (exception != null)
+ {
+ details = exception.getLocalizedMessage();
+ }
}
+
FacesMessage msg = new FacesMessage(jsfSeverity, message, details);
facesContext.addMessage(target, msg);
}
14 years, 2 months
gatein SVN: r4816 - epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-25 07:12:16 -0400 (Mon, 25 Oct 2010)
New Revision: 4816
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java
Log:
JBEPP-572: It is possible to change page of "NotFound" node and NPE exception occurs after it
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java 2010-10-25 08:06:56 UTC (rev 4815)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java 2010-10-25 11:12:16 UTC (rev 4816)
@@ -186,13 +186,16 @@
public void invokeSetBindingBean(Object bean) throws Exception
{
super.invokeSetBindingBean(bean);
- PageNode node = (PageNode)bean;
- Calendar cal = getUIFormDateTimeInput(START_PUBLICATION_DATE).getCalendar();
- Date date = (cal != null) ? cal.getTime() : null;
- node.setStartPublicationDate(date);
- cal = getUIFormDateTimeInput(END_PUBLICATION_DATE).getCalendar();
- date = (cal != null) ? cal.getTime() : null;
- node.setEndPublicationDate(date);
+ PageNode node = (PageNode) bean;
+ if (node.getVisibility() != Visibility.SYSTEM)
+ {
+ Calendar cal = getUIFormDateTimeInput(START_PUBLICATION_DATE).getCalendar();
+ Date date = (cal != null) ? cal.getTime() : null;
+ node.setStartPublicationDate(date);
+ cal = getUIFormDateTimeInput(END_PUBLICATION_DATE).getCalendar();
+ date = (cal != null) ? cal.getTime() : null;
+ node.setEndPublicationDate(date);
+ }
}
public void setShowCheckPublicationDate(boolean show)
@@ -269,7 +272,11 @@
WebuiRequestContext ctx = event.getRequestContext();
UIPageNodeForm uiPageNodeForm = event.getSource();
UIApplication uiPortalApp = ctx.getUIApplication();
- if (uiPageNodeForm.getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).isChecked())
+ PageNode pageNode = uiPageNodeForm.getPageNode();
+ if (pageNode == null)
+ pageNode = new PageNode();
+
+ if (pageNode.getVisibility() != Visibility.SYSTEM && uiPageNodeForm.getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).isChecked())
{
Calendar currentCalendar = Calendar.getInstance();
currentCalendar.set(currentCalendar.get(Calendar.YEAR), currentCalendar.get(Calendar.MONTH), currentCalendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
@@ -305,10 +312,7 @@
}
}
-
- PageNode pageNode = uiPageNodeForm.getPageNode();
- if (pageNode == null)
- pageNode = new PageNode();
+
uiPageNodeForm.invokeSetBindingBean(pageNode);
UIPageSelector2 pageSelector = uiPageNodeForm.getChild(UIPageSelector2.class);
if (pageSelector.getPage() == null)
14 years, 2 months