You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by df...@apache.org on 2004/09/12 20:32:18 UTC
cvs commit: jakarta-slide/projector/src/content/applications/demo/site index.xml
dflorey 2004/09/12 11:32:18
Modified: projector/src/content/applications/core/i18n exceptions.xml
projector/src/java/org/apache/slide/projector/i18n
DefaultMessage.java
projector/src/content/applications/core/config
formProcessors.xml
projector/src/content/applications/demo application.xml
projector/src/content/applications/core application.xml
projector/src/java/org/apache/slide/projector/processor/form
Test.java FormGenerator.java
projector/src/java/org/apache/slide/projector/engine
ProcessorManager.java
projector/src/content/applications/demo/site index.xml
Added: projector/src/content/applications/core/i18n messages.xml
projector/src/content/applications/core/templates/form
simpleGeneratedForm.tmpl
projector/src/content/applications/core/images button_ok.png
process.jpg
projector/src/content/applications/demo/form antrag.xml
projector/src/content/applications/demo/config
formProcessors.xml
Log:
Demo application updated (but not yet functional)
Revision Changes Path
1.5 +8 -0 jakarta-slide/projector/src/content/applications/core/i18n/exceptions.xml
Index: exceptions.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/core/i18n/exceptions.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- exceptions.xml 27 Aug 2004 17:05:21 -0000 1.4
+++ exceptions.xml 12 Sep 2004 18:32:17 -0000 1.5
@@ -345,6 +345,14 @@
<entry key="details">Der zugewiesene Wert {0} ist nicht als String verwendbar.</entry>
</locale>
</message>
+ <message id="uncastableDateValue">
+ <locale language="de">
+ <entry key="title">Wert ungültig.</entry>
+ <entry key="text">Der zugewiesene Wert {0} ist nicht als Datum verwendbar.</entry>
+ <entry key="summary">Der zugewiesene Wert {0} ist nicht als Datum verwendbar.</entry>
+ <entry key="details">Der zugewiesene Wert {0} ist nicht als Datum verwendbar.</entry>
+ </locale>
+ </message>
<message id="uncastableBooleanValue">
<locale language="de">
<entry key="title">Wert ungültig.</entry>
1.1 jakarta-slide/projector/src/content/applications/core/i18n/messages.xml
Index: messages.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<messages>
<message id="formGenerator/errors">
<locale language="de">
<entry key="text">Fehler:</entry>
</locale>
<locale language="en">
<entry key="text">Errors:</entry>
</locale>
</message>
</messages>
1.2 +2 -2 jakarta-slide/projector/src/java/org/apache/slide/projector/i18n/DefaultMessage.java
Index: DefaultMessage.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/i18n/DefaultMessage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultMessage.java 19 Jul 2004 12:09:24 -0000 1.1
+++ DefaultMessage.java 12 Sep 2004 18:32:17 -0000 1.2
@@ -3,8 +3,8 @@
import java.util.Locale;
public class DefaultMessage extends LocalizedMessage {
- private final static String TITLE = "title";
- private final static String TEXT = "text";
+ public static String TITLE = "title";
+ public final static String TEXT = "text";
public DefaultMessage(String messageId) {
super(messageId);
1.2 +1 -0 jakarta-slide/projector/src/content/applications/core/config/formProcessors.xml
Index: formProcessors.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/core/config/formProcessors.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- formProcessors.xml 22 Jul 2004 12:18:37 -0000 1.1
+++ formProcessors.xml 12 Sep 2004 18:32:17 -0000 1.2
@@ -7,6 +7,7 @@
<processor uri="formContainer" config-uri="templates/form/form.tmpl" class="org.apache.slide.projector.processor.TemplateRenderer" />
<processor uri="formResult" config-uri="templates/form/formResult.tmpl" class="org.apache.slide.projector.processor.TemplateRenderer" />
<processor uri="errors" config-uri="templates/form/errorsTable.tmpl" class="org.apache.slide.projector.processor.table.TableMapRenderer" />
+ <processor uri="simpleFormGenerator" config-uri="templates/form/simpleGeneratedForm.tmpl" class="org.apache.slide.projector.processor.form.FormGenerator" />
<!-- html controls -->
<processor uri="combobox" config-uri="templates/form/controls.tmpl" class="org.apache.slide.projector.processor.form.Combobox" />
1.2 +1 -0 jakarta-slide/projector/src/content/applications/demo/application.xml
Index: application.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/demo/application.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- application.xml 11 Aug 2004 13:13:07 -0000 1.1
+++ application.xml 12 Sep 2004 18:32:17 -0000 1.2
@@ -11,6 +11,7 @@
<content>
<processors uri="config/templateProcessors.xml" />
<processors uri="config/pageProcessors.xml" />
+ <processors uri="config/formProcessors.xml" />
<messages uri="i18n/text.xml" />
<jobs uri="config/jobs.xml" />
<classes uri="classes/" />
1.3 +1 -0 jakarta-slide/projector/src/content/applications/core/application.xml
Index: application.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/core/application.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- application.xml 4 Aug 2004 15:27:22 -0000 1.2
+++ application.xml 12 Sep 2004 18:32:17 -0000 1.3
@@ -29,6 +29,7 @@
<processors uri="config/pageProcessors.xml" />
<messages uri="i18n/exceptions.xml" />
<messages uri="i18n/processors.xml" />
+ <messages uri="i18n/messages.xml" />
<jobs uri="config/jobs.xml" />
</content>
</application>
1.1 jakarta-slide/projector/src/content/applications/core/templates/form/simpleGeneratedForm.tmpl
Index: simpleGeneratedForm.tmpl
===================================================================
<!-- This template contains the generic form -->
<!--*** Start of 'default form' ***-->
<table class="form-table">
<tr><td class="form-title" colspan="2"><%processor-title%></td></tr>
<tr><td><img src="<%processor-large-icon%>"/></td><td class="form-description"><%processor-text%></td></tr>
<tr><td colspan="2" height="8px"></td></tr>
<tr><td colspan="2">
<form action="<%handler%>" method="<%method%>">
<table class="controls-table">
<%controls%>
<%triggers%>
</table>
</form>
</table>
<!--*** End of 'default form' ***-->
<!--*** Start of 'invalid form' ***-->
<table class="form-table">
<tr><td class="form-title" colspan="2"><%processor-title%></td></tr>
<tr><td><img src="<%processor-large-icon%>"/></td><td class="form-description"><%processor-text%></td></tr>
<tr><td colspan="2" height="8px"></td></tr>
<tr><td colspan="2">
<form action="<%handler%>" method="<%method%>">
<table class="controls-table">
<%controls%>
<%triggers%>
</table>
</form>
<?errors
<tr><td height="8px" colspan=2"></td></tr>
<tr><td class="invalid-control-title" colspan=2"><%errors-title%></td></tr>
<%errors%>?>
</td></tr>
</table>
<!--*** End of 'invalid form' ***-->
1.1 jakarta-slide/projector/src/content/applications/core/images/button_ok.png
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/core/images/process.jpg
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/demo/form/antrag.xml
Index: antrag.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<process first-step="evaluate">
<description>
<input>
<parameter name="antragsdatum">
<date/>
</parameter>
<parameter name="vorname">
<string/>
</parameter>
<parameter name="nachname">
<string/>
</parameter>
</input>
<output>
<state>ok</state>
<result name="output" description="composedPage" content-type="text/html" presentable="true" />
</output>
</description>
<step id="evaluate" processor="3ColumnPage">
<load parameter="title"><string>Demo</string></load>
<load parameter="left"><string>Links</string></load>
<load parameter="middle"><string>Mitte</string></load>
<load parameter="right"><string>Rechts</string></load>
<save result="output" store="output" key="output" presentable="true"/>
<route state="ok" return="ok" />
</step>
</process>
1.1 jakarta-slide/projector/src/content/applications/demo/config/formProcessors.xml
Index: formProcessors.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<processors>
<!-- Template that generates xml for the news overview -->
<processor uri="form/antrag" config-uri="form/antrag.xml" class="org.apache.slide.projector.processor.process.Process" />
</processors>
1.4 +2 -2 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/Test.java
Index: Test.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/Test.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Test.java 28 Aug 2004 09:59:03 -0000 1.3
+++ Test.java 12 Sep 2004 18:32:17 -0000 1.4
@@ -39,7 +39,7 @@
private final static ParameterDescriptor[] parameterDescriptors = new ParameterDescriptor[] {
new ParameterDescriptor(PROCESSOR, new ParameterMessage("test/parameter/processor"), new URIValueDescriptor(), NullValue.NULL),
};
-
+
public Result process(Map parameter, Context context) throws Exception {
URI processorUri = ProcessorManager.getInstance().getURI(this);
context.setBookmark(processorUri);
@@ -104,6 +104,6 @@
}
public ResultDescriptor getResultDescriptor() {
- return null;
+ return ResultDescriptor.OK;
}
}
1.4 +6 -5 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/FormGenerator.java
Index: FormGenerator.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/FormGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FormGenerator.java 28 Jul 2004 09:47:53 -0000 1.3
+++ FormGenerator.java 12 Sep 2004 18:32:18 -0000 1.4
@@ -26,6 +26,7 @@
import org.apache.slide.projector.engine.ProcessorManager;
import org.apache.slide.projector.i18n.DefaultMessage;
import org.apache.slide.projector.i18n.ErrorMessage;
+import org.apache.slide.projector.i18n.MessageManager;
import org.apache.slide.projector.i18n.ParameterMessage;
import org.apache.slide.projector.processor.process.Process;
import org.apache.slide.projector.value.ArrayValue;
@@ -53,8 +54,8 @@
protected final static URI COMBOBOX = new URIValue("combobox");
protected final static URI CHECKBOX = new URIValue("checkbox");
protected final static URI ERRORS_TABLE = new URIValue("errors");
- protected final static URI TRIGGER_URI = new URIValue("textTrigger");
- protected final static URI DEFAULT_TRIGGER_IMAGE = new URIValue("/files/contelligent/images/ok.gif");
+ protected final static URI TRIGGER_URI = new URIValue("imageTrigger");
+ protected final static URI DEFAULT_TRIGGER_IMAGE = new URIValue("/projector/applications/core/images/button_ok.png");
protected final static URI DEFAULT_CONTROL_CONTAINER = new URIValue("bigControl");
protected final static URI DEFAULT_TRIGGER_CONTAINER = new URIValue("triggerContainer");
protected final static URI DEFAULT_ERROR_RENDERER = new URIValue("errors");
@@ -66,7 +67,7 @@
protected final static String PROCESSOR_LARGE_ICON = "processor-large-icon";
protected final static String STYLE = "style";
- protected final static String ORANGE_STYLE = "style.html";
+ protected final static String ORANGE_STYLE = "/style.css";
protected final static String LAUNCH_PROCESSOR = "trigger:launch";
private ParameterDescriptor[] parameterDescriptors;
@@ -138,7 +139,7 @@
parameter.put(TITLE, processorDescriptor.getName());
parameter.put(STYLE, ((HttpContext)context).getContextPath() + ORANGE_STYLE);
parameter.put(ERRORS, controlComposerResult.getResultEntries().get(ControlComposer.RENDERED_ERRORS));
- parameter.put(ERRORS_TITLE, "Fehler:");
+ parameter.put(ERRORS_TITLE, MessageManager.getText("formGenerator/errors", DefaultMessage.TEXT, new Object[0], locale));
Template template = defaultTemplate;
String state = controlComposerResult.getState();
if ( state == VALID_STATE && validTemplate != null ) {
1.8 +2 -2 jakarta-slide/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java
Index: ProcessorManager.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProcessorManager.java 27 Aug 2004 17:04:38 -0000 1.7
+++ ProcessorManager.java 12 Sep 2004 18:32:18 -0000 1.8
@@ -59,8 +59,8 @@
private final static Logger logger = Logger.getLogger(ProcessorManager.class.getName());
private final static String PROCESSOR_CONFIG = "processors.xml";
- private final static URI SMALL_DEFAULT_ICON = new URIValue("/files/contelligent/images/process.jpg");
- private final static URI LARGE_DEFAULT_ICON = new URIValue("/files/contelligent/images/process.jpg");
+ private final static URI SMALL_DEFAULT_ICON = new URIValue("/projector/applications/core/images/process.jpg");
+ private final static URI LARGE_DEFAULT_ICON = new URIValue("/projector/applications/core/images/process.jpg");
private static ProcessorManager processorManager = new ProcessorManager();
1.2 +13 -6 jakarta-slide/projector/src/content/applications/demo/site/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/demo/site/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 11 Aug 2004 13:12:50 -0000 1.1
+++ index.xml 12 Sep 2004 18:32:18 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<process first-step="compose">
+<process first-step="form">
<description>
<output>
<state>ok</state>
@@ -7,13 +7,20 @@
</output>
</description>
- <step id="compose" processor="2ColumnPage">
- <load parameter="title"><string>Demo project index page</string></load>
- <load parameter="keywords"><string>slide,contelligent</string></load>
- <load parameter="description"><string>This page is the index page of the demo project</string></load>
+ <step id="form" processor="simpleFormGenerator">
+ <load parameter="action"><uri>form/antrag</uri></load>
+ <load parameter="targetStep"><uri>evaluate</uri></load>
+ <save result="output" key="form" />
+ <route state="default" step="compose" />
+ <route state="valid" step="compose" />
+ <route state="invalid" step="compose" />
+ </step>
+
+ <step id="compose" processor="3ColumnPage">
+ <load parameter="title"><string>Demo</string></load>
<load parameter="left"><string>Links</string></load>
+ <load parameter="middle"><value key="form" /></load>
<load parameter="right"><string>Rechts</string></load>
- <load parameter="style"><value processor="url"><string>style.html</string></value></load>
<save result="output" store="output" key="output" presentable="true"/>
<route state="ok" return="ok" />
</step>
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org