Author: knguyen
Date: Mon Dec 10 12:09:18 2007
New Revision: 19352
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19352&repname=
=3Djahia
Log:
enable slide search and https
Modified:
trunk/core/src/java/org/jahia/services/search/slide/SlideSearchHandler.=
java
Modified: trunk/core/src/java/org/jahia/services/search/slide/SlideSearchHa=
ndler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/search/slide/SlideSearchHandler.java&rev=3D19352&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/search/slide/SlideSearchHandler.=
java (original)
+++ trunk/core/src/java/org/jahia/services/search/slide/SlideSearchHandler.=
java Mon Dec 10 12:09:18 2007
@@ -19,6 +19,7 @@
import org.apache.commons.httpclient.Cookie;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpURL;
+import org.apache.commons.httpclient.HttpsURL;
import org.apache.lucene.search.Filter;
import org.apache.slide.common.JahiaDomain;
import org.apache.slide.util.conf.Configuration;
@@ -26,8 +27,8 @@
import org.apache.webdav.lib.methods.SearchMethod;
import org.compass.core.Compass;
import org.compass.core.engine.SearchEngine;
-import org.compass.core.spi.InternalCompass;
import org.compass.core.lucene.engine.LuceneSearchEngine;
+import org.compass.core.spi.InternalCompass;
import org.jahia.bin.Jahia;
import org.jahia.params.ParamBean;
import org.jahia.params.ProcessingContext;
@@ -130,7 +131,12 @@
String path =3D jParams.getContextPath() + "/webdav/site/" + j=
Params.getSiteKey();
=
SearchMethod method =3D new SearchMethod(path,query);
- HttpURL httpURL =3D new HttpURL(serverUrl);
+ HttpURL httpURL =3D null;
+ if (serverUrl.startsWith("https")){
+ httpURL =3D new HttpsURL(serverUrl);
+ } else {
+ httpURL =3D new HttpURL(serverUrl);
+ }
WebdavResource webdavResource =3D new WebdavResource(httpURL,W=
ebdavResource.NOACTION, 0);
String id =3D jParams.getSession(true).getId();
webdavResource.getSessionInstance(httpURL).getState().addCooki=
e(new Cookie(httpURL.getHost(), "JSESSIONID", id, "/", -1, false));
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
