Commit 6eee25b6 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

Undid forced plugin=search in ant build

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@8093 b35dd754-fafc-0310-a699-88a17e54d16e
parent 76fa9104
...@@ -7,9 +7,7 @@ ...@@ -7,9 +7,7 @@
<antReference projectDefault="true" /> <antReference projectDefault="true" />
<customJdkName value="" /> <customJdkName value="" />
<maximumHeapSize value="128" /> <maximumHeapSize value="128" />
<properties> <properties />
<property name="plugin" value="search" />
</properties>
</buildFile> </buildFile>
</component> </component>
<component name="BuildJarProjectSettings"> <component name="BuildJarProjectSettings">
......
...@@ -17,13 +17,9 @@ ...@@ -17,13 +17,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" name="Default" comment=""> <list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../src/java/org/jivesoftware/openfire/nio/ConnectionHandler.java" afterPath="$PROJECT_DIR$/../../src/java/org/jivesoftware/openfire/nio/ConnectionHandler.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Plugins.iml" afterPath="$PROJECT_DIR$/Plugins.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Admin.iml" afterPath="$PROJECT_DIR$/Admin.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Openfire.iws" afterPath="$PROJECT_DIR$/Openfire.iws" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Openfire.iws" afterPath="$PROJECT_DIR$/Openfire.iws" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Openfire.ipr" afterPath="$PROJECT_DIR$/Openfire.ipr" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/protocols/xmpp/XMPPListener.java" afterPath="$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/protocols/xmpp/XMPPListener.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Openfire.iml" afterPath="$PROJECT_DIR$/Openfire.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/protocols/xmpp/XMPPSession.java" afterPath="$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/protocols/xmpp/XMPPSession.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Spank.iml" afterPath="$PROJECT_DIR$/Spank.iml" />
</list> </list>
</component> </component>
<component name="ChangeListSynchronizer" /> <component name="ChangeListSynchronizer" />
...@@ -198,7 +194,37 @@ ...@@ -198,7 +194,37 @@
</subPane> </subPane>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf /> <leaf>
<file leaf-file-name="XMPPSession.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/protocols/xmpp/XMPPSession.java">
<provider selected="true" editor-type-id="text-editor">
<state line="84" column="59" selection-start="2814" selection-end="2814" vertical-scroll-proportion="0.19873817">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="XMPPListener.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/protocols/xmpp/XMPPListener.java">
<provider selected="true" editor-type-id="text-editor">
<state line="69" column="71" selection-start="2075" selection-end="2075" vertical-scroll-proportion="0.2933754">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BaseTransport.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/BaseTransport.java">
<provider selected="true" editor-type-id="text-editor">
<state line="866" column="124" selection-start="35734" selection-end="35734" vertical-scroll-proportion="3.0080776">
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component> </component>
<component name="FindManager"> <component name="FindManager">
<FindUsagesManager> <FindUsagesManager>
...@@ -231,6 +257,12 @@ ...@@ -231,6 +257,12 @@
<component name="NamedScopeManager" /> <component name="NamedScopeManager" />
<component name="PackagesPane"> <component name="PackagesPane">
<subPane> <subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Openfire.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="Openfire.ipr" /> <option name="myItemId" value="Openfire.ipr" />
...@@ -305,6 +337,202 @@ ...@@ -305,6 +337,202 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Openfire.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Openfire.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Openfire.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Openfire.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Openfire.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Openfire.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/protocols" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Openfire.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/protocols" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/protocols/xmpp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Openfire.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/../../src/plugins/gateway/src/i18n" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Resource Bundle 'gateway_i18n'" />
<option name="myItemType" value="com.intellij.lang.properties.projectView.ResourceBundleNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</component> </component>
<component name="ProjectReloadState"> <component name="ProjectReloadState">
...@@ -318,7 +546,7 @@ ...@@ -318,7 +546,7 @@
<showLibraryContents /> <showLibraryContents />
<hideEmptyPackages /> <hideEmptyPackages />
<abbreviatePackageNames /> <abbreviatePackageNames />
<showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" /> <showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" />
<autoscrollToSource /> <autoscrollToSource />
<autoscrollFromSource /> <autoscrollFromSource />
<sortByType /> <sortByType />
...@@ -357,25 +585,6 @@ ...@@ -357,25 +585,6 @@
</component> </component>
<component name="RestoreUpdateTree" /> <component name="RestoreUpdateTree" />
<component name="RunManager" selected="Application.Openfire"> <component name="RunManager" selected="Application.Openfire">
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
<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="Application" factoryName="Application" enabled="false" merge="false"> <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" /> <option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" /> <option name="VM_PARAMETERS" />
...@@ -389,6 +598,18 @@ ...@@ -389,6 +598,18 @@
<option name="Make" value="true" /> <option name="Make" value="true" />
</method> </method>
</configuration> </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" /> <module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
...@@ -408,6 +629,13 @@ ...@@ -408,6 +629,13 @@
<option name="Make" value="true" /> <option name="Make" value="true" />
</method> </method>
</configuration> </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="false" name="Openfire" type="Application" factoryName="Application" enabled="false" merge="false"> <configuration default="false" name="Openfire" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" value="org.jivesoftware.openfire.starter.ServerStarter" /> <option name="MAIN_CLASS_NAME" value="org.jivesoftware.openfire.starter.ServerStarter" />
<option name="VM_PARAMETERS" value="-DopenfireHome=C:\java\openfire -server" /> <option name="VM_PARAMETERS" value="-DopenfireHome=C:\java\openfire -server" />
...@@ -545,6 +773,7 @@ ...@@ -545,6 +773,7 @@
<option name="MERGE_DRY_RUN" value="false" /> <option name="MERGE_DRY_RUN" value="false" />
<configuration useDefault="false">C:\Documents and Settings\gato\Application Data\Subversion</configuration> <configuration useDefault="false">C:\Documents and Settings\gato\Application Data\Subversion</configuration>
<checkoutURL>https://svn.jivesoftware.com/svn/repos</checkoutURL> <checkoutURL>https://svn.jivesoftware.com/svn/repos</checkoutURL>
<upgradeMode>auto</upgradeMode>
</component> </component>
<component name="TodoView" selected-index="0"> <component name="TodoView" selected-index="0">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -561,36 +790,36 @@ ...@@ -561,36 +790,36 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="367" y="168" width="1367" height="843" extended-state="0" /> <frame x="5" y="24" width="1580" height="1125" extended-state="0" />
<editor active="true" /> <editor active="false" />
<layout> <layout>
<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="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32946634" order="8" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="11" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298292" order="3" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298292" order="3" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32996634" order="7" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32996634" order="7" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19137819" order="0" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13063407" order="1" />
<window_info id="Clover" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298292" order="5" />
<window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298292" order="4" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3972028" order="4" />
<window_info id="JProfiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32996634" order="9" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.565097" order="10" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="11" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19174942" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.59414226" order="1" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.59414226" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21496005" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21496005" order="1" />
<window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32782102" order="12" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32867134" order="12" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="13" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="13" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13063358" order="1" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32996634" order="14" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32996634" order="14" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32946634" order="2" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32946634" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20332226" order="2" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20332226" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3972028" order="4" />
<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="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32995495" order="15" /> <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32995495" order="15" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32976654" order="10" />
<window_info id="SVN Repositories" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32946634" order="8" /> <window_info id="SVN Repositories" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32946634" order="8" />
<window_info id="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32946634" order="8" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
<window_info id="Clover" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298292" order="5" />
<window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298292" order="4" />
<window_info id="JProfiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32996634" order="9" />
<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="2" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" /> <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
...@@ -610,7 +839,7 @@ ...@@ -610,7 +839,7 @@
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
<option name="PUT_FOCUS_INTO_COMMENT" value="false" /> <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="LAST_COMMIT_MESSAGE" value="Updated for 3.2.0 Beta." /> <option name="LAST_COMMIT_MESSAGE" value="Applied German language patches from WarEagle.&#10;Added in missing strings from non-english sets." />
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
...@@ -623,7 +852,6 @@ ...@@ -623,7 +852,6 @@
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="Unregister component's domain if registration of new component fails. JM-902" />
<MESSAGE value="Ignore subscribed presences of unknown users. JM-903" /> <MESSAGE value="Ignore subscribed presences of unknown users. JM-903" />
<MESSAGE value="Added a very small delay before closing the connection once an account was removed." /> <MESSAGE value="Added a very small delay before closing the connection once an account was removed." />
<MESSAGE value="Updated documentation with new certificate management from admin console (a screenshot would be nice to add)" /> <MESSAGE value="Updated documentation with new certificate management from admin console (a screenshot would be nice to add)" />
...@@ -633,6 +861,7 @@ ...@@ -633,6 +861,7 @@
<MESSAGE value="1) Keep body's onload property.&#10;2) Keep original header elements." /> <MESSAGE value="1) Keep body's onload property.&#10;2) Keep original header elements." />
<MESSAGE value="Fixed error while clicking login after setup has finished. JM-928" /> <MESSAGE value="Fixed error while clicking login after setup has finished. JM-928" />
<MESSAGE value="Updated for 3.2.0 Beta." /> <MESSAGE value="Updated for 3.2.0 Beta." />
<MESSAGE value="Applied German language patches from WarEagle.&#10;Added in missing strings from non-english sets." />
</component> </component>
<component name="VssConfiguration"> <component name="VssConfiguration">
<option name="CLIENT_PATH" value="" /> <option name="CLIENT_PATH" value="" />
...@@ -675,9 +904,50 @@ ...@@ -675,9 +904,50 @@
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
<buildFile url="file://$PROJECT_DIR$/../build.xml"> <buildFile url="file://$PROJECT_DIR$/../build.xml">
<antCommandLine value="" /> <antCommandLine value="-Dplugin=&quot;gateway&quot;" />
<runInBackground value="false" /> <runInBackground value="false" />
<targetFilters /> <targetFilters>
<filter targetName="-i18n" isVisible="false" />
<filter targetName="-javadoc-impl" isVisible="false" />
<filter targetName="-jspc-impl" isVisible="false" />
<filter targetName="-plugin-impl-dev-build" isVisible="false" />
<filter targetName="-plugins-impl" isVisible="false" />
<filter targetName="-plugins-impl-dev" isVisible="false" />
<filter targetName="adminPlugin" isVisible="false" />
<filter targetName="anttasks" isVisible="false" />
<filter targetName="clean" isVisible="true" />
<filter targetName="clean-jspc" isVisible="false" />
<filter targetName="clean-plugins" isVisible="false" />
<filter targetName="clean-test" isVisible="false" />
<filter targetName="clean.dist.folders" isVisible="false" />
<filter targetName="compile" isVisible="true" />
<filter targetName="dailybuild" isVisible="true" />
<filter targetName="dist.bin" isVisible="true" />
<filter targetName="dist.init" isVisible="false" />
<filter targetName="dist.src" isVisible="true" />
<filter targetName="enterprise" isVisible="false" />
<filter targetName="init" isVisible="false" />
<filter targetName="installer" isVisible="true" />
<filter targetName="installer-debian" isVisible="true" />
<filter targetName="installer.mac" isVisible="true" />
<filter targetName="installer.rpm" isVisible="true" />
<filter targetName="javadoc" isVisible="true" />
<filter targetName="jspc" isVisible="true" />
<filter targetName="mac.delete" isVisible="false" />
<filter targetName="mac.pkg" isVisible="false" />
<filter targetName="mac.prefpane" isVisible="false" />
<filter targetName="mac.prepare" isVisible="false" />
<filter targetName="openfire" isVisible="true" />
<filter targetName="openfireHome" isVisible="false" />
<filter targetName="plugin" isVisible="true" />
<filter targetName="plugins" isVisible="true" />
<filter targetName="plugins-dev" isVisible="false" />
<filter targetName="run" isVisible="true" />
<filter targetName="run.test" isVisible="false" />
<filter targetName="run.test.init" isVisible="false" />
<filter targetName="spank" isVisible="false" />
<filter targetName="test" isVisible="true" />
</targetFilters>
<treeView value="true" /> <treeView value="true" />
<verbose value="true" /> <verbose value="true" />
<viewClosedWhenNoErrors value="false" /> <viewClosedWhenNoErrors value="false" />
...@@ -686,9 +956,9 @@ ...@@ -686,9 +956,9 @@
<component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1"> <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" /> <option name="myLastEditedConfigurable" />
</component> </component>
<component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.37" version="1"> <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.37,0.5" version="1">
<option name="myPlainMode" value="false" /> <option name="myPlainMode" value="false" />
<option name="myLastEditedConfigurable" value="ThrottleTest" /> <option name="myLastEditedConfigurable" value="Plugins" />
</component> </component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" /> <option name="myLastEditedConfigurable" />
...@@ -701,6 +971,89 @@ ...@@ -701,6 +971,89 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/i18n/gateway_i18n_de.properties">
<provider editor-type-id="ResourceBundle">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state line="151" column="66" selection-start="8404" selection-end="8404" vertical-scroll-proportion="0.5496183">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/i18n/gateway_i18n_es.properties">
<provider editor-type-id="ResourceBundle">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state line="122" column="0" selection-start="6542" selection-end="6542" vertical-scroll-proportion="0.1646674">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/i18n/gateway_i18n_fr.properties">
<provider editor-type-id="ResourceBundle">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state line="121" column="0" selection-start="6742" selection-end="6742" vertical-scroll-proportion="0.15158124">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/i18n/gateway_i18n_it.properties">
<provider editor-type-id="ResourceBundle">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state line="121" column="0" selection-start="6217" selection-end="6217" vertical-scroll-proportion="0.15158124">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/i18n/gateway_i18n_pt_BR.properties">
<provider editor-type-id="ResourceBundle">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state line="121" column="0" selection-start="6067" selection-end="6622" vertical-scroll-proportion="0.15158124">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/i18n/gateway_i18n.properties">
<provider editor-type-id="ResourceBundle">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state line="323" column="0" selection-start="14613" selection-end="15169" vertical-scroll-proportion="0.08615049">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/BaseTransport.java">
<provider selected="true" editor-type-id="text-editor">
<state line="866" column="124" selection-start="35734" selection-end="35734" vertical-scroll-proportion="3.0080776">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/protocols/xmpp/XMPPListener.java">
<provider selected="true" editor-type-id="text-editor">
<state line="69" column="71" selection-start="2075" selection-end="2075" vertical-scroll-proportion="0.2933754">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/plugins/gateway/src/java/org/jivesoftware/openfire/gateway/protocols/xmpp/XMPPSession.java">
<provider selected="true" editor-type-id="text-editor">
<state line="84" column="59" selection-start="2814" selection-end="2814" vertical-scroll-proportion="0.19873817">
<folding />
</state>
</provider>
</entry>
</component> </component>
<component name="simpleUML.DiagramSettingsWorkspace" /> <component name="simpleUML.DiagramSettingsWorkspace" />
<component name="simpleUML.UMLToolWindowPlugin"> <component name="simpleUML.UMLToolWindowPlugin">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment