[seam-commits] Seam SVN: r7146 - in trunk/examples/wiki: src/main/org/jboss/seam/wiki/plugin/faqBrowser and 1 other directory.

Author: christian.bauer(a)jboss.com Date: 2008-01-18 03:39:21 -0500 (Fri, 18 Jan 2008) New Revision: 7146 Modified: trunk/examples/wiki/Wiki.ipr trunk/examples/wiki/Wiki.iws trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java Log: Updated IntelliJ project to subversion Modified: trunk/examples/wiki/Wiki.ipr =================================================================== --- trunk/examples/wiki/Wiki.ipr 2008-01-17 22:18:17 UTC (rev 7145) +++ trunk/examples/wiki/Wiki.ipr 2008-01-18 08:39:21 UTC (rev 7146) @@ -8,13 +8,13 @@ <customJdkName value="" /> <maximumHeapSize value="128" /> <properties> - <property name="profile" value="dev" /> + <property name="profile" value="prod" /> </properties> <executeOn event="afterCompilation" target="deploy" /> + <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="DocumentHistoryTests.updateDocumentCheckRevisions" /> + <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="AllTests" /> <executeOn event="beforeRun" target="configuretests" runConfigurationName="LoginTest" /> - <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="DocumentHistoryTests.updateDocumentCheckRevisions" /> <executeOn event="beforeRun" target="configuretests" runConfigurationName="Unnamed" /> - <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="AllTests" /> <executeOn event="beforeRun" target="configuretests" runConfigurationName="AllTests" /> <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="Adhoc" /> <executeOn event="beforeRun" target="configuretests" runConfigurationName="" /> @@ -1385,8 +1385,9 @@ <option name="ADDITIONAL_OPTIONS_STRING" value="" /> </component> <component name="StarteamVcsAdapter" /> + <component name="SvnBranchConfigurationManager" /> <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="CVS" /> + <mapping directory="" vcs="svn" /> </component> <component name="VssVcs" /> <component name="WebServicesPlugin" addRequiredLibraries="true" /> Modified: trunk/examples/wiki/Wiki.iws =================================================================== --- trunk/examples/wiki/Wiki.iws 2008-01-17 22:18:17 UTC (rev 7145) +++ trunk/examples/wiki/Wiki.iws 2008-01-18 08:39:21 UTC (rev 7146) @@ -5,7 +5,7 @@ <option name="ANALYSIS_IN_BACKGROUND" value="true" /> </component> <component name="BookmarkManager"> - <editor_bookmark url="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/prefs/CommentsPreferences.java" line="23" number="1" description="USER" /> + <editor_bookmark url="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/feeds/FeedDAO.java" line="95" /> </component> <component name="CCaseConfig"> <option name="implementation" value="net.sourceforge.transparent.CommandLineClearCase" /> @@ -33,26 +33,12 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/flash/Flash.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/flash/FlashPreferences.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/flash/FlashPreferences.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.ipr" afterPath="$PROJECT_DIR$/Wiki.ipr" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceValue.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceValue.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/includes/pluginPreferencesForm.xhtml" afterPath="$PROJECT_DIR$/view/includes/pluginPreferencesForm.xhtml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.iml" afterPath="$PROJECT_DIR$/Wiki.iml" /> - <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/main/org/jboss/seam/wiki/core/action/NodeHome.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeHome.java" /> - <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/etc/WEB-INF/pages.xml" afterPath="$PROJECT_DIR$/src/etc/WEB-INF/pages.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/plugins/flash/plugin.xhtml" afterPath="$PROJECT_DIR$/view/plugins/flash/plugin.xhtml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/docDisplay_d.xhtml" afterPath="$PROJECT_DIR$/view/docDisplay_d.xhtml" /> - <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$/Wiki.iws" afterPath="$PROJECT_DIR$/Wiki.iws" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java" /> </list> <list name="Failed commit: Default" comment="Oops" /> - <list name="Failed commit: Default (2)" comment="Oops"> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java" /> - </list> + <list name="Foo" comment="" /> </component> <component name="ChangeListSynchronizer" /> <component name="ChangesViewManager" flattened_view="true" show_ignored="false" /> @@ -62,14 +48,21 @@ <splitter proportion="0.5" /> </component> <component name="CompilerWorkspaceConfiguration"> - <option name="COMPILE_IN_BACKGROUND" value="false" /> + <option name="COMPILE_IN_BACKGROUND" value="true" /> <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" /> <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" /> <option name="COMPILE_DEPENDENT_FILES" value="false" /> <option name="CLEAR_OUTPUT_DIRECTORY" value="false" /> <option name="ASSERT_NOT_NULL" value="true" /> </component> - <component name="CoverageDataManager" /> + <component name="CoverageDataManager"> + <SUITE FILE_PATH="$PROJECT_DIR$/../../../../../../../Library/Caches/IntelliJIDEA70/coverage/Wiki$AllTests$.es" NAME=" Coverage Results" MODIFIED="1199948424469"> + <FILTER>org.jboss.seam.wiki.core.*</FILTER> + <FILTER>org.jboss.seam.wiki.plugin.*</FILTER> + <FILTER>org.jboss.seam.wiki.preferences.*</FILTER> + <FILTER>org.jboss.seam.wiki.util.*</FILTER> + </SUITE> + </component> <component name="CreatePatchCommitExecutor"> <option name="PATCH_PATH" value="" /> </component> @@ -149,7 +142,7 @@ </option> </SplitterProportionsDataImpl> </option> - <option name="lastEditedConfigurable" value="Default" /> + <option name="lastEditedConfigurable" value="Project Default" /> </component> <component name="ErrorTreeViewConfiguration"> <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> @@ -186,10 +179,10 @@ <option name="SPLITTER_PROPORTION" value="0.5" /> <option name="GROUP_BY_SEVERITY" value="false" /> <option name="FILTER_RESOLVED_ITEMS" value="true" /> - <option name="ANALYZE_TEST_SOURCES" value="true" /> + <option name="ANALYZE_TEST_SOURCES" value="false" /> <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" /> - <option name="SCOPE_TYPE" value="1" /> - <option name="CUSTOM_SCOPE_NAME" value="" /> + <option name="SCOPE_TYPE" value="3" /> + <option name="CUSTOM_SCOPE_NAME" value="Project Files" /> <option name="SHOW_ONLY_DIFF" value="false" /> <option name="SHOW_STRUCTURE" value="true" /> <option name="ANALYSIS_IN_BACKGROUND" value="false" /> @@ -241,200 +234,153 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="core" /> + <option name="myItemId" value="test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> - </subPane> - </component> - <component name="PerforceChangeBrowserSettings"> - <option name="USE_CLIENT_FILTER" value="true" /> - <option name="CLIENT" value="" /> - </component> - <component name="PerforceDirect.Settings"> - <option name="useP4CONFIG" value="true" /> - <option name="port" value="&lt;perforce_server&gt;:1666" /> - <option name="client" value="" /> - <option name="user" value="" /> - <option name="passwd" value="" /> - <option name="showCmds" value="false" /> - <option name="useNativeApi" value="false" /> - <option name="pathToExec" value="p4" /> - <option name="useCustomPathToExec" value="false" /> - <option name="SYNC_FORCE" value="false" /> - <option name="SYNC_RUN_RESOLVE" value="true" /> - <option name="REVERT_UNCHANGED_FILES" value="true" /> - <option name="CHARSET" value="none" /> - <option name="SHOW_BRANCHES_HISTORY" value="true" /> - <option name="ENABLED" value="true" /> - <option name="USE_LOGIN" value="false" /> - <option name="LOGIN_SILENTLY" value="false" /> - <option name="INTEGRATE_RUN_RESOLVE" value="true" /> - <option name="INTEGRATE_REVERT_UNCHANGED" value="true" /> - <option name="SERVER_TIMEOUT" value="20000" /> - </component> - <component name="ProjectLevelVcsManager"> - <OptionsSetting value="true" id="Add" /> - <OptionsSetting value="true" id="Remove" /> - <OptionsSetting value="true" id="Checkin" /> - <OptionsSetting value="true" id="Checkout" /> - <OptionsSetting value="true" id="Update" /> - <OptionsSetting value="true" id="Status" /> - <OptionsSetting value="true" id="Edit" /> - <OptionsSetting value="true" id="Undo Check Out" /> - <OptionsSetting value="true" id="Compare with SourceSafe Version" /> - <OptionsSetting value="true" id="Get Latest Version" /> - <ConfirmationsSetting value="0" id="Add" /> - <ConfirmationsSetting value="0" id="Remove" /> - </component> - <component name="ProjectPane"> - <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemId" value="org.jboss.seam.wiki" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemId" value="test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="editing" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="org.jboss.seam.wiki" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="preferences" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="org.jboss.seam.wiki" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="plugin" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/themes" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="org.jboss.seam.wiki" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="plugin" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/themes" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="forum" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/themes/inrelationto" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="org.jboss.seam.wiki" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <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/inrelationto" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/themes/inrelationto/css" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="org.jboss.seam.wiki" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/themes" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="model" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </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> + </subPane> + </component> + <component name="PerforceChangeBrowserSettings"> + <option name="USE_CLIENT_FILTER" value="true" /> + <option name="CLIENT" value="" /> + </component> + <component name="PerforceDirect.Settings" /> + <component name="ProjectLevelVcsManager"> + <OptionsSetting value="true" id="Add" /> + <OptionsSetting value="true" id="Remove" /> + <OptionsSetting value="true" id="Checkin" /> + <OptionsSetting value="true" id="Checkout" /> + <OptionsSetting value="true" id="Update" /> + <OptionsSetting value="true" id="Status" /> + <OptionsSetting value="true" id="Edit" /> + <OptionsSetting value="true" id="Undo Check Out" /> + <OptionsSetting value="true" id="Compare with SourceSafe Version" /> + <OptionsSetting value="true" id="Get Latest Version" /> + <ConfirmationsSetting value="0" id="Add" /> + <ConfirmationsSetting value="0" id="Remove" /> + </component> + <component name="ProjectPane"> + <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="Wiki" /> @@ -444,26 +390,6 @@ <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/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_ELEMENT> - <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> <PATH> <PATH_ELEMENT> @@ -478,14 +404,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/view/plugins" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -501,57 +419,13 @@ <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/flash" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Wiki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> - <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> <PATH> <PATH_ELEMENT> @@ -574,10 +448,6 @@ <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> <PATH> <PATH_ELEMENT> @@ -596,53 +466,7 @@ <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" /> - <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/flash" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -669,7 +493,7 @@ <showLibraryContents /> <hideEmptyPackages ProjectPane="true" /> <abbreviatePackageNames /> - <showStructure ProjectPane="false" Scope="false" PackagesPane="false" Favorites="false" /> + <showStructure PackagesPane="false" Scope="false" Favorites="false" ProjectPane="false" /> <autoscrollToSource /> <autoscrollFromSource ProjectPane="false" /> <sortByType /> @@ -683,16 +507,16 @@ <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeOrder4" value="4" /> <property name="TEMP_MODULE_EXPLODED_DIR_FOR_Wiki/web/Web" value="/private/tmp/webExplodedDir27892tmp" /> <property name="cvs_file_history_flatOrder1" value="1" /> - <property name="cvs_file_history_flatWidth1" value="351" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatOrder5" value="5" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth6" value="706" /> + <property name="cvs_file_history_flatWidth1" value="351" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth6" value="531" /> <property name="cvs_file_history_flatOrder2" value="2" /> <property name="MemberChooser.showClasses" value="true" /> <property name="cvs_file_history_flatWidth4" value="350" /> <property name="TEMP_MODULE_EXPLODED_DIR_FOR_Wiki/web/Wiki" value="/private/tmp/webExplodedDir5371tmp" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatOrder2" value="2" /> <property name="cvs_file_history_treeOrder5" value="5" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth5" value="290" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth5" value="318" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatOrder1" value="1" /> <property name="MemberChooser.sorted" value="false" /> <property name="RunManagerConfig.compileBeforeRunning" value="true" /> @@ -700,51 +524,51 @@ <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="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth2" value="292" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth2" value="318" /> <property name="cvs_file_history_treeWidth3" value="351" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeOrder6" value="6" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatOrder6" value="6" /> <property name="JBoss Web Module Deployment Descriptor Default Version" value="4.0" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth4" value="288" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth4" value="316" /> <property name="cvs_file_history_flatOrder6" value="6" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth1" value="305" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth1" value="325" /> <property name="cvs_file_history_flatWidth3" value="351" /> <property name="GoToClass.includeJavaFiles" value="false" /> <property name="MemberChooser.copyJavadoc" value="false" /> <property name="TEMP_MODULE_EXPLODED_DIR_FOR_Wiki" value="/private/tmp/webExplodedDir22512tmp" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth3" value="290" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth3" value="318" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatOrder4" value="4" /> <property name="cvs_file_history_treeOrder1" value="1" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth2" value="291" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth3" value="288" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth2" value="318" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth3" value="317" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeOrder1" value="1" /> <property name="Web Module Deployment Descriptor Default Version" value="2.4" /> <property name="GoToFile.includeJavaFiles" value="false" /> <property name="cvs_file_history_treeWidth1" value="351" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth0" value="288" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth0" value="316" /> <property name="cvs_file_history_treeOrder6" value="6" /> <property name="GoToClass.includeLibraries" value="false" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth1" value="305" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth1" value="325" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeOrder2" value="2" /> <property name="cvs_file_history_treeWidth2" value="351" /> <property name="cvs_file_history_flatOrder3" value="3" /> <property name="GoToClass.toSaveIncludeLibraries" value="false" /> <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeOrder3" value="3" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth0" value="282" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth0" value="313" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeOrder0" value="0" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth6" value="705" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeWidth6" value="531" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatOrder0" value="0" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth5" value="319" /> <property name="cvs_file_history_flatWidth6" value="350" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth5" value="291" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatOrder3" value="3" /> <property name="cvs_file_history_flatOrder5" value="5" /> - <property name="cvs_file_history_flatWidth5" value="351" /> <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_treeOrder5" value="5" /> + <property name="cvs_file_history_flatWidth5" value="351" /> <property name="cvs_file_history_treeOrder2" value="2" /> <property name="cvs_file_history_treeWidth5" value="351" /> <property name="cvs_file_history_flatWidth0" value="351" /> - <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth4" value="289" /> + <property name="FileHistory.com.intellij.cvsSupport2.history.CvsHistoryProvider_flatWidth4" value="317" /> <property name="cvs_file_history_treeOrder0" value="0" /> </component> <component name="ReadonlyStatusHandler"> @@ -752,29 +576,22 @@ </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> - <recent name="org.jboss.seam.wiki.plugin.blogdirectory" /> - <recent name="org.jboss.seam.wiki.core.dao" /> - <recent name="org.jboss.seam.wiki.plugin.flash" /> - <recent name="org.jboss.seam.wiki.plugin.comments" /> - <recent name="org.jboss.seam.wiki.core.ui" /> + <recent name="org.jboss.seam.wiki.plugin.faqBrowser" /> + <recent name="org.jboss.seam.wiki.core.action" /> + <recent name="org.jboss.seam.wiki.test.preferences" /> + <recent name="org.jboss.seam.wiki.core.preferences2.template" /> + <recent name="org.jboss.seam.wiki.core.preferences2.editor" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> - <recent name="org.jboss.seam.wiki.core.dao" /> - <recent name="org.jboss.seam.wiki.core" /> - <recent name="org.jboss.seam.wiki.importers.metamodel" /> - <recent name="org.jboss.seam.wiki.importers.annotations" /> - <recent name="org.jboss.seam.wiki.importers.registry" /> + <recent name="org.jboss.seam.wiki.preferences" /> + <recent name="org.jboss.seam.wiki.core.preferences" /> + <recent name="org.jboss.seam.wiki.preferences2.metamodel" /> + <recent name="org.jboss.seam.wiki.preferences2" /> + <recent name="org.jboss.seam.wiki.preferences2.annotations" /> </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Application.Test"> - <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> + <component name="RunManager" selected="TestNG.AllTests"> <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> @@ -787,6 +604,37 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> + <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote"> + <option name="WORKING_DIRECTORY" /> + <option name="HOST" value="localhost" /> + <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" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="8080" /> + <option name="LOCAL" value="true" /> + <option name="OPEN_IN_BROWSER" value="true" /> + <option name="OPEN_IN_BROWSER_URL" value="/" /> + <option name="COMMON_VM_ARGUMENTS" value="" /> + <option name="DEPLOY_TOMCAT_MANAGER" value="false" /> + <option name="BASE_DIRECTORY_NAME" value="" /> + <predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" /> + </configuration> <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -806,56 +654,16 @@ <value defaultName="wholeProject" /> </option> <option name="PROPERTIES_FILE" /> - <properties /> + <properties> + <property name="binaryDir" value="META-INF/testbinaries" /> + <property name="database" value="hsql" /> + <property name="datasourceJndiName" value="java:/wikiTestDatasource" /> + </properties> <method> - <option name="Make" value="false" /> - <option name="Run ant target" value="true" /> + <option name="Make" value="true" /> + <option name="Run ant target" value="false" /> </method> </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="" /> - <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="WebLogic Instance" factoryName="Remote"> - <option name="WORKING_DIRECTORY" /> - <option name="HOST" value="localhost" /> - <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="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.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="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -869,32 +677,6 @@ <option name="Make" value="true" /> </method> </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="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="#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> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -914,18 +696,6 @@ <option name="Make" value="true" /> </method> </configuration> - <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local"> - <option name="WORKING_DIRECTORY" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="8080" /> - <option name="LOCAL" value="true" /> - <option name="OPEN_IN_BROWSER" value="true" /> - <option name="OPEN_IN_BROWSER_URL" value="/" /> - <option name="COMMON_VM_ARGUMENTS" value="" /> - <option name="DEPLOY_TOMCAT_MANAGER" value="false" /> - <option name="BASE_DIRECTORY_NAME" value="" /> - <predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" /> - </configuration> <configuration default="false" name="Test" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" value="org.jboss.seam.wiki.core.importers.blosxom.KwikiParser" /> <option name="VM_PARAMETERS" value="" /> @@ -980,6 +750,10 @@ </method> </configuration> <configuration default="false" name="AllTests" type="TestNG" factoryName="TestNG" enabled="false" merge="false"> + <pattern value="org.jboss.seam.wiki.core.*" /> + <pattern value="org.jboss.seam.wiki.plugin.*" /> + <pattern value="org.jboss.seam.wiki.preferences.*" /> + <pattern value="org.jboss.seam.wiki.util.*" /> <module name="Wiki" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> @@ -991,14 +765,18 @@ <option name="TEST_OBJECT" value="SUITE" /> <option name="VM_PARAMETERS" value="" /> <option name="PARAMETERS" value="" /> - <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/build" /> - <option name="OUTPUT_DIRECTORY" value="" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> + <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/build/test-output" /> <option name="ADDITIONAL_CLASS_PATH" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="singleModule" /> </option> <option name="PROPERTIES_FILE" value="" /> - <properties /> + <properties> + <property name="binaryDir" value="META-INF/testbinaries" /> + <property name="database" value="hsql" /> + <property name="datasourceJndiName" value="java:/wikiTestDatasource" /> + </properties> <RunnerSettings RunnerId="Debug"> <option name="DEBUG_PORT" value="55160" /> <option name="TRANSPORT" value="0" /> @@ -1012,6 +790,101 @@ <option name="Run ant target" value="true" /> </method> </configuration> + <configuration default="false" name="Adhoc" type="TestNG" factoryName="TestNG" enabled="false" merge="false"> + <module name="Wiki" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" value="" /> + <option name="SUITE_NAME" value="" /> + <option name="PACKAGE_NAME" value="org.jboss.seam.wiki.test.plugin" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.seam.wiki.test.plugin.FaqBrowserDAOTests" /> + <option name="METHOD_NAME" value="linkToDocumentFragments" /> + <option name="GROUP_NAME" value="" /> + <option name="TEST_OBJECT" value="CLASS" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PARAMETERS" value="" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> + <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/build/test-output" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="singleModule" /> + </option> + <option name="PROPERTIES_FILE" value="" /> + <properties> + <property name="binaryDir" value="META-INF/testbinaries" /> + <property name="database" value="hsql" /> + <property name="datasourceJndiName" value="java:/wikiTestDatasource" /> + </properties> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="55956" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> + <ConfigurationWrapper RunnerId="Run" /> + <method> + <option name="Make" value="false" /> + <option name="Run ant target" value="true" /> + </method> + </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> + <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="" /> + <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="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="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="Remote"> + <option name="WORKING_DIRECTORY" /> + <option name="HOST" value="localhost" /> + <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="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> </component> <component name="SQLPlugin.ProjectConfiguration"> <queries /> @@ -1098,36 +971,36 @@ <frame x="0" y="22" width="2560" height="1536" extended-state="0" /> <editor active="false" /> <layout> - <window_info id="SQL" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38931298" order="16" x="11" y="253" width="1391" height="477" /> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6435374" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14257269" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.62317836" order="1" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24970132" order="1" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.24011104" order="12" x="24" y="688" width="925" height="442" /> + <window_info id="SQL" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46495488" order="16" x="11" y="253" width="1391" height="477" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6426093" order="7" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18949045" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.61762667" order="1" /> + <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16162421" order="8" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2873005" order="12" x="24" y="688" width="925" height="442" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="5" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32961783" order="7" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3954481" order="13" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39486468" order="13" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.11549184" order="1" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.12420382" order="2" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298466" order="14" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4663428" order="2" x="-1442" y="805" width="1440" height="900" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24930307" order="2" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.55818814" order="3" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39971244" order="0" /> - <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="15" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.31983805" order="11" /> - <window_info id="Duplicates" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="9" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24930307" order="1" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6363636" order="3" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39968154" order="0" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2109646" order="11" /> + <window_info id="Duplicates" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3296322" order="9" /> <window_info id="SVN Repositories" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32928476" order="8" /> + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" /> + <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3297414" order="3" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="4" /> <window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3297491" order="4" /> - <window_info id="SQL Schema" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2928522" order="0" /> + <window_info id="SQL Schema" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29215822" order="0" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="10" /> - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="6" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="8" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="6" /> + <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="15" /> </layout> </component> <component name="VCS.FileViewConfiguration"> @@ -1145,7 +1018,7 @@ <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" /> <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" value="Show document tags by default" /> + <option name="LAST_COMMIT_MESSAGE" value="Fixes for faq browser" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> @@ -1156,31 +1029,31 @@ <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="Defensive against invalid user input" /> - <MESSAGE value="Show more information in breadcrumb" /> - <MESSAGE value="Internationalized almost all strings" /> - <MESSAGE value="Added [&lt;=endTeaser] macro, JBSEAM-2102" /> - <MESSAGE value="Updated nested set docs" /> - <MESSAGE value="TODO note" /> - <MESSAGE value="Less minimum characters for names" /> - <MESSAGE value="Linkable comments" /> - <MESSAGE value="Defer createdOn timestamp until the document is actually persisted" /> - <MESSAGE value="Conversation switcher leaked document_id parameter into existing conversation, JBSEAM-2140" /> - <MESSAGE value="Initial import of forum plugin" /> - <MESSAGE value="Access control for feeds and feed entries, JBSEAM-2114" /> - <MESSAGE value="Workaround for resetting persistence context filter arguments after login" /> - <MESSAGE value="Various updates to core classes and views, required for forum plugin" /> - <MESSAGE value="Fix tests" /> - <MESSAGE value="Generalized pager, still not used everywhere" /> - <MESSAGE value="Disabled flash plugin, open to XSS attacks" /> - <MESSAGE value="Imr" /> - <MESSAGE value="Improved extensibility of core wiki render engine" /> + <MESSAGE value="Relax user realname constraints" /> + <MESSAGE value="Make feed domain model extensible, preparation for aggregator" /> + <MESSAGE value="Forum queries performance optimization" /> + <MESSAGE value="Disable tests that fail on HSQL DB" /> + <MESSAGE value="Dev profile now requires MySQL, disabled tests conditionally that don't run on HSQL" /> + <MESSAGE value="Minor improvements to forum browsing and doc pager" /> + <MESSAGE value="Avoid NPE" /> + <MESSAGE value="Configurable forum reply e-mail notification and Safari3 fixes" /> + <MESSAGE value="Use new SeamTest superclass" /> + <MESSAGE value="JBSEAM-2397 and JBSEAM-1883 - implemented trashcan feature and more reliable update of 2nd level cache and lucene index" /> + <MESSAGE value="If you write new code, actually call it at some point..." /> + <MESSAGE value="JBSEAM-2477 - Only/no comments displayed on feeds" /> + <MESSAGE value="Better getInstance() calls" /> + <MESSAGE value="Improved macro handling in documents and URL rendering" /> <MESSAGE value="Oops" /> - <MESSAGE value="Fixed 'create user homepage' bug, added macro detection" /> - <MESSAGE value="Upgraded to AS 4.2.2, reduced recommended session timeout" /> - <MESSAGE value="Fixed tabindex order" /> + <MESSAGE value="JBSEAM-2136 - Anchor/linking support for document headlines" /> + <MESSAGE value="Right-click action menu on dir display" /> + <MESSAGE value="JBSEAM-2457 - Render &quot;REST&quot; feed/file download URLs, breaks all current feed/file bookmarks" /> <MESSAGE value="Minor" /> - <MESSAGE value="Show document tags by default" /> + <MESSAGE value="Fix test" /> + <MESSAGE value="Layout fix for revision display" /> + <MESSAGE value="Make ORDER BY in queries more typesafe" /> + <MESSAGE value="Ooops" /> + <MESSAGE value="JBSEAM-2486 - Implemented FAQ browser plugin" /> + <MESSAGE value="Fixes for faq browser" /> </component> <component name="VssConfiguration"> <option name="CLIENT_PATH" value="" /> @@ -1222,13 +1095,14 @@ <option name="FILTER_TARGETS" value="false" /> <buildFile url="file://$PROJECT_DIR$/build.xml"> <antCommandLine value="" /> - <runInBackground value="false" /> + <runInBackground value="true" /> <targetFilters> <filter targetName="clean" isVisible="true" /> <filter targetName="cleanredeploy" isVisible="true" /> <filter targetName="compileclasses" isVisible="true" /> <filter targetName="compiletests" isVisible="true" /> <filter targetName="configuretests" isVisible="true" /> + <filter targetName="copydatasets" isVisible="false" /> <filter targetName="copyjbossembedded" isVisible="false" /> <filter targetName="copyseam" isVisible="false" /> <filter targetName="copyseamdependencies" isVisible="false" /> @@ -1241,6 +1115,7 @@ <filter targetName="hotdeploy" isVisible="true" /> <filter targetName="init" isVisible="true" /> <filter targetName="initcopy" isVisible="false" /> + <filter targetName="initdav" isVisible="false" /> <filter targetName="initpoms" isVisible="false" /> <filter targetName="redeploy" isVisible="true" /> <filter targetName="schemaexport" isVisible="true" /> @@ -1265,113 +1140,107 @@ <option name="myLastEditedConfigurable" value="Default" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/preferences/PreferenceProperty.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="19" selection-start="1922" selection-end="1944" vertical-scroll-proportion="0.5046729"> + <state line="134" column="18" selection-start="4229" selection-end="4229" vertical-scroll-proportion="0.23220704"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/view/includes/pluginPreferencesForm.xhtml"> - <provider editor-type-id="HtmlPreview"> - <state /> - </provider> + <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/WikiMacro.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="0" selection-start="2145" selection-end="2145" vertical-scroll-proportion="0.3817771"> + <state line="25" column="26" selection-start="745" selection-end="745" vertical-scroll-proportion="0.23364486"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/preferences/PreferenceProvider.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="0" selection-start="2157" selection-end="2157" vertical-scroll-proportion="0.58444715"> + <state line="146" column="55" selection-start="5849" selection-end="5849" vertical-scroll-proportion="0.34579438"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/UserRoleAccessFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="126" column="0" selection-start="5450" selection-end="5450" vertical-scroll-proportion="0.14216281"> + <state line="219" column="0" selection-start="9060" selection-end="9060" vertical-scroll-proportion="0.94392526"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/flash/Flash.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="81" selection-start="1132" selection-end="1132" vertical-scroll-proportion="0.3271028"> + <state line="89" column="17" selection-start="3507" selection-end="3507" vertical-scroll-proportion="0.34219986"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/forum/ForumListHome.java"> + <entry file="file://$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="40" column="5" selection-start="993" selection-end="993" vertical-scroll-proportion="0.37383178"> + <state line="6" column="139" selection-start="565" selection-end="565" vertical-scroll-proportion="0.057395145"> <folding /> </state> </provider> </entry> - <entry file="jar://$PROJECT_DIR$/../../lib/jboss-seam.jar!/org/jboss/seam/annotations/RaiseEvent.class"> + <entry file="file://$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/util/DBUnitSeamTest.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="218" selection-start="369" selection-end="369" vertical-scroll-proportion="0.046728972"> + <state line="96" column="26" selection-start="4109" selection-end="4109" vertical-scroll-proportion="0.05248023"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/PluginPreferenceEditor.java"> + <entry file="file://$PROJECT_DIR$/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="119" column="34" selection-start="4962" selection-end="4962" vertical-scroll-proportion="0.85046726"> + <state line="498" column="22" selection-start="19431" selection-end="19431" vertical-scroll-proportion="0.3944687"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/WikiRequestResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="239" column="0" selection-start="9568" selection-end="9568" vertical-scroll-proportion="0.682243"> + <state line="177" column="83" selection-start="7362" selection-end="7362" vertical-scroll-proportion="0.28900072"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/NodeHome.java"> + <entry file="file://$PROJECT_DIR$/src/etc/messages_faqBrowser_en.properties"> <provider selected="true" editor-type-id="text-editor"> - <state line="235" column="0" selection-start="7436" selection-end="7436" vertical-scroll-proportion="0.7943925"> + <state line="18" column="113" selection-start="827" selection-end="827" vertical-scroll-proportion="0.1682243"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/view/plugins/flash/plugin.xhtml"> - <provider editor-type-id="HtmlPreview"> - <state /> - </provider> + <entry file="file://$PROJECT_DIR$/view/plugins/faqBrowser/faqControls.xhtml"> <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="8" selection-start="1975" selection-end="1975" vertical-scroll-proportion="0.4307229"> + <state line="24" column="66" selection-start="975" selection-end="975" vertical-scroll-proportion="0.009461426"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/preferences/PreferenceValue.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="0" selection-start="373" selection-end="373" vertical-scroll-proportion="0.10280374"> + <state line="403" column="87" selection-start="18308" selection-end="18308" vertical-scroll-proportion="0.009345794"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceValue.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowserDAO.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="200" column="94" selection-start="5886" selection-end="5886" vertical-scroll-proportion="0.91588783"> + <state line="48" column="45" selection-start="1774" selection-end="1774" vertical-scroll-proportion="0.44859812"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceProvider.java"> + <entry file="file://$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/plugin/FaqBrowserDAOTests.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="128" column="27" selection-start="6138" selection-end="6138" vertical-scroll-proportion="0.33285406"> + <state line="23" column="10" selection-start="768" selection-end="768" vertical-scroll-proportion="0.21495327"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="126" column="0" selection-start="3998" selection-end="3998" vertical-scroll-proportion="0.39252338"> + <state line="10" column="0" selection-start="244" selection-end="244" vertical-scroll-proportion="0.13402061"> <folding /> </state> </provider> Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java 2008-01-17 22:18:17 UTC (rev 7145) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java 2008-01-18 08:39:21 UTC (rev 7146) @@ -8,7 +8,6 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.*; -import org.jboss.seam.annotations.web.RequestParameter; import org.jboss.seam.log.Log; import org.jboss.seam.wiki.core.dao.WikiNodeDAO; import org.jboss.seam.wiki.core.model.WikiDirectory; @@ -17,6 +16,7 @@ import org.jboss.seam.wiki.core.nestedset.query.NestedSetNodeWrapper; import java.util.List; +import java.io.Serializable; /** * @author Christian Bauer @@ -24,7 +24,7 @@ @Name("faqBrowser") @Scope(ScopeType.PAGE) @AutoCreate -public class FaqBrowser { +public class FaqBrowser implements Serializable { @Logger Log log;