Menu
▾
▴
aplaws-commit — Automatic mailing when changes are committed to CVS.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(48) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(22) |
Feb
(68) |
Mar
(185) |
Apr
(11) |
May
(21) |
Jun
(23) |
Jul
(46) |
Aug
(69) |
Sep
(211) |
Oct
(26) |
Nov
(51) |
Dec
(52) |
| 2006 |
Jan
(13) |
Feb
(13) |
Mar
(8) |
Apr
(21) |
May
(17) |
Jun
(100) |
Jul
(34) |
Aug
(23) |
Sep
(26) |
Oct
(16) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(66) |
Oct
(10) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(31) |
Aug
(8) |
Sep
(11) |
Oct
(6) |
Nov
|
Dec
|
| 2012 |
Jan
(13) |
Feb
(2) |
Mar
(9) |
Apr
(6) |
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(120) |
| 2013 |
Jan
(6) |
Feb
(35) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ap...@vh...> - 2005-09-21 22:03:17
|
Author: apevec Date: 2005-09-21 23:53:54 +0200 (Wed, 21 Sep 2005) New Revision: 891 Added: trunk/ccm-ldn-aplaws/bundles/TEMPLATE/ Log: directory for common files used to build aplaws bundles |
|
From: <ap...@vh...> - 2005-09-21 21:39:19
|
Author: apevec
Date: 2005-09-21 23:29:53 +0200 (Wed, 21 Sep 2005)
New Revision: 890
Modified:
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionDefinition.java
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionDefinition.java
Log:
SF patch [ 1224034 ] permission check on item list
Modified: trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionDefinition.java
===================================================================
--- trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionDefinition.java 2005-09-21 17:14:10 UTC (rev 889)
+++ trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionDefinition.java 2005-09-21 21:29:53 UTC (rev 890)
@@ -23,6 +23,7 @@
import com.arsdigita.kernel.ACSObject;
import com.arsdigita.kernel.Kernel;
+import com.arsdigita.kernel.Party;
import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
@@ -147,7 +148,7 @@
/** Can be overridden to extract differently the category to inspect. */
protected Category getCategory(NavigationModel model) {
- return model.getCategory();
+ return model.getCategory();
}
protected void applyFilters(DataCollection objects,
@@ -192,11 +193,22 @@
}
if (m_checkPermissions) {
- PermissionService.filterObjects(objects,
- PrivilegeDescriptor.READ,
- Kernel.getContext().getParty().getOID());
+ // allow subclasses to override the permission check
+ checkPermissions(objects);
}
}
+
+ protected void checkPermissions(DataCollection objects) {
+ Party party = Kernel.getContext().getParty();
+ if (party == null) {
+ party = Kernel.getPublicUser();
+ }
+
+ PermissionService.filterObjects(
+ objects,
+ PrivilegeDescriptor.READ,
+ party.getOID());
+ }
protected String getCategorizedObjectPath(String fragment) {
return fragment;
Modified: trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionDefinition.java
===================================================================
--- trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionDefinition.java 2005-09-21 17:14:10 UTC (rev 889)
+++ trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionDefinition.java 2005-09-21 21:29:53 UTC (rev 890)
@@ -21,11 +21,14 @@
import com.arsdigita.cms.CMS;
import com.arsdigita.cms.ContentItem;
-
+import com.arsdigita.cms.SecurityManager;
import com.arsdigita.london.navigation.DataCollectionDefinition;
import com.arsdigita.london.navigation.NavigationModel;
-
import com.arsdigita.kernel.ACSObject;
+import com.arsdigita.kernel.Kernel;
+import com.arsdigita.kernel.Party;
+import com.arsdigita.kernel.permissions.PermissionService;
+import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.Filter;
@@ -79,6 +82,20 @@
objects.addPath("masterVersion.objectType");
}
+ protected void checkPermissions(DataCollection objects) {
+ // parties are assigned the cms_read_item privilege on content items
+ // rather than the primitive READ
+ Party party = Kernel.getContext().getParty();
+ if (party == null) {
+ party = Kernel.getPublicUser();
+ }
+
+ PermissionService.filterObjects(
+ objects,
+ PrivilegeDescriptor.get(SecurityManager.CMS_READ_ITEM),
+ party.getOID());
+ }
+
protected String getCategorizedObjectPath(String fragment) {
return "parent." + fragment;
}
|
|
From: <ap...@vh...> - 2005-09-21 17:23:31
|
Author: apevec
Date: 2005-09-21 19:14:10 +0200 (Wed, 21 Sep 2005)
New Revision: 889
Modified:
trunk/ccm-core/src/com/arsdigita/search/CachedResultSet.java
trunk/ccm-core/src/com/arsdigita/search/Search.java
trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneSearch.java
trunk/ccm-core/src/com/arsdigita/search/ui/ResultsPane.java
Log:
SF patch [ 1242260 ] Fixed file descriptors leak
Modified: trunk/ccm-core/src/com/arsdigita/search/CachedResultSet.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/search/CachedResultSet.java 2005-09-21 17:09:00 UTC (rev 888)
+++ trunk/ccm-core/src/com/arsdigita/search/CachedResultSet.java 2005-09-21 17:14:10 UTC (rev 889)
@@ -32,6 +32,7 @@
private long m_time;
private Document[] m_results;
private String m_engine;
+ private ResultSet m_realResultSet = null;
public CachedResultSet(QuerySpecification spec,
ResultSet results,
@@ -95,10 +96,10 @@
last <= m_count) {
s_log.info("Requested range: " + offset + "->" + (offset + count) +
" is outsize cache size " + m_results.length);
- ResultSet results = Search.process(m_spec,
+ m_realResultSet = Search.process(m_spec,
Search.NOP_RESULT_CACHE,
m_engine);
- return results.getDocuments(offset, count);
+ return m_realResultSet.getDocuments(offset, count);
}
return new ResultIterator(m_results,
@@ -138,7 +139,11 @@
* any system resources allocated
*/
public void close() {
- // No-op
+ if(m_realResultSet != null && m_realResultSet instanceof ResultSet) {
+ m_realResultSet.close();
+ } else {
+ // noop
+ }
}
private class ResultIterator implements Iterator {
Modified: trunk/ccm-core/src/com/arsdigita/search/Search.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/search/Search.java 2005-09-21 17:09:00 UTC (rev 888)
+++ trunk/ccm-core/src/com/arsdigita/search/Search.java 2005-09-21 17:14:10 UTC (rev 889)
@@ -19,6 +19,7 @@
package com.arsdigita.search;
import com.arsdigita.util.Assert;
+import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.xml.Element;
import java.util.Iterator;
@@ -182,13 +183,22 @@
if (results == null) {
ResultSet rawResults = processInternal(spec, engine);
- Assert.exists(rawResults, ResultSet.class);
- cache.put(spec, rawResults);
-
- // Re-fetch results, since cache may wrap them
- results = (ResultSet) cache.get(spec);
- if (results == null) {
- results = rawResults;
+ try {
+ Assert.exists(rawResults, ResultSet.class);
+ cache.put(spec, rawResults);
+
+ // Re-fetch results, since cache may wrap them
+ results = (ResultSet) cache.get(spec);
+ if (results == null) {
+ results = rawResults;
+ } else if(rawResults != null) {
+ rawResults.close();
+ }
+ } catch(Exception e) {
+ if(rawResults != null) {
+ rawResults.close();
+ }
+ throw new UncheckedWrapperException(e);
}
}
Modified: trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneSearch.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneSearch.java 2005-09-21 17:09:00 UTC (rev 888)
+++ trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneSearch.java 2005-09-21 17:14:10 UTC (rev 889)
@@ -100,6 +100,7 @@
* @param f a filter
**/
public LuceneSearch(String searchString, Filter f) {
+ m_index = null;
try {
LuceneConfig conf = LuceneConfig.getConfig();
Analyzer analyzer = conf.getAnalyzer();
@@ -112,9 +113,14 @@
}
m_hitIndex = 0;
} catch (IOException ex) {
+ this.close();
LOG.fatal("failed the search for " + searchString, ex);
} catch (ParseException ex) {
+ this.close();
LOG.fatal("failed the search for " + searchString, ex);
+ } catch (Exception ex) {
+ this.close();
+ throw new UncheckedWrapperException(ex);
}
}
Modified: trunk/ccm-core/src/com/arsdigita/search/ui/ResultsPane.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/search/ui/ResultsPane.java 2005-09-21 17:09:00 UTC (rev 888)
+++ trunk/ccm-core/src/com/arsdigita/search/ui/ResultsPane.java 2005-09-21 17:14:10 UTC (rev 889)
@@ -82,56 +82,61 @@
}
QuerySpecification spec = m_query.getQuerySpecification(state);
- ResultSet resultSet = m_engine == null ?
- Search.process(spec) :
- Search.process(spec,
- Search.DEFAULT_RESULT_CACHE,
- m_engine);
-
- if (s_log.isDebugEnabled()) {
- s_log.debug("Got result set " + resultSet.getClass() +
- " count: " + resultSet.getCount());
- }
+ ResultSet resultSet = null;
+ try {
+ resultSet = m_engine == null ?
+ Search.process(spec) :
+ Search.process(spec,
+ Search.DEFAULT_RESULT_CACHE,
+ m_engine);
+
+ if (s_log.isDebugEnabled()) {
+ s_log.debug("Got result set " + resultSet.getClass() +
+ " count: " + resultSet.getCount());
+ }
- Integer page = (Integer)state.getValue(m_pageNumber);
- int pageNumber = (page == null ? 1 : page.intValue());
- long objectCount = resultSet.getCount();
- int pageCount = (int)Math.ceil((double)objectCount / (double)m_pageSize);
+ Integer page = (Integer)state.getValue(m_pageNumber);
+ int pageNumber = (page == null ? 1 : page.intValue());
+ long objectCount = resultSet.getCount();
+ int pageCount = (int)Math.ceil((double)objectCount / (double)m_pageSize);
- if (pageNumber < 1) {
- pageNumber = 1;
- }
-
- if (pageNumber > pageCount) {
- pageNumber = (pageCount == 0 ? 1 : pageCount);
- }
-
- long begin = ((pageNumber-1) * m_pageSize);
- int count = (int)Math.min(m_pageSize, (objectCount - begin));
- long end = begin + count;
-
- Iterator results = resultSet.getDocuments(begin, count);
-
- Element content = Search.newElement("results");
- exportAttributes(content);
-
- if (s_log.isDebugEnabled()) {
- s_log.debug("Paginator stats\n page number:" + pageNumber +
- "\n page count: "+ pageCount + "\n page size: " +
- m_pageSize + "\n start " + begin + "\n end: " +
- end + "\n count: "+ objectCount);
- }
-
- content.addContent(generatePaginatorXML(state,
+ if (pageNumber < 1) {
+ pageNumber = 1;
+ }
+
+ if (pageNumber > pageCount) {
+ pageNumber = (pageCount == 0 ? 1 : pageCount);
+ }
+
+ long begin = ((pageNumber-1) * m_pageSize);
+ int count = (int)Math.min(m_pageSize, (objectCount - begin));
+ long end = begin + count;
+
+ Iterator results = resultSet.getDocuments(begin, count);
+
+ Element content = Search.newElement("results");
+ exportAttributes(content);
+
+ if (s_log.isDebugEnabled()) {
+ s_log.debug("Paginator stats\n page number:" + pageNumber +
+ "\n page count: "+ pageCount + "\n page size: " +
+ m_pageSize + "\n start " + begin + "\n end: " +
+ end + "\n count: "+ objectCount);
+ }
+
+ content.addContent(generatePaginatorXML(state,
m_pageNumber.getName(),
pageNumber, pageCount,
m_pageSize, begin, end,
objectCount));
- content.addContent(generateDocumentsXML(state, results));
+ content.addContent(generateDocumentsXML(state, results));
- parent.addContent(content);
-
- resultSet.close();
+ parent.addContent(content);
+ } finally {
+ if(resultSet != null) {
+ resultSet.close();
+ }
+ }
}
protected Element generatePaginatorXML(PageState state,
|
|
From: <ap...@vh...> - 2005-09-21 17:18:21
|
Author: apevec
Date: 2005-09-21 19:09:00 +0200 (Wed, 21 Sep 2005)
New Revision: 888
Modified:
trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig.java
Log:
don't try to recover from a class loading issues,
it's prolly a typo in config parameter value
Modified: trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig.java 2005-09-21 17:01:27 UTC (rev 887)
+++ trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig.java 2005-09-21 17:09:00 UTC (rev 888)
@@ -20,6 +20,7 @@
import com.arsdigita.runtime.AbstractConfig;
import com.arsdigita.runtime.CCM;
+import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.util.parameter.IntegerParameter;
import com.arsdigita.util.parameter.Parameter;
import com.arsdigita.util.parameter.StringParameter;
@@ -85,8 +86,8 @@
try {
m_analyzerClass = Class.forName(className);
} catch (Exception ex) {
- LOG.error("Unable to load "+className+", using StandardAnalyzer", ex);
- return new StandardAnalyzer();
+ LOG.error("Unable to load "+className);
+ throw new UncheckedWrapperException(ex);
}
}
try {
|
|
From: <ap...@vh...> - 2005-09-21 17:10:56
|
Author: apevec Date: 2005-09-21 19:01:27 +0200 (Wed, 21 Sep 2005) New Revision: 887 Added: trunk/ccm-core/lib/lucene-1.4.3.jar Removed: trunk/ccm-core/lib/lucene-1.2.jar Modified: trunk/ccm-core/etc/java-libs.txt trunk/ccm-core/src/com/arsdigita/search/lucene/Indexer.java trunk/ccm-core/src/com/arsdigita/search/lucene/Initializer.java trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig.java trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig_parameter.properties trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneSearch.java trunk/ccm-core/test/src/com/arsdigita/search/lucene/SearchTest.java Log: SF patch [ 1292835 ] Lucene customized Analyzer Update Lucene to 1.4.3 Modified: trunk/ccm-core/etc/java-libs.txt =================================================================== --- trunk/ccm-core/etc/java-libs.txt 2005-09-21 16:47:54 UTC (rev 886) +++ trunk/ccm-core/etc/java-libs.txt 2005-09-21 17:01:27 UTC (rev 887) @@ -25,8 +25,7 @@ jdxslt.jar 1.5.5 MPL 1.1 http://www.mozilla.org/MPL/ jdom.jar beta 9 http://cvs.jdom.org/cgi-bin/viewcvs.cgi/jdom/LICENSE.txt log4j.jar 1.2 APACHE http://www.apache.org/LICENSE.txt -lucene-1.2.jar 1.2 APACHE http://www.apache.org/LICENSE.txt -postgresql.jar 7.2 BSD http://www.postgresql.org/licence.html +lucene-1.4.3.jar 1.4.3 APACHE http://www.apache.org/LICENSE.txt mail.jar 1.3.1 SUN http://java.sun.com/products/javamail/ saxon.jar 6.5.2 MPL 1.0 http://www.mozilla.org/MPL/ servlet.jar 2.2 APACHE http://www.apache.org/LICENSE.txt Deleted: trunk/ccm-core/lib/lucene-1.2.jar Added: trunk/ccm-core/lib/lucene-1.4.3.jar =================================================================== (Binary files differ) Property changes on: trunk/ccm-core/lib/lucene-1.4.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/ccm-core/src/com/arsdigita/search/lucene/Indexer.java =================================================================== --- trunk/ccm-core/src/com/arsdigita/search/lucene/Indexer.java 2005-09-21 16:47:54 UTC (rev 886) +++ trunk/ccm-core/src/com/arsdigita/search/lucene/Indexer.java 2005-09-21 17:01:27 UTC (rev 887) @@ -33,7 +33,7 @@ import org.apache.log4j.Logger; -import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.DateField; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -149,9 +149,10 @@ } private void update(Document doc) throws IOException { + LuceneConfig conf = LuceneConfig.getConfig(); + Analyzer analyzer = conf.getAnalyzer(); synchronized (LOCK) { - IndexWriter iw = new IndexWriter(m_index, new StandardAnalyzer(), - false); + IndexWriter iw = new IndexWriter(m_index, analyzer, false); try { if (LOG.isDebugEnabled()) { LOG.debug("Indexing document (" + doc.getID() + "): " + Modified: trunk/ccm-core/src/com/arsdigita/search/lucene/Initializer.java =================================================================== --- trunk/ccm-core/src/com/arsdigita/search/lucene/Initializer.java 2005-09-21 16:47:54 UTC (rev 886) +++ trunk/ccm-core/src/com/arsdigita/search/lucene/Initializer.java 2005-09-21 17:01:27 UTC (rev 887) @@ -30,7 +30,7 @@ import java.util.Date; import org.apache.log4j.Logger; -import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -66,14 +66,16 @@ LuceneConfig conf = LuceneConfig.getConfig(); String location = conf.getIndexLocation(); int interval = conf.getIndexerInterval(); + Analyzer analyzer = conf.getAnalyzer(); LOG.info("Lucene index location: " + location); + LOG.info("Lucene Analyzer = " + analyzer.getClass().getName()); try { if (!IndexReader.indexExists(location)) { File f = new File(location); f.mkdirs(); IndexWriter iw = new IndexWriter - (location, new StandardAnalyzer(), true); + (location, analyzer, true); iw.close(); LOG.info("Lucene created index directory"); } Modified: trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig.java =================================================================== --- trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig.java 2005-09-21 16:47:54 UTC (rev 886) +++ trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig.java 2005-09-21 17:01:27 UTC (rev 887) @@ -23,6 +23,9 @@ import com.arsdigita.util.parameter.IntegerParameter; import com.arsdigita.util.parameter.Parameter; import com.arsdigita.util.parameter.StringParameter; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.log4j.Logger; import java.io.File; @@ -36,6 +39,7 @@ public class LuceneConfig extends AbstractConfig { public final static String versionId = "$Id$ by $Author$, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger LOG = Logger.getLogger(LuceneConfig.class); private static LuceneConfig s_conf; @@ -48,15 +52,21 @@ return s_conf; } + private Class m_analyzerClass; + private StringParameter m_location = new StringParameter ("waf.lucene.location", Parameter.REQUIRED, new File(CCM.getDataDirectory(), "lucene").getPath()); private IntegerParameter m_interval = new IntegerParameter ("waf.lucene.interval", Parameter.REQUIRED, new Integer(2*60)); + private StringParameter m_analyzer = new StringParameter + ("waf.lucene.analyzer", Parameter.REQUIRED, + "org.apache.lucene.analysis.standard.StandardAnalyzer"); public LuceneConfig() { register(m_location); register(m_interval); + register(m_analyzer); loadInfo(); } @@ -67,4 +77,24 @@ public int getIndexerInterval() { return ((Integer) get(m_interval)).intValue(); } + + public Analyzer getAnalyzer() { + + if (m_analyzerClass == null) { + String className = (String) get(m_analyzer); + try { + m_analyzerClass = Class.forName(className); + } catch (Exception ex) { + LOG.error("Unable to load "+className+", using StandardAnalyzer", ex); + return new StandardAnalyzer(); + } + } + try { + return (Analyzer) m_analyzerClass.newInstance(); + } catch (Exception ex) { + LOG.error("Unable to create Lucene analyzer, using StandardAnalyzer", ex); + return new StandardAnalyzer(); + } + } + } Modified: trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig_parameter.properties =================================================================== --- trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig_parameter.properties 2005-09-21 16:47:54 UTC (rev 886) +++ trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneConfig_parameter.properties 2005-09-21 17:01:27 UTC (rev 887) @@ -5,4 +5,8 @@ waf.lucene.interval.title=Lucene update interval waf.lucene.interval.purpose=The frequency with which the Lucene index is updated waf.lucene.interval.example=120 -waf.lucene.interval.format=[integer] \ No newline at end of file +waf.lucene.interval.format=[integer] +waf.lucene.analyzer.title=Lucene Analyzer implementation +waf.lucene.analyzer.purpose=The class implementing the Analyzer, standard by default +waf.lucene.analyzer.example=org.apache.lucene.analysis.standard.StandardAnalyzer +waf.lucene.analyzer.format=[string] Modified: trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneSearch.java =================================================================== --- trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneSearch.java 2005-09-21 16:47:54 UTC (rev 886) +++ trunk/ccm-core/src/com/arsdigita/search/lucene/LuceneSearch.java 2005-09-21 17:01:27 UTC (rev 887) @@ -21,7 +21,7 @@ import com.arsdigita.util.UncheckedWrapperException; import org.apache.log4j.Logger; -import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.DateField; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.QueryParser; @@ -66,11 +66,13 @@ **/ public LuceneSearch(String searchString) { try { + LuceneConfig conf = LuceneConfig.getConfig(); + Analyzer analyzer = conf.getAnalyzer(); synchronized(LOCK) { m_index = new IndexSearcher(Index.getLocation()); Query query = QueryParser.parse(searchString, Document.CONTENT, - new StandardAnalyzer()); + analyzer); m_hits = m_index.search(query); } m_hitIndex = 0; @@ -99,11 +101,13 @@ **/ public LuceneSearch(String searchString, Filter f) { try { + LuceneConfig conf = LuceneConfig.getConfig(); + Analyzer analyzer = conf.getAnalyzer(); synchronized(LOCK) { m_index = new IndexSearcher(Index.getLocation()); Query query = QueryParser.parse(searchString, Document.CONTENT, - new StandardAnalyzer()); + analyzer); m_hits = m_index.search(query, f); } m_hitIndex = 0; Modified: trunk/ccm-core/test/src/com/arsdigita/search/lucene/SearchTest.java =================================================================== --- trunk/ccm-core/test/src/com/arsdigita/search/lucene/SearchTest.java 2005-09-21 16:47:54 UTC (rev 886) +++ trunk/ccm-core/test/src/com/arsdigita/search/lucene/SearchTest.java 2005-09-21 17:01:27 UTC (rev 887) @@ -21,7 +21,7 @@ import com.arsdigita.search.Search; import java.math.BigDecimal; import org.apache.log4j.Logger; -import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.index.IndexWriter; /** @@ -153,9 +153,11 @@ } private void cleanIndex() throws Exception { + LuceneConfig conf = LuceneConfig.getConfig(); + Analyzer analyzer = conf.getAnalyzer(); synchronized (LuceneLock.getInstance()) { IndexWriter iw = new IndexWriter(Index.getLocation(), - new StandardAnalyzer(), + analyzer, true); iw.close(); |
|
From: <ap...@vh...> - 2005-09-21 16:57:30
|
Author: apevec
Date: 2005-09-21 18:47:54 +0200 (Wed, 21 Sep 2005)
New Revision: 886
Modified:
trunk/tools/devel/xsl/build-template.xsl
Log:
SF patch [ 1242167 ] Improving build performances
Modified: trunk/tools/devel/xsl/build-template.xsl
===================================================================
--- trunk/tools/devel/xsl/build-template.xsl 2005-09-21 12:31:41 UTC (rev 885)
+++ trunk/tools/devel/xsl/build-template.xsl 2005-09-21 16:47:54 UTC (rev 886)
@@ -297,10 +297,14 @@
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
- <xsl:call-template name="AppPropertyClassPath_Requires">
- <xsl:with-param name="requires" select="$requires"/>
- <xsl:with-param name="type" select="$type"/>
- </xsl:call-template>
+ <xsl:variable name="classPathRequires">
+ <xsl:call-template name="AppPropertyClassPath_Requires">
+ <xsl:with-param name="requires" select="$requires"/>
+ <xsl:with-param name="type" select="$type"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:variable name="classPathRequiresNodeSet" select="common:nodeSet($classPathRequires)" />
+ <xsl:copy-of select="$classPathRequiresNodeSet/path[not(@refid=following::path/@refid)]"/>
</xsl:otherwise>
</xsl:choose>
<xsl:for-each select="/ccm:project/ccm:prebuilt/ccm:application">
|
|
From: <ssk...@vh...> - 2005-09-21 12:41:16
|
Author: sskracic Date: 2005-09-21 14:31:41 +0200 (Wed, 21 Sep 2005) New Revision: 885 Modified: trunk/ccm-cms-types-agenda/sql/ccm-cms-types-agenda/upgrade/oracle-se-6.1.0-6.1.1.sql Log: Upgrade script for Oracle not needed, since DATE contains time portion as well. Modified: trunk/ccm-cms-types-agenda/sql/ccm-cms-types-agenda/upgrade/oracle-se-6.1.0-6.1.1.sql =================================================================== --- trunk/ccm-cms-types-agenda/sql/ccm-cms-types-agenda/upgrade/oracle-se-6.1.0-6.1.1.sql 2005-09-21 08:38:09 UTC (rev 884) +++ trunk/ccm-cms-types-agenda/sql/ccm-cms-types-agenda/upgrade/oracle-se-6.1.0-6.1.1.sql 2005-09-21 12:31:41 UTC (rev 885) @@ -18,16 +18,4 @@ -- $Id$ -- $DateTime: 2004/08/16 18:10:38 $ -\echo Agenda content-type 6.1.0 -> 6.1.1 Upgrade Script (Oracle SE) - -begin; - -alter table ct_agendas rename column agenda_date to agenda_date_old; - -alter table ct_agendas add agenda_date TIMESTAMP; - -update ct_agendas set agenda_date = agenda_date_old; - -alter table ct_agendas drop column agenda_date_old; - -commit; +PROMPT Agenda content-type 6.1.0 -> 6.1.1 Upgrade Script (Oracle SE) |
|
From: <fa...@vh...> - 2005-09-21 08:47:35
|
Author: fabrice
Date: 2005-09-21 10:38:09 +0200 (Wed, 21 Sep 2005)
New Revision: 884
Modified:
trunk/ccm-core/web/assets/htmlarea/htmlarea.js
Log:
Fixing encoding mix-up
Modified: trunk/ccm-core/web/assets/htmlarea/htmlarea.js
===================================================================
--- trunk/ccm-core/web/assets/htmlarea/htmlarea.js 2005-09-20 15:54:06 UTC (rev 883)
+++ trunk/ccm-core/web/assets/htmlarea/htmlarea.js 2005-09-21 08:38:09 UTC (rev 884)
@@ -2317,7 +2317,7 @@
return el && el.nodeType == 1 && (HTMLArea._blockTags.indexOf(" " + el.tagName.toLowerCase() + " ") != -1);
};
-HTMLArea._closingTags="headscriptstyledivspantrtdtbodytableemstrongbicodecitedfnabbracronymfontatitleformtextareah1h2h3h4h5h6";
+HTMLArea._closingTags = " head script style div span tr td tbody table em strong b i code cite dfn abbr acronym font a title form textarea h1 h2 h3 h4 h5 h6 ";
HTMLArea.needsClosingTag = function(el) {
return el && el.nodeType == 1 && (HTMLArea._closingTags.indexOf(" " + el.tagName.toLowerCase() + " ") != -1);
};
|
|
From: <ssk...@vh...> - 2005-09-20 16:03:41
|
Author: sskracic
Date: 2005-09-20 17:54:06 +0200 (Tue, 20 Sep 2005)
New Revision: 883
Modified:
trunk/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java
Log:
Allowing package-scoped access for renameThread() method, declared
static as well.
Modified: trunk/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java 2005-09-19 11:58:21 UTC (rev 882)
+++ trunk/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java 2005-09-20 15:54:06 UTC (rev 883)
@@ -123,7 +123,7 @@
}
}
- private void renameThread(Connection conn) {
+ static void renameThread(Connection conn) {
if (s_taggingEnabled) {
Thread curr = Thread.currentThread();
String tname = curr.getName();
|
|
From: <ssk...@vh...> - 2005-09-19 12:07:52
|
Author: sskracic
Date: 2005-09-19 13:58:21 +0200 (Mon, 19 Sep 2005)
New Revision: 882
Modified:
trunk/ccm-core/src/com/arsdigita/caching/CacheServlet.java
Log:
Failed peer notifications don't deserve so severe log level.
Modified: trunk/ccm-core/src/com/arsdigita/caching/CacheServlet.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/caching/CacheServlet.java 2005-09-18 12:46:54 UTC (rev 881)
+++ trunk/ccm-core/src/com/arsdigita/caching/CacheServlet.java 2005-09-19 11:58:21 UTC (rev 882)
@@ -228,7 +228,7 @@
// XXX check status is 200, or rather, not an error code
} catch (IOException e) {
- s_log.error("Failure sending cache invalidate: " + m_url, e);
+ s_log.warn("Failure sending cache invalidate: " + m_url, e);
}
}
}
|
|
From: <cl...@vh...> - 2005-09-18 12:56:16
|
Author: clasohm Date: 2005-09-18 14:46:54 +0200 (Sun, 18 Sep 2005) New Revision: 881 Modified: contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationInitializer.java Log: fixed minor bug in alert scheduling Modified: contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationInitializer.java =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationInitializer.java 2005-09-18 12:46:20 UTC (rev 880) +++ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationInitializer.java 2005-09-18 12:46:54 UTC (rev 881) @@ -54,7 +54,7 @@ Calendar cal = Calendar.getInstance(); int hourOfDay = cal.get(Calendar.HOUR_OF_DAY); int minute = cal.get(Calendar.MINUTE); - if (hourOfDay > ALERT_HOUR || hourOfDay == ALERT_HOUR && minute > ALERT_MINUTE) + if (hourOfDay > ALERT_HOUR || hourOfDay == ALERT_HOUR && minute >= ALERT_MINUTE) cal.add(Calendar.DATE, 1); cal.set(Calendar.HOUR_OF_DAY, ALERT_HOUR); cal.set(Calendar.MINUTE, ALERT_MINUTE); |
|
From: <cl...@vh...> - 2005-09-18 12:55:49
|
Author: clasohm Date: 2005-09-18 14:46:20 +0200 (Sun, 18 Sep 2005) New Revision: 880 Removed: contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/ Log: removed empty directory |
|
From: <ssk...@vh...> - 2005-09-16 18:25:34
|
Author: sskracic Date: 2005-09-16 20:16:22 +0200 (Fri, 16 Sep 2005) New Revision: 879 Modified: trunk/ccm-formbuilder-pdf/ Log: Ignore build/ directory, what else? Property changes on: trunk/ccm-formbuilder-pdf ___________________________________________________________________ Name: svn:ignore + build |
|
From: <ssk...@vh...> - 2005-09-16 17:31:15
|
Author: sskracic
Date: 2005-09-16 19:21:52 +0200 (Fri, 16 Sep 2005)
New Revision: 878
Modified:
trunk/ccm-core/src/com/arsdigita/caching/CacheServlet.java
Log:
Fixed cache peer selection filter (doh!), and disabled peer
notification if server is still bootstrapping.
Modified: trunk/ccm-core/src/com/arsdigita/caching/CacheServlet.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/caching/CacheServlet.java 2005-09-16 13:35:09 UTC (rev 877)
+++ trunk/ccm-core/src/com/arsdigita/caching/CacheServlet.java 2005-09-16 17:21:52 UTC (rev 878)
@@ -19,6 +19,9 @@
package com.arsdigita.caching;
import com.arsdigita.domain.DomainCollection;
+import com.arsdigita.persistence.Filter;
+import com.arsdigita.persistence.Session;
+import com.arsdigita.persistence.SessionManager;
import com.arsdigita.util.servlet.HttpHost;
import com.arsdigita.web.Host;
import com.arsdigita.web.ParameterMap;
@@ -156,31 +159,25 @@
private static void notifyPeers(final String id,
final String key,
final String hash) {
-// // XXX unpleasant hack to get around bootstrapping problem
-
-// // XXX temporarily disabaling multi JVM support in order to
-// // work around bootstrapping issues on the packaging branch.
-// if (true) { return; }
-
-// try {
-// DomainObjectFactory.newInstance(new OID(Host.BASE_DATA_OBJECT_TYPE,
-// 0));
-// } catch (InstantiatorNotFoundException nfe) {
-// s_log.warn("Not notifying peers; server isn't bootstrapped yet");
-// return;
-// }
-
if (!Web.getConfig().getDeactivateCacheHostNotifications()) {
- s_log.debug("notifying peers");
- final DomainCollection hosts = Host.retrieveAll();
- final HttpHost current = Web.getConfig().getHost();
- hosts.addNotEqualsFilter(Host.SERVER_PORT, new Integer(current.getPort()));
- while (hosts.next()) {
- final Host host = (Host) hosts.getDomainObject();
- notifyPeer(host, makeParameterMap(id, key, hash));
+ s_log.debug("about to notify peers");
+ final Session session = SessionManager.getSession();
+ if (session == null) {
+ s_log.debug("Server is bootstrapping, disabling peer notification");
+ return;
+ }
+ final DomainCollection hosts = Host.retrieveAll();
+ final HttpHost current = Web.getConfig().getHost();
+ Filter f = hosts.addFilter(" not ( " + Host.SERVER_NAME + " = :currName "
+ + " and " + Host.SERVER_PORT + " = :currPort )");
+ f.set("currName", current.getName());
+ f.set("currPort", new Integer(current.getPort()));
+ while (hosts.next()) {
+ final Host host = (Host) hosts.getDomainObject();
+ notifyPeer(host, makeParameterMap(id, key, hash));
+ }
}
}
- }
private static void notifyPeer(Host host, ParameterMap params) {
final String url = "http://" + host + SERVLET_URL + params;
|
|
From: <ssk...@vh...> - 2005-09-16 13:44:24
|
Author: sskracic Date: 2005-09-16 15:35:09 +0200 (Fri, 16 Sep 2005) New Revision: 877 Modified: users/sskracic/bin/make-build-area.sh users/sskracic/bin/make-build-release-area.sh Log: Tools directory also affected by the svn repo reorg. Modified: users/sskracic/bin/make-build-area.sh =================================================================== --- users/sskracic/bin/make-build-area.sh 2005-09-16 13:31:34 UTC (rev 876) +++ users/sskracic/bin/make-build-area.sh 2005-09-16 13:35:09 UTC (rev 877) @@ -16,6 +16,6 @@ if [ ! -d tools ] then - ln -s ~/svn/tools/trunk tools + ln -s ~/svn/trunk/tools tools fi Modified: users/sskracic/bin/make-build-release-area.sh =================================================================== --- users/sskracic/bin/make-build-release-area.sh 2005-09-16 13:31:34 UTC (rev 876) +++ users/sskracic/bin/make-build-release-area.sh 2005-09-16 13:35:09 UTC (rev 877) @@ -19,6 +19,6 @@ if [ ! -L tools ] then - ln -s ~/svn/tools/trunk tools + ln -s ~/svn/trunk/tools tools fi |
|
From: <ap...@vh...> - 2005-09-16 13:40:59
|
Author: apevec Date: 2005-09-16 15:31:34 +0200 (Fri, 16 Sep 2005) New Revision: 876 Removed: tools/ Log: svn reorg |
|
From: <ap...@vh...> - 2005-09-16 13:19:34
|
Author: apevec Date: 2005-09-16 15:10:18 +0200 (Fri, 16 Sep 2005) New Revision: 874 Added: trunk/tools/ Removed: tools/trunk/ Log: svn reorg Copied: trunk/tools (from rev 873, tools/trunk) |
|
From: <ssk...@vh...> - 2005-09-16 13:19:29
|
Author: sskracic
Date: 2005-09-16 15:10:11 +0200 (Fri, 16 Sep 2005)
New Revision: 875
Modified:
users/sskracic/bin/make-build-area.sh
users/sskracic/bin/make-devel-area.sh
users/sskracic/bin/make-release-area.sh
Log:
Now that svn repo has reorg'd, it's time to reflect those
changes in build system helpers.
Modified: users/sskracic/bin/make-build-area.sh
===================================================================
--- users/sskracic/bin/make-build-area.sh 2005-09-16 13:10:18 UTC (rev 874)
+++ users/sskracic/bin/make-build-area.sh 2005-09-16 13:10:11 UTC (rev 875)
@@ -4,13 +4,13 @@
set -e
-DIRLIST=$(cd ~/svn ; echo ccm*)
+DIRLIST=$(cd ~/svn/trunk ; echo ccm*)
for dir in $DIRLIST
do
if [ ! -d $dir ]
then
mkdir $dir
- ln -s ~/svn/$dir/trunk $dir/$dir
+ ln -s ~/svn/trunk/$dir $dir/$dir
fi
done
Modified: users/sskracic/bin/make-devel-area.sh
===================================================================
--- users/sskracic/bin/make-devel-area.sh 2005-09-16 13:10:18 UTC (rev 874)
+++ users/sskracic/bin/make-devel-area.sh 2005-09-16 13:10:11 UTC (rev 875)
@@ -4,17 +4,12 @@
set -e
-DIRLIST=$(cd ~/svn ; echo ccm*)
+DIRLIST=$(cd ~/svn/trunk ; echo ccm*)
for dir in $DIRLIST
do
if [ ! -L $dir ]
then
- ln -s ~/svn/$dir/trunk $dir
+ ln -s ~/svn/trunk/$dir $dir
fi
done
-if [ ! -L tools ]
-then
- ln -s ~/svn/tools/trunk tools
-fi
-
Modified: users/sskracic/bin/make-release-area.sh
===================================================================
--- users/sskracic/bin/make-release-area.sh 2005-09-16 13:10:18 UTC (rev 874)
+++ users/sskracic/bin/make-release-area.sh 2005-09-16 13:10:11 UTC (rev 875)
@@ -15,8 +15,3 @@
fi
done
-if [ ! -L tools ]
-then
- ln -s $REL_DIR/tools tools
-fi
-
|
|
From: <ap...@vh...> - 2005-09-16 13:04:40
|
Author: apevec Date: 2005-09-16 14:55:28 +0200 (Fri, 16 Sep 2005) New Revision: 873 Removed: ccm-auth-http/ ccm-cms-assets-fileattachment/ ccm-cms-assets-notes/ ccm-cms-assets-relatedlink/ ccm-cms-types-address/ ccm-cms-types-agenda/ ccm-cms-types-article/ ccm-cms-types-bookmark/ ccm-cms-types-contact/ ccm-cms-types-esdservice/ ccm-cms-types-event/ ccm-cms-types-faqitem/ ccm-cms-types-filestorageitem/ ccm-cms-types-formitem/ ccm-cms-types-formsectionitem/ ccm-cms-types-glossaryitem/ ccm-cms-types-htmlform/ ccm-cms-types-inlinesite/ ccm-cms-types-job/ ccm-cms-types-legalnotice/ ccm-cms-types-minutes/ ccm-cms-types-motditem/ ccm-cms-types-mparticle/ ccm-cms-types-newsitem/ ccm-cms-types-organization/ ccm-cms-types-pressrelease/ ccm-cms-types-service/ ccm-cms-types-siteproxy/ ccm-cms/ ccm-core/ ccm-formbuilder-pdf/ ccm-forum/ ccm-ldn-aplaws/ ccm-ldn-atoz/ ccm-ldn-dublin/ ccm-ldn-exporter/ ccm-ldn-freeform/ ccm-ldn-image-step/ ccm-ldn-importer/ ccm-ldn-navigation/ ccm-ldn-portal/ ccm-ldn-rss/ ccm-ldn-search/ ccm-ldn-shortcuts/ ccm-ldn-subsite/ ccm-ldn-terms/ ccm-ldn-theme/ ccm-ldn-util/ ccm-ldn-xmlfeed/ ccm-simplesurvey/ ccm-user-preferences/ Log: svn reorg |
|
From: <ap...@vh...> - 2005-09-16 11:46:19
|
Author: apevec Date: 2005-09-16 13:37:07 +0200 (Fri, 16 Sep 2005) New Revision: 872 Removed: ccm-cms/6.1.0/ ccm-core/core-6.1.0/ Log: obsolete branches |
|
From: <ap...@vh...> - 2005-09-16 10:13:12
|
Author: apevec Date: 2005-09-16 12:03:56 +0200 (Fri, 16 Sep 2005) New Revision: 871 Added: trunk/ccm-user-preferences/ Removed: ccm-user-preferences/trunk/ Log: svn reorg Copied: trunk/ccm-user-preferences (from rev 870, ccm-user-preferences/trunk) |
|
From: <ap...@vh...> - 2005-09-16 10:13:09
|
Author: apevec Date: 2005-09-16 12:03:54 +0200 (Fri, 16 Sep 2005) New Revision: 870 Added: trunk/ccm-simplesurvey/ Removed: ccm-simplesurvey/trunk/ Log: svn reorg Copied: trunk/ccm-simplesurvey (from rev 869, ccm-simplesurvey/trunk) |
|
From: <ap...@vh...> - 2005-09-16 10:12:59
|
Author: apevec Date: 2005-09-16 12:03:51 +0200 (Fri, 16 Sep 2005) New Revision: 869 Added: trunk/ccm-ldn-xmlfeed/ Removed: ccm-ldn-xmlfeed/trunk/ Log: svn reorg Copied: trunk/ccm-ldn-xmlfeed (from rev 868, ccm-ldn-xmlfeed/trunk) |
|
From: <ap...@vh...> - 2005-09-16 10:12:58
|
Author: apevec Date: 2005-09-16 12:03:45 +0200 (Fri, 16 Sep 2005) New Revision: 867 Added: trunk/ccm-ldn-theme/ Removed: ccm-ldn-theme/trunk/ Log: svn reorg Copied: trunk/ccm-ldn-theme (from rev 866, ccm-ldn-theme/trunk) |
|
From: <ap...@vh...> - 2005-09-16 10:12:58
|
Author: apevec Date: 2005-09-16 12:03:48 +0200 (Fri, 16 Sep 2005) New Revision: 868 Added: trunk/ccm-ldn-util/ Removed: ccm-ldn-util/trunk/ Log: svn reorg Copied: trunk/ccm-ldn-util (from rev 867, ccm-ldn-util/trunk) |
18 messages has been excluded from this view by a project administrator.
