tdraier 2005/05/18 14:42:06 CEST
Modified files:
src/java/org/sensei/webapp ViewFormAction.java
src/webapp/WEB-INF/chiba components.xsl html-form-controls.xsl
html4.xsl
transform-for-validation.xsl ui.xsl
src/webapp/WEB-INF web.xml
src/webapp/jsp/css all.css chiba-styles.css ie-xforms.css
mozilla-xforms.css styles.css
src/webapp/jsp wizardProcesses.jsp wizardUrl.jsp
wizardWelcome.jsp
. project.xml
Added files:
src/conf commons-logging.properties
Log:
upgrade to chiba 1.0, fixed websphere issues
Revision Changes Path
1.9 +1 -1 senseiwebapp/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/project.xml.diff?r1=1.8&r2=1.9&f=h
1.1 +1 -0 senseiwebapp/src/conf/commons-logging.properties (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/conf/commons-logging.properties?rev=1.1&content-type=text/plain
1.14 +9 -6
senseiwebapp/src/java/org/sensei/webapp/ViewFormAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/java/org/sensei/webapp/ViewFormAction.java.diff?r1=1.13&r2=1.14&f=h
1.6 +1 -1 senseiwebapp/src/webapp/WEB-INF/chiba/components.xsl
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/WEB-INF/chiba/components.xsl.diff?r1=1.5&r2=1.6&f=h
1.8 +3 -8
senseiwebapp/src/webapp/WEB-INF/chiba/html-form-controls.xsl
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/WEB-INF/chiba/html-form-controls.xsl.diff?r1=1.7&r2=1.8&f=h
1.6 +10 -3 senseiwebapp/src/webapp/WEB-INF/chiba/html4.xsl
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/WEB-INF/chiba/html4.xsl.diff?r1=1.5&r2=1.6&f=h
1.6 +3 -2
senseiwebapp/src/webapp/WEB-INF/chiba/transform-for-validation.xsl
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/WEB-INF/chiba/transform-for-validation.xsl.diff?r1=1.5&r2=1.6&f=h
1.4 +42 -41 senseiwebapp/src/webapp/WEB-INF/chiba/ui.xsl
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/WEB-INF/chiba/ui.xsl.diff?r1=1.3&r2=1.4&f=h
1.6 +11 -10 senseiwebapp/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/WEB-INF/web.xml.diff?r1=1.5&r2=1.6&f=h
1.3 +0 -0 senseiwebapp/src/webapp/jsp/css/all.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/jsp/css/all.css.diff?r1=1.2&r2=1.3&f=h
1.3 +21 -1 senseiwebapp/src/webapp/jsp/css/chiba-styles.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/jsp/css/chiba-styles.css.diff?r1=1.2&r2=1.3&f=h
1.4 +0 -1 senseiwebapp/src/webapp/jsp/css/ie-xforms.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/jsp/css/ie-xforms.css.diff?r1=1.3&r2=1.4&f=h
1.4 +22 -4 senseiwebapp/src/webapp/jsp/css/mozilla-xforms.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/jsp/css/mozilla-xforms.css.diff?r1=1.3&r2=1.4&f=h
1.3 +29 -0 senseiwebapp/src/webapp/jsp/css/styles.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/jsp/css/styles.css.diff?r1=1.2&r2=1.3&f=h
1.4 +1 -1 senseiwebapp/src/webapp/jsp/wizardProcesses.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/jsp/wizardProcesses.jsp.diff?r1=1.3&r2=1.4&f=h
1.4 +1 -1 senseiwebapp/src/webapp/jsp/wizardUrl.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/jsp/wizardUrl.jsp.diff?r1=1.3&r2=1.4&f=h
1.4 +1 -1 senseiwebapp/src/webapp/jsp/wizardWelcome.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/jsp/wizardWelcome.jsp.diff?r1=1.3&r2=1.4&f=h
Index: commons-logging.properties
====================================================================
## Override special definitions from Websphere
Index: ViewFormAction.java
===================================================================
RCS file:
/home/cvs/repository/senseiwebapp/src/java/org/sensei/webapp/ViewFormAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ViewFormAction.java 12 May 2005 10:30:44 -0000 1.13
+++ ViewFormAction.java 18 May 2005 12:42:03 -0000 1.14
@@ -38,10 +38,10 @@
* Time: 13:45:22
* <p/>
* $Author: tdraier $
- * $Date: 2005/05/12 10:30:44 $
- * $Id: ViewFormAction.java,v 1.13 2005/05/12 10:30:44 tdraier Exp $
+ * $Date: 2005/05/18 12:42:03 $
+ * $Id: ViewFormAction.java,v 1.14 2005/05/18 12:42:03 tdraier Exp $
* $RCSfile: ViewFormAction.java,v $
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
* $Source:
/home/cvs/repository/senseiwebapp/src/java/org/sensei/webapp/ViewFormAction.java,v
$
* $State: Exp $
*/
@@ -211,7 +211,8 @@
adapter.setFormDocument(result);
adapter.setStylesheetPath(getServlet().getServletContext().getRealPath("WEB-INF/chiba"));
adapter.setActionUrl("executeForm.do");
-
adapter.setUploadDir(".."+request.getContextPath()+"/WEB-INF/var/content");
+ adapter.setUploadDir("WEB-INF/var/content");
+//
adapter.setUploadDir(".."+request.getContextPath()+"/WEB-INF/var/content");
new
File(servlet.getServletContext().getRealPath("/WEB-INF/var/content")).mkdirs();
//todo: refactor to use ChibaContext
@@ -224,6 +225,8 @@
adapter.createUIGenerator().setParameter("styles-base",request.getContextPath()+"/jsp/css");
adapter.createUIGenerator().setParameter("show-attachment-action",
request.getScheme() + "://" + request.getServerName() + ":" +
request.getServerPort() + request.getContextPath() + "/ShowAttachmentServlet");
autoValues.setValues(adapter.getChibaBean());
+ updateContext(adapter, request, session);
+ adapter.executeHandler();
session.setAttribute("chiba.adapter", adapter);
}
}
Index: components.xsl
===================================================================
RCS file:
/home/cvs/repository/senseiwebapp/src/webapp/WEB-INF/chiba/components.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- components.xsl 10 Jan 2005 15:42:34 -0000 1.5
+++ components.xsl 18 May 2005 12:42:04 -0000 1.6
@@ -4,7 +4,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:xlink="http://www.w3.org/1999/xlink";
- xmlns:chiba="http://chiba.sourceforge.net/2003/08/xforms";
+ xmlns:chiba="http://chiba.sourceforge.net/xforms";
exclude-result-prefixes="xhtml xforms chiba xlink">
Index: html-form-controls.xsl
===================================================================
RCS file:
/home/cvs/repository/senseiwebapp/src/webapp/WEB-INF/chiba/html-form-controls.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- html-form-controls.xsl 7 Feb 2005 11:34:30 -0000 1.7
+++ html-form-controls.xsl 18 May 2005 12:42:04 -0000 1.8
@@ -1,9 +1,10 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:xforms="http://www.w3.org/2002/xforms";
- xmlns:chiba="http://chiba.sourceforge.net/2003/08/xforms";
+ xmlns:chiba="http://chiba.sourceforge.net/xforms";
xmlns:xlink="http://www.w3.org/1999/xlink";
exclude-result-prefixes="chiba xforms xlink xsl">
+ <!-- Copyright 2005 Chibacon -->
<xsl:variable name="data-prefix" select="'d_'"/>
<xsl:variable name="trigger-prefix" select="'t_'"/>
@@ -11,7 +12,7 @@
<xsl:param name="scripted" select="'false'"/>
<!-- change this to your ShowAttachmentServlet -->
- <xsl:param name="show-attachment-action"
select="'http://@baseurl.host@:@baseurl.port@/[EMAIL
PROTECTED]@/ShowAttachmentServlet'"/>
+ <xsl:variable name="show-attachment-action"
select="'http://@baseurl.host@:@baseurl.port@/[EMAIL
PROTECTED]@/ShowAttachmentServlet'"/>
<!-- This stylesheet contains a collection of templates which map XForms
controls to HTML controls. -->
<xsl:output method="html" indent="yes" omit-xml-declaration="yes"/>
@@ -27,7 +28,6 @@
<xsl:variable name="repeat-id"
select="ancestor::*[name(.)='xforms:repeat'][1]/@id"/>
<xsl:variable name="pos" select="position()"/>
<xsl:variable name="id" select="@id"/>
- <xsl:variable name="bind" select="@xforms:bind"/>
<xsl:if test="$debug-enabled='true'">
<xsl:message>###repeat-id: <xsl:value-of
select="$repeat-id"/></xsl:message>
@@ -35,8 +35,6 @@
<xsl:message>###position: <xsl:value-of
select="position()"/></xsl:message>
</xsl:if>
- <xsl:message>---yy-xx- <xsl:value-of select="$bind"/> --
<xsl:value-of select="//xforms:[EMAIL PROTECTED]/@xforms:type"/></xsl:message>
-
<xsl:element name="input">
<xsl:attribute name="id">
<xsl:value-of select="concat($id,'-value')"/>
@@ -48,9 +46,6 @@
<xsl:attribute name="value">
<xsl:value-of select="chiba:data/text()"/>
</xsl:attribute>
- <xsl:if test="//xforms:[EMAIL PROTECTED]/@xforms:type='date'">
- <xsl:attribute
name="onfocus">showCalendar('',this,this,'<xsl:value-of
select="chiba:data/text()"/>','<xsl:value-of
select="concat($id,'-value')"/>',0,30,1)</xsl:attribute>
- </xsl:if>
<xsl:attribute name="title">
<xsl:value-of select="normalize-space(xforms:hint)"/>
</xsl:attribute>
Index: html4.xsl
===================================================================
RCS file:
/home/cvs/repository/senseiwebapp/src/webapp/WEB-INF/chiba/html4.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- html4.xsl 10 Jan 2005 15:42:34 -0000 1.5
+++ html4.xsl 18 May 2005 12:42:04 -0000 1.6
@@ -4,8 +4,9 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:xlink="http://www.w3.org/1999/xlink";
- xmlns:chiba="http://chiba.sourceforge.net/2003/08/xforms";
+ xmlns:chiba="http://chiba.sourceforge.net/xforms";
exclude-result-prefixes="xhtml xforms chiba xlink">
+ <!-- Copyright 2005 Chibacon -->
<xsl:include href="ui.xsl"/>
<xsl:include href="html-form-controls.xsl"/>
@@ -118,6 +119,12 @@
</xsl:for-each>
</script>
</xsl:if>
+
+ <!-- :olli hack -->
+ <!-- import slider JavaScript -->
+ <script type="text/javascript" src="scripts/slider.js"></script>
+ <!-- :olli hack ende -->
+
<xsl:apply-templates/>
</xsl:template>
@@ -200,7 +207,7 @@
</span>
</td>
<td align="right">
- © Chiba 2004
+ © Chiba 2001-2005
</td>
</tr>
</table>
@@ -575,7 +582,7 @@
<!-- only execute if there's a data element which is e.g. not the
case for unbound groups -->
<xsl:choose>
- <xsl:when test="self::chiba:data"
xmlns:chiba="http://chiba.sourceforge.net/2003/08/xforms";>
+ <xsl:when test="self::chiba:data"
xmlns:chiba="http://chiba.sourceforge.net/xforms";>
<xsl:variable name="enabled">
<xsl:choose>
<xsl:when
test="chiba:data/@chiba:enabled='true'">enabled</xsl:when>
Index: transform-for-validation.xsl
===================================================================
RCS file:
/home/cvs/repository/senseiwebapp/src/webapp/WEB-INF/chiba/transform-for-validation.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- transform-for-validation.xsl 10 Jan 2005 15:42:34 -0000 1.5
+++ transform-for-validation.xsl 18 May 2005 12:42:04 -0000 1.6
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0"
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xmlns:chiba="http://chiba.sourceforge.net/2003/08/xforms";
+ xmlns:chiba="http://chiba.sourceforge.net/xforms";
>
+ <!-- Copyright 2005 Chibacon -->
<xsl:output method="xml" encoding="iso-8859-1" indent="yes"/>
<!-- put the "schemaLocation" attributes on the root node -->
@@ -17,7 +18,7 @@
</xsl:for-each>
<!-- schemaLocation attributes -->
- <xsl:attribute
name="xsi:schemaLocation">http://www.w3.org/2002/xforms xforms.xsd
http://chiba.sourceforge.net/2003/08/xforms chiba.xsd
http://www.w3.org/1999/xlink xlink.xsd</xsl:attribute>
+ <xsl:attribute
name="xsi:schemaLocation">http://www.w3.org/2002/xforms xforms.xsd
http://chiba.sourceforge.net/xforms chiba.xsd http://www.w3.org/1999/xlink
xlink.xsd</xsl:attribute>
<xsl:apply-templates/>
</xsl:copy>
Index: ui.xsl
===================================================================
RCS file: /home/cvs/repository/senseiwebapp/src/webapp/WEB-INF/chiba/ui.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ui.xsl 10 Jan 2005 15:42:34 -0000 1.3
+++ ui.xsl 18 May 2005 12:42:04 -0000 1.4
@@ -4,7 +4,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:xlink="http://www.w3.org/1999/xlink";
- xmlns:chiba="http://chiba.sourceforge.net/2003/08/xforms";
+ xmlns:chiba="http://chiba.sourceforge.net/xforms";
exclude-result-prefixes="xhtml xforms chiba xlink">
@@ -16,14 +16,7 @@
<!--
#######################################################################################################
-->
<!-- ############################################ PARAMS
################################################### -->
- <xsl:param name="debug-enabled" select="'true'"/>
-
- <!-- ### specifies the parameter prefix for repeat selectors ### -->
- <xsl:param name="selector-prefix" select="'s_'"/>
-
- <!-- ### wether JavaScript should be generated or not ### -->
- <xsl:param name="scripted" select="'false'"/>
-
+ <!-- ##### should be declared in html4.xsl ###### -->
<!-- ############################################ VARIABLES
################################################ -->
@@ -66,22 +59,23 @@
<xsl:choose>
<!-- **** handle group label ***** -->
- <xsl:when test="self::xforms:label"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:label">
<xsl:if test="$debug-enabled='true'">
<xsl:message>handling group label
...</xsl:message>
</xsl:if>
<span id="{$id}-label" class="minimal-group-label">
<xsl:apply-templates select="."/>
</span>
+ <xsl:message>handled group label ...</xsl:message>
</xsl:when>
<!-- **** handle group alert ***** -->
- <xsl:when test="self::xforms:alert"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:alert">
<xsl:apply-templates select="xforms:alert"/>
</xsl:when>
<!-- **** handle sub group ***** -->
- <xsl:when test="self::xforms:group"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:group">
<xsl:if test="$debug-enabled='true'">
<xsl:message>found group</xsl:message>
</xsl:if>
@@ -89,7 +83,7 @@
</xsl:when>
<!-- **** handle repeat ***** -->
- <xsl:when test="self::xforms:repeat"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:repeat">
<xsl:if test="$debug-enabled='true'">
<xsl:message>found repeat</xsl:message>
</xsl:if>
@@ -97,7 +91,7 @@
</xsl:when>
<!-- **** handle switch ***** -->
- <xsl:when test="self::xforms:switch"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:switch">
<xsl:if test="$debug-enabled='true'">
<xsl:message>found switch</xsl:message>
</xsl:if>
@@ -105,14 +99,14 @@
</xsl:when>
<!-- **** handle chiba:data element ***** -->
- <xsl:when test="self::chiba:data"
xmlns:chiba="http://chiba.sourceforge.net/2003/08/xforms";>
+ <xsl:when test="self::chiba:data"
xmlns:chiba="http://chiba.sourceforge.net/xforms";>
<xsl:if test="$debug-enabled='true'">
<xsl:message>ignoring chiba data
element</xsl:message>
</xsl:if>
</xsl:when>
<!-- **** handle trigger + submit ***** -->
- <xsl:when test="self::xforms:trigger or
self::xforms:submit" xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:trigger or
self::xforms:submit">
<xsl:if test="$debug-enabled='true'">
<xsl:message>handling trigger:
<xsl:value-of select="xforms:label"/>
@@ -127,7 +121,7 @@
</xsl:when>
<!-- **** handle xforms control ***** -->
- <xsl:when test="self::xforms:*"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:*">
<xsl:if test="$debug-enabled='true'">
<xsl:message>handling control label</xsl:message>
@@ -194,7 +188,7 @@
<xsl:call-template name="labelClasses"/>
</xsl:variable>
<td id="{../@id}-label" class="{$label-class}">
- <xsl:apply-templates
select="self::node()[not(name(..)='xforms:trigger' or
name(..)='xforms:submit')]" xmlns:xforms="http://www.w3.org/2002/xforms"/>
+ <xsl:apply-templates
select="self::node()[not(name(..)='xforms:trigger' or
name(..)='xforms:submit')]"/>
</td>
</xsl:for-each>
</tr>
@@ -203,33 +197,33 @@
<xsl:choose>
<!-- **** handle group label ***** -->
- <xsl:when test="self::xforms:label"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:label">
<xsl:if test="$debug-enabled='true'">
<xsl:message>ignoring group label
...</xsl:message>
</xsl:if>
</xsl:when>
<!-- **** handle group alert ***** -->
- <xsl:when test="self::xforms:alert"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:alert">
<xsl:apply-templates select="xforms:alert"/>
</xsl:when>
<!-- **** handle sub group ***** -->
- <xsl:when test="self::xforms:group"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:group">
<td colspan="{$control-count}">
<xsl:apply-templates select="."/>
</td>
</xsl:when>
<!-- **** handle repeat ***** -->
- <xsl:when test="self::xforms:repeat"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:repeat">
<td colspan="{$control-count}">
<xsl:apply-templates select="."/>
</td>
</xsl:when>
<!-- **** handle switch ***** -->
- <xsl:when test="self::xforms:switch"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:switch">
<xsl:if test="$debug-enabled='true'">
<xsl:message>found switch</xsl:message>
</xsl:if>
@@ -239,7 +233,7 @@
</xsl:when>
<!-- **** handle trigger + submit ***** -->
- <xsl:when test="self::xforms:trigger or
self::xforms:submit" xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:trigger or
self::xforms:submit">
<xsl:if test="$debug-enabled='true'">
<xsl:message>handling trigger:
<xsl:value-of select="xforms:label"/>
@@ -254,7 +248,7 @@
</xsl:when>
<!-- **** handle xforms control ***** -->
- <xsl:when test="self::xforms:*"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:*">
<xsl:variable name="css">
<xsl:call-template name="assembleClasses"/>
</xsl:variable>
@@ -270,7 +264,7 @@
</xsl:when>
<!-- **** handle chiba:data element ***** -->
- <xsl:when test="self::chiba:data"
xmlns:xforms="http://chiba.sourceforge.net/2003/08/xforms";>
+ <xsl:when test="self::chiba:data"
xmlns:xforms="http://chiba.sourceforge.net/xforms";>
<xsl:if test="$debug-enabled='true'">
<xsl:message>ignoring chiba data
element</xsl:message>
</xsl:if>
@@ -303,10 +297,14 @@
<table class="{normalize-space(concat('full-group','
',$group-css))}" id="{$id}" border="0">
<!-- handling group children -->
<xsl:for-each select="*">
- <xsl:choose>
+ <xsl:message>*=
+ <xsl:value-of select="."/> ...
+ </xsl:message>
+ <xsl:choose>
+
<!-- ***** build caption with column labels ***** -->
- <xsl:when test="self::xforms:label"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:label">
<xsl:if test="$debug-enabled='true'">
<xsl:message>handling group label
...</xsl:message>
</xsl:if>
@@ -315,15 +313,16 @@
<xsl:apply-templates select="."/>
</td>
</tr>
+ <xsl:message>handled group label ...</xsl:message>
</xsl:when>
<!-- **** handle group alert ***** -->
- <xsl:when test="self::xforms:alert"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:alert">
<xsl:apply-templates select="xforms:alert"/>
</xsl:when>
<!-- **** handle sub group ***** -->
- <xsl:when test="self::xforms:group"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:group">
<tr>
<td colspan="2">
<xsl:apply-templates select="."/>
@@ -332,7 +331,7 @@
</xsl:when>
<!-- **** handle repeat ***** -->
- <xsl:when test="self::xforms:repeat"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:repeat">
<tr>
<td colspan="2">
<xsl:apply-templates select="."/>
@@ -341,7 +340,7 @@
</xsl:when>
<!-- **** handle switch ***** -->
- <xsl:when test="self::xforms:switch"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:switch">
<xsl:if test="$debug-enabled='true'">
<xsl:message>found switch</xsl:message>
</xsl:if>
@@ -353,7 +352,7 @@
</xsl:when>
<!-- **** handle trigger + submit ***** -->
- <xsl:when test="self::xforms:trigger or
self::xforms:submit" xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:trigger or
self::xforms:submit">
<xsl:if test="$debug-enabled='true'">
<xsl:message>handling trigger:
<xsl:value-of select="xforms:label"/>
@@ -370,7 +369,7 @@
</xsl:when>
<!-- **** handle xforms control ***** -->
- <xsl:when test="self::xforms:*"
xmlns:xforms="http://www.w3.org/2002/xforms";>
+ <xsl:when test="self::xforms:*">
<xsl:if test="$debug-enabled='true'">
<xsl:message>element ->
<xsl:value-of select="name(.)"/>
@@ -395,9 +394,11 @@
<xsl:apply-templates select="xforms:label"/>
</td>
- <xsl:variable name="css">
- <xsl:call-template name="assembleClasses"/>
- </xsl:variable>
+ <!--
+ <xsl:variable
name="cssa">
+
<xsl:call-template name="assembleClasses"/>
+ </xsl:variable>
+ -->
<td id="[EMAIL PROTECTED]" class="{$css}">
<xsl:if test="$debug-enabled='true'">
<xsl:message>handling
control</xsl:message>
@@ -411,7 +412,7 @@
</xsl:when>
<!-- **** handle chiba:data element ***** -->
- <xsl:when test="self::chiba:data"
xmlns:xforms="http://chiba.sourceforge.net/2003/08/xforms";>
+ <xsl:when test="self::chiba:data"
xmlns:xforms="http://chiba.sourceforge.net/xforms";>
<xsl:if test="$debug-enabled='true'">
<xsl:message>ignoring chiba data
element</xsl:message>
</xsl:if>
@@ -502,7 +503,7 @@
</tr>
</xsl:if>
- <xsl:variable name="outermost-id"
select="ancestor-or-self::xforms:repeat/@id"
xmlns:xforms="http://www.w3.org/2002/xforms"/>
+ <xsl:variable name="outermost-id"
select="ancestor-or-self::xforms:repeat/@id"/>
<xsl:variable name="repeat-id" select="@id"/>
<!-- ***** loop repeat entries ***** -->
@@ -661,7 +662,7 @@
</xsl:for-each>
</tr>
- <xsl:variable name="outermost-id"
select="ancestor-or-self::xforms:repeat/@id"
xmlns:xforms="http://www.w3.org/2002/xforms"/>
+ <xsl:variable name="outermost-id"
select="ancestor-or-self::xforms:repeat/@id"/>
<xsl:variable name="repeat-id" select="@id"/>
<xsl:for-each select="xforms:[EMAIL PROTECTED]:transient]">
@@ -778,7 +779,7 @@
</tr>
</xsl:if>
- <xsl:variable name="outermost-id"
select="ancestor-or-self::xforms:repeat/@id"
xmlns:xforms="http://www.w3.org/2002/xforms"/>
+ <xsl:variable name="outermost-id"
select="ancestor-or-self::xforms:repeat/@id"/>
<xsl:variable name="repeat-id" select="@id"/>
<!-- ***** loop repeat entries ***** -->
Index: web.xml
===================================================================
RCS file: /home/cvs/repository/senseiwebapp/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- web.xml 11 Feb 2005 18:25:23 -0000 1.5
+++ web.xml 18 May 2005 12:42:04 -0000 1.6
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
-<web-app>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
+ "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";>
+<web-app>
<servlet>
<servlet-name>struts</servlet-name>
<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
@@ -34,7 +35,7 @@
<servlet-name>ShowAttachmentServlet</servlet-name>
<servlet-class>org.chiba.adapter.web.ShowAttachmentServlet</servlet-class>
</servlet>
-
+
<servlet-mapping>
<servlet-name>struts</servlet-name>
<url-pattern>*.do</url-pattern>
@@ -44,17 +45,13 @@
<servlet-name>ShowAttachmentServlet</servlet-name>
<url-pattern>/ShowAttachmentServlet</url-pattern>
</servlet-mapping>
-
+
<!-- The Usual Welcome File List -->
<welcome-file-list>
<welcome-file>/viewForm.do</welcome-file>
<welcome-file>/index.jsp</welcome-file>
</welcome-file-list>
- <security-role>
- <role-name>manager</role-name>
- </security-role>
-
<!-- Struts Tag Library Descriptors -->
<taglib>
<taglib-uri>/WEB-INF/struts/struts-bean</taglib-uri>
@@ -68,4 +65,8 @@
<taglib-uri>/WEB-INF/struts/struts-logic</taglib-uri>
<taglib-location>/WEB-INF/struts/struts-logic.tld</taglib-location>
</taglib>
+
+ <security-role>
+ <role-name>manager</role-name>
+ </security-role>
</web-app>
\ No newline at end of file
Index: chiba-styles.css
===================================================================
RCS file:
/home/cvs/repository/senseiwebapp/src/webapp/jsp/css/chiba-styles.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chiba-styles.css 10 Jan 2005 15:42:34 -0000 1.2
+++ chiba-styles.css 18 May 2005 12:42:05 -0000 1.3
@@ -42,5 +42,25 @@
padding-left:10px;
}
-
+#news{
+border-left:thin groove;
+padding-left:10px;
+ width:150px;
+}
+.headline{
+border:thin solid;
+border-color:#4C5C5C;
+-moz-border-radius:6px;
+margin-bottom:5px;
+padding:3px;
+background:#aabbff;
+}
+.headline .para{
+font-style:italic;
+}
+.date{
+display:block;
+border-bottom:thin solid #4c5c5c;
+margin-bottom:3px;
+}
Index: ie-xforms.css
===================================================================
RCS file: /home/cvs/repository/senseiwebapp/src/webapp/jsp/css/ie-xforms.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ie-xforms.css 13 Jan 2005 17:05:37 -0000 1.3
+++ ie-xforms.css 18 May 2005 12:42:05 -0000 1.4
@@ -34,7 +34,6 @@
border:none;
background-color:#eeeeee;
padding:2px;
- width:100%;
}
.full-group-label{
background-color:#eeeeee;
Index: mozilla-xforms.css
===================================================================
RCS file:
/home/cvs/repository/senseiwebapp/src/webapp/jsp/css/mozilla-xforms.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mozilla-xforms.css 13 Jan 2005 17:05:37 -0000 1.3
+++ mozilla-xforms.css 18 May 2005 12:42:05 -0000 1.4
@@ -4,7 +4,7 @@
/*
***************************************************************************** */
.invalid > .alert{
- position:relative;
+ position:absolute;
border:thin solid;
background-color:white;
color:red;
@@ -12,6 +12,9 @@
height:14px;
margin-left:2px;
}
+.invalid > .value{
+ background:red;
+}
.valid > .alert{
display:none;
@@ -26,6 +29,22 @@
display:none;
}
+input:hover{
+ background-color:#aabbff;
+ }
+input:focus{
+ background-color:#aabbff;
+ color:white;
+ }
+textarea:hover{
+ background-color:#aabbff;
+}
+textarea:focus{
+ background-color:#aabbff;
+ color:white;
+ }
+
+
.legend{
display:block;
width:150px;
@@ -118,7 +137,6 @@
border:none;
background-color:#eeeeee;
padding:2px;
- width:100%;
}
.full-group-label{
background-color:#eeeeee;
@@ -182,7 +200,7 @@
border-width:1pt;
border-style:ridge;
border-color:#444444;
- font-size: 8pt;
+ font-size: 10pt;
font-family: sans-serif;
}
.trigger > .value:active{
@@ -199,7 +217,7 @@
border-width:1pt;
border-style:ridge;
border-color:#444444;
- font-size: 8pt;
+ font-size: 10pt;
font-family: sans-serif;
}
.submit > .value:active{
Index: styles.css
===================================================================
RCS file: /home/cvs/repository/senseiwebapp/src/webapp/jsp/css/styles.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- styles.css 10 Jan 2005 15:42:34 -0000 1.2
+++ styles.css 18 May 2005 12:42:05 -0000 1.3
@@ -4,11 +4,40 @@
/*
***************************************************************************** */
/* ######################################### HTML styles
############################################ */
+body{background-color:#aabbdd;}
+a.link{color:#444444;}
+a.visited{color:#444444;}
+a.active{color:#444444;}
+
+*{font-family:sans-serif;
+ font-size:8pt;
+}
.text12{
font-size:12pt;
}
+input:hover{
+ background-color:#aabbff;
+ }
+input:focus{
+ background-color:#aabbff;
+ color:white;
+ }
+
+textarea:hover{
+ background-color:#aabbff;
+}
+textarea:focus{
+ background-color:#aabbff;
+ color:white;
+ }
+
+/* Chiba-logo on forms pages - linked to forms page */
+img#chiba-logo:hover{
+ background-color:#aabbff;
+}
+
.legend{
display:block;
width:150px;
Index: wizardProcesses.jsp
===================================================================
RCS file:
/home/cvs/repository/senseiwebapp/src/webapp/jsp/wizardProcesses.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wizardProcesses.jsp 11 Feb 2005 18:25:23 -0000 1.3
+++ wizardProcesses.jsp 18 May 2005 12:42:05 -0000 1.4
@@ -53,7 +53,7 @@
</td></tr></table>
</td></tr></table>
</td></tr>
- </table>
+ </table><br>
</td></tr></table>
Index: wizardUrl.jsp
===================================================================
RCS file: /home/cvs/repository/senseiwebapp/src/webapp/jsp/wizardUrl.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wizardUrl.jsp 11 Feb 2005 18:25:23 -0000 1.3
+++ wizardUrl.jsp 18 May 2005 12:42:05 -0000 1.4
@@ -61,7 +61,7 @@
</td></tr></table>
</td></tr></table>
</td></tr>
- </table>
+ </table><br>
</td></tr></table>
Index: wizardWelcome.jsp
===================================================================
RCS file: /home/cvs/repository/senseiwebapp/src/webapp/jsp/wizardWelcome.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wizardWelcome.jsp 11 Feb 2005 18:25:23 -0000 1.3
+++ wizardWelcome.jsp 18 May 2005 12:42:05 -0000 1.4
@@ -30,6 +30,6 @@
</td></tr></table>
</td></tr></table>
</td></tr>
- </table>
+ </table><br>
</td></tr></table>
<%@ include file="footer.jsp" %>
\ No newline at end of file
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/senseiwebapp/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 12 May 2005 10:30:45 -0000 1.8
+++ project.xml 18 May 2005 12:42:06 -0000 1.9
@@ -50,7 +50,7 @@
<dependency>
<id>chiba:chiba-full</id>
- <version>0.9.8-SNAPSHOT</version>
+ <version>1.0.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
