[seam-commits] Seam SVN: r7153 - in trunk/examples/wiki: src/etc and 8 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Sat Jan 19 03:52:48 EST 2008
Author: christian.bauer at jboss.com
Date: 2008-01-19 03:52:48 -0500 (Sat, 19 Jan 2008)
New Revision: 7153
Modified:
trunk/examples/wiki/Wiki.iml
trunk/examples/wiki/Wiki.ipr
trunk/examples/wiki/Wiki.iws
trunk/examples/wiki/src/etc/messages_faqBrowser_en.properties
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java
trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml
trunk/examples/wiki/view/docDisplay_d.xhtml
trunk/examples/wiki/view/plugins/faqBrowser/faqControls.xhtml
trunk/examples/wiki/view/themes/default/css/template.css
trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css
Log:
Update IntelliJ, better headline rendering, minor fixes to FAQ plugin
Modified: trunk/examples/wiki/Wiki.iml
===================================================================
--- trunk/examples/wiki/Wiki.iml 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/Wiki.iml 2008-01-19 08:52:48 UTC (rev 7153)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="ModuleRootManager" />
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes" />
<exclude-output />
Modified: trunk/examples/wiki/Wiki.ipr
===================================================================
--- trunk/examples/wiki/Wiki.ipr 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/Wiki.ipr 2008-01-19 08:52:48 UTC (rev 7153)
@@ -8,22 +8,21 @@
<customJdkName value="" />
<maximumHeapSize value="128" />
<properties>
- <property name="profile" value="prod" />
+ <property name="profile" value="dev" />
</properties>
<executeOn event="afterCompilation" target="deploy" />
- <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="DocumentHistoryTests.updateDocumentCheckRevisions" />
- <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="AllTests" />
+ <executeOn event="beforeRun" target="configuretests" runConfigurationName="" />
+ <executeOn event="beforeRun" target="configuretests" runConfigurationName="AllTests" />
<executeOn event="beforeRun" target="configuretests" runConfigurationName="LoginTest" />
<executeOn event="beforeRun" target="configuretests" runConfigurationName="Unnamed" />
- <executeOn event="beforeRun" target="configuretests" runConfigurationName="AllTests" />
<executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="Adhoc" />
- <executeOn event="beforeRun" target="configuretests" runConfigurationName="" />
+ <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="AllTests" />
+ <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="DocumentHistoryTests.updateDocumentCheckRevisions" />
</buildFile>
</component>
<component name="BuildJarProjectSettings">
<option name="BUILD_JARS_ON_MAKE" value="false" />
</component>
- <component name="ClearCase" />
<component name="CodeStyleProjectProfileManger">
<option name="PROJECT_PROFILE" />
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
@@ -80,12 +79,15 @@
<option name="DEFAULT_SCHEMA_NAME" />
<option name="TABLE_PATTERN" value="" />
<option name="NAME" value="Datasource" />
+ <option name="PROJECT" value="Wiki" />
<TABLE_DATA>
<option name="NAME" value="COMMENTS" />
<option name="SCHEMA" value="PUBLIC" />
<option name="CATALOG" />
+ <option name="TYPE" />
<FIELD_ELEMENT>
<option name="NAME" value="COMMENT_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="true" />
@@ -95,6 +97,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="OBJ_VERSION" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -104,6 +107,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="SUBJECT" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -113,6 +117,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="FROM_USER_NAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -122,6 +127,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="FROM_USER_EMAIL" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -131,6 +137,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="FROM_USER_HOMEPAGE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -140,6 +147,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="COMMENT_TEXT" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -149,6 +157,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="CREATED_ON" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="93" />
<option name="TYPE" value="java.sql.Timestamp" />
<option name="PRIMARY" value="false" />
@@ -158,6 +167,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="FROM_USER_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -167,6 +177,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="DOCUMENT_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -199,8 +210,10 @@
<option name="NAME" value="NODE" />
<option name="SCHEMA" value="PUBLIC" />
<option name="CATALOG" />
+ <option name="TYPE" />
<FIELD_ELEMENT>
<option name="NAME" value="NODE_TYPE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -210,6 +223,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="NODE_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="true" />
@@ -219,6 +233,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="NODE_REVISION" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -228,6 +243,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="OBJ_VERSION" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -237,6 +253,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="NAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -246,6 +263,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="WIKINAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -255,6 +273,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="MENU_ITEM" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="16" />
<option name="TYPE" value="java.lang.Boolean" />
<option name="PRIMARY" value="false" />
@@ -264,6 +283,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="AREA_NR" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -273,6 +293,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="CREATED_ON" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="93" />
<option name="TYPE" value="java.sql.Timestamp" />
<option name="PRIMARY" value="false" />
@@ -282,6 +303,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="LAST_MODIFIED_ON" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="93" />
<option name="TYPE" value="java.sql.Timestamp" />
<option name="PRIMARY" value="false" />
@@ -291,6 +313,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="WRITE_ACCESS_LEVEL" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -300,6 +323,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="READ_ACCESS_LEVEL" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -309,6 +333,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="CONTENT" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -318,6 +343,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="NAME_AS_TITLE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="16" />
<option name="TYPE" value="java.lang.Boolean" />
<option name="PRIMARY" value="false" />
@@ -327,6 +353,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="PARENT_NODE_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -336,6 +363,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="DEFAULT_DOCUMENT_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -345,6 +373,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="LAST_MODIFIED_BY_USER_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -354,6 +383,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="CREATED_BY_USER_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -363,6 +393,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="NODE_POSITION" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -415,8 +446,10 @@
<option name="NAME" value="NODE_FILE" />
<option name="SCHEMA" value="PUBLIC" />
<option name="CATALOG" />
+ <option name="TYPE" />
<FIELD_ELEMENT>
<option name="NAME" value="FILENAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -426,6 +459,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="FILESIZE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -435,6 +469,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="FILEDATA" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-4" />
<option name="TYPE" value="byte[]" />
<option name="PRIMARY" value="false" />
@@ -444,6 +479,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="CONTENT_TYPE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -453,6 +489,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="IMAGE_SIZE_X" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -462,6 +499,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="IMAGE_SIZE_Y" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -471,6 +509,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="IMAGE_THUMBNAIL" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="1" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -480,6 +519,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="FILE_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="true" />
@@ -502,8 +542,10 @@
<option name="NAME" value="NODE_HISTORY" />
<option name="SCHEMA" value="PUBLIC" />
<option name="CATALOG" />
+ <option name="TYPE" />
<FIELD_ELEMENT>
<option name="NAME" value="NODE_HISTORY_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="true" />
@@ -513,6 +555,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="NODE_TYPE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -522,6 +565,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="NODE_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -531,6 +575,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="NODE_REVISION" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -540,6 +585,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="NAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -549,6 +595,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="WIKINAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -558,6 +605,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="LAST_MODIFIED_ON" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="93" />
<option name="TYPE" value="java.sql.Timestamp" />
<option name="PRIMARY" value="false" />
@@ -567,6 +615,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="LAST_MODIFIED_BY_USERNAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -576,6 +625,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="CONTENT" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -585,6 +635,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="FILENAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -594,6 +645,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="FILESIZE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -603,6 +655,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="FILEDATA" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-3" />
<option name="TYPE" value="byte[]" />
<option name="PRIMARY" value="false" />
@@ -612,6 +665,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="CONTENT_TYPE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -621,6 +675,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="IMAGE_SIZE_X" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -630,6 +685,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="IMAGE_SIZE_Y" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -639,6 +695,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="IMAGE_THUMBNAIL" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="1" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -651,8 +708,10 @@
<option name="NAME" value="PREFERENCE" />
<option name="SCHEMA" value="PUBLIC" />
<option name="CATALOG" />
+ <option name="TYPE" />
<FIELD_ELEMENT>
<option name="NAME" value="PREF_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="true" />
@@ -662,6 +721,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="OBJ_VERSION" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -671,6 +731,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="COMPONENT_NAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -680,6 +741,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="PROPERTY_NAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -689,6 +751,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="LONG_VALUE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -698,6 +761,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="DOUBLE_VALUE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="8" />
<option name="TYPE" value="java.lang.Double" />
<option name="PRIMARY" value="false" />
@@ -707,6 +771,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="TIMESTAMP_VALUE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="93" />
<option name="TYPE" value="java.sql.Timestamp" />
<option name="PRIMARY" value="false" />
@@ -716,6 +781,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="BOOLEAN_VALUE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="16" />
<option name="TYPE" value="java.lang.Boolean" />
<option name="PRIMARY" value="false" />
@@ -725,6 +791,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="STRING_VALUE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -737,8 +804,10 @@
<option name="NAME" value="PREFERENCE_NODE" />
<option name="SCHEMA" value="PUBLIC" />
<option name="CATALOG" />
+ <option name="TYPE" />
<FIELD_ELEMENT>
<option name="NAME" value="PREF_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="true" />
@@ -748,6 +817,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="NODE_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -780,8 +850,10 @@
<option name="NAME" value="PREFERENCE_USER" />
<option name="SCHEMA" value="PUBLIC" />
<option name="CATALOG" />
+ <option name="TYPE" />
<FIELD_ELEMENT>
<option name="NAME" value="PREF_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="true" />
@@ -791,6 +863,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="USER_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -823,8 +896,10 @@
<option name="NAME" value="ROLE" />
<option name="SCHEMA" value="PUBLIC" />
<option name="CATALOG" />
+ <option name="TYPE" />
<FIELD_ELEMENT>
<option name="NAME" value="ROLE_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="true" />
@@ -834,6 +909,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="OBJ_VERSION" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -843,6 +919,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="NAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -852,6 +929,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="DISPLAY_NAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -861,6 +939,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="ACCESS_LEVEL" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -870,6 +949,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="CREATED_ON" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="93" />
<option name="TYPE" value="java.sql.Timestamp" />
<option name="PRIMARY" value="false" />
@@ -882,8 +962,10 @@
<option name="NAME" value="USERS" />
<option name="SCHEMA" value="PUBLIC" />
<option name="CATALOG" />
+ <option name="TYPE" />
<FIELD_ELEMENT>
<option name="NAME" value="USER_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="true" />
@@ -893,6 +975,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="OBJ_VERSION" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -902,6 +985,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="FIRSTNAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -911,6 +995,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="LASTNAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -920,6 +1005,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="USERNAME" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -929,6 +1015,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="PASSWORDHASH" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -938,6 +1025,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="EMAIL" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -947,6 +1035,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="ACTIVATED" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="16" />
<option name="TYPE" value="java.lang.Boolean" />
<option name="PRIMARY" value="false" />
@@ -956,6 +1045,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="ACTIVATION_CODE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -965,6 +1055,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="CREATED_ON" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="93" />
<option name="TYPE" value="java.sql.Timestamp" />
<option name="PRIMARY" value="false" />
@@ -974,6 +1065,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="MEMBER_HOME_NODE_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -996,8 +1088,10 @@
<option name="NAME" value="USER_IMAGE" />
<option name="SCHEMA" value="PUBLIC" />
<option name="CATALOG" />
+ <option name="TYPE" />
<FIELD_ELEMENT>
<option name="NAME" value="USER_IMAGE_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="true" />
@@ -1007,6 +1101,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="OBJ_VERSION" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="4" />
<option name="TYPE" value="java.lang.Integer" />
<option name="PRIMARY" value="false" />
@@ -1016,6 +1111,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="IMAGE_DATA" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-4" />
<option name="TYPE" value="byte[]" />
<option name="PRIMARY" value="false" />
@@ -1025,6 +1121,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="CONTENT_TYPE" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="12" />
<option name="TYPE" value="java.lang.String" />
<option name="PRIMARY" value="false" />
@@ -1034,6 +1131,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="CREATED_ON" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="93" />
<option name="TYPE" value="java.sql.Timestamp" />
<option name="PRIMARY" value="false" />
@@ -1043,6 +1141,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="USER_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -1065,8 +1164,10 @@
<option name="NAME" value="USER_ROLE" />
<option name="SCHEMA" value="PUBLIC" />
<option name="CATALOG" />
+ <option name="TYPE" />
<FIELD_ELEMENT>
<option name="NAME" value="USER_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -1076,6 +1177,7 @@
</FIELD_ELEMENT>
<FIELD_ELEMENT>
<option name="NAME" value="ROLE_ID" />
+ <option name="SQL_TYPE" />
<option name="JDBC_TYPE" value="-5" />
<option name="TYPE" value="java.lang.Long" />
<option name="PRIMARY" value="false" />
@@ -1107,7 +1209,7 @@
<libraries>
<library>
<attribute name="URI" value="" />
- <url>jar://$PROJECT_DIR$/../../seam-gen/lib/hsqldb.jar!/</url>
+ <url>jar://$PROJECT_DIR$/../../../jboss-seam/seam-gen/lib/hsqldb.jar!/</url>
</library>
</libraries>
</DataSource>
@@ -1115,7 +1217,9 @@
<component name="DependenciesAnalyzeManager">
<option name="myForwardDirection" value="false" />
</component>
- <component name="DependencyValidationManager" />
+ <component name="DependencyValidationManager">
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </component>
<component name="EclipseCompilerSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="true" />
@@ -1162,24 +1266,6 @@
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
- <used_levels>
- <error>
- <option name="myName" value="ERROR" />
- <option name="myVal" value="400" />
- </error>
- <warning>
- <option name="myName" value="WARNING" />
- <option name="myVal" value="300" />
- </warning>
- <information>
- <option name="myName" value="INFO" />
- <option name="myVal" value="200" />
- </information>
- <server>
- <option name="myName" value="SERVER PROBLEM" />
- <option name="myVal" value="100" />
- </server>
- </used_levels>
<inspection_tool class="FieldCanBeLocal" level="WARNING" enabled="false" />
<inspection_tool class="UNUSED_SYMBOL" level="WARNING" enabled="true">
<option name="LOCAL_VARIABLE" value="true" />
@@ -1187,6 +1273,7 @@
<option name="METHOD" value="true" />
<option name="CLASS" value="true" />
<option name="PARAMETER" value="true" />
+ <option name="REPORT_PARAMETER_FOR_PUBLIC_METHODS" value="true" />
<option name="INJECTION_ANNOS">
<value>
<list size="3">
@@ -1200,6 +1287,7 @@
<inspection_tool class="EjbQlInspection" level="ERROR" enabled="false" />
</profile>
</profiles>
+ <list size="0" />
</component>
<component name="JavacSettings">
<option name="DEBUGGING_INFO" value="true" />
@@ -1369,7 +1457,6 @@
<component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5.0" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
- <component name="ProjectRunConfigurationManager" />
<component name="ResourceManagerContainer">
<option name="myResourceBundles">
<value>
@@ -1384,12 +1471,9 @@
<option name="GENERATE_IIOP_STUBS" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
- <component name="StarteamVcsAdapter" />
- <component name="SvnBranchConfigurationManager" />
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="svn" />
</component>
- <component name="VssVcs" />
<component name="WebServicesPlugin" addRequiredLibraries="true" />
<component name="com.intellij.jsf.UserDefinedFacesConfigs">
<option name="USER_DEFINED_CONFIGS">
@@ -1418,6 +1502,5 @@
<SOURCES />
</library>
</component>
- <component name="uidesigner-configuration" />
</project>
Modified: trunk/examples/wiki/Wiki.iws
===================================================================
--- trunk/examples/wiki/Wiki.iws 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/Wiki.iws 2008-01-19 08:52:48 UTC (rev 7153)
@@ -33,14 +33,24 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
+ <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/ui/WikiFormattedTextHandler.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml" afterPath="$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/plugins/faqBrowser/faqControls.xhtml" afterPath="$PROJECT_DIR$/view/plugins/faqBrowser/faqControls.xhtml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.ipr" afterPath="$PROJECT_DIR$/Wiki.ipr" />
- <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/ui/UIWikiFormattedText.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/messages_faqBrowser_en.properties" afterPath="$PROJECT_DIR$/src/etc/messages_faqBrowser_en.properties" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/themes/sfwkorg/css/sfwk.css" afterPath="$PROJECT_DIR$/view/themes/sfwkorg/css/sfwk.css" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.iml" afterPath="$PROJECT_DIR$/Wiki.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/docDisplay_d.xhtml" afterPath="$PROJECT_DIR$/view/docDisplay_d.xhtml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml" afterPath="$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/themes/default/css/template.css" afterPath="$PROJECT_DIR$/view/themes/default/css/template.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java" />
</list>
<list name="Failed commit: Default" comment="Oops" />
<list name="Foo" comment="" />
</component>
- <component name="ChangeListSynchronizer" />
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="Commander">
<leftPanel />
@@ -49,14 +59,9 @@
</component>
<component name="CompilerWorkspaceConfiguration">
<option name="COMPILE_IN_BACKGROUND" value="true" />
- <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
- <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" />
- <option name="COMPILE_DEPENDENT_FILES" value="false" />
- <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
- <option name="ASSERT_NOT_NULL" value="true" />
</component>
<component name="CoverageDataManager">
- <SUITE FILE_PATH="$PROJECT_DIR$/../../../../../../../Library/Caches/IntelliJIDEA70/coverage/Wiki$AllTests$.es" NAME=" Coverage Results" MODIFIED="1199948424469">
+ <SUITE FILE_PATH="$PROJECT_DIR$/../../../../../../../Library/Caches/IntelliJIDEA70/coverage/Wiki$AllTests$.es" NAME=" Coverage Results" MODIFIED="1199948424469" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>org.jboss.seam.wiki.core.*</FILTER>
<FILTER>org.jboss.seam.wiki.plugin.*</FILTER>
<FILTER>org.jboss.seam.wiki.preferences.*</FILTER>
@@ -65,6 +70,7 @@
</component>
<component name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" />
+ <option name="REVERSE_PATCH" value="false" />
</component>
<component name="Cvs2Configuration">
<option name="UPDATE_DATE_OR_REVISION_SETTINGS">
@@ -174,26 +180,10 @@
<option name="SORT_ALPHABETICALLY" value="false" />
<option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
</component>
- <component name="InspectionManager">
- <option name="AUTOSCROLL_TO_SOURCE" value="false" />
- <option name="SPLITTER_PROPORTION" value="0.5" />
- <option name="GROUP_BY_SEVERITY" value="false" />
- <option name="FILTER_RESOLVED_ITEMS" value="true" />
- <option name="ANALYZE_TEST_SOURCES" value="false" />
- <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" />
- <option name="SCOPE_TYPE" value="3" />
- <option name="CUSTOM_SCOPE_NAME" value="Project Files" />
- <option name="SHOW_ONLY_DIFF" value="false" />
- <option name="SHOW_STRUCTURE" value="true" />
- <option name="ANALYSIS_IN_BACKGROUND" value="false" />
- </component>
- <component name="J2EEProjectPane" />
- <component name="JspContextManager" />
<component name="ModuleEditorState">
<option name="LAST_EDITED_MODULE_NAME" />
<option name="LAST_EDITED_TAB_NAME" />
</component>
- <component name="NamedScopeManager" />
<component name="PackagesPane">
<subPane>
<PATH>
@@ -364,7 +354,6 @@
<option name="USE_CLIENT_FILTER" value="true" />
<option name="CLIENT" value="" />
</component>
- <component name="PerforceDirect.Settings" />
<component name="ProjectLevelVcsManager">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
@@ -419,6 +408,72 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/plugins" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/plugins" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/plugins/faqBrowser" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -445,6 +500,32 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -493,7 +574,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="true" />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" Scope="false" Favorites="false" ProjectPane="false" />
+ <showStructure Favorites="false" Scope="false" PackagesPane="false" ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource ProjectPane="false" />
<sortByType />
@@ -571,9 +652,6 @@
<property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth4" value="317" />
<property name="cvs_file_history_treeOrder0" value="0" />
</component>
- <component name="ReadonlyStatusHandler">
- <option name="SHOW_DIALOG" value="true" />
- </component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="org.jboss.seam.wiki.plugin.faqBrowser" />
@@ -590,7 +668,6 @@
<recent name="org.jboss.seam.wiki.preferences2.annotations" />
</key>
</component>
- <component name="RestoreUpdateTree" />
<component name="RunManager" selected="TestNG.AllTests">
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
@@ -604,13 +681,6 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -623,45 +693,33 @@
<option name="BASE_DIRECTORY_NAME" value="" />
<predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />
</configuration>
- <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
- <option name="WORKING_DIRECTORY" />
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
- <option name="PORT" value="8080" />
- <option name="LOCAL" value="true" />
- <option name="OPEN_IN_BROWSER" value="true" />
- <option name="OPEN_IN_BROWSER_URL" value="/" />
- <option name="COMMON_VM_ARGUMENTS" value="" />
- <option name="DEPLOY_TOMCAT_MANAGER" value="false" />
- <option name="BASE_DIRECTORY_NAME" value="" />
- <predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />
+ <option name="PORT" value="5005" />
</configuration>
- <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
+ <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
+ <option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="OUTPUT_DIRECTORY" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <option name="PROPERTIES_FILE" />
- <properties>
- <property name="binaryDir" value="META-INF/testbinaries" />
- <property name="database" value="hsql" />
- <property name="datasourceJndiName" value="java:/wikiTestDatasource" />
- </properties>
+ <envs />
<method>
<option name="Make" value="true" />
- <option name="Run ant target" value="false" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
@@ -672,28 +730,53 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
<module name="" />
+ <envs />
<method>
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
+ <option name="WORKING_DIRECTORY" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="8080" />
+ <option name="LOCAL" value="true" />
+ <option name="OPEN_IN_BROWSER" value="true" />
+ <option name="OPEN_IN_BROWSER_URL" value="/" />
+ <option name="COMMON_VM_ARGUMENTS" value="" />
+ <option name="DEPLOY_TOMCAT_MANAGER" value="false" />
+ <option name="BASE_DIRECTORY_NAME" value="" />
+ <predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />
+ </configuration>
+ <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="WORKING_DIRECTORY" />
+ <option name="OUTPUT_DIRECTORY" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <option name="PROPERTIES_FILE" />
+ <properties>
+ <property name="binaryDir" value="META-INF/testbinaries" />
+ <property name="database" value="hsql" />
+ <property name="datasourceJndiName" value="java:/wikiTestDatasource" />
+ </properties>
<method>
<option name="Make" value="true" />
+ <option name="Run ant target" value="false" />
</method>
</configuration>
<configuration default="false" name="Test" type="Application" factoryName="Application" enabled="false" merge="false">
@@ -704,7 +787,10 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
<module name="Wiki" />
+ <envs />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="55191" />
<option name="TRANSPORT" value="0" />
@@ -827,6 +913,13 @@
<option name="Run ant target" value="true" />
</method>
</configuration>
+ <list size="5">
+ <item index="0" class="java.lang.String" itemvalue="Application.Test" />
+ <item index="1" class="java.lang.String" itemvalue="Remote.Debug JBoss AS" />
+ <item index="2" class="java.lang.String" itemvalue="Remote.Debug TestNG" />
+ <item index="3" class="java.lang.String" itemvalue="TestNG.AllTests" />
+ <item index="4" class="java.lang.String" itemvalue="TestNG.Adhoc" />
+ </list>
<configuration default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -904,7 +997,6 @@
</PATH>
</subPane>
</component>
- <component name="ShelveChangesManager" />
<component name="StarteamConfiguration">
<option name="SERVER" value="" />
<option name="PORT" value="49201" />
@@ -916,7 +1008,6 @@
<option name="LOCK_ON_CHECKOUT" value="false" />
<option name="UNLOCK_ON_CHECKIN" value="false" />
</component>
- <component name="StructuralSearchPlugin" />
<component name="StructureViewFactory">
<option name="AUTOSCROLL_MODE" value="true" />
<option name="AUTOSCROLL_FROM_SOURCE" value="false" />
@@ -966,40 +1057,46 @@
<flatten-packages value="false" />
<is-autoscroll-to-source value="true" />
</todo-panel>
+ <todo-panel id="default-changelist">
+ <are-packages-shown value="false" />
+ <are-modules-shown value="false" />
+ <flatten-packages value="false" />
+ <is-autoscroll-to-source value="false" />
+ </todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="22" width="2560" height="1536" extended-state="0" />
+ <frame x="0" y="22" width="2560" height="1536" extended-state="6" />
<editor active="false" />
<layout>
- <window_info id="SQL" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46495488" order="16" x="11" y="253" width="1391" height="477" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6426093" order="7" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18949045" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.61762667" order="1" />
+ <window_info id="SQL" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46458924" order="16" x="11" y="253" width="1391" height="477" />
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.64235127" order="7" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18789808" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6175637" order="1" />
<window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16162421" order="8" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2873005" order="12" x="24" y="688" width="925" height="442" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2868272" order="12" x="24" y="688" width="925" height="442" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="5" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32961783" order="7" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39486468" order="13" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.12420382" order="2" />
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298466" order="14" />
+ <window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32945424" order="4" />
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293201" order="14" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4663428" order="2" x="-1442" y="805" width="1440" height="900" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24930307" order="1" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6363636" order="3" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39968154" order="0" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2109646" order="11" />
<window_info id="Duplicates" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3296322" order="9" />
<window_info id="SVN Repositories" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32928476" order="8" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3297414" order="3" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="4" />
- <window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3297491" order="4" />
<window_info id="SQL Schema" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29215822" order="0" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="10" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="6" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="8" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="6" />
+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39968154" order="0" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="15" />
</layout>
</component>
@@ -1018,19 +1115,17 @@
<option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="Fixes for faq browser" />
+ <option name="LAST_COMMIT_MESSAGE" value="Stupid bug" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
<option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
<option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
<option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
- <option name="ERROR_OCCURED" value="false" />
<option name="ACTIVE_VCS_NAME" value="CVS" />
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+ <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
- <MESSAGE value="Relax user realname constraints" />
- <MESSAGE value="Make feed domain model extensible, preparation for aggregator" />
<MESSAGE value="Forum queries performance optimization" />
<MESSAGE value="Disable tests that fail on HSQL DB" />
<MESSAGE value="Dev profile now requires MySQL, disabled tests conditionally that don't run on HSQL" />
@@ -1054,6 +1149,8 @@
<MESSAGE value="Ooops" />
<MESSAGE value="JBSEAM-2486 - Implemented FAQ browser plugin" />
<MESSAGE value="Fixes for faq browser" />
+ <MESSAGE value="Updated IntelliJ project to subversion" />
+ <MESSAGE value="Stupid bug" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -1140,107 +1237,135 @@
<option name="myLastEditedConfigurable" value="Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java">
+ <entry file="file://$PROJECT_DIR$/view/plugins/faqBrowser/plugin.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="134" column="18" selection-start="4229" selection-end="4229" vertical-scroll-proportion="0.23220704">
+ <state line="1" column="13" selection-start="48" selection-end="48" vertical-scroll-proportion="0.009461426">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/WikiMacro.java">
+ <entry file="file://$PROJECT_DIR$/view/includes/wikiTextPreview.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="26" selection-start="745" selection-end="745" vertical-scroll-proportion="0.23364486">
+ <state line="10" column="28" selection-start="458" selection-end="458" vertical-scroll-proportion="0.09461427">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java">
+ <entry file="file://$PROJECT_DIR$/src/main/seam.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="146" column="55" selection-start="5849" selection-end="5849" vertical-scroll-proportion="0.34579438">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/UserRoleAccessFactory.java">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="219" column="0" selection-start="9060" selection-end="9060" vertical-scroll-proportion="0.94392526">
+ <state line="34" column="7" selection-start="817" selection-end="817" vertical-scroll-proportion="0.32452276">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java">
+ <entry file="file://$PROJECT_DIR$/view/plugins/faqBrowser/faqQuestionForm.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="89" column="17" selection-start="3507" selection-end="3507" vertical-scroll-proportion="0.34219986">
+ <state line="27" column="0" selection-start="1011" selection-end="1011" vertical-scroll-proportion="0.26096654">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml">
+ <entry file="file://$PROJECT_DIR$/view/plugins/faqBrowser/faqControls.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="139" selection-start="565" selection-end="565" vertical-scroll-proportion="0.057395145">
+ <state line="55" column="62" selection-start="3475" selection-end="3475" vertical-scroll-proportion="0.4267658">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/util/DBUnitSeamTest.java">
+ <entry file="file://$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="96" column="26" selection-start="4109" selection-end="4109" vertical-scroll-proportion="0.05248023">
+ <state line="57" column="46" selection-start="2917" selection-end="2974" vertical-scroll-proportion="0.55714285">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="498" column="22" selection-start="19431" selection-end="19431" vertical-scroll-proportion="0.3944687">
+ <state line="201" column="17" selection-start="9757" selection-end="9757" vertical-scroll-proportion="0.37958884">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/WikiRequestResolver.java">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/feeds/FeedEntryManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="177" column="83" selection-start="7362" selection-end="7362" vertical-scroll-proportion="0.28900072">
+ <state line="30" column="35" selection-start="1117" selection-end="1117" vertical-scroll-proportion="0.2863436">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/etc/messages_faqBrowser_en.properties">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="113" selection-start="827" selection-end="827" vertical-scroll-proportion="0.1682243">
+ <state line="115" column="0" selection-start="3399" selection-end="3399" vertical-scroll-proportion="0.9236417">
+ <folding>
+ <marker date="1200731089000" expanded="true" signature="329:360" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="422:677" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="739:912" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="1004:1042" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="1102:1144" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="1193:1226" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="1408:1458" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="1506:1566" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="1612:1677" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="1730:1914" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="1967:2151" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="2204:2388" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="2441:2625" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="2673:2731" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="2782:2842" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="2891:2951" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="3004:3066" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="3110:3162" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="3207:3237" placeholder="{...}" />
+ <marker date="1200731089000" expanded="true" signature="3303:3329" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/WikiLink.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="40" column="91" selection-start="1142" selection-end="1214" vertical-scroll-proportion="0.38179147">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/plugins/faqBrowser/faqControls.xhtml">
+ <entry file="file://$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="24" column="66" selection-start="975" selection-end="975" vertical-scroll-proportion="0.009461426">
+ <state line="6" column="139" selection-start="565" selection-end="565" vertical-scroll-proportion="0.08496732">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java">
+ <entry file="file://$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="403" column="87" selection-start="18308" selection-end="18308" vertical-scroll-proportion="0.009345794">
+ <state line="34" column="0" selection-start="1679" selection-end="1679" vertical-scroll-proportion="0.3386973">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowserDAO.java">
+ <entry file="file://$PROJECT_DIR$/view/docDisplay_d.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="45" selection-start="1774" selection-end="1774" vertical-scroll-proportion="0.44859812">
+ <state line="94" column="0" selection-start="4516" selection-end="4516" vertical-scroll-proportion="0.6015152">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/plugin/FaqBrowserDAOTests.java">
+ <entry file="file://$PROJECT_DIR$/view/themes/sfwkorg/css/sfwk.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="10" selection-start="768" selection-end="768" vertical-scroll-proportion="0.21495327">
+ <state line="72" column="17" selection-start="1083" selection-end="1083" vertical-scroll-proportion="0.49588633">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java">
+ <entry file="file://$PROJECT_DIR$/view/themes/default/css/template.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="0" selection-start="244" selection-end="244" vertical-scroll-proportion="0.13402061">
+ <state line="360" column="24" selection-start="5641" selection-end="5641" vertical-scroll-proportion="0.2303665">
<folding />
</state>
</provider>
Modified: trunk/examples/wiki/src/etc/messages_faqBrowser_en.properties
===================================================================
--- trunk/examples/wiki/src/etc/messages_faqBrowser_en.properties 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/src/etc/messages_faqBrowser_en.properties 2008-01-19 08:52:48 UTC (rev 7153)
@@ -17,3 +17,4 @@
faqBrowser.msg.Question.Delete=Question '{0}' has been deleted.
faqBrowser.msg.TreeNotFound=Could not find FAQ tree, please create a default document with [<=faqBrowser] header!
+faqBrowser.msg.TreeEmpty=No FAQ categories found, create subdirectories in the current directory.
\ No newline at end of file
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java 2008-01-19 08:52:48 UTC (rev 7153)
@@ -11,6 +11,10 @@
*/
public class DefaultWikiTextRenderer implements WikiTextRenderer {
+ public static enum Headline {
+ H1, H2, H3, H4;
+ }
+
public String renderInternalLink(WikiLink internalLink) {
return !internalLink.isBroken() ?
"<a href=\""
@@ -56,19 +60,27 @@
}
public String renderHeadline1(String headline) {
- return "<h1 class=\"wikiHeadline1\" id=\""+getHeadlineId(headline)+"\">" + headline + "</h1>";
+ return "<h1 class=\"wikiHeadline1\" id=\""+getHeadlineId(Headline.H1, headline)+"\">"
+ + getHeadlineLink(Headline.H1, headline)
+ + "</h1>";
}
public String renderHeadline2(String headline) {
- return "<h2 class=\"wikiHeadline2\" id=\""+getHeadlineId(headline)+"\">" + headline + "</h2>";
+ return "<h2 class=\"wikiHeadline2\" id=\""+getHeadlineId(Headline.H2, headline)+"\">"
+ + getHeadlineLink(Headline.H2, headline)
+ + "</h2>";
}
public String renderHeadline3(String headline) {
- return "<h3 class=\"wikiHeadline3\" id=\""+getHeadlineId(headline)+"\">" + headline + "</h3>";
+ return "<h3 class=\"wikiHeadline3\" id=\""+getHeadlineId(Headline.H3, headline)+"\">"
+ + getHeadlineLink(Headline.H3, headline)
+ + "</h3>";
}
public String renderHeadline4(String headline) {
- return "<h4 class=\"wikiHeadline4\" id=\""+getHeadlineId(headline)+"\">" + headline + "</h4>";
+ return "<h4 class=\"wikiHeadline4\" id=\""+getHeadlineId(Headline.H4, headline)+"\">"
+ + getHeadlineLink(Headline.H4, headline)
+ + "</h4>";
}
@@ -96,9 +108,11 @@
return "</i>";
}
- protected String getHeadlineId(String headline) {
- // HTML id attribute has restrictions on valid values... so the easiest way is to make this a WikiLink
- return HEADLINE_ID_PREFIX+WikiUtil.convertToWikiName(headline);
- // We also need to access it correctly, see WikiLink.java
+ protected String getHeadlineId(Headline h, String headline) {
+ return "";
}
+
+ protected String getHeadlineLink(Headline h, String headline) {
+ return headline;
+ }
}
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java 2008-01-19 08:52:48 UTC (rev 7153)
@@ -235,6 +235,18 @@
Contexts.getEventContext().set(contextVariable, contextLinks);
*/
}
+
+ protected String getHeadlineId(Headline h, String headline) {
+ // HTML id attribute has restrictions on valid values... so the easiest way is to make this a WikiLink
+ return HEADLINE_ID_PREFIX+WikiUtil.convertToWikiName(headline);
+ // We also need to access it correctly, see WikiLink.java and getHeadLineLink()
+ }
+
+ protected String getHeadlineLink(Headline h, String headline) {
+ return "<a href=\""+WikiUtil.renderURL(baseFile)+"#"+WikiTextRenderer.HEADLINE_ID_PREFIX+WikiUtil.convertToWikiName(headline)+"\">"
+ + headline
+ +"</a>";
+ }
}
parser.setRenderer(new WikiFormattedTextRenderer());
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java 2008-01-19 08:52:48 UTC (rev 7153)
@@ -58,16 +58,18 @@
* Main apply method called by facelets to create this component.
*/
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, ELException {
- log.debug(">>> building wiki text components");
+ log.debug(">>> building wiki text components for child of: " + parent.getClientId(ctx.getFacesContext()));
String id = ctx.generateUniqueId(this.tagId);
UIComponent cmp = findChildByTagId(parent, id);
if (cmp == null) {
cmp = createComponent(ctx);
cmp.getAttributes().put(MARK, id);
}
+ log.debug("::: invoking nextHandler for child id: " + cmp.getClientId(ctx.getFacesContext()) );
this.nextHandler.apply(ctx, cmp);
parent.getChildren().add(cmp);
createPlugins(ctx, cmp);
+ log.debug("<<< completed building wiki text components for child of: " + parent.getClientId(ctx.getFacesContext()));
}
private UIComponent createComponent(FaceletContext ctx) {
@@ -132,13 +134,20 @@
// Don't forget this, transporting the value to the handled component
wikiFormattedText.setValue(unparsed);
+ log.debug("trying to create plugin children for component");
+
+ if (Contexts.getEventContext().get(UIWikiFormattedText.CURRENT_MACRO_EVENT_VARIABLE) != null) {
+ log.debug("disabling plugin rendering, we are trying to create plugins inside a plugin - not possible!");
+ return;
+ }
+
if (getAttribute(UIWikiFormattedText.ATTR_ENABLE_PLUGINS) == null ||
!getAttribute(UIWikiFormattedText.ATTR_ENABLE_PLUGINS).getBoolean(ctx)) {
log.debug("plugin rendering disabled");
return;
}
- log.debug("<<< creating plugin components from wiki text macros");
+ log.debug("creating plugin components from wiki text macros");
WikiTextParser parser = new WikiTextParser(unparsed, true, false);
parser.setRenderer(
@@ -149,7 +158,7 @@
URL faceletURL = getPluginURL(macro.getName(), ctx);
if (faceletURL == null) return null;
- log.debug("setting current macro in EVENT context");
+ log.debug("setting current macro in EVENT context before including facelets file");
Contexts.getEventContext().set(UIWikiFormattedText.CURRENT_MACRO_EVENT_VARIABLE, macro);
includePluginCSS(macro.getName(), parent);
@@ -170,8 +179,8 @@
wikiFormattedText.addPluginMacro(macro.getPosition(), macro);
}
- log.debug("including plugin CSS and facelet template at URL: " + faceletURL);
-
+ log.debug("unsetting current macro in EVENT context");
+ Contexts.getEventContext().remove(UIWikiFormattedText.CURRENT_MACRO_EVENT_VARIABLE);
return null;
}
}
@@ -205,6 +214,7 @@
// Cribbed from facelets
VariableMapper orig = ctx.getVariableMapper();
try {
+ log.debug("including plugin facelets file from URL: " + faceletURL);
ctx.setVariableMapper(new VariableMapperWrapper(orig));
ctx.includeFacelet(parent, faceletURL);
} catch (IOException e) {
@@ -223,6 +233,7 @@
WikiPreferences wikiPrefs = (WikiPreferences) Preferences.getInstance("Wiki");
String css = "/themes/" + wikiPrefs.getThemeName() + "/css/" + macroName + ".css";
if (ResourceLoader.instance().getResource(css) != null) {
+ log.debug("including plugin CSS file from resource: " + css);
// TODO: For Pete to fix, UILoadStyle doesn't load the CSS anymore
UILoadStyle style = UILoadStyle.newInstance();
style.setSrc(css);
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java 2008-01-19 08:52:48 UTC (rev 7153)
@@ -51,7 +51,12 @@
if (faqRoot != null) {
log.debug("found faq root: " + faqRoot);
tree = wikiNodeDAO.findWikiDirectoryTree(faqRoot, 99l, 1l, false);
+ } else {
+ log.warn("did not find faq root, started search in: " + currentDirectory);
}
+ if (tree == null) {
+ log.warn("faq directory tree has not been loaded");
+ }
}
@Create
@@ -75,15 +80,18 @@
}
public NestedSetNodeWrapper<WikiDirectory> getTree() {
+ log.debug("getting faq tree");
if (tree == null) loadTree();
return tree;
}
public NestedSetNodeWrapper<WikiDirectory> getSelectedDir() {
+ log.debug("getting selected directory : " + selectedDir);
return selectedDir;
}
public void setSelectedDir(NestedSetNodeWrapper<WikiDirectory> selectedDir) {
+ log.debug("setting selected directory: " + selectedDir);
this.selectedDir = selectedDir;
}
@@ -107,6 +115,7 @@
List<WikiDocument> questions;
public List<WikiDocument> getQuestions() {
+ log.debug("retrieving questions: " + questions);
return questions;
}
Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml
===================================================================
--- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml 2008-01-19 08:52:48 UTC (rev 7153)
@@ -33,7 +33,7 @@
NAME_AS_TITLE="true" ENABLE_COMMENTS="false" ENABLE_COMMENT_FORM="false" ENABLE_COMMENTS_ON_FEEDS="false"
HEADER_MACROS="[NULL]" CONTENT_MACROS="[NULL]" FOOTER_MACROS="[NULL]"
HEADER="[NULL]" FOOTER="[NULL]"
- CONTENT="Most content on this website (blogs, blog comments, wiki pages, user profiles) is rendered using the [Seam Text=>http://docs.jboss.com/seam/latest/reference/en/html/text.html] engine. If you are creating content, it helps to know a few simple tricks.

++ Basic formatting

You can emphasize words using *emphasis*, _underline_, ~strikeout~ or ^superscript^.

`You can emphasize words using
*emphasis*, _underline_, ~strikeout~ or ^superscript^.`

But if you really want to type a special character such as \* or \+, you need to escape it with a \\.

`But if you really want to type a special character
such as \* or \+, you need to escape it with a \\.`

Alternatively, you can use special characters freely inside |monospace text|.

`Alternatively, you can use special characters freely
inside |monospace text|.`

++ Block formatting

Of course, you can also use "inline quotes&quo!
t;.

"And block quotes."

And split text across several paragraphs.

`Of course, you can also use "inline quotes".

"And block quotes."

And split text across several paragraphs.`

You can create

= unorderedlists
= of stuff
= like this

or

# numbered lists
# of other things

`You can create
= unordered lists
= of stuff
= like this

or

# numbered lists
# of other things`

++ Code Blocks

A third option for embedding text that uses special characters is to use a code block, delimited by \`backticks\`. For example:

<pre>
\`
for (int i\=0; i\<100; i\+\+) {
 log.info(\"Hello world!\");
}
\`
</pre>

+ Here is a first-level heading

Here is a normal paragraph.

++ Here is a second-level heading

And another paragraph.

!
;`+ Here is a first-level heading

Here is a normal paragraph.


++ Here is a second-level heading

And another paragraph.`

++ Links

The wiki has powerful handling for links.

HTML links to [=>http://hibernate.org] or attach the link to [some link text=>http://hibernate.org].
My [e-mail address=>mailto:foo at bar.tld] will be automatically protected.

`HTML links to [=>http://hibernate.org] or attach the
link to [some link text=>http://hibernate.org].
My [e-mail address=>mailto:foo at bar.tld] will be
automatically protected.`

Internal wiki links simply use area and document/file names:

= Link to another document: \[\=\>My Document\] 
= Link to another document with link text: \[A document\=\>My Document\]
= Link to another document in another area: \[\=\>Another Area\|My Document\]
= Link to an uploaded file or image: \[\=\>My Upload\]

You can even link to a [Hibernate JIRA issue=>hhh://2702], or a
[Seam JIRA issue=>jbseam://1920].&#!
xA;
`You can even link to a [Hibernate JIRA issue=>hhh://2702],
or a [Seam JIRA issue=>jbseam://1920].`

++ Embedded HTML

You can even use <i>many</i> HTML tags directly, but <b>not</b> tags that would create a security vulnerability!

`You can even use <i>many</i> HTML tags directly,
but <b>not</b> tags that would create a
security vulnerability!`"/>
+ CONTENT="Most content on this website (blogs, blog comments, wiki pages, user profiles) is rendered using the [Seam Text=>http://docs.jboss.com/seam/latest/reference/en/html/text.html] engine. If you are creating content, it helps to know a few simple tricks.

++ Basic formatting

You can emphasize words using *emphasis*, _underline_, ~strikeout~ or ^superscript^.

`You can emphasize words using
*emphasis*, _underline_, ~strikeout~ or ^superscript^.`

But if you really want to type a special character such as \* or \+, you need to escape it with a \\.

`But if you really want to type a special character
such as \* or \+, you need to escape it with a \\.`

Alternatively, you can use special characters freely inside |monospace text|.

`Alternatively, you can use special characters freely
inside |monospace text|.`

++ Block formatting

Of course, you can also use "inline quotes&quo!
t;.

"And block quotes."

And split text across several paragraphs.

`Of course, you can also use "inline quotes".

"And block quotes."

And split text across several paragraphs.`

You can create

= unorderedlists
= of stuff
= like this

or

# numbered lists
# of other things

`You can create
= unordered lists
= of stuff
= like this

or

# numbered lists
# of other things`

++ Code Blocks

A third option for embedding text that uses special characters is to use a code block, delimited by \`backticks\`. For example:

<pre>
\`
for (int i\=0; i\<100; i\+\+) {
 log.info(\"Hello world!\");
}
\`
</pre>

+ Here is a first-level heading

Here is a normal paragraph.

++ Here is a second-level heading

And another paragraph.

!
;`+ Here is a first-level heading

Here is a normal paragraph.


++ Here is a second-level heading

And another paragraph.`

++ Links

The wiki has powerful handling for links.

HTML links to [=>http://hibernate.org] or attach the link to [some link text=>http://hibernate.org].
My [e-mail address=>mailto:foo at bar.tld] will be automatically protected.

`HTML links to [=>http://hibernate.org] or attach the
link to [some link text=>http://hibernate.org].
My [e-mail address=>mailto:foo at bar.tld] will be
automatically protected.`

Internal wiki links simply use area and document/file names:

= Link to another document: \[\=\>My Document\] 
= Link to another document with link text: \[A document\=\>My Document\]
= Link to another documents fragment: \[\=\>My Document\#My Headline\]
= Link to another document in another area: \[\=\>Another Area\|My Document\]
= Link to an uploaded file or image: \[\=\>My Upload\]

You can even link to a [Hibe!
rnate JIRA issue=>hhh://2702], or a
[Seam JIRA issue=>jbseam://1920].

`You can even link to a [Hibernate JIRA issue=>hhh://2702],
or a [Seam JIRA issue=>jbseam://1920].`

++ Embedded HTML

You can even use <i>many</i> HTML tags directly, but <b>not</b> tags that would create a security vulnerability!

`You can even use <i>many</i> HTML tags directly,
but <b>not</b> tags that would create a
security vulnerability!`"/>
<WIKI_NODE
Modified: trunk/examples/wiki/view/docDisplay_d.xhtml
===================================================================
--- trunk/examples/wiki/view/docDisplay_d.xhtml 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/view/docDisplay_d.xhtml 2008-01-19 08:52:48 UTC (rev 7153)
@@ -91,9 +91,11 @@
enablePlugins="true"/>
<s:div rendered="#{documentHome.instance.nameAsTitle}">
- <h:outputLink value="#{wiki:renderURL(currentDocument)}">
- <h1 class="documentTitle">#{documentHome.instance.name}</h1>
- </h:outputLink>
+ <h1 class="documentTitle">
+ <h:outputLink value="#{wiki:renderURL(currentDocument)}">
+ <h:outputText value="#{documentHome.instance.name}"/>
+ </h:outputLink>
+ </h1>
</s:div>
<wiki:formattedText value="#{documentHome.instance.content}"
Modified: trunk/examples/wiki/view/plugins/faqBrowser/faqControls.xhtml
===================================================================
--- trunk/examples/wiki/view/plugins/faqBrowser/faqControls.xhtml 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/view/plugins/faqBrowser/faqControls.xhtml 2008-01-19 08:52:48 UTC (rev 7153)
@@ -23,7 +23,7 @@
<s:span>
<h:selectOneMenu value="#{faqBrowser.selectedDir}"
- rendered="#{not empty faqBrowser.tree}"
+ rendered="#{not empty faqBrowser.tree and faqBrowser.tree.wrappedChildren.size() > 0}"
converter="#{nestedSetNodeWrapperRestrictedEntityConverter}"
styleClass="ajaxSupport" tabindex="1">
<s:selectItems value="#{faqBrowser.tree.wrappedChildren}"
@@ -34,19 +34,20 @@
reRender="faqQuestions, faqQuestionsControl, faqCategoryLink, messageBoxContainer"/>
</h:selectOneMenu>
<h:outputText value="#{messages['faqBrowser.msg.TreeNotFound']}" rendered="#{empty faqBrowser.tree}"/>
+ <h:outputText value="#{messages['faqBrowser.msg.TreeEmpty']}" rendered="#{faqBrowser.tree.wrappedChildren.size() == 0}"/>
</s:span>
<s:span id="faqQuestionsControl">
<a:commandLink action="#{faqBrowser.showQuestions}" tabindex="1"
reRender="faqQuestions, faqQuestionsControl, faqCategoryLink, messageBoxContainer"
status="faqsSelectorFormStatus"
- rendered="#{not faqBrowser.directorySelected and not empty faqBrowser.tree}">
+ rendered="#{not faqBrowser.directorySelected and not empty faqBrowser.tree and faqBrowser.tree.wrappedChildren.size() > 0}">
<h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/down.gif" width="18" height="18"/>
</a:commandLink>
<a:commandLink action="#{faqBrowser.hideQuestions}" tabindex="1"
reRender="faqQuestions, faqQuestionsControl, faqCategoryLink, messageBoxContainer"
status="faqsSelectorFormStatus"
- rendered="#{faqBrowser.directorySelected and not empty faqBrowser.tree}">
+ rendered="#{faqBrowser.directorySelected and not empty faqBrowser.tree and faqBrowser.tree.wrappedChildren.size() > 0}">
<h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/up.gif" width="18" height="18"/>
</a:commandLink>
</s:span>
Modified: trunk/examples/wiki/view/themes/default/css/template.css
===================================================================
--- trunk/examples/wiki/view/themes/default/css/template.css 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/view/themes/default/css/template.css 2008-01-19 08:52:48 UTC (rev 7153)
@@ -118,6 +118,12 @@
list-style: square;
}
+/* ----- Wiki text ---- */
+
+.wikiHeadline1 a, .wikiHeadline2 a, .wikiHeadline3 a, .wikiHeadline4 a {
+ color: black;
+}
+
/* ---- Fonts ----- */
.smallFont {
@@ -348,11 +354,11 @@
margin-top: 10px;
}
-.documentTitle {
+.documentTitle a {
color: #000;
}
-.documentTitle:hover {
+.documentTitle a:hover {
text-decoration: underline;
}
Modified: trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css
===================================================================
--- trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-01-19 02:02:26 UTC (rev 7152)
+++ trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-01-19 08:52:48 UTC (rev 7153)
@@ -26,22 +26,18 @@
}
h1 {
- color:#576c74;
font-size:150%;
}
h2 {
- color:#576c74;
font-size:130%;
}
h3 {
- color:#576c74;
font-size:115%;
}
h4 {
- color:#696969;
font-size:100%;
}
@@ -65,12 +61,19 @@
/* ----- Wiki text ---- */
+.wikiHeadline1 a, .wikiHeadline2 a, .wikiHeadline3 a, .wikiHeadline4 a {
+ color: #576c74;
+}
+
+.wikiHeadline1 a:hover, .wikiHeadline2 a:hover, .wikiHeadline3 a:hover, .wikiHeadline4 a:hover {
+ color: #000;
+}
+
.wikiHeadline2 {
- margin-top: 25px;
+ margin-top: 15px;
}
.wikiHeadline3 {
- color:#576c74;
border-top: 1px solid #576c74;
background-color:#b9d5e0;
padding: 2px;
@@ -399,9 +402,8 @@
/* General
----------------------------------------------- */
-a:hover .documentTitle {
+.documentTitle a:hover {
color: #000;
- text-decoration: underline;
}
.documentTags {
More information about the seam-commits
mailing list