dflorey 2004/12/07 12:55:57
Modified: projector/src/content/applications/demo/form antrag.xml
projector/src/content/applications/core/i18n exceptions.xml
projector/src/content/applications/demo/config
formProcessors.xml
projector/src/content/applications/demo/i18n text.xml
projector/src/content/applications/demo/site news.xml
index.xml
projector/src/content/applications/admin/security login.xml
Log:
Refactored projector applicatons
Revision Changes Path
1.2 +5 -5
jakarta-slide/projector/src/content/applications/demo/form/antrag.xml
Index: antrag.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/demo/form/antrag.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- antrag.xml 12 Sep 2004 18:32:17 -0000 1.1
+++ antrag.xml 7 Dec 2004 20:55:56 -0000 1.2
@@ -2,14 +2,14 @@
<process first-step="evaluate">
<description>
<input>
- <parameter name="antragsdatum">
- <date/>
+ <parameter name="vorname"
description="form/antrag/vorname">
+ <string minumum="1"/>
</parameter>
- <parameter name="vorname">
+ <parameter name="nachname"
description="form/antrag/nachname">
<string/>
</parameter>
- <parameter name="nachname">
- <string/>
+ <parameter name="alter" description="form/antrag/alter">
+ <number minimum="20" maximum="25" />
</parameter>
</input>
<output>
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- exceptions.xml 30 Sep 2004 20:14:14 -0000 1.7
+++ exceptions.xml 7 Dec 2004 20:55:56 -0000 1.8
@@ -523,4 +523,12 @@
<entry key="details">Sie haben keine Berechtigung,
einen Benutzer anzulegen.</entry>
</locale>
</message>
+ <message id="noBookmark">
+ <locale language="de">
+ <entry key="title">Zielseite nicht gefunden!</entry>
+ <entry key="text">Sie haben eine Formularauswertung
illegal aufgerufen!</entry>
+ <entry key="summary">Sie haben eine Formularauswertung
illegal aufgerufen!</entry>
+ <entry key="details">Sie haben eine Formularauswertung
illegal aufgerufen!</entry>
+ </locale>
+ </message>
</messages>
1.2 +1 -1
jakarta-slide/projector/src/content/applications/demo/config/formProcessors.xml
Index: formProcessors.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/demo/config/formProcessors.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- formProcessors.xml 12 Sep 2004 18:32:17 -0000 1.1
+++ formProcessors.xml 7 Dec 2004 20:55:56 -0000 1.2
@@ -1,5 +1,5 @@
<?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" />
+ <processor uri="form/antrag" description="form/antrag"
config-uri="form/antrag.xml"
class="org.apache.slide.projector.processor.process.Process" />
</processors>
1.2 +22 -1
jakarta-slide/projector/src/content/applications/demo/i18n/text.xml
Index: text.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/demo/i18n/text.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- text.xml 11 Aug 2004 13:12:29 -0000 1.1
+++ text.xml 7 Dec 2004 20:55:56 -0000 1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<messages>
<message id="welcome">
<locale language="de">
@@ -6,6 +6,27 @@
</locale>
<locale language="en">
<entry key="text">Welcome to the projector
demonstration!</entry>
+ </locale>
+ </message>
+ <message id="form/antrag">
+ <locale language="de">
+ <entry key="title">Antrag</entry>
+ <entry key="text">Dieses ist ein beispielhaftes
Antragsformular</entry>
+ <entry key="prompt">Bitte Vornamen eingeben:</entry>
+ </locale>
+ </message>
+ <message id="form/antrag/vorname">
+ <locale language="de">
+ <entry key="title">Vorname</entry>
+ <entry key="text">Alle Vornamen des
Antragsstellers</entry>
+ <entry key="prompt">Bitte Vornamen eingeben:</entry>
+ </locale>
+ </message>
+ <message id="form/antrag/nachname">
+ <locale language="de">
+ <entry key="title">Nachname</entry>
+ <entry key="text">Familienname der
Antragsstellers</entry>
+ <entry key="prompt">Bitte Nachnamen eingeben:</entry>
</locale>
</message>
</messages>
1.2 +3 -2
jakarta-slide/projector/src/content/applications/demo/site/news.xml
Index: news.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/demo/site/news.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- news.xml 11 Aug 2004 13:12:50 -0000 1.1
+++ news.xml 7 Dec 2004 20:55:56 -0000 1.2
@@ -15,7 +15,7 @@
<step id="newsIcon" processor="htmlTag">
<load parameter="fragment"><string>img</string></load>
- <load parameter="src"><value processor="image"
result="url"><url>/projector/applications/admin/images/role.gif</url></value></load>
+ <load parameter="src"><value processor="image"
result="url"><uri>/projector/applications/admin/images/role.gif</uri></value></load>
<save result="output" key="newsIcon"/>
<route state="ok" step="renderNews" />
</step>
@@ -57,6 +57,7 @@
<entry key="url"><value
processor="url"><string>test</string></value></entry>
</map>
</entry>
+ <entry
key="result"><string>output</string></entry>
<entry
key="key"><string>output</string></entry>
<entry
key="sortable"><string>false</string></entry>
<entry
key="resizable"><string>false</string></entry>
@@ -104,7 +105,7 @@
<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>
- <load parameter="left"><value /></load>
+ <load parameter="left"><string>Links</string></load>
<load parameter="middle"><value key="content" /></load>
<load parameter="right"><string>Right</string></load>
<load parameter="style"><value
processor="url"><string>style.html</string></value></load>
1.3 +5 -13
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 12 Sep 2004 18:32:18 -0000 1.2
+++ index.xml 7 Dec 2004 20:55:56 -0000 1.3
@@ -3,25 +3,17 @@
<description>
<output>
<state>ok</state>
- <result name="output" description="composedPage"
content-type="text/html" presentable="true" />
+ <result name="output" description="composedPage"
content-type="text/html"/>
</output>
</description>
- <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="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>
<load parameter="middle"><value key="form" /></load>
<load parameter="right"><string>Rechts</string></load>
- <save result="output" store="output" key="output"
presentable="true"/>
+ <save result="output" store="output" key="output"/>
<route state="ok" return="ok" />
</step>
</process>
1.6 +1 -1
jakarta-slide/projector/src/content/applications/admin/security/login.xml
Index: login.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/security/login.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- login.xml 30 Sep 2004 19:26:16 -0000 1.5
+++ login.xml 7 Dec 2004 20:55:57 -0000 1.6
@@ -107,7 +107,7 @@
</entry>
<entry key="image">
<value processor="image" result="url">
-
<string>/projector/applications/admin/images/button_ok.png</string>
+
<uri>/projector/applications/admin/images/button_ok.png</uri>
</value>
</entry>
</map>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
