[jboss-cvs] jboss-seam/examples/wiki ...
Christian Bauer
christian at hibernate.org
Fri Apr 27 06:33:23 EDT 2007
User: cbauer
Date: 07/04/27 06:33:23
Modified: examples/wiki Wiki.ipr Wiki.iml build.xml Wiki.iws
README.txt
Log:
Now deployable on 4.2 out-of-box (local Hibernate JARs) and optimized SQL and caching
Revision Changes Path
1.8 +3 -3 jboss-seam/examples/wiki/Wiki.ipr
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Wiki.ipr
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/Wiki.ipr,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Wiki.ipr 26 Apr 2007 15:11:51 -0000 1.7
+++ Wiki.ipr 27 Apr 2007 10:33:23 -0000 1.8
@@ -11,10 +11,10 @@
<property name="profile" value="dev" />
</properties>
<executeOn event="afterCompilation" target="hotdeploy" />
- <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="LoginTest" />
- <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="" />
- <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="Unnamed" />
<executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="AllTests" />
+ <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="Unnamed" />
+ <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="" />
+ <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="LoginTest" />
</buildFile>
</component>
<component name="BuildJarProjectSettings">
1.7 +14 -0 jboss-seam/examples/wiki/Wiki.iml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Wiki.iml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/Wiki.iml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Wiki.iml 26 Apr 2007 05:29:16 -0000 1.6
+++ Wiki.iml 27 Apr 2007 10:33:23 -0000 1.7
@@ -617,6 +617,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/ehcache-1.3.0-beta.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
@@ -686,6 +695,11 @@
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/ehcache-1.3.0-beta.jar" />
+ <url>jar://$MODULE_DIR$/lib/ehcache-1.3.0-beta.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/ejb3-persistence.jar" />
<url>jar://$MODULE_DIR$/lib/ejb3-persistence.jar!/</url>
</containerElement>
1.22 +36 -5 jboss-seam/examples/wiki/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- build.xml 26 Apr 2007 05:29:16 -0000 1.21
+++ build.xml 27 Apr 2007 10:33:23 -0000 1.22
@@ -88,6 +88,13 @@
<include name="**/*.MF"/>
</patternset>
+ <!-- ################## CUSTOM TASKS ####################### -->
+
+ <taskdef name="hibernatetool"
+ classname="org.hibernate.tool.ant.HibernateToolTask"
+ classpathref="tools.classpath"/>
+
+
<!-- ################## SETUP ####################### -->
<target name="init" description="Initialize the project build">
@@ -121,6 +128,17 @@
</fileset>
</copy>
+ <taskdef name="instrument" classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
+ <classpath path="${classes.dir}"/>
+ <classpath refid="build.classpath"/>
+ </taskdef>
+
+ <instrument verbose="true">
+ <fileset dir="${classes.dir}/org/jboss/seam/wiki/core/model">
+ <include name="*.class"/>
+ </fileset>
+ </instrument>
+
</target>
<!-- ################## EXPLODE ####################### -->
@@ -184,9 +202,12 @@
</copy>
<copy todir="${exploded.war.dir}/WEB-INF/lib">
<fileset dir="${local.lib.dir}">
- <exclude name="hibernate*"/>
+ <exclude name="hibernate-tools*"/>
+ <!--
<exclude name="ejb3*"/>
<exclude name="jboss*"/>
+ <exclude name="ehcache*"/>
+ -->
</fileset>
</copy>
@@ -212,6 +233,7 @@
<include name="hibernate.cfg.xml" />
<include name="jbpm.cfg.xml" />
<include name="*.skin.properties"/>
+ <include name="ehcache.xml"/>
</fileset>
</copy>
<copy tofile="${exploded.war.dir}/WEB-INF/classes/import.sql"
@@ -310,6 +332,19 @@
<!-- Replace @@LF@@ in import.sql with real SQL char(10) linefeed (concat)-->
<replace file="${dist.dir}/${project.name}-data.sql" token="@@LF@@" value="'||char(10)||'"/>
+ <!-- Schema -->
+ <hibernatetool destdir="${basedir}">
+ <classpath path="${exploded.war.dir}/WEB-INF/classes"/>
+ <jpaconfiguration/> <!-- Use META-INF/persistence.xml -->
+ <hbm2ddl
+ drop="false"
+ create="true"
+ export="false"
+ outputfilename="${dist.dir}/${project.name}-ddl.sql"
+ delimiter=";"
+ format="true"/>
+ </hibernatetool>
+
<!-- Clean up afterwards for the next deploy run -->
<antcall target="clean"/>
@@ -320,10 +355,6 @@
<target name="schemaexport" depends="clean, exploderegular, exploderesources"
description="Exports a generated schema to a file">
- <taskdef name="hibernatetool"
- classname="org.hibernate.tool.ant.HibernateToolTask"
- classpathref="tools.classpath"/>
-
<mkdir dir="${dist.dir}"/>
<hibernatetool destdir="${basedir}">
1.10 +582 -274 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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Wiki.iws 26 Apr 2007 15:11:51 -0000 1.9
+++ Wiki.iws 27 Apr 2007 10:33:23 -0000 1.10
@@ -19,30 +19,38 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/fileEdit.xhtml" afterPath="$PROJECT_DIR$/view/fileEdit.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectory.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectory.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.ipr" afterPath="$PROJECT_DIR$/Wiki.ipr" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/themes/default/css/blogDirectory.css" afterPath="$PROJECT_DIR$/view/themes/default/css/blogDirectory.css" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java" />
- <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/dirDisplay.xhtml" afterPath="$PROJECT_DIR$/view/dirDisplay.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/plugins/feedTeasers/plugin.xhtml" afterPath="$PROJECT_DIR$/view/plugins/feedTeasers/plugin.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/userList.xhtml" afterPath="$PROJECT_DIR$/view/userList.xhtml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/etc/ehcache.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/view/plugins/blogDirectory/allEntries.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$/src/main/org/jboss/seam/wiki/core/model/Document.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Document.java" />
+ <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$/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/META-INF/persistence-dev-war.xml" afterPath="$PROJECT_DIR$/src/etc/META-INF/persistence-dev-war.xml" />
+ <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$/Wiki.iws" afterPath="$PROJECT_DIR$/Wiki.iws" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Node.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Node.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/NodeDAO.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/NodeDAO.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/plugins/lastModifiedDocuments/plugin.xhtml" afterPath="$PROJECT_DIR$/view/plugins/lastModifiedDocuments/plugin.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/import-prod.sql" afterPath="$PROJECT_DIR$/src/etc/import-prod.sql" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/dirEdit.xhtml" afterPath="$PROJECT_DIR$/view/dirEdit.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/docEdit.xhtml" afterPath="$PROJECT_DIR$/view/docEdit.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectoryPreferences.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectoryPreferences.java" />
+ <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="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/ehcache-1.3.0-beta.jar" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiLinkResolver.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiLinkResolver.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeBrowser.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeBrowser.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/Menu.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/Menu.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/view/plugins/blogDirectory/recentEntries.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/etc/wiki-prod-ds.xml" afterPath="$PROJECT_DIR$/src/etc/wiki-prod-ds.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/import-test.sql" afterPath="$PROJECT_DIR$/src/etc/import-test.sql" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/includes/pluginPreferencesForm.xhtml" afterPath="$PROJECT_DIR$/view/includes/pluginPreferencesForm.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/docHistory.xhtml" afterPath="$PROJECT_DIR$/view/docHistory.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/includes/preferencesEditor.xhtml" afterPath="$PROJECT_DIR$/view/includes/preferencesEditor.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogEntry.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogEntry.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/wiki-dev-ds.xml" afterPath="$PROJECT_DIR$/src/etc/wiki-dev-ds.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/CommentHome.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/CommentHome.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/util/MonitoringEHCacheProvider.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/view/plugins/blogDirectory/entryPages.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/WikiInit.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/WikiInit.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.txt" afterPath="$PROJECT_DIR$/README.txt" />
+ <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/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceProvider.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceProvider.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$/view/includes/commentsDisplay.xhtml" afterPath="$PROJECT_DIR$/view/includes/commentsDisplay.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/plugins/blogDirectory/plugin.xhtml" afterPath="$PROJECT_DIR$/view/plugins/blogDirectory/plugin.xhtml" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -216,103 +224,37 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="recentEntries.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/view/plugins/blogDirectory/recentEntries.xhtml">
+ <file leaf-file-name="README.txt" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/README.txt">
<provider selected="true" editor-type-id="text-editor">
- <state line="44" column="0" selection-start="1574" selection-end="1810" vertical-scroll-proportion="0.42750373">
+ <state line="17" column="0" selection-start="573" selection-end="573" vertical-scroll-proportion="0.15968208">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
- </entry>
- </file>
- <file leaf-file-name="BlogDirectory.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectory.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="52" column="0" selection-start="1389" selection-end="1389" vertical-scroll-proportion="0.4884393">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="import-dev.sql" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/etc/import-dev.sql">
- <provider selected="true" editor-type-id="text-editor">
- <state line="116" column="374" selection-start="75050" selection-end="75050" vertical-scroll-proportion="0.7626004">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="plugin.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/view/plugins/blogDirectory/plugin.xhtml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="40" column="0" selection-start="1861" selection-end="1861" vertical-scroll-proportion="0.38863975">
- <folding />
- </state>
- </provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
- </entry>
- </file>
- <file leaf-file-name="allEntries.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/view/plugins/blogDirectory/allEntries.xhtml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="55" column="0" selection-start="2542" selection-end="2542" vertical-scroll-proportion="0.53437966">
- <folding />
- </state>
- </provider>
- <provider editor-type-id="HtmlPreview">
- <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 selected="true" editor-type-id="text-editor">
- <state line="154" column="0" selection-start="8217" selection-end="8540" vertical-scroll-proportion="0.5052317">
- <folding />
- </state>
- </provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
</file>
- <file leaf-file-name="Node.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Node.java">
+ <file leaf-file-name="persistence-prod-war.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/etc/META-INF/persistence-prod-war.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="228" column="22" selection-start="6976" selection-end="6976" vertical-scroll-proportion="0.46459538">
+ <state line="38" column="0" selection-start="2344" selection-end="2344" vertical-scroll-proportion="0.35693642">
<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="wiki-dev-ds.xml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/etc/wiki-dev-ds.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="107" column="13" selection-start="3593" selection-end="3593" vertical-scroll-proportion="0.6900289">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Document.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Document.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="13" selection-start="225" selection-end="225" vertical-scroll-proportion="0.08453757">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="blogDirectory.css" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/view/themes/default/css/blogDirectory.css">
+ <file leaf-file-name="wiki-prod-ds.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/etc/wiki-prod-ds.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="131" column="16" selection-start="2498" selection-end="2498" vertical-scroll-proportion="0.7463873">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -468,6 +410,10 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/themes" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/themes/default" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -494,6 +440,10 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/themes/default" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/themes/default/mailtemplates" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -521,7 +471,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/themes/default/mailtemplates" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/themes/default/css" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -595,6 +545,32 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/plugins/feedTeasers" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki.ipr" />
+ <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/blogDirectory" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -713,6 +689,100 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki/util" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki.ipr" />
+ <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>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki.ipr" />
+ <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>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/feedTeasers" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki.ipr" />
+ <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>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -781,6 +851,74 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/preferences" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki.ipr" />
+ <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>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki.ipr" />
+ <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>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -927,6 +1065,58 @@
<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/etc" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/etc/WEB-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki.ipr" />
+ <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/etc" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/etc/META-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Wiki.ipr" />
+ <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$/lib" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -944,7 +1134,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="true" />
<abbreviatePackageNames />
- <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
+ <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -956,8 +1146,8 @@
<property name="cvs_file_history_treeWidth0" value="351" />
<property name="cvs_file_history_treeOrder4" value="4" />
<property name="cvs_file_history_flatWidth2" value="351" />
- <property name="TEMP_MODULE_EXPLODED_DIR_FOR_Wiki" value="/private/tmp/webExplodedDir22512tmp" />
<property name="cvs_file_history_flatOrder4" value="4" />
+ <property name="TEMP_MODULE_EXPLODED_DIR_FOR_Wiki" value="/private/tmp/webExplodedDir22512tmp" />
<property name="cvs_file_history_treeOrder1" value="1" />
<property name="Web Module Deployment Descriptor Default Version" value="2.4" />
<property name="GoToFile.includeJavaFiles" value="false" />
@@ -975,18 +1165,18 @@
<property name="cvs_file_history_treeOrder5" value="5" />
<property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
<property name="MemberChooser.sorted" value="false" />
- <property name="RunManagerConfig.compileBeforeRunning" value="true" />
<property name="cvs_file_history_flatWidth6" value="350" />
+ <property name="RunManagerConfig.compileBeforeRunning" value="true" />
<property name="cvs_file_history_flatOrder0" value="0" />
- <property name="cvs_file_history_treeWidth4" value="350" />
<property name="cvs_file_history_treeOrder3" value="3" />
+ <property name="cvs_file_history_treeWidth4" value="350" />
<property name="cvs_file_history_treeWidth6" value="350" />
<property name="cvs_file_history_flatOrder5" value="5" />
<property name="cvs_file_history_flatWidth5" value="351" />
- <property name="cvs_file_history_treeWidth3" value="351" />
<property name="cvs_file_history_treeOrder2" value="2" />
- <property name="cvs_file_history_treeWidth5" value="351" />
+ <property name="cvs_file_history_treeWidth3" value="351" />
<property name="JBoss Web Module Deployment Descriptor Default Version" value="4.0" />
+ <property name="cvs_file_history_treeWidth5" value="351" />
<property name="cvs_file_history_flatOrder6" value="6" />
<property name="cvs_file_history_flatWidth0" value="351" />
<property name="cvs_file_history_flatWidth3" value="351" />
@@ -1011,28 +1201,195 @@
<recent name="org.jboss.seam.wiki.plugin.comments" />
</key>
</component>
- <component name="RestoreUpdateTree" />
+ <component name="RestoreUpdateTree">
+ <UpdateInfo date="4/27/07 12:30 PM" ActionInfo="Chec_k Status">
+ <UpdatedFiles>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Updated from server" />
+ <option name="myStatusName" value="Changed on server" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="CHANGED_ON_SERVER" />
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Updated" />
+ <option name="myStatusName" value="Changed" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="UPDATED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Created" />
+ <option name="myStatusName" value="Created" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="CREATED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Deleted" />
+ <option name="myStatusName" value="Deleted" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="true" />
+ <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Restored" />
+ <option name="myStatusName" value="Will be restored" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="RESTORED" />
+ </FILE-GROUP>
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Modified" />
+ <option name="myStatusName" value="Modified" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MODIFIED" />
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Directory.java</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiLinkResolver.java</PATH>
+ <PATH>$PROJECT_DIR$/src/etc/META-INF/persistence-dev-war.xml</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java</PATH>
+ <PATH>$PROJECT_DIR$/src/etc/wiki-dev-ds.xml</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceProvider.java</PATH>
+ <PATH>$PROJECT_DIR$/Wiki.iws</PATH>
+ <PATH>$PROJECT_DIR$/src/etc/wiki-prod-ds.xml</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Node.java</PATH>
+ <PATH>$PROJECT_DIR$/build.xml</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/Menu.java</PATH>
+ <PATH>$PROJECT_DIR$/src/etc/META-INF/persistence-test-war.xml</PATH>
+ <PATH>$PROJECT_DIR$/src/etc/import-test.sql</PATH>
+ <PATH>$PROJECT_DIR$/Wiki.iml</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/WikiInit.java</PATH>
+ <PATH>$PROJECT_DIR$/src/etc/META-INF/persistence-prod-war.xml</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Document.java</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/NodeDAO.java</PATH>
+ <PATH>$PROJECT_DIR$/README.txt</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/CommentHome.java</PATH>
+ <PATH>$PROJECT_DIR$/Wiki.ipr</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/File.java</PATH>
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Skipped" />
+ <option name="myStatusName" value="Skipped" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="SKIPPED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged with conflicts" />
+ <option name="myStatusName" value="Will be merged with conflicts" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED_WITH_CONFLICTS" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged" />
+ <option name="myStatusName" value="Will be merged" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Not in repository" />
+ <option name="myStatusName" value="Not in repository" />
+ <option name="mySupportsDeletion" value="true" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="UNKNOWN" />
+ <PATH>$PROJECT_DIR$/view/backup.txt</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/TestAction.java</PATH>
+ <PATH>$PROJECT_DIR$/view/test.xhtml</PATH>
+ <PATH>$PROJECT_DIR$/UI.graffle</PATH>
+ <PATH>$PROJECT_DIR$/view/themes/default/mailtemplates/test.xhtml</PATH>
+ <PATH>$PROJECT_DIR$/moon.jpg</PATH>
+ <PATH>$PROJECT_DIR$/embedded-ejb/wiki-ddl.sql</PATH>
+ <PATH>$PROJECT_DIR$/moon.hex</PATH>
+ <PATH>$PROJECT_DIR$/view/themes/default/img/cal-next.png</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/Test.java</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/TestBean.java</PATH>
+ <PATH>$PROJECT_DIR$/src/etc/META-INF/orm.xml</PATH>
+ <PATH>$PROJECT_DIR$/wikidist.zip</PATH>
+ <PATH>$PROJECT_DIR$/view/themes/default/img/cal-prev.png</PATH>
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally added" />
+ <option name="myStatusName" value="Locally added" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="LOCALLY_ADDED" />
+ <PATH>$PROJECT_DIR$/src/etc/ehcache.xml</PATH>
+ <PATH>$PROJECT_DIR$/view/plugins/blogDirectory/allEntries.xhtml</PATH>
+ <PATH>$PROJECT_DIR$/lib/ehcache-1.3.0-beta.jar</PATH>
+ <PATH>$PROJECT_DIR$/view/plugins/blogDirectory/recentEntries.xhtml</PATH>
+ <PATH>$PROJECT_DIR$/view/plugins/blogDirectory/entryPages.xml</PATH>
+ <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/util/MonitoringEHCacheProvider.java</PATH>
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally removed" />
+ <option name="myStatusName" value="Locally removed" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="LOCALLY_REMOVED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Unknown" />
+ <option name="myStatusName" value="Unknown" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="UNKNOWN_TYPE" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally modified removed from server" />
+ <option name="myStatusName" value="Locally modified removed from server" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MOD_REMOVED_FROM_SERVER" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally removed modified on server" />
+ <option name="myStatusName" value="Locally removed modified on server" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="LOCALLY_REMOVED_MODIFIED_ON_SERVER" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Created by second party" />
+ <option name="myStatusName" value="Created by second party" />
+ <option name="mySupportsDeletion" value="true" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="CREATED_BY_SECOND_PARTY" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Binary file has to be merged" />
+ <option name="myStatusName" value="Binary file has to be merged" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="BINARY_MERGED" />
+ </FILE-GROUP>
+ </UpdatedFiles>
+ </UpdateInfo>
+ </component>
<component name="RunManager" selected="TestNG.AllTests">
- <configuration default="true" type="WebLogic Instance" factoryName="Remote">
+ <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.jsr45.JSR45ConfigurationFactory" factoryName="Remote">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
- <option name="PORT" value="7001" />
+ <option name="PORT" value="8080" />
<option name="LOCAL" value="false" />
<option name="OPEN_IN_BROWSER" value="true" />
<option name="OPEN_IN_BROWSER_URL" value="/" />
<option name="COMMON_VM_ARGUMENTS" value="" />
- <J2EE_MODULE DEPLOYMENT_METHOD="Weblogic.Deployer">
- <option name="CHECK_EJB_CMP_DATASOURCES" value="true" />
- <option name="MODULE_NAME" value="Wiki" />
- <option name="DEPLOY" value="false" />
- </J2EE_MODULE>
- <option name="DOMAIN_PATH" value="" />
- <option name="USER" value="weblogic" />
- <option name="PASSWORD" value="weblogic" />
- <option name="SERVER_NAME" value="myserver" />
- <option name="DOMAIN_NAME" value="mydomain" />
- <predefined_log_file id="WEBLOGIC_DOMAIN_LOG_FILE" enabled="true" />
- <predefined_log_file id="WEBLOGIC_SERVER_LOG_FILE" enabled="true" />
+ <option name="JSP_PACKAGE" value="" />
+ <option name="VM_OPTS" value="VM_OPTS" />
+ <option name="USE_WEBSPHERE51_LINEMAPPING_MODEL" value="false" />
+ <option name="LOCAL_PORT" value="80" />
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
<module name="" />
@@ -1059,7 +1416,7 @@
<option name="Run ant target" value="true" />
</method>
</configuration>
- <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
+ <configuration default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
<option name="PORT" value="8080" />
@@ -1067,33 +1424,43 @@
<option name="OPEN_IN_BROWSER" value="true" />
<option name="OPEN_IN_BROWSER_URL" value="/" />
<option name="COMMON_VM_ARGUMENTS" value="" />
- <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
- <option name="CONTEXT_PATH" value="/" />
- <option name="MODULE_NAME" value="Wiki" />
- <option name="DEPLOY" value="false" />
- </J2EE_MODULE>
+ <option name="JSP_PACKAGE" value="" />
+ <option name="VM_OPTS" value="VM_OPTS" />
+ <option name="USE_WEBSPHERE51_LINEMAPPING_MODEL" value="false" />
+ <option name="LOCAL_PORT" value="80" />
+ </configuration>
+ <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
+ <option name="WORKING_DIRECTORY" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="8080" />
+ <option name="LOCAL" value="false" />
+ <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="JUnit" factoryName="JUnit" enabled="false" merge="false">
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- <method>
- <option name="Make" value="true" />
- </method>
+ <configuration default="true" type="WebLogic Instance" factoryName="Local">
+ <option name="WORKING_DIRECTORY" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="7001" />
+ <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="" />
+ <J2EE_MODULE DEPLOYMENT_METHOD="Weblogic.Deployer" DEPLOYMENT_SOURCE_NAME="exploded">
+ <option name="CHECK_EJB_CMP_DATASOURCES" value="true" />
+ <option name="MODULE_NAME" value="Wiki" />
+ <option name="DEPLOY" value="false" />
+ </J2EE_MODULE>
+ <option name="DOMAIN_PATH" value="" />
+ <option name="USER" value="weblogic" />
+ <option name="PASSWORD" value="weblogic" />
+ <option name="SERVER_NAME" value="myserver" />
+ <option name="DOMAIN_NAME" value="mydomain" />
+ <predefined_log_file id="WEBLOGIC_DOMAIN_LOG_FILE" enabled="true" />
+ <predefined_log_file id="WEBLOGIC_SERVER_LOG_FILE" enabled="true" />
</configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
@@ -1105,37 +1472,45 @@
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="" />
</configuration>
- <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
+ <configuration default="true" type="WebLogic Instance" factoryName="Remote">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
- <option name="PORT" value="8080" />
+ <option name="PORT" value="7001" />
<option name="LOCAL" value="false" />
<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="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" />
+ <J2EE_MODULE DEPLOYMENT_METHOD="Weblogic.Deployer">
+ <option name="CHECK_EJB_CMP_DATASOURCES" value="true" />
+ <option name="MODULE_NAME" value="Wiki" />
+ <option name="DEPLOY" value="false" />
+ </J2EE_MODULE>
+ <option name="DOMAIN_PATH" value="" />
+ <option name="USER" value="weblogic" />
+ <option name="PASSWORD" value="weblogic" />
+ <option name="SERVER_NAME" value="myserver" />
+ <option name="DOMAIN_NAME" value="mydomain" />
+ <predefined_log_file id="WEBLOGIC_DOMAIN_LOG_FILE" enabled="true" />
+ <predefined_log_file id="WEBLOGIC_SERVER_LOG_FILE" enabled="true" />
</configuration>
- <configuration default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" 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="JSP_PACKAGE" value="" />
- <option name="VM_OPTS" value="VM_OPTS" />
- <option name="USE_WEBSPHERE51_LINEMAPPING_MODEL" value="false" />
- <option name="LOCAL_PORT" value="80" />
+ <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="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <method>
+ <option name="Make" value="true" />
+ </method>
</configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
@@ -1149,39 +1524,22 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Remote">
+ <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="false" />
- <option name="OPEN_IN_BROWSER" value="true" />
- <option name="OPEN_IN_BROWSER_URL" value="/" />
- <option name="COMMON_VM_ARGUMENTS" value="" />
- <option name="JSP_PACKAGE" value="" />
- <option name="VM_OPTS" value="VM_OPTS" />
- <option name="USE_WEBSPHERE51_LINEMAPPING_MODEL" value="false" />
- <option name="LOCAL_PORT" value="80" />
- </configuration>
- <configuration default="true" type="WebLogic Instance" factoryName="Local">
- <option name="WORKING_DIRECTORY" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="7001" />
<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="" />
- <J2EE_MODULE DEPLOYMENT_METHOD="Weblogic.Deployer" DEPLOYMENT_SOURCE_NAME="exploded">
- <option name="CHECK_EJB_CMP_DATASOURCES" value="true" />
+ <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
+ <option name="CONTEXT_PATH" value="/" />
<option name="MODULE_NAME" value="Wiki" />
<option name="DEPLOY" value="false" />
</J2EE_MODULE>
- <option name="DOMAIN_PATH" value="" />
- <option name="USER" value="weblogic" />
- <option name="PASSWORD" value="weblogic" />
- <option name="SERVER_NAME" value="myserver" />
- <option name="DOMAIN_NAME" value="mydomain" />
- <predefined_log_file id="WEBLOGIC_DOMAIN_LOG_FILE" enabled="true" />
- <predefined_log_file id="WEBLOGIC_SERVER_LOG_FILE" enabled="true" />
+ <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="false" name="Test" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" value="org.jboss.seam.wiki.core.Test" />
@@ -1327,7 +1685,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="22" width="2560" height="1532" extended-state="6" />
+ <frame x="-3" y="22" width="2560" height="1532" 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.4832636" order="15" />
@@ -1373,7 +1731,7 @@
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
<option name="PUT_FOCUS_INTO_COMMENT" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="Broken Hibernate Search integration, to debug for Emmanuel" />
+ <option name="LAST_COMMIT_MESSAGE" value="Minor blogging improvements" />
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
@@ -1386,8 +1744,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="Quite useless plugin for embedding flash movies on wiki pages" />
- <MESSAGE value="Kicked out jCaptcha and replaced with simple math captcha" />
<MESSAGE value="Minor bugs" />
<MESSAGE value="Ability to change owner/creator of wiki node" />
<MESSAGE value="Argh, forgot file" />
@@ -1396,6 +1752,8 @@
<MESSAGE value="Added feature: Manual account creation (for admins)" />
<MESSAGE value="Minor" />
<MESSAGE value="Broken Hibernate Search integration, to debug for Emmanuel" />
+ <MESSAGE value="New blog features: recent entries, index of all entries" />
+ <MESSAGE value="Minor blogging improvements" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -1476,157 +1834,107 @@
<option name="myLastEditedConfigurable" value="Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/view/plugins/lastModifiedDocuments/plugin.xhtml">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiLinkResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="27" selection-start="1919" selection-end="1919" vertical-scroll-proportion="0.3497758">
+ <state line="166" column="0" selection-start="7569" selection-end="7569" vertical-scroll-proportion="0.7182081">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/plugins/feedTeasers/plugin.xhtml">
+ <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="33" column="168" selection-start="1685" selection-end="1685" vertical-scroll-proportion="0.3206278">
+ <state line="40" column="0" selection-start="1210" selection-end="1210" vertical-scroll-proportion="0.27745664">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/etc/WEB-INF/pages.xml">
+ <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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="14" column="91" selection-start="560" selection-end="560" vertical-scroll-proportion="0.26608187">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/plugins/blogDirectory/entryPages.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceProvider.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="111" selection-start="1455" selection-end="1455" vertical-scroll-proportion="0.21599402">
- <folding>
- <marker date="1177595519000" expanded="true" signature="23:5543" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="424:2858" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="493:2849" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="526:2831" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="569:1534" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="614:1033" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="667:812" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="865:1010" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="1078:1177" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="1226:1515" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="1342:1492" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="1575:2114" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="1655:2019" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="2157:2815" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="2268:2497" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="2375:2472" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="2620:2796" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="2723:2771" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="2941:3120" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="3147:5533" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="3476:3679" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="3782:3853" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="3967:4176" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="4279:4350" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="4664:4865" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="4968:5035" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="5145:5346" placeholder="..." />
- <marker date="1177595519000" expanded="true" signature="5449:5516" placeholder="..." />
- </folding>
+ <state line="29" column="20" selection-start="1081" selection-end="1081" vertical-scroll-proportion="0.27239883">
+ <folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/NodeDAO.java">
+ <entry file="file://$PROJECT_DIR$/src/etc/META-INF/persistence-dev-war.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="300" column="36" selection-start="11741" selection-end="11741" vertical-scroll-proportion="0.5115607">
+ <state line="15" column="53" selection-start="896" selection-end="896" vertical-scroll-proportion="0.14089595">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/plugins/blogDirectory/recentEntries.xhtml">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Node.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="44" column="0" selection-start="1574" selection-end="1810" vertical-scroll-proportion="0.42750373">
+ <state line="89" column="38" selection-start="3199" selection-end="3199" vertical-scroll-proportion="0.40390173">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Document.java">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/NodeDAO.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="13" selection-start="225" selection-end="225" vertical-scroll-proportion="0.08453757">
+ <state line="341" column="85" selection-start="13710" selection-end="13710" vertical-scroll-proportion="0.80274564">
<folding />
</state>
</provider>
</entry>
<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="107" column="13" selection-start="3593" selection-end="3593" vertical-scroll-proportion="0.6900289">
+ <state line="13" column="13" selection-start="321" selection-end="321" vertical-scroll-proportion="0.12210982">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Node.java">
+ <entry file="file://$PROJECT_DIR$/src/etc/ehcache.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="228" column="22" selection-start="6976" selection-end="6976" vertical-scroll-proportion="0.46459538">
+ <state line="172" column="36" selection-start="5755" selection-end="5755" vertical-scroll-proportion="0.8966763">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/plugins/blogDirectory/plugin.xhtml">
+ <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="40" column="0" selection-start="1861" selection-end="1861" vertical-scroll-proportion="0.38863975">
+ <state line="108" column="1" selection-start="4717" selection-end="4775" vertical-scroll-proportion="0.85910404">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/userList.xhtml">
+ <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/CommentHome.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="154" column="0" selection-start="8217" selection-end="8540" vertical-scroll-proportion="0.5052317">
+ <state line="136" column="0" selection-start="4189" selection-end="4189" vertical-scroll-proportion="0.8966763">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/plugins/blogDirectory/allEntries.xhtml">
+ <entry file="file://$PROJECT_DIR$/README.txt">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="0" selection-start="2542" selection-end="2542" vertical-scroll-proportion="0.53437966">
+ <state line="17" column="0" selection-start="573" selection-end="573" vertical-scroll-proportion="0.15968208">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/themes/default/css/blogDirectory.css">
+ <entry file="file://$PROJECT_DIR$/src/etc/META-INF/persistence-prod-war.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="131" column="16" selection-start="2498" selection-end="2498" vertical-scroll-proportion="0.7463873">
+ <state line="38" column="0" selection-start="2344" selection-end="2344" vertical-scroll-proportion="0.35693642">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectory.java">
+ <entry file="file://$PROJECT_DIR$/src/etc/wiki-prod-ds.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="0" selection-start="1389" selection-end="1389" vertical-scroll-proportion="0.4884393">
+ <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/etc/import-dev.sql">
+ <entry file="file://$PROJECT_DIR$/src/etc/wiki-dev-ds.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="116" column="374" selection-start="75050" selection-end="75050" vertical-scroll-proportion="0.7626004">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
1.6 +5 -8 jboss-seam/examples/wiki/README.txt
(In the diff below, changes in quantity of whitespace are not shown.)
Index: README.txt
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/README.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- README.txt 26 Apr 2007 05:29:16 -0000 1.5
+++ README.txt 27 Apr 2007 10:33:23 -0000 1.6
@@ -4,18 +4,15 @@
INSTALLATION
==========================================================================================
-- Install JBoss AS 4.2 CR2
+- Install JBoss Application Server 4.2 CR2
-- Upgrade the Hibernate JARs in server/default/lib/ with the bundled Hibernate JARs
-
-- Upgrade jboss-archive-browsing.jar and ejb3-persistence.jar in server/default/lib
-
-- Add hibernate-commons-annotations.jar, hibernate-search.jar, and lucene-core.jar to server/default/lib/
+- Edit build.properties
- Edit src/etc/META-INF/persistence-dev.xml and change the path to your Lucene index directory
- Run the standalone HSQL DB server with 'ant startdb'
-- Edit build.properties
-
- Call 'ant deploy'
+
+- Access http://localhost:8080/wiki/
+
More information about the jboss-cvs-commits
mailing list