You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ad...@apache.org on 2009/07/05 09:04:58 UTC
svn commit: r791203 [2/2] - in /tuscany/branches/sca-java-1.x/modules:
domain-manager/
domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/
domain-manager/src/main/resources/ domain-search/
domain-search/src/main/java/org/apache/tus...
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchFormatter.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchFormatter.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchFormatter.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchFormatter.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,30 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import org.apache.lucene.search.highlight.Formatter;
+import org.apache.lucene.search.highlight.TokenGroup;
+
+public class DomainSearchFormatter implements Formatter {
+
+ final public static String HIGHLIGHT_START = "\u0005\u0005\u0006";
+
+ final public static String HIGHLIGHT_END = "\u0006\u0005\u0005";
+
+ private StringBuilder sb = new StringBuilder();
+
+ public String highlightTerm(String originalText, TokenGroup tokenGroup) {
+
+ if (tokenGroup.getTotalScore() > 0) {
+ sb.setLength(0);
+
+ sb.append(HIGHLIGHT_START).append(originalText).append(
+ HIGHLIGHT_END);
+
+ return sb.toString();
+
+ } else {
+ return originalText;
+ }
+
+ }
+
+}
Modified: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java?rev=791203&r1=791202&r2=791203&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java (original)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchImpl.java Sun Jul 5 07:04:56 2009
@@ -1,8 +1,6 @@
package org.apache.tuscany.sca.domain.search.impl;
-import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.util.List;
import org.apache.lucene.analysis.Analyzer;
@@ -21,91 +19,65 @@
import org.apache.tuscany.sca.contribution.service.ContributionRepository;
import org.apache.tuscany.sca.domain.search.DocumentMap;
import org.apache.tuscany.sca.domain.search.DomainSearch;
+import org.apache.tuscany.sca.domain.search.Result;
import org.osoa.sca.annotations.AllowsPassByReference;
+import org.osoa.sca.annotations.Scope;
+@Scope("COMPOSITE")
public class DomainSearchImpl implements DomainSearch {
+ private Directory dir = new RAMDirectory();
+
+ private Analyzer analyzer = new DomainSearchAnalyzer();
+
+ public DomainSearchImpl() {
+ // empty constructor
+ }
+
@AllowsPassByReference
public void contributionAdded(ContributionRepository repository,
Contribution contribution) {
System.out.println("contributionAdded:");
System.out.println(repository);
System.out.println(contribution);
-
+
try {
- Directory dir = new RAMDirectory();
- Analyzer analyzer = new DomainSearchAnalyzer();
- IndexWriter indexWriter = new IndexWriter(dir, analyzer, IndexWriter.MaxFieldLength.UNLIMITED);
- DomainSearchDocumentProcessorsMap docProcessors = new DomainSearchDocumentProcessorsMap();
- DocumentMap docs = new DocumentMap();
-
- docProcessors.process(docProcessors, docs, contribution, null, "");
-
- for (Document doc : docs.values()) {
- indexWriter.addDocument(doc.createLuceneDocument());
- }
-
- indexWriter.close();
-
- final IndexSearcher searcher = new IndexSearcher(dir);
- BufferedReader consoleReader = new BufferedReader(new InputStreamReader(System.in));
- QueryParser qp = new QueryParser("", analyzer);
-
- qp.setAllowLeadingWildcard(true);
-
- while (true) {
- System.out.print("query: ");
- String queryString = consoleReader.readLine();
-
- if (queryString.equals("exit")) {
- break;
- }
-
+ IndexWriter indexWriter = new IndexWriter(dir, analyzer,
+ IndexWriter.MaxFieldLength.UNLIMITED);
+
+ try {
+ DomainSearchDocumentProcessorsMap docProcessors = new DomainSearchDocumentProcessorsMap();
+ DocumentMap docs = new DocumentMap();
+
try {
- Query query = qp.parse(queryString);
-
- searcher.search(query, new HitCollector() {
-
- @Override
- public void collect(int doc, float score) {
- try {
- org.apache.lucene.document.Document document = searcher.doc(doc);
- List<?> fields = document.getFields();
- System.out.println("---------");
- System.out.println("doc = " + doc);
-
- for (Object obj : fields) {
- Field field = (Field) obj;
- String[] values = document.getValues(field.name());
- System.out.println(field);
-
- for (String value : values) {
- System.out.println("\t" + value);
- }
-
- }
-
- } catch (CorruptIndexException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- });
-
- } catch (ParseException e) {
- System.out.println(e.getMessage());
+ docProcessors.process(docProcessors, docs, contribution, null, "");
+ } catch (Exception e) {
+ e.printStackTrace();
}
-
- System.out.println();
-
+
+ for (Document doc : docs.values()) {
+ indexWriter.addDocument(doc.createLuceneDocument());
+ }
+
+ } finally {
+ indexWriter.close();
}
-
-
-
+
+ // BufferedReader consoleReader = new BufferedReader(
+ // new InputStreamReader(System.in));
+ //
+ // while (true) {
+ // System.out.print("query: ");
+ // String queryString = consoleReader.readLine();
+ //
+ // if (queryString.equals("exit")) {
+ // break;
+ // }
+ //
+ // parseAndSearch(queryString, false);
+ //
+ // }
+
} catch (CorruptIndexException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -116,7 +88,7 @@
// TODO Auto-generated catch block
e.printStackTrace();
}
-
+
}
public void contributionRemoved(ContributionRepository repository,
@@ -124,17 +96,100 @@
System.out.println("contributionRemoved:");
System.out.println(repository);
System.out.println(contribution);
-
+
}
public void contributionUpdated(ContributionRepository repository,
Contribution oldContribution, Contribution contribution) {
-
+
System.out.println("contributionUpdated:");
System.out.println(repository);
System.out.println(oldContribution);
System.out.println(contribution);
-
+
+ }
+
+ @SuppressWarnings("deprecation")
+ public Result[] parseAndSearch(String searchQuery, boolean highlight) {
+
+ try {
+ final IndexSearcher searcher = new IndexSearcher(dir);
+ final DomainSearchResultProcessor resultProcessor = new DomainSearchResultProcessor(
+ new DomainSearchResultFactory());
+
+ QueryParser qp = new QueryParser("", analyzer);
+
+ qp.setAllowLeadingWildcard(true);
+
+ try {
+ final Query query = qp.parse(searchQuery);
+
+ searcher.search(query, new HitCollector() {
+
+ @Override
+ public void collect(int doc, float score) {
+ try {
+ org.apache.lucene.document.Document document = searcher
+ .doc(doc);
+
+ resultProcessor.process(document, query, null);
+
+ List<?> fields = document.getFields();
+ System.out.println("---------");
+ System.out.println("doc = " + doc);
+
+ for (Object obj : fields) {
+ Field field = (Field) obj;
+ String[] values = document.getValues(field
+ .name());
+ System.out.println(field);
+
+ for (String value : values) {
+ System.out.println("\t" + value);
+ }
+
+ }
+
+ } catch (CorruptIndexException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ });
+
+ } catch (ParseException e) {
+ System.out.println(e.getMessage());
+ }
+
+ Result[] results = resultProcessor.getResultRoots();
+
+ // for (Result result : results) {
+ // System.out.println(result);
+ // }
+
+ System.out.println();
+
+ return results;
+
+ } catch (CorruptIndexException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ return null;
+
+ }
+
+ public Result[] search(Query searchQuery, boolean hightlight) {
+ // TODO Auto-generated method stub
+ return null;
}
}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchResultFactory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchResultFactory.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchResultFactory.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchResultFactory.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,18 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+public class DomainSearchResultFactory extends ResultFactoryList {
+
+ private static final long serialVersionUID = -7421799172738469027L;
+
+ public DomainSearchResultFactory() {
+ add(new ContributionResultFactory());
+ add(new CompositeResultFactory());
+ add(new ComponentResultFactory());
+ add(new ComponentTypeResultFactory());
+ add(new ArtifactResultProcessor.ArtifactResultFactory());
+ add(new BindingResultFactory());
+ add(new FileContentResultProcessor.FileContentResultFactory());
+
+ }
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchResultProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchResultProcessor.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchResultProcessor.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/DomainSearchResultProcessor.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,20 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import org.apache.tuscany.sca.domain.search.Result;
+import org.apache.tuscany.sca.domain.search.ResultFactory;
+
+public class DomainSearchResultProcessor extends ResultProcessorList {
+
+ private static final long serialVersionUID = 792292814333612713L;
+
+ public DomainSearchResultProcessor(
+ ResultFactory<? extends Result> resultFactory) {
+
+ super(new DomainSearchResultFactory());
+
+ add(new ArtifactResultProcessor());
+ add(new FileContentResultProcessor());
+
+ }
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContent.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContent.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContent.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContent.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,18 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public interface FileContent {
+
+ String getPath();
+
+ String getName();
+
+ FileContent[] getChildren();
+
+ boolean isLeaf();
+
+ InputStream getInputStream() throws IOException;
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContentResult.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContentResult.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContentResult.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContentResult.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,25 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+public class FileContentResult extends ResultImpl {
+
+ private static final long serialVersionUID = 950227008096181276L;
+
+ private String content;
+
+ public FileContentResult() {
+ // empty constructor
+ }
+
+ public FileContentResult(String name) {
+ super(name);
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContentResultProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContentResultProcessor.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContentResultProcessor.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileContentResultProcessor.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,116 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.lucene.document.Document;
+import org.apache.lucene.search.Query;
+import org.apache.tuscany.sca.domain.search.Result;
+import org.apache.tuscany.sca.domain.search.ResultFactory;
+import org.apache.tuscany.sca.domain.search.ResultProcessor;
+
+public class FileContentResultProcessor implements ResultProcessor {
+
+ public static class FileContentResultFactory implements
+ ResultFactory<FileContentResult> {
+
+ public FileContentResultFactory() {
+ // empty constructor
+ }
+
+ public FileContentResult createResult(String name) {
+ return new FileContentResult(name);
+ }
+
+ public String getName(Document document) {
+ return document.get(SearchFields.FILE_FIELD);
+ }
+
+ public String getType() {
+ return SearchFields.FILE_FIELD;
+ }
+
+ public FileContentResult createResult(Document document) {
+ String name = getName(document);
+
+ if (name != null) {
+ return createResult(name);
+ }
+
+ return null;
+
+ }
+
+ }
+
+ public Result process(Document document, Query query, Result result) {
+
+ if (result instanceof FileContentResult) {
+ FileContentResult fileContentResult = (FileContentResult) result;
+ Reader reader;
+
+ ParentField parentField = new ParentField(document
+ .get(SearchFields.PARENT_FIELD));
+ String parentURI = parentField.getElementURI(parentField
+ .getElementsCount() - 1);
+ String name = document.get(SearchFields.FILE_FIELD);
+
+ if (name == null) {
+ return result;
+ }
+
+ if (parentURI.indexOf(ZipDocumentProcessor.ARCHIVE_SEPARATOR) != -1) {
+ String[] locations = parentURI.split(Character
+ .toString(ZipDocumentProcessor.ARCHIVE_SEPARATOR));
+
+ try {
+ ZipFile zip = new ZipFile(new File(locations[0]));
+
+ // TODO: normalize the entry path and check if the entry still exists
+ ZipEntry entry = zip.getEntry(locations[1].substring(1) + name);
+
+ Enumeration<? extends ZipEntry> entries = zip.entries();
+
+ while (entries.hasMoreElements()) System.out.println(entries.nextElement().getName());
+
+ reader = new InputStreamReader(zip.getInputStream(entry));
+
+ } catch (IOException e) {
+ return result;
+ }
+
+ } else {
+
+ try {
+ reader = new InputStreamReader(new FileInputStream(
+ new File(parentURI + '/' + name)));
+
+ } catch (FileNotFoundException e) {
+ return result;
+ }
+
+ }
+
+ try {
+ fileContentResult.setContent(HighlightingUtil
+ .bestFragmentHighlighted(query, reader));
+
+ } catch (IOException e) {
+ // ignore content loading, TODO: maybe it return an error
+ // message as the content
+ }
+
+ }
+
+ return result;
+
+ }
+
+}
Modified: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileDocumentProcessor.java?rev=791203&r1=791202&r2=791203&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileDocumentProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/FileDocumentProcessor.java Sun Jul 5 07:04:56 2009
@@ -1,50 +1,86 @@
package org.apache.tuscany.sca.domain.search.impl;
-import java.io.File;
+import java.util.LinkedList;
import org.apache.lucene.document.Field;
import org.apache.tuscany.sca.domain.search.DocumentMap;
import org.apache.tuscany.sca.domain.search.DocumentProcessor;
-import org.apache.tuscany.sca.domain.search.DocumentProcessorsMap;
-public class FileDocumentProcessor implements DocumentProcessor {
+public class FileDocumentProcessor extends LinkedList<DocumentProcessor>
+ implements DocumentProcessor {
- public Document process(DocumentProcessorsMap processors,
+ private static final long serialVersionUID = 7843338343970738591L;
+
+ public Document process(DocumentProcessor parentProcessor,
DocumentMap documents, Object object, Document doc, String parent) {
- if (object instanceof File) {
- File file = (File) object;
- documents.get(file.getAbsoluteFile());
-
- if (file.isFile()) {
- doc.add(new Field(SearchFields.DIRECTORY_FIELD, file.getAbsolutePath(),
- Field.Store.YES, Field.Index.ANALYZED));
-
- parent += DomainPathAnalyzer.PATH_SEPARATOR + SearchFields.FILE_FIELD + DomainPathAnalyzer.TYPE_SEPARATOR + file.getName();
-
- File[] files = file.listFiles();
-
- for (File childFile : files) {
- Document fileDoc = processors.process(processors, documents, childFile, null, parent);
-
+ if (object instanceof FileContent) {
+ FileContent file = (FileContent) object;
+
+ if (!file.isLeaf()) {
+
+ if (doc == null) {
+ doc = documents.get(file.getPath());
+ }
+
+ doc.add(new Field(SearchFields.DIRECTORY_FIELD, file
+ .getPath(), Field.Store.YES,
+ Field.Index.ANALYZED));
+
+ parent += DomainPathAnalyzer.PATH_SEPARATOR
+ + SearchFields.FILE_FIELD
+ + DomainPathAnalyzer.TYPE_SEPARATOR + file.getPath()
+ + DomainPathAnalyzer.URI_SEPARATOR + file.getName();
+
+ FileContent[] files = file.getChildren();
+
+ for (FileContent childFile : files) {
+ Document fileDoc = parentProcessor.process(parentProcessor,
+ documents, childFile, null, parent);
+
fileDoc.add(new Field(SearchFields.PARENT_FIELD, parent,
Field.Store.YES, Field.Index.ANALYZED));
-
+
}
+ return doc;
+
+ } else {
+
+ for (DocumentProcessor processor : this) {
+ Document newDoc = processor.process(this, documents,
+ object, doc, parent);
+
+ if (newDoc != null) {
+ return newDoc;
+ }
+
+ }
+
}
-
- return doc;
}
-
- throw new IllegalArgumentException();
+
+ return doc;
}
public Object getDocumentKey(Object object) {
- // TODO Auto-generated method stub
- return null;
+
+ if (object instanceof FileContent) {
+ FileContent file = (FileContent) object;
+ String path = file.getPath();
+
+ if (path != null && path.length() == 0) {
+ return null;
+ }
+
+ return path;
+
+ }
+
+ throw new IllegalArgumentException();
+
}
}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/HighlightingUtil.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,132 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+
+import org.apache.lucene.analysis.CachingTokenFilter;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.highlight.Highlighter;
+import org.apache.lucene.search.highlight.InvalidTokenOffsetsException;
+import org.apache.lucene.search.highlight.SimpleFragmenter;
+import org.apache.lucene.search.highlight.SpanScorer;
+
+final public class HighlightingUtil {
+
+ public static String bestFragmentHighlighted(Query query, Reader reader) throws IOException {
+ StringBuilder sb = new StringBuilder();
+ int c;
+
+ // TODO: load the chars into a buffer instead of one at a time
+ while ((c = reader.read()) != -1) {
+ char character = (char) c;
+
+ if (!Character.isIdentifierIgnorable(character)) {
+ sb.append(character);
+ }
+
+ }
+
+ String text = sb.toString();
+
+ CachingTokenFilter tokenStream = new CachingTokenFilter(new NamingAnalyzer().tokenStream(
+ SearchFields.FILE_CONTENT_FIELD, new StringReader(text)));
+
+ Highlighter highlighter = new Highlighter(new DomainSearchFormatter(), new SpanScorer(query, SearchFields.FILE_CONTENT_FIELD, tokenStream, ""));
+ highlighter.setTextFragmenter(new SimpleFragmenter(100));
+ tokenStream.reset();
+
+ try {
+ return highlighter.getBestFragments(tokenStream, text, 2, "...");
+
+ } catch (InvalidTokenOffsetsException e) {
+
+ // could not create fragments, return empty string
+ return "";
+
+ }
+
+ }
+
+ public static String replaceHighlightMarkupBy(CharSequence text,
+ String startHighlight, String endHighlight) {
+ StringBuilder sb = new StringBuilder();
+ int start = 0;
+ int end = 0;
+
+ for (int i = 0; i < text.length(); i++) {
+ char c = text.charAt(i);
+
+ if (start > 0) {
+
+ if (c == DomainSearchFormatter.HIGHLIGHT_START.charAt(start)) {
+ start++;
+
+ if (start == DomainSearchFormatter.HIGHLIGHT_START.length()) {
+ sb.append(startHighlight);
+ start = 0;
+
+ }
+
+ } else {
+
+ for (int j = 0; j < start; j++) {
+ sb.append(DomainSearchFormatter.HIGHLIGHT_START.charAt(j));
+ }
+
+ start = 0;
+
+ }
+
+ } else if (end > 0) {
+
+ if (c == DomainSearchFormatter.HIGHLIGHT_END.charAt(end)) {
+ end++;
+
+ if (end == DomainSearchFormatter.HIGHLIGHT_END.length()) {
+ sb.append(endHighlight);
+ end = 0;
+
+ }
+
+ } else {
+
+ for (int j = 0; j < end; j++) {
+ sb.append(DomainSearchFormatter.HIGHLIGHT_END.charAt(j));
+ }
+
+ end = 0;
+
+ }
+
+ } else if (c == DomainSearchFormatter.HIGHLIGHT_START.charAt(0)) {
+ start = 1;
+
+ } else if (c == DomainSearchFormatter.HIGHLIGHT_END.charAt(0)) {
+ end = 1;
+
+ } else {
+ sb.append(c);
+ }
+
+ }
+
+ if (start > 0) {
+
+ for (int j = 0; j < start; j++) {
+ sb.append(DomainSearchFormatter.HIGHLIGHT_START.charAt(j));
+ }
+
+ } else if (end > 0) {
+
+ for (int j = 0; j < start; j++) {
+ sb.append(DomainSearchFormatter.HIGHLIGHT_END.charAt(j));
+ }
+
+ }
+
+ return sb.toString();
+
+ }
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ParentField.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ParentField.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ParentField.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ParentField.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,184 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ParentField implements Serializable {
+
+ private static final long serialVersionUID = -2090538050273088026L;
+
+ final private List<ParentFieldElement> elements;
+
+ public ParentField(String parentFieldValue) {
+ int length = parentFieldValue.length();
+
+ if (length == 0) {
+ this.elements = Collections.emptyList();
+
+ return;
+
+ }
+
+ this.elements = new ArrayList<ParentFieldElement>();
+
+ ParentFieldElement element = null;
+ StringBuilder sb = new StringBuilder();
+
+ for (int i = 0; i < length ; i++) {
+ char c = parentFieldValue.charAt(i);
+
+ if (c == DomainPathAnalyzer.PATH_SEPARATOR) {
+
+ if (sb.length() > 0 || element != null) {
+
+ if (element == null) {
+ element = new ParentFieldElement();
+ }
+
+ if (element.type == null) {
+ element.type = "";
+ }
+
+ if (element.uri == null) {
+ element.uri = element.name = sb.toString();
+
+ } else {
+ element.name = sb.toString();
+ }
+
+ sb.setLength(0);
+ this.elements.add(element);
+ element = null;
+
+ }
+
+ } else if (c == DomainPathAnalyzer.TYPE_SEPARATOR) {
+
+ if (element == null) {
+ element = new ParentFieldElement();
+ }
+
+ element.type = sb.toString();
+
+ sb.setLength(0);
+
+ } else if (c == DomainPathAnalyzer.URI_SEPARATOR) {
+
+ if (element == null) {
+ element = new ParentFieldElement();
+ }
+
+ element.uri = sb.toString();
+
+ sb.setLength(0);
+
+ } else {
+ sb.append(c);
+ }
+
+ }
+
+ if (sb.length() > 0 || element != null) {
+
+ if (element == null) {
+ element = new ParentFieldElement();
+ }
+
+ if (element.type == null) {
+ element.type = "";
+ }
+
+ if (element.uri == null) {
+ element.uri = element.name = sb.toString();
+
+ } else {
+ element.name = sb.toString();
+ }
+
+ sb.setLength(0);
+ this.elements.add(element);
+ element = null;
+
+ }
+
+ }
+
+ public static String getURIPath(ParentField parentField) {
+ return getURIPath(parentField, System.getProperty("file.separator"));
+ }
+
+ public static String getURIPath(ParentField parentField, String pathSeparator) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(pathSeparator);
+ int elementsCount = parentField.getElementsCount();
+
+ for (int i = 0 ; i < elementsCount ; i++) {
+ sb.append(parentField.getElementName(i));
+ sb.append(pathSeparator);
+
+ }
+
+ if (sb.length() > pathSeparator.length()) {
+ sb.setLength(sb.length() - pathSeparator.length());
+ }
+
+ return sb.toString();
+
+ }
+
+ public static int getParentElementsCount(String parent) {
+ int length = parent.length();
+
+ if (length == 0) {
+ return 0;
+ }
+
+ boolean pathSeparatorBefore = true;
+ int count = 1;
+
+ for (int i = 0; i < length - 1; i++) {
+ char c = parent.charAt(i);
+
+ if (c == DomainPathAnalyzer.PATH_SEPARATOR && !pathSeparatorBefore) {
+ pathSeparatorBefore = true;
+ count++;
+
+ } else {
+ pathSeparatorBefore = false;
+ }
+
+ }
+
+ return count;
+
+ }
+
+ public int getElementsCount() {
+ return this.elements.size();
+ }
+
+ public String getElementType(int index) {
+ return this.elements.get(index).type;
+ }
+
+ public String getElementURI(int index) {
+ return this.elements.get(index).uri;
+ }
+
+ public String getElementName(int index) {
+ return this.elements.get(index).name;
+ }
+
+ final private static class ParentFieldElement {
+
+ String type;
+
+ String uri;
+
+ String name;
+
+ }
+
+}
Modified: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/PropertyDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/PropertyDocumentProcessor.java?rev=791203&r1=791202&r2=791203&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/PropertyDocumentProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/PropertyDocumentProcessor.java Sun Jul 5 07:04:56 2009
@@ -6,11 +6,10 @@
import org.apache.tuscany.sca.assembly.Property;
import org.apache.tuscany.sca.domain.search.DocumentMap;
import org.apache.tuscany.sca.domain.search.DocumentProcessor;
-import org.apache.tuscany.sca.domain.search.DocumentProcessorsMap;
public class PropertyDocumentProcessor implements DocumentProcessor {
- public Document process(DocumentProcessorsMap processors,
+ public Document process(DocumentProcessor parentProcessor,
DocumentMap documents, Object object, Document doc, String parent) {
if (object instanceof Property) {
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/PropertyResult.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/PropertyResult.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/PropertyResult.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/PropertyResult.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,20 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+public class PropertyResult extends ResultImpl {
+
+ private static final long serialVersionUID = 5744678253277504237L;
+
+ private String[] values;
+
+ public PropertyResult(String name, String... values) {
+ super(name);
+
+ this.values = values;
+
+ }
+
+ public String[] getValues() {
+ return this.values.clone();
+ }
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ReferenceResult.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ReferenceResult.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ReferenceResult.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ReferenceResult.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,27 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+public class ReferenceResult extends ResultImpl {
+
+ private static final long serialVersionUID = -2846199490484466090L;
+
+ private String[] operations;
+
+ private String[] callbackOperations;
+
+ public ReferenceResult(String name, String[] operations, String[] callbackOperations) {
+ super(name);
+
+ this.operations = operations;
+ this.callbackOperations = callbackOperations;
+
+ }
+
+ public String[] getOperations() {
+ return this.operations.clone();
+ }
+
+ public String[] getCallbackOperations() {
+ return this.callbackOperations.clone();
+ }
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultFactoryList.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultFactoryList.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultFactoryList.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultFactoryList.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,55 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import java.util.LinkedList;
+
+import org.apache.lucene.document.Document;
+import org.apache.tuscany.sca.domain.search.Result;
+import org.apache.tuscany.sca.domain.search.ResultFactory;
+
+public class ResultFactoryList extends LinkedList<ResultFactory<? extends Result>> implements ResultFactory<Result> {
+
+ private static final long serialVersionUID = 6806221945324235828L;
+
+ public ResultFactoryList() {
+ // empty constructor
+ }
+
+ public Result createResult(Document document) {
+
+ for (ResultFactory<? extends Result> resultFactory : this) {
+ Result result = resultFactory.createResult(document);
+
+ if (result != null) {
+ return result;
+ }
+
+ }
+
+ return null;
+
+ }
+
+ public Result createResult(String name) {
+ return null;
+ }
+
+ public String getName(Document document) {
+
+ for (ResultFactory<? extends Result> resultFactory : this) {
+ String name = resultFactory.getName(document);
+
+ if (name != null) {
+ return name;
+ }
+
+ }
+
+ return null;
+
+ }
+
+ public String getType() {
+ return "";
+ }
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultImpl.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultImpl.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultImpl.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,251 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.domain.search.Result;
+
+public abstract class ResultImpl implements Result {
+
+ private static final long serialVersionUID = 7084570994751217396L;
+
+ private Result container;
+
+ private HashMap<String, Result> contents;
+
+ private String name;
+
+ public ResultImpl() {
+ // empty constructor
+ }
+
+ public ResultImpl(String name) {
+ this.name = name;
+ }
+
+ public Result getContainer() {
+ return this.container;
+ }
+
+ public Map<String, Result> getContents() {
+
+ if (this.contents == null) {
+ return Collections.emptyMap();
+ }
+
+ return Collections.unmodifiableMap(this.contents);
+
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setContainer(Result container) {
+
+ if (container != this.container) {
+
+ if (this.container != null) {
+ this.container.removeContent(this);
+ }
+
+ this.container = container;
+
+ if (container != null) {
+ container.addContent(this);
+ }
+
+ }
+
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+
+ if (obj instanceof Result) {
+ Result artifactResult = (Result) obj;
+
+ if (artifactResult.getName() == this.name || this.name != null
+ && this.name.equals(artifactResult.getName())) {
+
+ if (artifactResult.getContainer() == this.container
+ || this.container != null
+ && this.container.equals(artifactResult.getContainer())) {
+
+ Map<String, Result> contents = artifactResult.getContents();
+
+ if (this.contents == null) {
+ return contents.isEmpty();
+
+ } else if (this.contents.equals(contents)) {
+ return true;
+ }
+
+ }
+
+ }
+
+ }
+
+ return false;
+
+ }
+
+ public void addContent(Result artifactResult) {
+ internalGetContents().put(artifactResult.getName(), artifactResult);
+
+ if (artifactResult.getContainer() != this) {
+ artifactResult.setContainer(this);
+ }
+
+ }
+
+ private HashMap<String, Result> internalGetContents() {
+
+ if (this.contents == null) {
+ this.contents = new HashMap<String, Result>();
+ }
+
+ return this.contents;
+
+ }
+
+ public void removeContent(Result artifactResult) {
+
+ if (this.contents != null) {
+ this.contents.remove(artifactResult);
+
+ artifactResult.setContainer(null);
+
+ if (this.contents.isEmpty()) {
+ this.contents = null;
+ }
+
+ }
+
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 11;
+
+ hash = hash * 31
+ + (this.container == null ? 7 : this.container.hashCode());
+ hash = hash
+ * 31
+ + (this.contents == null || this.contents.isEmpty() ? 13
+ : this.contents.hashCode());
+ hash = hash * 31 + (this.name == null ? 17 : this.name.hashCode());
+
+ return hash;
+
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String toString() {
+ StringBuilder sb = new StringBuilder("<");
+ Result container = getContainer();
+
+ sb.append(getClass().getName()).append(" name='").append(getName())
+ .append("' container='").append(container != null ? container.getName() : null).append("'>\n");
+
+ Method[] methods = getClass().getMethods();
+
+ for (Method method : methods) {
+ String methodName = method.getName();
+
+ if (method.getReturnType() != void.class) {
+
+ if (method.getParameterTypes().length == 0) {
+
+ if (methodName.startsWith("get")
+ && !"getName".equals(methodName)
+ && !"getContainer".equals(methodName)) {
+
+ try {
+ Object returnedObj = method.invoke(this);
+
+ sb.append('\t');
+
+ if (returnedObj instanceof Map<?, ?>) {
+
+ sb.append("<collection type='").append(
+ returnedObj.getClass()
+ .getGenericInterfaces()[1])
+ .append("'>\n");
+
+ for (Object obj : ((Map<?, ?>) returnedObj).values()) {
+
+ sb.append("\t\t").append(obj.toString())
+ .append("\n");
+
+ }
+
+ sb.append("\t</collection>\n");
+
+ } else if (returnedObj instanceof Collection<?>) {
+
+ sb.append("<collection type='").append(
+ returnedObj.getClass()
+ .getGenericInterfaces()[0])
+ .append("'>\n");
+
+ for (Object obj : (Collection<?>) returnedObj) {
+
+ sb.append("\t\t").append(obj.toString())
+ .append("\n");
+
+ }
+
+ sb.append("\t</collection>\n");
+
+ } else if (returnedObj.getClass().isArray()) {
+
+ sb.append("<array type='").append(
+ returnedObj.getClass()
+ .getComponentType())
+ .append("'>\n");
+
+ int length = Array.getLength(returnedObj);
+
+ for (int i = 0 ; i < length ; i++) {
+
+ sb.append("\t\t").append(Array.get(returnedObj, i).toString())
+ .append("\n");
+
+ }
+
+ sb.append("\t</array>\n");
+
+ } else {
+
+ sb.append('\t').append(returnedObj).append('\n');
+
+ }
+
+ } catch (Throwable e) {
+ // ignore exceptions and don't print the object
+ }
+
+ }
+
+ }
+
+ }
+
+ }
+
+ sb.append("</").append(getClass().getName()).append(">");
+
+ return sb.toString();
+
+ }
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultProcessorList.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultProcessorList.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultProcessorList.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ResultProcessorList.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,148 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+
+import org.apache.lucene.document.Document;
+import org.apache.lucene.search.Query;
+import org.apache.tuscany.sca.domain.search.Result;
+import org.apache.tuscany.sca.domain.search.ResultFactory;
+import org.apache.tuscany.sca.domain.search.ResultProcessor;
+
+public class ResultProcessorList extends LinkedList<ResultProcessor> implements ResultProcessor {
+
+ private static final long serialVersionUID = 7147307292452694895L;
+
+ private ResultFactoryList resultFactoryList;
+
+ private HashMap<String, ResultHashMap> resultRoots = new HashMap<String, ResultHashMap>();
+
+ public ResultProcessorList(ResultFactoryList resultFactoryList) {
+ this.resultFactoryList = resultFactoryList;
+ }
+
+ public Result process(Document document, Query query, Result result) {
+
+ if (result == null) {
+ result = this.resultFactoryList.createResult(document);
+ }
+
+ if (result == null) {
+ return null;
+ }
+
+ ResultHashMap resultHashMap;
+
+ String parent = document.get(SearchFields.PARENT_FIELD);
+
+ if (parent == null) {
+ resultHashMap = new ResultHashMap(result);
+ resultRoots.put(result.getName(), resultHashMap);
+
+ } else {
+
+ ParentField parentField = new ParentField(parent);
+ HashMap<String, ResultHashMap> current = this.resultRoots;
+ Result currentResult = null;
+ int elementsCount = parentField.getElementsCount();
+
+ for (int i = 0 ; i < elementsCount ; i++) {
+ String actualURI = parentField.getElementURI(i);
+ String type = parentField.getElementType(i);
+
+ if (actualURI.length() > 0) {
+ ResultHashMap actualResultHashMap = current.get(actualURI);
+
+ if (actualResultHashMap == null) {
+ ResultHashMap aux = new ResultHashMap(type, parentField.getElementName(i));
+
+ if (current.put(actualURI, aux) == null && currentResult != null) {
+ currentResult.addContent(aux.result);
+ }
+
+ current = aux;
+ currentResult = aux.result;
+
+ } else {
+ current = actualResultHashMap;
+ currentResult = actualResultHashMap.result;
+
+ }
+
+ }
+
+ }
+
+ resultHashMap = current.get(result.getName());
+
+ if (resultHashMap == null) {
+ resultHashMap = new ResultHashMap(result);
+ current.put(result.getName(), resultHashMap);
+
+ if (currentResult != null) {
+ currentResult.addContent(result);
+ }
+
+ }
+
+ }
+
+ for (ResultProcessor processor : this) {
+ result = processor.process(document, query, result);
+ }
+
+ resultHashMap.result = result;
+
+ return result;
+
+ }
+
+ public Result[] getResultRoots() {
+ int size = this.resultRoots.size();
+
+ if (size == 0) {
+ return new Result[0];
+ }
+
+ Result[] res = new Result[size];
+
+ int i = 0;
+ for (ResultHashMap resultHashMap : this.resultRoots.values()) {
+ res[i++] = resultHashMap.result;
+ }
+
+ return res;
+
+ }
+
+ private Result createResult(String type, String name) {
+
+ for (ResultFactory<? extends Result> actualResultFactory : this.resultFactoryList) {
+
+ if (type.equals(actualResultFactory.getType())) {
+ return actualResultFactory.createResult(name);
+ }
+
+ }
+
+ throw new IllegalArgumentException();
+
+ }
+
+ private class ResultHashMap extends HashMap<String, ResultHashMap> {
+
+ private static final long serialVersionUID = 7982561264440904411L;
+
+ Result result;
+
+ ResultHashMap(String type, String name) {
+ this.result = createResult(type, name);
+ }
+
+ ResultHashMap(Result result) {
+ this.result = result;
+ }
+
+ }
+
+}
Modified: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/SearchFields.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/SearchFields.java?rev=791203&r1=791202&r2=791203&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/SearchFields.java (original)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/SearchFields.java Sun Jul 5 07:04:56 2009
@@ -51,5 +51,7 @@
final public static String KEY_FIELD = "propertykey";
final public static String VALUE_FIELD = "propertyvalue";
+
+ final public static String FILE_CONTENT_FIELD = "filecontent";
}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ServiceResult.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ServiceResult.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ServiceResult.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ServiceResult.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,27 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+public class ServiceResult extends ResultImpl {
+
+ private static final long serialVersionUID = -2846199490484466090L;
+
+ private String[] operations;
+
+ private String[] callbackOperations;
+
+ public ServiceResult(String name, String[] operations, String[] callbackOperations) {
+ super(name);
+
+ this.operations = operations;
+ this.callbackOperations = callbackOperations;
+
+ }
+
+ public String[] getOperations() {
+ return this.operations.clone();
+ }
+
+ public String[] getCallbackOperations() {
+ return this.callbackOperations.clone();
+ }
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/SystemFileContent.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/SystemFileContent.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/SystemFileContent.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/SystemFileContent.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,44 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class SystemFileContent extends File implements FileContent {
+
+ private static final long serialVersionUID = -8337926886777467728L;
+
+ final boolean leaf;
+
+ final private File file;
+
+ public SystemFileContent(File file) {
+ super(file.getPath());
+
+ this.leaf = !file.isDirectory();
+ this.file = file;
+
+ }
+
+ public InputStream getInputStream() throws IOException {
+ return new FileInputStream(this);
+ }
+
+ public FileContent[] getChildren() {
+ File[] files = this.file.listFiles();
+ FileContent[] ret = new FileContent[files.length];
+
+ for (int i = 0; i < files.length; i++) {
+ ret[i] = new SystemFileContent(files[i]);
+ }
+
+ return ret;
+
+ }
+
+ public boolean isLeaf() {
+ return this.leaf;
+ }
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ZipDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ZipDocumentProcessor.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ZipDocumentProcessor.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ZipDocumentProcessor.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,77 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import org.apache.lucene.document.Field;
+import org.apache.tuscany.sca.domain.search.DocumentMap;
+import org.apache.tuscany.sca.domain.search.DocumentProcessor;
+
+public class ZipDocumentProcessor implements DocumentProcessor {
+
+ final public static char ARCHIVE_SEPARATOR = '\u0004';
+
+ public Object getDocumentKey(Object object) {
+
+ if (object instanceof File) {
+ File file = (File) object;
+ String path = file.getPath();
+
+ if (path != null && path.length() == 0) {
+ return null;
+ }
+
+ return path;
+
+ }
+
+ throw new IllegalArgumentException();
+
+ }
+
+ public Document process(DocumentProcessor parentProcessor,
+ DocumentMap documents, Object object, Document document,
+ String parent) {
+
+ if (object instanceof SystemFileContent) {
+ SystemFileContent file = (SystemFileContent) object;
+
+ try {
+ ZipFile zip = new ZipFile(file);
+
+ if (document == null) {
+ document = documents.get(file.getPath());
+ }
+
+ parent += DomainPathAnalyzer.PATH_SEPARATOR
+ + SearchFields.FILE_FIELD
+ + DomainPathAnalyzer.TYPE_SEPARATOR + file.getPath() + ARCHIVE_SEPARATOR
+ + DomainPathAnalyzer.URI_SEPARATOR + file.getName();
+
+ document.add(new Field(SearchFields.FILE_FIELD, file.getName(), Field.Store.YES,
+ Field.Index.ANALYZED));
+
+ ZipFileContent[] zipFiles = ZipFileContent.createZipFileContent(zip);
+
+ for (ZipFileContent zipFile : zipFiles) {
+
+ parentProcessor.process(parentProcessor, documents,
+ zipFile, document, parent);
+
+ }
+
+ return document;
+
+ } catch (IOException e) {
+ // ignore file
+ }
+
+ }
+
+ return null;
+
+ }
+
+}
Added: tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ZipFileContent.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ZipFileContent.java?rev=791203&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ZipFileContent.java (added)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ZipFileContent.java Sun Jul 5 07:04:56 2009
@@ -0,0 +1,188 @@
+package org.apache.tuscany.sca.domain.search.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.tuscany.sca.domain.search.DocumentProcessor;
+
+public class ZipFileContent implements FileContent {
+
+ final private ZipFile file;
+
+ final private ZipEntry entry;
+
+ private FileContent[] children;
+
+ private ZipFileContent(ZipFile file, ZipEntry entry) {
+ this.file = file;
+ this.entry = entry;
+
+ }
+
+ public InputStream getInputStream() throws IOException {
+ return this.file.getInputStream(this.entry);
+ }
+
+ public String getPath() {
+ return this.file.getName() + ZipDocumentProcessor.ARCHIVE_SEPARATOR + '/' + this.entry.getName();
+ }
+
+ public FileContent[] getChildren() {
+ return this.children;
+ }
+
+ public String getName() {
+ String name = this.entry.getName();
+ int lastSlashIndex = name.lastIndexOf('/');
+
+ if (lastSlashIndex == -1) {
+ return name;
+ }
+
+ if (lastSlashIndex == name.length() - 1 && name.length() > 1) {
+ lastSlashIndex = name.lastIndexOf('/', name.length() - 2);
+
+ if (lastSlashIndex == -1) {
+ return name.substring(0, name.length() - 1);
+ }
+
+ return name.substring(lastSlashIndex + 1, name.length() - 1);
+
+ }
+
+ return name.substring(lastSlashIndex + 1);
+
+ }
+
+ public boolean isLeaf() {
+ return !this.entry.isDirectory();
+ }
+
+ public static ZipFileContent[] createZipFileContent(ZipFile file) {
+ Enumeration<? extends ZipEntry> entries = file.entries();
+
+ if (!entries.hasMoreElements()) {
+ return null;
+ }
+
+ HashMap<String, ZipMap> roots = new HashMap<String, ZipMap>();
+
+ do {
+ ZipEntry entry = entries.nextElement();
+ String name = entry.getName();
+
+ if (name.length() > 0) {
+
+ String[] path = name.split("/");
+
+ ZipMap current = roots.get(path[0]);
+
+ if (current == null) {
+ current = new ZipMap();
+ roots.put(path[0], current);
+
+ if (path.length == 1) {
+ current.setEntry(file, entry);
+ continue;
+
+ }
+
+ }
+
+ for (int i = 1 ; i < path.length - 1 ; i++) {
+ ZipMap actual = current.get(path[i]);
+
+ if (actual == null) {
+ actual = new ZipMap();
+ current.put(path[i], actual);
+
+ }
+
+ current = actual;
+
+ }
+
+ ZipMap entryMap = current.get(path[path.length - 1]);
+
+ if (entryMap == null) {
+ entryMap = new ZipMap();
+ current.put(path[path.length - 1], entryMap);
+
+ }
+
+ entryMap.setEntry(file, entry);
+
+ }
+
+ } while (entries.hasMoreElements());
+
+ for (ZipMap map : roots.values()) {
+ createZipFileContentChildren(map);
+ }
+
+ ZipFileContent[] ret = new ZipFileContent[roots.size()];
+ int i = 0;
+
+ for (ZipMap rootMap : roots.values()) {
+ ret[i++] = rootMap.zipContent;
+ }
+
+ return ret;
+
+ }
+
+ private static void createZipFileContentChildren(ZipMap map) {
+ ZipFileContent[] children = new ZipFileContent[map.size()];
+ int i = 0;
+
+ for (ZipMap childMap : map.values()) {
+
+ if (childMap.zipContent == null) {
+ throw new RuntimeException("could not load zip file hierarchy for file: " + map.zipContent.file);
+ }
+
+ children[i++] = childMap.zipContent;
+
+ createZipFileContentChildren(childMap);
+
+ }
+
+ map.zipContent.children = children;
+
+ }
+
+ @Override
+ public String toString() {
+ return this.file.getName() + '/' + this.entry.getName();
+ }
+
+ private static class ZipMap extends HashMap<String, ZipMap> {
+
+ private static final long serialVersionUID = 6514645087432837480L;
+
+ ZipFileContent zipContent;
+
+ void setEntry(ZipFile zipFile, ZipEntry entry) {
+ this.zipContent = new ZipFileContent(zipFile, entry);
+ }
+
+ ZipFileContent[] getChildren() {
+
+ ZipFileContent ret[] = new ZipFileContent[this.size()];
+ int i = 0;
+
+ for (ZipMap actual : this.values()) {
+ ret[i++] = actual.zipContent;
+ }
+
+ return ret;
+
+ }
+
+ }
+
+}
Modified: tuscany/branches/sca-java-1.x/modules/domain-search/src/test/java/org/apache/tuscany/sca/domain/search/impl/DomainPathAnalyzerTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-search/src/test/java/org/apache/tuscany/sca/domain/search/impl/DomainPathAnalyzerTestCase.java?rev=791203&r1=791202&r2=791203&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-search/src/test/java/org/apache/tuscany/sca/domain/search/impl/DomainPathAnalyzerTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/domain-search/src/test/java/org/apache/tuscany/sca/domain/search/impl/DomainPathAnalyzerTestCase.java Sun Jul 5 07:04:56 2009
@@ -16,7 +16,7 @@
Tokenizer tokenizer = new DomainPathAnalyzer.DomainPathTokenizer(new StringReader(
DomainPathAnalyzer.PATH_SEPARATOR + SearchFields.CONTRIBUTION_FIELD + DomainPathAnalyzer.TYPE_SEPARATOR + "123tuscany" + DomainPathAnalyzer.TYPE_SEPARATOR + "SCA" +
- DomainPathAnalyzer.PATH_SEPARATOR + DomainPathAnalyzer.TYPE_SEPARATOR + "TuscanySCA" + DomainPathAnalyzer.TYPE_SEPARATOR + "123"));
+ DomainPathAnalyzer.PATH_SEPARATOR + DomainPathAnalyzer.TYPE_SEPARATOR + "TuscanySCA" + DomainPathAnalyzer.TYPE_SEPARATOR + "321" + DomainPathAnalyzer.URI_SEPARATOR + "123"));
assertNextToken(Character.toString(DomainPathAnalyzer.PATH_SEPARATOR), tokenizer);
assertNextToken("123", tokenizer);
Modified: tuscany/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java?rev=791203&r1=791202&r2=791203&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java (original)
+++ tuscany/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java Sun Jul 5 07:04:56 2009
@@ -100,9 +100,11 @@
int k = 0;
try {
while ((k != 'q') && (k != 'r')) {
- k = System.in.read();
+ // k = System.in.read();
+ Thread.sleep(100);
+
}
- } catch (IOException e) {
+ } catch (Exception e) {
// Wait forever
Object lock = new Object();