[jboss-cvs] jboss-seam/examples/wiki ...

Christian Bauer christian at hibernate.org
Thu Apr 26 01:29:16 EDT 2007


  User: cbauer  
  Date: 07/04/26 01:29:16

  Modified:    examples/wiki      Wiki.ipr Wiki.iml build.xml Wiki.iws
                        README.txt
  Log:
  Broken Hibernate Search integration, to debug for Emmanuel
  
  Revision  Changes    Path
  1.6       +2 -2      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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Wiki.ipr	21 Apr 2007 08:13:49 -0000	1.5
  +++ Wiki.ipr	26 Apr 2007 05:29:16 -0000	1.6
  @@ -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="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.6       +56 -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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Wiki.iml	21 Apr 2007 08:13:49 -0000	1.5
  +++ Wiki.iml	26 Apr 2007 05:29:16 -0000	1.6
  @@ -581,6 +581,42 @@
           <SOURCES />
         </library>
       </orderEntry>
  +    <orderEntry type="module-library">
  +      <library>
  +        <CLASSES>
  +          <root url="jar://$MODULE_DIR$/lib/hibernate-search.jar!/" />
  +        </CLASSES>
  +        <JAVADOC />
  +        <SOURCES />
  +      </library>
  +    </orderEntry>
  +    <orderEntry type="module-library">
  +      <library>
  +        <CLASSES>
  +          <root url="jar://$MODULE_DIR$/lib/jboss-archive-browsing.jar!/" />
  +        </CLASSES>
  +        <JAVADOC />
  +        <SOURCES />
  +      </library>
  +    </orderEntry>
  +    <orderEntry type="module-library">
  +      <library>
  +        <CLASSES>
  +          <root url="jar://$MODULE_DIR$/lib/lucene-core-2.1.0.jar!/" />
  +        </CLASSES>
  +        <JAVADOC />
  +        <SOURCES />
  +      </library>
  +    </orderEntry>
  +    <orderEntry type="module-library">
  +      <library>
  +        <CLASSES>
  +          <root url="jar://$MODULE_DIR$/lib/hibernate-tools.jar!/" />
  +        </CLASSES>
  +        <JAVADOC />
  +        <SOURCES />
  +      </library>
  +    </orderEntry>
       <orderEntryProperties />
     </component>
     <component name="VcsManagerConfiguration">
  @@ -670,6 +706,16 @@
       </containerElement>
       <containerElement type="library" level="module">
         <attribute name="method" value="1" />
  +      <attribute name="URI" value="/WEB-INF/lib/hibernate-search.jar" />
  +      <url>jar://$MODULE_DIR$/lib/hibernate-search.jar!/</url>
  +    </containerElement>
  +    <containerElement type="library" level="module">
  +      <attribute name="method" value="1" />
  +      <attribute name="URI" value="/WEB-INF/lib/hibernate-tools.jar" />
  +      <url>jar://$MODULE_DIR$/lib/hibernate-tools.jar!/</url>
  +    </containerElement>
  +    <containerElement type="library" level="module">
  +      <attribute name="method" value="1" />
         <attribute name="URI" value="/WEB-INF/lib/hibernate-validator.jar" />
         <url>jar://$MODULE_DIR$/lib/hibernate-validator.jar!/</url>
       </containerElement>
  @@ -680,11 +726,21 @@
       </containerElement>
       <containerElement type="library" level="module">
         <attribute name="method" value="1" />
  +      <attribute name="URI" value="/WEB-INF/lib/jboss-archive-browsing.jar" />
  +      <url>jar://$MODULE_DIR$/lib/jboss-archive-browsing.jar!/</url>
  +    </containerElement>
  +    <containerElement type="library" level="module">
  +      <attribute name="method" value="1" />
         <attribute name="URI" value="/WEB-INF/lib/jdom.jar" />
         <url>jar://$MODULE_DIR$/lib/jdom.jar!/</url>
       </containerElement>
       <containerElement type="library" level="module">
         <attribute name="method" value="1" />
  +      <attribute name="URI" value="/WEB-INF/lib/lucene-core-2.1.0.jar" />
  +      <url>jar://$MODULE_DIR$/lib/lucene-core-2.1.0.jar!/</url>
  +    </containerElement>
  +    <containerElement type="library" level="module">
  +      <attribute name="method" value="1" />
         <attribute name="URI" value="/WEB-INF/lib/rome-0.9.jar" />
         <url>jar://$MODULE_DIR$/lib/rome-0.9.jar!/</url>
       </containerElement>
  
  
  
  1.21      +1 -0      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.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- build.xml	22 Apr 2007 13:53:52 -0000	1.20
  +++ build.xml	26 Apr 2007 05:29:16 -0000	1.21
  @@ -253,6 +253,7 @@
       <target name="deploy" depends="explodewar"
               description="Deploy datasource and exploded WAR to JBoss AS">
           <fail unless="jboss.home">jboss.home not set</fail>
  +        <echo>Make sure you use JBoss AS 4.2 CR2 and upgrade the Hibernate JARs!</echo>
   
           <!-- ######## Datasoure ######## -->
           <copy todir="${deploy.dir}">
  
  
  
  1.8       +382 -183  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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- Wiki.iws	21 Apr 2007 08:34:37 -0000	1.7
  +++ Wiki.iws	26 Apr 2007 05:29:16 -0000	1.8
  @@ -19,12 +19,37 @@
     </component>
     <component name="ChangeListManager">
       <list default="true" name="Default" comment="">
  -      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java" />
  -      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/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$/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/includes/searchControl.xhtml" afterPath="$PROJECT_DIR$/view/includes/searchControl.xhtml" />
  +      <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$/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/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="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/lucene-core-2.1.0.jar" />
  +      <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$/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$/view/dirDisplay.xhtml" afterPath="$PROJECT_DIR$/view/dirDisplay.xhtml" />
  +      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/preferences/PreferenceSupport.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/preferences/PreferenceSupport.java" />
  +      <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/model/Node.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Node.java" />
  +      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/META-INF/wiki.taglib.xml" afterPath="$PROJECT_DIR$/src/etc/META-INF/wiki.taglib.xml" />
  +      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.iws" afterPath="$PROJECT_DIR$/Wiki.iws" />
  +      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/NodeDAO.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/NodeDAO.java" />
  +      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/includes/attachmentDisplay.xhtml" afterPath="$PROJECT_DIR$/view/includes/attachmentDisplay.xhtml" />
  +      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/File.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/File.java" />
  +      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectoryPreferences.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectoryPreferences.java" />
         <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$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java" />
  +      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeSearch.java" />
  +      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/hibernate-search.jar" />
  +      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/WEB-INF/pages.xml" afterPath="$PROJECT_DIR$/src/etc/WEB-INF/pages.xml" />
  +      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/util/WikiUtil.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/util/WikiUtil.java" />
  +      <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$/README.txt" afterPath="$PROJECT_DIR$/README.txt" />
         <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$/Wiki.iws" afterPath="$PROJECT_DIR$/Wiki.iws" />
  +      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/plugins/blogDirectory/plugin.xhtml" afterPath="$PROJECT_DIR$/view/plugins/blogDirectory/plugin.xhtml" />
       </list>
     </component>
     <component name="ChangeListSynchronizer" />
  @@ -198,97 +223,85 @@
     </component>
     <component name="FileEditorManager">
       <leaf>
  -      <file leaf-file-name="commentForm.xhtml" pinned="false" current="false" current-in-tab="false">
  -        <entry file="file://$PROJECT_DIR$/view/includes/commentForm.xhtml">
  -          <provider editor-type-id="HtmlPreview">
  -            <state />
  -          </provider>
  +      <file leaf-file-name="UserSearch.java" pinned="false" current="false" current-in-tab="false">
  +        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/UserSearch.java">
             <provider selected="true" editor-type-id="text-editor">
  -            <state line="35" column="34" selection-start="1776" selection-end="1776" vertical-scroll-proportion="0.3393124">
  +            <state line="34" column="0" selection-start="883" selection-end="883" vertical-scroll-proportion="0.31936416">
                 <folding />
               </state>
             </provider>
           </entry>
         </file>
  -      <file leaf-file-name="WikiIdentity.java" pinned="false" current="false" current-in-tab="false">
  -        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java">
  +      <file leaf-file-name="NodeSearch.java" pinned="false" current="false" current-in-tab="false">
  +        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeSearch.java">
             <provider selected="true" editor-type-id="text-editor">
  -            <state line="81" column="12" selection-start="2945" selection-end="2945" vertical-scroll-proportion="0.15968208">
  +            <state line="45" column="5" selection-start="1186" selection-end="1186" vertical-scroll-proportion="0.42268786">
                 <folding />
               </state>
             </provider>
           </entry>
         </file>
  -      <file leaf-file-name="NodeHome.java" pinned="false" current="false" current-in-tab="false">
  -        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeHome.java">
  +      <file leaf-file-name="urlrewrite.xml" pinned="false" current="false" current-in-tab="false">
  +        <entry file="file://$PROJECT_DIR$/src/etc/WEB-INF/urlrewrite.xml">
             <provider selected="true" editor-type-id="text-editor">
  -            <state line="202" column="30" selection-start="6540" selection-end="6540" vertical-scroll-proportion="0.9017341">
  +            <state line="26" column="0" selection-start="726" selection-end="726" vertical-scroll-proportion="0.24421965">
                 <folding />
               </state>
             </provider>
           </entry>
         </file>
  -      <file leaf-file-name="Directory.java" pinned="false" current="true" current-in-tab="true">
  -        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Directory.java">
  +      <file leaf-file-name="File.java" pinned="false" current="false" current-in-tab="false">
  +        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/File.java">
             <provider selected="true" editor-type-id="text-editor">
  -            <state line="8" column="37" selection-start="187" selection-end="187" vertical-scroll-proportion="0.07514451">
  +            <state line="112" column="0" selection-start="2796" selection-end="2796" vertical-scroll-proportion="0.9436416">
                 <folding />
               </state>
             </provider>
           </entry>
         </file>
  -      <file leaf-file-name="WikiPreferences.java" pinned="false" current="false" current-in-tab="false">
  -        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java">
  +      <file leaf-file-name="UIWikiFormattedText.java" pinned="false" current="false" current-in-tab="false">
  +        <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="49" column="16" selection-start="1982" selection-end="1982" vertical-scroll-proportion="0.46026012">
  +            <state line="174" column="0" selection-start="7208" selection-end="7208" vertical-scroll-proportion="0.9436416">
                 <folding />
               </state>
             </provider>
           </entry>
         </file>
  -      <file leaf-file-name="userControl.xhtml" pinned="false" current="false" current-in-tab="false">
  -        <entry file="file://$PROJECT_DIR$/view/includes/userControl.xhtml">
  -          <provider editor-type-id="HtmlPreview">
  -            <state />
  -          </provider>
  +      <file leaf-file-name="PreferenceSupport.java" pinned="false" current="false" current-in-tab="false">
  +        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/preferences/PreferenceSupport.java">
             <provider selected="true" editor-type-id="text-editor">
  -            <state line="12" column="0" selection-start="455" selection-end="455" vertical-scroll-proportion="0.11659193">
  +            <state line="71" column="0" selection-start="3674" selection-end="3674" vertical-scroll-proportion="0.5867052">
                 <folding />
               </state>
             </provider>
           </entry>
         </file>
  -      <file leaf-file-name="WikiCaptcha.java" pinned="false" current="false" current-in-tab="false">
  -        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptcha.java">
  -          <provider selected="true" editor-type-id="text-editor">
  -            <state line="23" column="39" selection-start="724" selection-end="724" vertical-scroll-proportion="0.21604046">
  -              <folding />
  -            </state>
  +      <file leaf-file-name="dirDisplay.xhtml" pinned="false" current="false" current-in-tab="false">
  +        <entry file="file://$PROJECT_DIR$/view/dirDisplay.xhtml">
  +          <provider editor-type-id="HtmlPreview">
  +            <state />
             </provider>
  -        </entry>
  -      </file>
  -      <file leaf-file-name="FeedDAO.java" pinned="false" current="false" current-in-tab="false">
  -        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java">
             <provider selected="true" editor-type-id="text-editor">
  -            <state line="29" column="13" selection-start="832" selection-end="832" vertical-scroll-proportion="0.27239883">
  +            <state line="143" column="21" selection-start="7788" selection-end="7788" vertical-scroll-proportion="0.42675635">
                 <folding />
               </state>
             </provider>
           </entry>
         </file>
  -      <file leaf-file-name="WikiNodeFactory.java" pinned="false" current="false" current-in-tab="false">
  -        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java">
  +      <file leaf-file-name="README.txt" pinned="false" current="true" current-in-tab="true">
  +        <entry file="file://$PROJECT_DIR$/README.txt">
             <provider selected="true" editor-type-id="text-editor">
  -            <state line="54" column="0" selection-start="2021" selection-end="2021" vertical-scroll-proportion="0.50722545">
  +            <state line="14" column="94" selection-start="693" selection-end="693" vertical-scroll-proportion="0.1315029">
                 <folding />
               </state>
             </provider>
           </entry>
         </file>
  -      <file leaf-file-name="WikiCaptchaResponse.java" pinned="false" current="false" current-in-tab="false">
  -        <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptchaResponse.java">
  +      <file leaf-file-name="NodeDAO.java" pinned="false" current="false" current-in-tab="false">
  +        <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="10" column="18" selection-start="269" selection-end="269" vertical-scroll-proportion="0.09393064">
  +            <state line="267" column="0" selection-start="10126" selection-end="10126" vertical-scroll-proportion="0.21098267">
                 <folding />
               </state>
             </provider>
  @@ -757,7 +770,7 @@
             <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/dao" />
  +          <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>
         </PATH>
  @@ -791,7 +804,7 @@
             <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/captcha" />
  +          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao" />
             <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
           </PATH_ELEMENT>
         </PATH>
  @@ -847,7 +860,23 @@
             <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="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/action" />
  +          <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/action/prefs" />
             <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
           </PATH_ELEMENT>
         </PATH>
  @@ -872,10 +901,6 @@
             <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>
  @@ -908,7 +933,7 @@
         <showLibraryContents />
         <hideEmptyPackages ProjectPane="true" />
         <abbreviatePackageNames />
  -      <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" />
  +      <showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" />
         <autoscrollToSource />
         <autoscrollFromSource />
         <sortByType />
  @@ -975,28 +1000,213 @@
         <recent name="org.jboss.seam.wiki.plugin.comments" />
       </key>
     </component>
  -  <component name="RestoreUpdateTree" />
  +  <component name="RestoreUpdateTree">
  +    <UpdateInfo date="4/26/07 7:22 AM" 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/etc/WEB-INF/urlrewrite.xml</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogEntry.java</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java</PATH>
  +          <PATH>$PROJECT_DIR$/src/etc/META-INF/persistence-dev-war.xml</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/preferences/PreferenceSupport.java</PATH>
  +          <PATH>$PROJECT_DIR$/src/etc/META-INF/wiki.taglib.xml</PATH>
  +          <PATH>$PROJECT_DIR$/Wiki.iws</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectoryPreferences.java</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Node.java</PATH>
  +          <PATH>$PROJECT_DIR$/src/etc/WEB-INF/pages.xml</PATH>
  +          <PATH>$PROJECT_DIR$/view/dirDisplay.xhtml</PATH>
  +          <PATH>$PROJECT_DIR$/view/themes/default/css/blogDirectory.css</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java</PATH>
  +          <PATH>$PROJECT_DIR$/build.xml</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$/view/plugins/blogDirectory/plugin.xhtml</PATH>
  +          <PATH>$PROJECT_DIR$/Wiki.iml</PATH>
  +          <PATH>$PROJECT_DIR$/view/includes/searchControl.xhtml</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/util/WikiUtil.java</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Document.java</PATH>
  +          <PATH>$PROJECT_DIR$/view/fileEdit.xhtml</PATH>
  +          <PATH>$PROJECT_DIR$/src/etc/import-dev.sql</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectory.java</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/NodeDAO.java</PATH>
  +          <PATH>$PROJECT_DIR$/Wiki.ipr</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/File.java</PATH>
  +          <PATH>$PROJECT_DIR$/view/includes/attachmentDisplay.xhtml</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/plugins/blogDirectory/blogEntries.xhtml</PATH>
  +          <PATH>$PROJECT_DIR$/view/themes/default/mailtemplates/test.xhtml</PATH>
  +          <PATH>$PROJECT_DIR$/moon.jpg</PATH>
  +          <PATH>$PROJECT_DIR$/view/plugins/blogDirectory/recentEntries.xhtml</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$/lib/lucene-core-2.1.0.jar</PATH>
  +          <PATH>$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeSearch.java</PATH>
  +          <PATH>$PROJECT_DIR$/lib/hibernate-search.jar</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="Local">
  +    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
  +      <option name="MAIN_CLASS_NAME" />
  +      <option name="VM_PARAMETERS" />
  +      <option name="PROGRAM_PARAMETERS" />
  +      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
  +      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  +      <option name="ALTERNATIVE_JRE_PATH" />
  +      <option name="ENABLE_SWING_INSPECTOR" value="false" />
  +      <module name="" />
  +    </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="LOCAL" value="true" />
  +      <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" 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" />
  +      <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="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
         <option name="WORKING_DIRECTORY" />
  @@ -1015,25 +1225,30 @@
         <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" />
  -    </configuration>
  -    <configuration default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Remote">
  +    <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="GROUP_NAME" />
  +      <option name="TEST_OBJECT" value="CLASS" />
  +      <option name="VM_PARAMETERS" />
  +      <option name="PARAMETERS" />
         <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" />
  +      <option name="OUTPUT_DIRECTORY" />
  +      <option name="ADDITIONAL_CLASS_PATH" />
  +      <option name="TEST_SEARCH_SCOPE">
  +        <value defaultName="wholeProject" />
  +      </option>
  +      <option name="PROPERTIES_FILE" />
  +      <properties />
  +      <method>
  +        <option name="Make" value="false" />
  +        <option name="Run ant target" value="true" />
  +      </method>
       </configuration>
       <configuration default="true" type="WebLogic Instance" factoryName="Remote">
         <option name="WORKING_DIRECTORY" />
  @@ -1056,47 +1271,26 @@
         <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" />
  -      <option name="VM_PARAMETERS" />
  -      <option name="PROGRAM_PARAMETERS" />
  -      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
  -      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  -      <option name="ALTERNATIVE_JRE_PATH" />
  -      <option name="ENABLE_SWING_INSPECTOR" value="false" />
  -      <module name="" />
  -    </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>
  -    <configuration default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
  +    <configuration default="true" type="WebLogic Instance" factoryName="Local">
         <option name="WORKING_DIRECTORY" />
         <option name="HOST" value="localhost" />
  -      <option name="PORT" value="8080" />
  +      <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="" />
  -      <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" />
  +      <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="Applet" factoryName="Applet">
         <module name="" />
  @@ -1110,41 +1304,43 @@
         <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
         <option name="ALTERNATIVE_JRE_PATH" />
       </configuration>
  -    <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" 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="Local">
         <option name="WORKING_DIRECTORY" />
         <option name="HOST" value="localhost" />
         <option name="PORT" value="8080" />
  -      <option name="LOCAL" value="false" />
  +      <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="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">
  +    <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="ADDITIONAL_CLASS_PATH" />
         <option name="TEST_SEARCH_SCOPE">
           <value defaultName="wholeProject" />
         </option>
  -      <option name="PROPERTIES_FILE" />
  -      <properties />
         <method>
  -        <option name="Make" value="false" />
  -        <option name="Run ant target" value="true" />
  +        <option name="Make" value="true" />
         </method>
       </configuration>
       <configuration default="false" name="Test" type="Application" factoryName="Application" enabled="false" merge="false">
  @@ -1314,10 +1510,10 @@
         <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" />
         <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5571827" order="5" />
         <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
  -      <window_info id="SQL Schema" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298466" 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="14" />
         <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32635984" order="10" />
         <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="1" />
  +      <window_info id="SQL Schema" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298466" order="0" />
         <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
         <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="4" />
         <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="6" />
  @@ -1350,15 +1546,15 @@
       <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="Fixed comments and blog directory" />
  -    <MESSAGE value="Added comment delete button" />
  -    <MESSAGE value="Permission check for comment deletion" />
  -    <MESSAGE value="Switched to new Hibernate unified sequence generator, solving the identity-insert bugs which were breaking some atomic conversation" />
  -    <MESSAGE value="Finalized 'deletion' of stuff with updated FK constraint rules, now required the very latest Hibernate JARs" />
  -    <MESSAGE value="Finished document history and diff feature" />
       <MESSAGE value="Upgraded to BSD-licensed urlrewrite and some cosmetic changes" />
       <MESSAGE value="Quite useless plugin for embedding flash movies on wiki pages" />
       <MESSAGE value="Kicked out jCaptcha and replaced with simple math captcha" />
  +    <MESSAGE value="Minor bugs" />
  +    <MESSAGE value="Ability to change owner/creator of wiki node" />
  +    <MESSAGE value="Argh, forgot file" />
  +    <MESSAGE value="Fixed atom feed updating/purging logic" />
  +    <MESSAGE value="Distribution target now generates valid SQL files ready for import in MySQL" />
  +    <MESSAGE value="Added feature: Manual account creation (for admins)" />
       <MESSAGE value="Minor" />
     </component>
     <component name="VssConfiguration">
  @@ -1440,119 +1636,122 @@
       <option name="myLastEditedConfigurable" value="Default" />
     </component>
     <component name="editorHistoryManager">
  -    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/UserDAO.java">
  +    <entry file="file://$PROJECT_DIR$/view/includes/breadcrumb.xhtml">
  +      <provider editor-type-id="HtmlPreview">
  +        <state />
  +      </provider>
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="63" column="13" selection-start="2133" selection-end="2133" vertical-scroll-proportion="0.41763005">
  +        <state line="13" column="0" selection-start="393" selection-end="579" vertical-scroll-proportion="0.12630792">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/User.java">
  +    <entry file="file://$PROJECT_DIR$/view/plugins/blogDirectory/recentEntries.xhtml">
  +      <provider editor-type-id="HtmlPreview">
  +        <state />
  +      </provider>
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="53" column="13" selection-start="1613" selection-end="1613" vertical-scroll-proportion="0.47904626">
  +        <state line="38" column="39" selection-start="1589" selection-end="1589" vertical-scroll-proportion="0.36920777">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/view/userList.xhtml">
  +    <entry file="file://$PROJECT_DIR$/view/plugins/blogDirectory/plugin.xhtml">
         <provider editor-type-id="HtmlPreview">
           <state />
         </provider>
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="148" column="104" selection-start="8243" selection-end="8243" vertical-scroll-proportion="0.22272047">
  +        <state line="40" column="37" selection-start="1867" selection-end="1867" vertical-scroll-proportion="0.38863975">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/build.xml">
  +    <entry file="file://$PROJECT_DIR$/view/docEdit.xhtml">
  +      <provider editor-type-id="HtmlPreview">
  +        <state />
  +      </provider>
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="41" column="0" selection-start="1835" selection-end="1835" vertical-scroll-proportion="0.3851156">
  +        <state line="122" column="0" selection-start="6368" selection-end="6516" vertical-scroll-proportion="0.009715994">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java">
  +    <entry file="file://$PROJECT_DIR$/view/themes/default/css/template.css">
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="29" column="13" selection-start="832" selection-end="832" vertical-scroll-proportion="0.27239883">
  +        <state line="54" column="0" selection-start="887" selection-end="918" vertical-scroll-proportion="0.009393063">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeFactory.java">
  +    <entry file="file://$PROJECT_DIR$/src/etc/import-dev.sql">
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="54" column="0" selection-start="2021" selection-end="2021" vertical-scroll-proportion="0.50722545">
  +        <state line="117" column="0" selection-start="75890" selection-end="75890" vertical-scroll-proportion="0.7815924">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptchaResponse.java">
  +    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/UserSearch.java">
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="10" column="18" selection-start="269" selection-end="269" vertical-scroll-proportion="0.09393064">
  +        <state line="34" column="0" selection-start="883" selection-end="883" vertical-scroll-proportion="0.31936416">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/captcha/WikiCaptcha.java">
  +    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/NodeDAO.java">
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="23" column="39" selection-start="724" selection-end="724" vertical-scroll-proportion="0.21604046">
  +        <state line="267" column="0" selection-start="10126" selection-end="10126" vertical-scroll-proportion="0.21098267">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/view/userRegister.xhtml">
  -      <provider editor-type-id="HtmlPreview">
  -        <state />
  -      </provider>
  +    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeSearch.java">
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="119" column="0" selection-start="5492" selection-end="6197" vertical-scroll-proportion="0.6502242">
  +        <state line="45" column="5" selection-start="1186" selection-end="1186" vertical-scroll-proportion="0.42268786">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/view/includes/userControl.xhtml">
  -      <provider editor-type-id="HtmlPreview">
  -        <state />
  -      </provider>
  +    <entry file="file://$PROJECT_DIR$/src/etc/WEB-INF/urlrewrite.xml">
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="12" column="0" selection-start="455" selection-end="455" vertical-scroll-proportion="0.11659193">
  +        <state line="26" column="0" selection-start="726" selection-end="726" vertical-scroll-proportion="0.24421965">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/view/includes/commentForm.xhtml">
  -      <provider editor-type-id="HtmlPreview">
  -        <state />
  -      </provider>
  +    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/File.java">
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="35" column="34" selection-start="1776" selection-end="1776" vertical-scroll-proportion="0.3393124">
  +        <state line="112" column="0" selection-start="2796" selection-end="2796" vertical-scroll-proportion="0.9436416">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java">
  +    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java">
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="49" column="16" selection-start="1982" selection-end="1982" vertical-scroll-proportion="0.46026012">
  +        <state line="174" column="0" selection-start="7208" selection-end="7208" vertical-scroll-proportion="0.9436416">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java">
  +    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/preferences/PreferenceSupport.java">
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="81" column="12" selection-start="2945" selection-end="2945" vertical-scroll-proportion="0.15968208">
  +        <state line="71" column="0" selection-start="3674" selection-end="3674" vertical-scroll-proportion="0.5867052">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeHome.java">
  +    <entry file="file://$PROJECT_DIR$/view/dirDisplay.xhtml">
  +      <provider editor-type-id="HtmlPreview">
  +        <state />
  +      </provider>
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="202" column="30" selection-start="6540" selection-end="6540" vertical-scroll-proportion="0.9017341">
  +        <state line="143" column="21" selection-start="7788" selection-end="7788" vertical-scroll-proportion="0.42675635">
             <folding />
           </state>
         </provider>
       </entry>
  -    <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/model/Directory.java">
  +    <entry file="file://$PROJECT_DIR$/README.txt">
         <provider selected="true" editor-type-id="text-editor">
  -        <state line="8" column="37" selection-start="187" selection-end="187" vertical-scroll-proportion="0.07514451">
  +        <state line="14" column="94" selection-start="693" selection-end="693" vertical-scroll-proportion="0.1315029">
             <folding />
           </state>
         </provider>
  
  
  
  1.5       +15 -6     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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- README.txt	19 Apr 2007 18:36:11 -0000	1.4
  +++ README.txt	26 Apr 2007 05:29:16 -0000	1.5
  @@ -1,12 +1,21 @@
   This is not a regular "Seam example", its a standalone seam-gen project structure. The build.xml
   references the existing Seam libraries and thirdparty libs, however, to avoid duplication.
   
  -This is configured for standalone HSQL DB on localhost (I like being able to acces
  -the database with a SQL client). So start it with 'java -cp hsqldb.jar org.hsqldb.Server'
  -before deploying.
  +INSTALLATION
  +==========================================================================================
   
  -The start document is hardcoded in index.html to be one of the records from import.sql.
  +- Install JBoss AS 4.2 CR2
   
  -Please use JBoss AS 4.2 CR2.
  +- Upgrade the Hibernate JARs in server/default/lib/ with the bundled Hibernate JARs
   
  -YOU NEED THE LATEST HIBERNATE VERSIONS INSTALLED IN JBOSS AS! THE VERSION SHIPPING WITH AS 4.2 CR2 IS TOO OLD!
  +- 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 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'
  
  
  



More information about the jboss-cvs-commits mailing list