shuber 2005/11/07 16:39:27 CET
Modified files: (Branch: JAHIA-4-1-BRANCH)
. jahia-JAHIA-4-1-BRANCH.iws
src/java/org/jahia/services/search
ScheduledSiteIndexationJob.java
Log:
JAHIA-430
Properly terminate connection when indexing site in background thread.
Revision Changes Path
1.1.2.5 +163 -32 jahia/jahia-JAHIA-4-1-BRANCH.iws
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/jahia-JAHIA-4-1-BRANCH.iws.diff?r1=1.1.2.4&r2=1.1.2.5&f=h
1.1.2.10 +83 -72
jahia/src/java/org/jahia/services/search/ScheduledSiteIndexationJob.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/search/ScheduledSiteIndexationJob.java.diff?r1=1.1.2.9&r2=1.1.2.10&f=h
Index: jahia-JAHIA-4-1-BRANCH.iws
===================================================================
RCS file: /home/cvs/repository/jahia/Attic/jahia-JAHIA-4-1-BRANCH.iws,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- jahia-JAHIA-4-1-BRANCH.iws 7 Nov 2005 11:08:14 -0000 1.1.2.4
+++ jahia-JAHIA-4-1-BRANCH.iws 7 Nov 2005 15:39:26 -0000 1.1.2.5
@@ -122,7 +122,7 @@
<file leaf-file-name="DAVFilemanager_Engine.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="701" column="80" selection-start="30741"
selection-end="30741" vertical-scroll-proportion="0.034623217">
+ <state line="701" column="80" selection-start="30741"
selection-end="30741" vertical-scroll-proportion="0.04009434">
<folding />
</state>
</provider>
@@ -131,7 +131,7 @@
<file leaf-file-name="AbstractAction.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/blogs/actions/AbstractAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.03359684">
+ <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.038724374">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -142,7 +142,7 @@
<file leaf-file-name="JahiaUserManagerLDAPProvider.java"
pinned="false" current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.034623217">
+ <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.04009434">
<folding />
</state>
</provider>
@@ -151,7 +151,7 @@
<file leaf-file-name="ConnectionDispenser.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/database/ConnectionDispenser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.034623217">
+ <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.04009434">
<folding />
</state>
</provider>
@@ -160,7 +160,7 @@
<file leaf-file-name="JahiaErrorDisplay.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/bin/JahiaErrorDisplay.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.034623217">
+ <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.04009434">
<folding />
</state>
</provider>
@@ -169,7 +169,7 @@
<file leaf-file-name="JahiaPageBaseService.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPageBaseService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1883" column="34" selection-start="76499"
selection-end="76499" vertical-scroll-proportion="0.5682281">
+ <state line="1883" column="34" selection-start="76499"
selection-end="76499" vertical-scroll-proportion="0.6580189">
<folding />
</state>
</provider>
@@ -178,7 +178,7 @@
<file leaf-file-name="JahiaPagesDB.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPagesDB.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="668" column="20" selection-start="28082"
selection-end="28082" vertical-scroll-proportion="1.3299389">
+ <state line="668" column="20" selection-start="28082"
selection-end="28082" vertical-scroll-proportion="1.5400944">
<folding />
</state>
</provider>
@@ -187,7 +187,7 @@
<file leaf-file-name="JahiaACLManagerService.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/acl/JahiaACLManagerService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="211" column="34" selection-start="7074"
selection-end="7074" vertical-scroll-proportion="0.84521383">
+ <state line="211" column="34" selection-start="7074"
selection-end="7074" vertical-scroll-proportion="0.9787736">
<folding />
</state>
</provider>
@@ -196,7 +196,7 @@
<file leaf-file-name="ParamBean.java" pinned="false" current="false"
current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/params/ParamBean.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="566" column="12" selection-start="23402"
selection-end="23402" vertical-scroll-proportion="0.034623217">
+ <state line="566" column="12" selection-start="23402"
selection-end="23402" vertical-scroll-proportion="0.04009434">
<folding />
</state>
</provider>
@@ -205,7 +205,7 @@
<file leaf-file-name="DummyServletRequestWrapper.java" pinned="false"
current="true" current-in-tab="true">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/params/DummyServletRequestWrapper.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="22" column="0" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.3320158">
+ <state line="37" column="27" selection-start="941"
selection-end="941" vertical-scroll-proportion="0.9567198">
<folding />
</state>
</provider>
@@ -318,6 +318,32 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="search" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="services" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="pages" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
@@ -451,8 +477,10 @@
<property name="GoToClass.includeLibraries" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="MemberChooser.sorted" value="false" />
+ <property name="RunManagerConfig.compileBeforeRunning" value="true" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
+ <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false"
/>
</component>
<component name="ReadonlyStatusHandler">
<option name="SHOW_DIALOG" value="true" />
@@ -460,7 +488,7 @@
<component name="RecentsManager" />
<component name="RestoreUpdateTree" />
<component name="RunManager">
- <activeType name="Application" />
+ <activeType
name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" />
<configuration selected="false" default="true" type="JUnit"
factoryName="JUnit">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -477,6 +505,15 @@
<value defaultName="wholeProject" />
</option>
</configuration>
+ <configuration selected="false" 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="" />
+ </configuration>
<configuration selected="false" default="true" type="Remote"
factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -505,6 +542,93 @@
<option name="ALTERNATIVE_JRE_PATH" />
<module name="" />
</configuration>
+ <configuration selected="true" default="false" name="Tomcat 4.1"
type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory"
factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 4.1.31">
+ <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="false" />
+ <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8009/"; />
+ <option name="COMMON_VM_ARGUMENTS" value="" />
+ <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
+ <option name="CONTEXT_PATH" value="/" />
+ <option name="MODULE_NAME" value="jahia-JAHIA-4-1-BRANCH" />
+ <option name="DEPLOY" value="false" />
+ </J2EE_MODULE>
+ <RunnerSettings RunnerId="Profile ">
+ <option name="myStartupWithAllocations" value="false" />
+ <option name="myCPUStartup" value="" />
+ <option name="myUsedMemoryThreshold" value="0" />
+ <option name="myDontLaunchUI" value="false" />
+ <option name="myCaptureMemoryOnExit" value="false" />
+ <option name="myCaptureCPUOnExit" value="false" />
+ <option name="mySnapshotsDir" value="" />
+ <option name="myForceJVMTI" value="false" />
+ <option name="myDisableAlloc" value="false" />
+ <option name="myDisableCounts" value="false" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="2665" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
+ <option name="USE_ENV_VARIABLES" value="true" />
+ <STARTUP>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT"
value="C:\java\technologies\jakarta-tomcat-4.1.31\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" run" />
+ </STARTUP>
+ <SHUTDOWN>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT"
value="C:\java\technologies\jakarta-tomcat-4.1.31\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" stop" />
+ </SHUTDOWN>
+ </ConfigurationWrapper>
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
+ <option name="USE_ENV_VARIABLES" value="true" />
+ <STARTUP>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT"
value="C:\java\technologies\jakarta-tomcat-4.1.31\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" run" />
+ </STARTUP>
+ <SHUTDOWN>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT"
value="C:\java\technologies\jakarta-tomcat-4.1.31\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" stop" />
+ </SHUTDOWN>
+ <EnvironmentVariables>
+ <option name="NAME" value="CATALINA_HOME" />
+ <option name="VALUE"
value="C:\java\technologies\jakarta-tomcat-4.1.31" />
+ <option name="IS_PREDEFINED" value="false" />
+ </EnvironmentVariables>
+ </ConfigurationWrapper>
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+ <option name="USE_ENV_VARIABLES" value="true" />
+ <STARTUP>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT"
value="C:\java\technologies\jakarta-tomcat-4.1.31\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" run" />
+ </STARTUP>
+ <SHUTDOWN>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT"
value="C:\java\technologies\jakarta-tomcat-4.1.31\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" stop" />
+ </SHUTDOWN>
+ <EnvironmentVariables>
+ <option name="NAME" value="CATALINA_HOME" />
+ <option name="VALUE"
value="C:\java\technologies\jakarta-tomcat-4.1.31" />
+ <option name="IS_PREDEFINED" value="false" />
+ </EnvironmentVariables>
+ </ConfigurationWrapper>
+ </configuration>
</component>
<component name="SelectInManager" />
<component name="StarteamConfiguration">
@@ -548,15 +672,15 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-11" y="-4" width="1285" height="1002" extended-state="0" />
- <editor active="false" />
+ <frame x="1" y="1" width="1275" height="992" extended-state="0" />
+ <editor active="true" />
<layout>
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="TODO" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="7" />
- <window_info id="Project" active="false" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.36658555" order="0" />
+ <window_info id="Project" active="false" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.36958298" order="0" />
<window_info id="Find" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="1" />
<window_info id="Structure" active="false" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.25" order="1" />
- <window_info id="Messages" active="true" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.32951945" order="8" />
+ <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33333334" order="8" />
<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="Profile" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="8" />
<window_info id="Module Dependencies" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="3" />
@@ -566,7 +690,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
<window_info id="Hierarchy" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.25" 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="Debug" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.4" order="4" />
+ <window_info id="Debug" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.39930555" order="4" />
<window_info id="Commander" active="false" anchor="right"
auto_hide="false" internal_type="sliding" type="sliding" visible="false"
weight="0.4" order="0" />
<window_info id="Version Control" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="8" />
<window_info id="Web" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
@@ -645,58 +769,72 @@
</state>
</provider>
</entry>
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/search/ScheduledSiteIndexationJob.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="53" column="34" selection-start="1926"
selection-end="1926" vertical-scroll-proportion="0.8939709">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/params/DummyServletRequestWrapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="37" column="27" selection-start="941"
selection-end="941" vertical-scroll-proportion="0.9567198">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/params/ParamBean.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="566" column="12" selection-start="23402"
selection-end="23402" vertical-scroll-proportion="0.034623217">
+ <state line="566" column="12" selection-start="23402"
selection-end="23402" vertical-scroll-proportion="0.04009434">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/acl/JahiaACLManagerService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="211" column="34" selection-start="7074"
selection-end="7074" vertical-scroll-proportion="0.84521383">
+ <state line="211" column="34" selection-start="7074"
selection-end="7074" vertical-scroll-proportion="0.9787736">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPagesDB.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="668" column="20" selection-start="28082"
selection-end="28082" vertical-scroll-proportion="1.3299389">
+ <state line="668" column="20" selection-start="28082"
selection-end="28082" vertical-scroll-proportion="1.5400944">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPageBaseService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1883" column="34" selection-start="76499"
selection-end="76499" vertical-scroll-proportion="0.5682281">
+ <state line="1883" column="34" selection-start="76499"
selection-end="76499" vertical-scroll-proportion="0.6580189">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/bin/JahiaErrorDisplay.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.034623217">
+ <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.04009434">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/database/ConnectionDispenser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.034623217">
+ <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.04009434">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.034623217">
+ <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.04009434">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/blogs/actions/AbstractAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.03359684">
+ <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.038724374">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -705,14 +843,7 @@
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="701" column="80" selection-start="30741"
selection-end="30741" vertical-scroll-proportion="0.034623217">
- <folding />
- </state>
- </provider>
- </entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/params/DummyServletRequestWrapper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="22" column="0" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.3320158">
+ <state line="701" column="80" selection-start="30741"
selection-end="30741" vertical-scroll-proportion="0.04009434">
<folding />
</state>
</provider>
Index: ScheduledSiteIndexationJob.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/search/Attic/ScheduledSiteIndexationJob.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- ScheduledSiteIndexationJob.java 13 Sep 2005 09:35:12 -0000 1.1.2.9
+++ ScheduledSiteIndexationJob.java 7 Nov 2005 15:39:27 -0000 1.1.2.10
@@ -24,100 +24,111 @@
public class ScheduledSiteIndexationJob implements StatefulJob {
private static org.apache.log4j.Logger logger =
- org.apache.log4j.Logger.getLogger(ScheduledSiteIndexationJob.class);
+
org.apache.log4j.Logger.getLogger(ScheduledSiteIndexationJob.class);
public ScheduledSiteIndexationJob () {
}
public void execute (JobExecutionContext context)
- throws JobExecutionException {
+ throws JobExecutionException {
logger.debug("Site Indexation Job executed in Thread name=" +
Thread.currentThread().getName());
- SiteIndexationJobDetail jobDetail =
- (SiteIndexationJobDetail)context.getJobDetail();
- JobDataMap jobDataMap = jobDetail.getJobDataMap();
-
- ParamBean jParams = (ParamBean)jobDataMap.get("jParams");
- int siteId = jobDetail.getSiteId();
-
- SiteIndexationStatus status = ServicesRegistry.getInstance()
- .getJahiaSearchService().getSiteIndexationStatus(siteId);
- if ( status == null ){
- logger.error(" Site Indexation status not found for siteId=" +
siteId +" , indexation not started");
- }
- status.setStartingTime(System.currentTimeMillis());
- JahiaSite site = null;
- ArrayList localeList = new ArrayList ();
- ServicesRegistry sReg = ServicesRegistry.getInstance ();
- Vector listFieldID = new Vector();
+ SiteIndexationStatus status;
+ boolean success;
try {
- site =
ServicesRegistry.getInstance().getJahiaSitesService().getSite(siteId);
+ SiteIndexationJobDetail jobDetail =
+ (SiteIndexationJobDetail)context.getJobDetail();
+ JobDataMap jobDataMap = jobDetail.getJobDataMap();
+
+ ParamBean jParams = (ParamBean)jobDataMap.get("jParams");
+ int siteId = jobDetail.getSiteId();
- Vector siteLanguageSettings = site.getLanguageSettings ();
- if (siteLanguageSettings != null) {
- for (int i = 0; i < siteLanguageSettings.size (); i++) {
- SiteLanguageSettings curSetting = (SiteLanguageSettings)
- siteLanguageSettings.elementAt (i);
- if (curSetting.isActivated ()) {
- Locale tempLocale = LanguageCodeConverters.
- languageCodeToLocale (curSetting.
- getCode ());
- localeList.add (tempLocale);
+ status = ServicesRegistry.getInstance()
+ .getJahiaSearchService().getSiteIndexationStatus(siteId);
+ if ( status == null ){
+ logger.error(" Site Indexation status not found for siteId="
+ siteId +" , indexation not started");
+ }
+ status.setStartingTime(System.currentTimeMillis());
+ JahiaSite site = null;
+ ArrayList localeList = new ArrayList ();
+ ServicesRegistry sReg = ServicesRegistry.getInstance ();
+ Vector listFieldID = new Vector();
+
+ try {
+ site =
ServicesRegistry.getInstance().getJahiaSitesService().getSite(siteId);
+
+ Vector siteLanguageSettings = site.getLanguageSettings ();
+ if (siteLanguageSettings != null) {
+ for (int i = 0; i < siteLanguageSettings.size (); i++) {
+ SiteLanguageSettings curSetting =
(SiteLanguageSettings)
+ siteLanguageSettings.elementAt (i);
+ if (curSetting.isActivated ()) {
+ Locale tempLocale = LanguageCodeConverters.
+ languageCodeToLocale (curSetting.
+ getCode ());
+ localeList.add (tempLocale);
+ }
}
}
+ listFieldID =
sReg.getJahiaFieldService().getAllFieldIDs(site.getID());
+ } catch (JahiaException je ){
+ status.setStatus(SiteIndexationStatus.ERROR_STATUS);
+ throw new JobExecutionException("Error sarting site
re-indexation" + siteId ,je , false);
}
- listFieldID =
sReg.getJahiaFieldService().getAllFieldIDs(site.getID());
- } catch (JahiaException je ){
- status.setStatus(SiteIndexationStatus.ERROR_STATUS);
- throw new JobExecutionException("Error sarting site
re-indexation" + siteId ,je , false);
- }
- // Index the fields
- JahiaField aField;
- int size = listFieldID.size();
- status.setNbDocsToIndex(size);
- status.setNbIndexedDocs(0);
- boolean success = true;
- for (int i = 0; i < size; i++) {
- if ( status.isShutdown() ){
- success = false;
- return;
- }
- int fieldID = ( (Integer) listFieldID.get(i)).intValue();
- while ( sReg.getJahiaSearchService().getNbDocumentsInQueue()>500
) {
- status = ServicesRegistry.getInstance()
-
.getJahiaSearchService().getSiteIndexationStatus(siteId);
+ // Index the fields
+ JahiaField aField;
+ int size = listFieldID.size();
+ status.setNbDocsToIndex(size);
+ status.setNbIndexedDocs(0);
+ success = true;
+ for (int i = 0; i < size; i++) {
if ( status.isShutdown() ){
success = false;
return;
}
- try {
- Thread.sleep(1000);
- } catch ( java.lang.InterruptedException ie ){
+ int fieldID = ( (Integer) listFieldID.get(i)).intValue();
+ while (
sReg.getJahiaSearchService().getNbDocumentsInQueue()>500 ) {
+ status = ServicesRegistry.getInstance()
+
.getJahiaSearchService().getSiteIndexationStatus(siteId);
+ if ( status.isShutdown() ){
+ success = false;
+ return;
+ }
+ try {
+ Thread.sleep(1000);
+ } catch ( java.lang.InterruptedException ie ){
+ }
+ ServicesRegistry.getInstance()
+ .getJahiaSearchService().notifyMainIndexThread();
}
- ServicesRegistry.getInstance()
- .getJahiaSearchService().notifyMainIndexThread();
- }
- status = ServicesRegistry.getInstance()
- .getJahiaSearchService().getSiteIndexationStatus(siteId);
- if ( !status.isShutdown() ){
+ status = ServicesRegistry.getInstance()
+
.getJahiaSearchService().getSiteIndexationStatus(siteId);
+ if ( !status.isShutdown() ){
- try {
- status.setNbIndexedDocs(status.getNbIndexedDocs()+1);
-
sReg.getJahiaSearchService().indexField(fieldID,false,jParams,false);
- }
- catch (Throwable t) {
- // page could not exists
- logger.debug("Error re-indexing field id=" + fieldID);
+ try {
+ status.setNbIndexedDocs(status.getNbIndexedDocs()+1);
+
sReg.getJahiaSearchService().indexField(fieldID,false,jParams,false);
+ }
+ catch (Throwable t) {
+ // page could not exists
+ logger.debug("Error re-indexing field id=" +
fieldID);
+ }
+ } else {
+ success = false;
+ return;
}
- } else {
- success = false;
- return;
}
+ org.jahia.services.database.ConnectionDispenser.
+ terminateConnection();
+
+ status.setDone(success);
+ status.setEndTime(System.currentTimeMillis());
+
status.setStatus(success?SiteIndexationStatus.SUCCESS_STATUS:SiteIndexationStatus.ERROR_STATUS);
+ } catch (Throwable t) {
+ org.jahia.services.database.ConnectionDispenser.
+ abortConnection();
}
- status.setDone(success);
- status.setEndTime(System.currentTimeMillis());
-
status.setStatus(success?SiteIndexationStatus.SUCCESS_STATUS:SiteIndexationStatus.ERROR_STATUS);
}
}
