knguyen 2005/02/23 18:13:12 CET
Modified files:
core/src/java/org/jahia/bin Jahia.java
JahiaAdministration.java
Log:
- partial adv search refactoring
Revision Changes Path
1.19 +23 -30 jahia/core/src/java/org/jahia/bin/Jahia.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/Jahia.java.diff?r1=1.18&r2=1.19&f=h
1.6 +4 -1
jahia/core/src/java/org/jahia/bin/JahiaAdministration.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaAdministration.java.diff?r1=1.5&r2=1.6&f=h
Index: Jahia.java
===================================================================
RCS file: /home/cvs/repository/jahia/core/src/java/org/jahia/bin/Jahia.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Jahia.java 14 Jan 2005 13:08:11 -0000 1.18
+++ Jahia.java 23 Feb 2005 17:13:12 -0000 1.19
@@ -1,4 +1,4 @@
-// $Id: Jahia.java,v 1.18 2005/01/14 13:08:11 shuber Exp $
+// $Id: Jahia.java,v 1.19 2005/02/23 17:13:12 knguyen Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -30,7 +30,10 @@
package org.jahia.bin;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.text.MessageFormat;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -51,8 +54,12 @@
import org.jahia.exceptions.JahiaSessionExpirationException;
import org.jahia.exceptions.JahiaSiteNotFoundException;
import org.jahia.exceptions.services.ServiceNotFoundException;
+import org.jahia.mbeans.JahiaMBeanServer;
import org.jahia.operations.OperationManager;
import org.jahia.params.ParamBean;
+import org.jahia.pipelines.Pipeline;
+import org.jahia.pipelines.PipelineDescriptor;
+import org.jahia.pipelines.PipelineException;
import org.jahia.registries.EnginesRegistry;
import org.jahia.registries.JahiaContainerDefinitionsRegistry;
import org.jahia.registries.JahiaFieldDefinitionsRegistry;
@@ -60,44 +67,30 @@
import org.jahia.registries.ServicesRegistry;
import org.jahia.registries.SharedTemplatePackagesRegistry;
import org.jahia.registries.locks.JahiaLocksRegistry;
-import org.jahia.security.license.InvalidBuildNumberException;
-import org.jahia.security.license.InvalidLicenseException;
-import org.jahia.security.license.InvalidReleaseNumberException;
-import org.jahia.security.license.LicenseException;
-import org.jahia.services.usermanager.JahiaUser;
+import org.jahia.resourcebundle.JahiaResourceBundle;
+import org.jahia.resourcebundle.ResourceMessage;
+import org.jahia.security.license.License;
+import org.jahia.security.license.LicenseConstants;
+import org.jahia.security.license.LicenseManager;
+import org.jahia.security.license.LicensePackage;
+import org.jahia.security.license.Limit;
import org.jahia.services.cache.CacheFactory;
+import org.jahia.services.usermanager.JahiaUser;
import org.jahia.settings.SettingsBean;
+import org.jahia.urls.ServletURL;
+import org.jahia.urls.URI;
+import org.jahia.urls.URICodec;
import org.jahia.utils.JahiaChrono;
import org.jahia.utils.JahiaConsole;
-import org.jahia.utils.Version;
-import org.jahia.utils.modifier.TomcatUsersModifier;
-import org.xml.sax.SAXException;
-import org.jahia.mbeans.JahiaMBeanServer;
-import org.jahia.security.license.LicenseManager;
-import org.jahia.security.license.License;
-import org.jahia.security.license.LicensePackage;
-import org.jahia.security.license.LicenseConstants;
-import org.jahia.security.license.Limit;
-import java.io.InputStream;
-import org.jahia.resourcebundle.ResourceMessage;
-import org.jahia.resourcebundle.JahiaResourceBundle;
import org.jahia.utils.LanguageCodeConverters;
-import java.text.MessageFormat;
-import org.jahia.urls.URICodec;
-import org.jahia.urls.URI;
-import org.jahia.urls.ServletURL;
-import org.jahia.pipelines.Pipeline;
-import org.jahia.pipelines.PipelineDescriptor;
-import org.jahia.utils.xml.betwixt.XmlReader;
-import java.io.FileInputStream;
-import org.jahia.pipelines.valves.*;
-import org.jahia.pipelines.PipelineException;
import org.jahia.utils.PathResolver;
+import org.jahia.utils.Version;
import org.jahia.utils.WebAppPathResolver;
+import org.jahia.utils.modifier.TomcatUsersModifier;
+import org.jahia.utils.xml.betwixt.XmlReader;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.xml.XmlBeanFactory;
-import org.jahia.utils.fileparsers.FileExtractorsConfig;
-import java.util.HashMap;
+import org.xml.sax.SAXException;
/**
* desc: This is the main servlet of Jahia.
Index: JahiaAdministration.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/JahiaAdministration.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JahiaAdministration.java 17 Aug 2004 13:59:32 -0000 1.5
+++ JahiaAdministration.java 23 Feb 2005 17:13:12 -0000 1.6
@@ -1,4 +1,4 @@
-// $Id: JahiaAdministration.java,v 1.5 2004/08/17 13:59:32 shuber Exp $
+// $Id: JahiaAdministration.java,v 1.6 2005/02/23 17:13:12 knguyen Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -1237,6 +1237,9 @@
request.setAttribute("org.jahia.data.JahiaData",jData);
request.setAttribute("org.jahia.params.ParamBean",jData.params());
+ // Seem's that the Thread Param Bean is null when were in Admin ????
So we set it here
+ Jahia.setThreadParamBean(jParams);
+
}
/**
