[Bedework-commit] bedework r1399 - in trunk: build deployment/resources/xsl/default/default

[svnadmin at bedework.org]

Author: douglm
Date: 2007-05-31 15:16:43 -0400 (Thu, 31 May 2007)
New Revision: 1399

Modified:
   trunk/build/quickstart-build.xml
   trunk/deployment/resources/xsl/default/default/errors.xsl
Log:
Fix up logging errro in portlet on upload

Add error message for duplicate calendars in admin

Modified: trunk/build/quickstart-build.xml
===================================================================
--- trunk/build/quickstart-build.xml	2007-05-31 19:10:58 UTC (rev 1398)
+++ trunk/build/quickstart-build.xml	2007-05-31 19:16:43 UTC (rev 1399)
@@ -363,6 +363,7 @@
       <jvmarg value="-Xms128m" />
       <jvmarg value="-Xmx630m" />
       <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+      <jvmarg value="-Dfile.encoding=UTF-8"/>
       <arg value="start"/>
     </java>
   </target>

Modified: trunk/deployment/resources/xsl/default/default/errors.xsl
===================================================================
--- trunk/deployment/resources/xsl/default/default/errors.xsl	2007-05-31 19:10:58 UTC (rev 1398)
+++ trunk/deployment/resources/xsl/default/default/errors.xsl	2007-05-31 19:16:43 UTC (rev 1399)
@@ -286,6 +286,12 @@
 
       <!--         End of scheduling            -->
 
+      <!-- Other error codes defined in CalfacadeException -->
+
+      <xsl:when test="id='org.bedework.exception.duplicatecalendar'">
+         Error: Duplicate calendar: <em><xsl:value-of select="param"/></em>
+      </xsl:when>
+
       <xsl:when test="id='org.bedework.validation.error.invalid.status'">
         Error: Invalid status: <em><xsl:value-of select="param"/></em>
       </xsl:when>