[jboss-cvs] jboss-seam/examples/wiki ...
Christian Bauer
christian at hibernate.org
Sat Apr 21 04:34:37 EDT 2007
User: cbauer
Date: 07/04/21 04:34:37
Modified: examples/wiki Wiki.iws
Log:
Minor bugs
Revision Changes Path
1.7 +77 -97 jboss-seam/examples/wiki/Wiki.iws
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Wiki.iws
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/Wiki.iws,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Wiki.iws 21 Apr 2007 08:13:49 -0000 1.6
+++ Wiki.iws 21 Apr 2007 08:34:37 -0000 1.7
@@ -19,35 +19,12 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.ipr" afterPath="$PROJECT_DIR$/Wiki.ipr" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/includes/searchControl.xhtml" afterPath="$PROJECT_DIR$/view/includes/searchControl.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/themes/default/template.xhtml" afterPath="$PROJECT_DIR$/view/themes/default/template.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/WEB-INF/components.xml" afterPath="$PROJECT_DIR$/src/etc/WEB-INF/components.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.iml" afterPath="$PROJECT_DIR$/Wiki.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/includes/userControl.xhtml" afterPath="$PROJECT_DIR$/view/includes/userControl.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/META-INF/persistence-prod-war.xml" afterPath="$PROJECT_DIR$/src/etc/META-INF/persistence-prod-war.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/import-dev.sql" afterPath="$PROJECT_DIR$/src/etc/import-dev.sql" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/userRegister.xhtml" afterPath="$PROJECT_DIR$/view/userRegister.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/userList.xhtml" afterPath="$PROJECT_DIR$/view/userList.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/index.html" afterPath="$PROJECT_DIR$/view/index.html" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptchaResponseValidator.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.iws" afterPath="$PROJECT_DIR$/Wiki.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/import-prod.sql" afterPath="$PROJECT_DIR$/src/etc/import-prod.sql" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptchaResponse.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/userHome.xhtml" afterPath="$PROJECT_DIR$/view/userHome.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/File.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/File.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/wiki-prod-ds.xml" afterPath="$PROJECT_DIR$/src/etc/wiki-prod-ds.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Directory.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Directory.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/import-test.sql" afterPath="$PROJECT_DIR$/src/etc/import-test.sql" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptcha.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/WEB-INF/pages.xml" afterPath="$PROJECT_DIR$/src/etc/WEB-INF/pages.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/includes/commentForm.xhtml" afterPath="$PROJECT_DIR$/view/includes/commentForm.xhtml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/META-INF/persistence-test-war.xml" afterPath="$PROJECT_DIR$/src/etc/META-INF/persistence-test-war.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/src/etc/WEB-INF/web.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/themes/default/mailtemplates/confirmationRegistration.xhtml" afterPath="$PROJECT_DIR$/view/themes/default/mailtemplates/confirmationRegistration.xhtml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.iws" afterPath="$PROJECT_DIR$/Wiki.iws" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -221,91 +198,97 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="userRegister.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/view/userRegister.xhtml">
+ <file leaf-file-name="commentForm.xhtml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/view/includes/commentForm.xhtml">
<provider editor-type-id="HtmlPreview">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="119" column="0" selection-start="5492" selection-end="6197" vertical-scroll-proportion="0.6502242">
+ <state line="35" column="34" selection-start="1776" selection-end="1776" vertical-scroll-proportion="0.3393124">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="commentForm.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/view/includes/commentForm.xhtml">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <file leaf-file-name="WikiIdentity.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="60" column="33" selection-start="3081" selection-end="3081" vertical-scroll-proportion="0.43647236">
+ <state line="81" column="12" selection-start="2945" selection-end="2945" vertical-scroll-proportion="0.15968208">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="WikiCaptcha.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptcha.java">
+ <file leaf-file-name="NodeHome.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeHome.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="24" selection-start="835" selection-end="835" vertical-scroll-proportion="0.24421965">
+ <state line="202" column="30" selection-start="6540" selection-end="6540" vertical-scroll-proportion="0.9017341">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/build.xml">
+ <file leaf-file-name="Directory.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Directory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="0" selection-start="1835" selection-end="1835" vertical-scroll-proportion="0.3851156">
+ <state line="8" column="37" selection-start="187" selection-end="187" vertical-scroll-proportion="0.07514451">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="FeedDAO.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java">
+ <file leaf-file-name="WikiPreferences.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="13" selection-start="832" selection-end="832" vertical-scroll-proportion="0.27239883">
+ <state line="49" column="16" selection-start="1982" selection-end="1982" vertical-scroll-proportion="0.46026012">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="WikiNodeFactory.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java">
+ <file leaf-file-name="userControl.xhtml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/view/includes/userControl.xhtml">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="33" selection-start="2055" selection-end="2055" vertical-scroll-proportion="0.5166185">
+ <state line="12" column="0" selection-start="455" selection-end="455" vertical-scroll-proportion="0.11659193">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="userList.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/view/userList.xhtml">
- <provider editor-type-id="HtmlPreview">
- <state />
+ <file leaf-file-name="WikiCaptcha.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptcha.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="23" column="39" selection-start="724" selection-end="724" vertical-scroll-proportion="0.21604046">
+ <folding />
+ </state>
</provider>
+ </entry>
+ </file>
+ <file leaf-file-name="FeedDAO.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="148" column="104" selection-start="8243" selection-end="8243" vertical-scroll-proportion="0.22272047">
+ <state line="29" column="13" selection-start="832" selection-end="832" vertical-scroll-proportion="0.27239883">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="User.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/User.java">
+ <file leaf-file-name="WikiNodeFactory.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="53" column="13" selection-start="1613" selection-end="1613" vertical-scroll-proportion="0.47904626">
+ <state line="54" column="0" selection-start="2021" selection-end="2021" vertical-scroll-proportion="0.50722545">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="UserDAO.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/UserDAO.java">
+ <file leaf-file-name="WikiCaptchaResponse.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptchaResponse.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="63" column="13" selection-start="2133" selection-end="2133" vertical-scroll-proportion="0.41763005">
+ <state line="10" column="18" selection-start="269" selection-end="269" vertical-scroll-proportion="0.09393064">
<folding />
</state>
</provider>
@@ -1367,7 +1350,6 @@
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
- <MESSAGE value="Migrated to a local newer Hibernate version, the hibernate-all.jar in Seam is too old" />
<MESSAGE value="Fixed comments and blog directory" />
<MESSAGE value="Added comment delete button" />
<MESSAGE value="Permission check for comment deletion" />
@@ -1376,6 +1358,7 @@
<MESSAGE value="Finished document history and diff feature" />
<MESSAGE value="Upgraded to BSD-licensed urlrewrite and some cosmetic changes" />
<MESSAGE value="Quite useless plugin for embedding flash movies on wiki pages" />
+ <MESSAGE value="Kicked out jCaptcha and replaced with simple math captcha" />
<MESSAGE value="Minor" />
</component>
<component name="VssConfiguration">
@@ -1457,84 +1440,81 @@
<option name="myLastEditedConfigurable" value="Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/view/themes/default/mailtemplates/confirmationRegistration.xhtml">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/UserDAO.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="25" selection-start="1406" selection-end="1406" vertical-scroll-proportion="0.3109118">
+ <state line="63" column="13" selection-start="2133" selection-end="2133" vertical-scroll-proportion="0.41763005">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptchaResponseValidator.java">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/User.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="1" selection-start="127" selection-end="385" vertical-scroll-proportion="0.1315029">
+ <state line="53" column="13" selection-start="1613" selection-end="1613" vertical-scroll-proportion="0.47904626">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptchaResponse.java">
+ <entry file="file://$PROJECT_DIR$/view/userList.xhtml">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="18" selection-start="269" selection-end="269" vertical-scroll-proportion="0.09393064">
+ <state line="148" column="104" selection-start="8243" selection-end="8243" vertical-scroll-proportion="0.22272047">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java">
+ <entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="13" selection-start="1403" selection-end="1403" vertical-scroll-proportion="0.3099711">
+ <state line="41" column="0" selection-start="1835" selection-end="1835" vertical-scroll-proportion="0.3851156">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/test.xhtml">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="62" column="0" selection-start="1735" selection-end="2440" vertical-scroll-proportion="0.6023916">
+ <state line="29" column="13" selection-start="832" selection-end="832" vertical-scroll-proportion="0.27239883">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeBrowser.java">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="216" column="13" selection-start="9242" selection-end="9242" vertical-scroll-proportion="0.7839595">
+ <state line="54" column="0" selection-start="2021" selection-end="2021" vertical-scroll-proportion="0.50722545">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/userRegister.xhtml">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptchaResponse.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="119" column="0" selection-start="5492" selection-end="6197" vertical-scroll-proportion="0.6502242">
+ <state line="10" column="18" selection-start="269" selection-end="269" vertical-scroll-proportion="0.09393064">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/UserDAO.java">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptcha.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="63" column="13" selection-start="2133" selection-end="2133" vertical-scroll-proportion="0.41763005">
+ <state line="23" column="39" selection-start="724" selection-end="724" vertical-scroll-proportion="0.21604046">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/User.java">
+ <entry file="file://$PROJECT_DIR$/view/userRegister.xhtml">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="53" column="13" selection-start="1613" selection-end="1613" vertical-scroll-proportion="0.47904626">
+ <state line="119" column="0" selection-start="5492" selection-end="6197" vertical-scroll-proportion="0.6502242">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/userList.xhtml">
+ <entry file="file://$PROJECT_DIR$/view/includes/userControl.xhtml">
<provider editor-type-id="HtmlPreview">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="148" column="104" selection-start="8243" selection-end="8243" vertical-scroll-proportion="0.22272047">
+ <state line="12" column="0" selection-start="455" selection-end="455" vertical-scroll-proportion="0.11659193">
<folding />
</state>
</provider>
@@ -1544,35 +1524,35 @@
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="60" column="33" selection-start="3081" selection-end="3081" vertical-scroll-proportion="0.43647236">
+ <state line="35" column="34" selection-start="1776" selection-end="1776" vertical-scroll-proportion="0.3393124">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptcha.java">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="24" selection-start="835" selection-end="835" vertical-scroll-proportion="0.24421965">
+ <state line="49" column="16" selection-start="1982" selection-end="1982" vertical-scroll-proportion="0.46026012">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="0" selection-start="1835" selection-end="1835" vertical-scroll-proportion="0.3851156">
+ <state line="81" column="12" selection-start="2945" selection-end="2945" vertical-scroll-proportion="0.15968208">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeHome.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="13" selection-start="832" selection-end="832" vertical-scroll-proportion="0.27239883">
+ <state line="202" column="30" selection-start="6540" selection-end="6540" vertical-scroll-proportion="0.9017341">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Directory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="33" selection-start="2055" selection-end="2055" vertical-scroll-proportion="0.5166185">
+ <state line="8" column="37" selection-start="187" selection-end="187" vertical-scroll-proportion="0.07514451">
<folding />
</state>
</provider>
More information about the jboss-cvs-commits
mailing list