svn commit: r741146 [2/2] - in /lenya/trunk: org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/ org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/us...
[email protected] Thu, 05 Feb 2009 15:40:45 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Modified: lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/FormsEditor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/FormsEditor.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/FormsEditor.java (original)
+++ lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/FormsEditor.java Thu Feb 5 15:40:42 2009
@@ -113,8 +113,8 @@
if (doc != null) {
nodes.add(doc.getRepositoryNode());
}
- return (org.apache.lenya.cms.repository.Node[])
- nodes.toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
+ return (org.apache.lenya.cms.repository.Node[]) nodes
+ .toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
}
/**
@@ -155,17 +155,14 @@
Request request = ContextHelper.getRequest(this.context);
String encoding = request.getCharacterEncoding();
- save(resolver, getSourceDocument(), unnumberTagsXslSource, numberTagsXslSource, encoding);
+ save(resolver, getSourceDocument(), unnumberTagsXslSource, numberTagsXslSource,
+ encoding);
if (hasErrors()) {
setParameter(VALIDATION_ERRORS, getErrorMessages());
} else if (!getParameterAsBoolean(WORKFLOW_INVOKED, false)) {
deleteParameter(VALIDATION_ERRORS);
- WorkflowUtil.invoke(this.manager,
- getSession(),
- getLogger(),
- getSourceDocument(),
- getEvent());
+ WorkflowUtil.invoke(this.manager, getLogger(), getSourceDocument(), getEvent());
setParameter(WORKFLOW_INVOKED, Boolean.valueOf(true));
}
@@ -186,7 +183,7 @@
protected void doExecute() throws Exception {
super.doExecute();
-
+
advance();
List errors = (List) getParameter(VALIDATION_ERRORS);
@@ -215,15 +212,16 @@
* @throws TransformerConfigurationException
* @throws TransformerException
*/
- private void save(SourceResolver resolver, org.apache.lenya.cms.publication.Document lenyaDocument,
- Source unnumberTagsXslSource, Source numberTagsXslSource,String encoding) throws Exception {
+ private void save(SourceResolver resolver,
+ org.apache.lenya.cms.publication.Document lenyaDocument, Source unnumberTagsXslSource,
+ Source numberTagsXslSource, String encoding) throws Exception {
if (!lenyaDocument.exists()) {
throw new ProcessingException("The document [" + lenyaDocument + "] does not exist.");
}
if (getLogger().isDebugEnabled()) {
getLogger().debug("Save modifications to [" + lenyaDocument + "]");
}
-
+
Document doc = null;
DocumentBuilderFactory parserFactory = DocumentBuilderFactory.newInstance();
parserFactory.setValidating(false);
@@ -234,9 +232,12 @@
InputSource xmlInputSource = new InputSource(lenyaDocument.getInputStream());
Document document = builder.parse(xmlInputSource);
- Document renumberedDocument = renumberDocument(document, unnumberTagsXslSource,numberTagsXslSource);
-
- System.setProperty(XPathQueryFactory.class.getName(), XPathQueryFactoryImpl.class.getName());
+ Document renumberedDocument = renumberDocument(document, unnumberTagsXslSource,
+ numberTagsXslSource);
+
+ System
+ .setProperty(XPathQueryFactory.class.getName(), XPathQueryFactoryImpl.class
+ .getName());
XUpdateImpl xUpdate = new XUpdateImpl();
@@ -256,7 +257,8 @@
checkModifiability(unnumberTagsSource);
javax.xml.transform.Source transformXmlSource = new DOMSource(renumberedDocument);
- javax.xml.transform.Source transformXslSource = new StreamSource(unnumberTagsXslSource.getInputStream());
+ javax.xml.transform.Source transformXslSource = new StreamSource(unnumberTagsXslSource
+ .getInputStream());
ByteArrayOutputStream out = new ByteArrayOutputStream();
StreamResult unnumberXmlResult = new StreamResult(out);
@@ -267,7 +269,7 @@
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
doc = DocumentHelper.readDocument(in);
-
+
ValidationUtil.validate(this.manager, doc, getSourceDocument().getResourceType()
.getSchema(), new UsecaseErrorHandler(this));
@@ -280,8 +282,8 @@
}
}
- if (doc != null){
- writeDocument(doc, getSourceDocument().getOutputStream(), encoding);
+ if (doc != null) {
+ writeDocument(doc, getSourceDocument().getOutputStream(), encoding);
}
}
@@ -320,8 +322,9 @@
XObject xObject = XPathAPI.eval(document.getDocumentElement(), select, resolver);
NodeList nodes = xObject.nodelist();
if (nodes.getLength() == 0) {
- getLogger().debug(".act(): Node does not exist (might have been deleted during update): "
- + select);
+ getLogger().debug(
+ ".act(): Node does not exist (might have been deleted during update): "
+ + select);
} else {
String xupdateModifications = null;
// now check for the different xupdate
@@ -350,17 +353,17 @@
} else if (pname.indexOf("xupdate:insert-before") > 0 && pname.endsWith("/>")) {
if (!getParameterAsString(pname).equals("null")) {
xupdateModifications = insertBefore(getParameterAsString(pname));
- editSelect = pname.substring(31,pname.length() - 3);
+ editSelect = pname.substring(31, pname.length() - 3);
editSelect = changeTagNumber(editSelect, -1);
}
// insert-before: in case of image
} else if (pname.indexOf("xupdate:insert-before") > 0 && pname.endsWith(">.x")) {
- xupdateModifications = insertBefore(pname.substring(0, pname.length() - 2));
+ xupdateModifications = insertBefore(pname.substring(0, pname.length() - 2));
// insert-after: in case of select/option
} else if (pname.indexOf("xupdate:insert-after") > 0 && pname.endsWith("/>")) {
if (!getParameterAsString(pname).equals("null")) {
xupdateModifications = insertAfter(getParameterAsString(pname));
- editSelect = pname.substring(30,pname.length() - 3);
+ editSelect = pname.substring(30, pname.length() - 3);
editSelect = changeTagNumber(editSelect, 1);
}
// insert-after: in case of image
@@ -368,7 +371,7 @@
xupdateModifications = insertAfter(pname.substring(0, pname.length() - 2));
} else if (pname.indexOf("xupdate:remove") > 0 && pname.endsWith("/>.x")) {
xupdateModifications = remove(pname.substring(0, pname.length() - 2));
- editSelect = pname.substring(24,pname.length() - 3);
+ editSelect = pname.substring(24, pname.length() - 3);
} else if (pname.endsWith(">.y")) {
getLogger().debug("Don't handle this: " + pname);
} else {
@@ -408,7 +411,7 @@
String[] prefixAndUri = namespace[i].split("=");
String prefix = prefixAndUri[0];
String uri = prefixAndUri[1].replaceAll("\"", "");
-
+
int colonIndex = prefix.indexOf(":");
if (colonIndex == -1) {
nsMap.setDefaultNamespace(uri);
@@ -423,19 +426,17 @@
}
/**
- * Change the tag number of the selected node.
- * The variable is used in a javascript in order to jump to the
- * appropriate node after deleting or inserting a node.
+ * Change the tag number of the selected node. The variable is used in a javascript in order to
+ * jump to the appropriate node after deleting or inserting a node.
* @param tagID The tagID where the new node is inserted.
- * @param step int value for changing the tagID.
- */
- protected String changeTagNumber(String tagID, int step){
- String number = tagID.substring(tagID.lastIndexOf(".")+1,tagID.lastIndexOf("]")-1);
+ * @param step int value for changing the tagID.
+ */
+ protected String changeTagNumber(String tagID, int step) {
+ String number = tagID.substring(tagID.lastIndexOf(".") + 1, tagID.lastIndexOf("]") - 1);
int num = Integer.parseInt(number) + step;
- String newTagNumber = tagID.substring(0, tagID.lastIndexOf(".")+1);
- return newTagNumber.concat(Integer.toString(num)+"']");
+ String newTagNumber = tagID.substring(0, tagID.lastIndexOf(".") + 1);
+ return newTagNumber.concat(Integer.toString(num) + "']");
}
-
/**
* Writes a document to a modifiable source.
@@ -446,8 +447,9 @@
* @throws TransformerException if an error occurs.
* @throws ProcessingException if an error occurs.
*/
- protected void writeDocument(Document document, OutputStream oStream, String encoding) throws IOException,
- TransformerConfigurationException, TransformerException, ProcessingException {
+ protected void writeDocument(Document document, OutputStream oStream, String encoding)
+ throws IOException, TransformerConfigurationException, TransformerException,
+ ProcessingException {
Writer writer = new OutputStreamWriter(oStream, encoding);
DocumentHelper.writeDocument(document, writer);
if (oStream != null) {
@@ -488,8 +490,8 @@
if (attributes != null) {
for (int i = 0; i < attributes.getLength(); i++) {
org.w3c.dom.Attr attribute = (org.w3c.dom.Attr) attributes.item(i);
- getLogger().debug(".getAttributes(): " + attribute.getName() + " "
- + attribute.getValue());
+ getLogger().debug(
+ ".getAttributes(): " + attribute.getName() + " " + attribute.getValue());
if (!attribute.getName().equals("tagID")) {
String namespace = attribute.getNamespaceURI();
getLogger().debug(".getAttributes(): Namespace: " + namespace);
@@ -523,7 +525,8 @@
private XUpdateAttributes getAttributes(String update, String tagID) {
getLogger().debug(update);
- StringBuffer xupdateBuffer = new StringBuffer("<xupdate:attribute name=\"tagID\">temp</xupdate:attribute>");
+ StringBuffer xupdateBuffer = new StringBuffer(
+ "<xupdate:attribute name=\"tagID\">temp</xupdate:attribute>");
String[] attributes = update.substring(0, update.indexOf(">")).split(" ");
for (int i = 1; i < attributes.length; i++) {
@@ -602,8 +605,8 @@
String xupdateUpdateAttribute = "<xupdate:update select=\""
+ new XPath(select).removePredicates(select) + "[@tagID='temp']/@tagID" + " \">"
+ xa.tagID + "</xupdate:update>";
- getLogger().debug(".update(): Update Node (update tagID attribute): "
- + xupdateUpdateAttribute);
+ getLogger().debug(
+ ".update(): Update Node (update tagID attribute): " + xupdateUpdateAttribute);
return "<xupdate:modifications xmlns:xupdate=\"http://www.xmldb.org/xupdate\">"
+ xupdateInsertAfter + xupdateRemove + xupdateUpdateAttribute
@@ -710,9 +713,11 @@
*/
private String removeParent(String xmlSnippet) {
String xmlSnippetWithoutParent = xmlSnippet;
- xmlSnippetWithoutParent = xmlSnippetWithoutParent.substring(xmlSnippetWithoutParent.indexOf(">") + 1);
+ xmlSnippetWithoutParent = xmlSnippetWithoutParent.substring(xmlSnippetWithoutParent
+ .indexOf(">") + 1);
xmlSnippetWithoutParent = StringUtils.reverse(xmlSnippetWithoutParent);
- xmlSnippetWithoutParent = xmlSnippetWithoutParent.substring(xmlSnippetWithoutParent.indexOf("<") + 1);
+ xmlSnippetWithoutParent = xmlSnippetWithoutParent.substring(xmlSnippetWithoutParent
+ .indexOf("<") + 1);
xmlSnippetWithoutParent = StringUtils.reverse(xmlSnippetWithoutParent);
return xmlSnippetWithoutParent;
}
Modified: lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java (original)
+++ lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java Thu Feb 5 15:40:42 2009
@@ -184,8 +184,7 @@
protected void saveDocument(Document content) throws Exception {
saveXMLFile(content, getSourceDocument());
- WorkflowUtil.invoke(this.manager, getSession(), getLogger(), getSourceDocument(),
- getEvent());
+ WorkflowUtil.invoke(this.manager, getLogger(), getSourceDocument(), getEvent());
}
/**
Modified: lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Importer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Importer.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Importer.java (original)
+++ lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Importer.java Thu Feb 5 15:40:42 2009
@@ -19,6 +19,8 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceSelector;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
import org.apache.lenya.cms.linking.LinkConverter;
@@ -47,9 +49,9 @@
* @param manager The service manager.
* @param logger The logger.
*/
- public Importer(ServiceManager manager, Logger logger) {
+ public Importer(ServiceManager manager, Log logger) {
+ setLogger(logger);
this.manager = manager;
- enableLogging(logger);
}
/**
Modified: lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml Thu Feb 5 15:40:42 2009
@@ -31,5 +31,13 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-workflow</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/org/apache/lenya/cms/editors/fckeditor/Fckeditor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/org/apache/lenya/cms/editors/fckeditor/Fckeditor.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/org/apache/lenya/cms/editors/fckeditor/Fckeditor.java (original)
+++ lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/org/apache/lenya/cms/editors/fckeditor/Fckeditor.java Thu Feb 5 15:40:42 2009
@@ -86,9 +86,9 @@
URLInformation info = new URLInformation(getSourceURL());
String pubId = info.getPublicationId();
LinkRewriter rewriter = new OutgoingLinkRewriter(this.manager, getSession(),
- getSourceURL(), request.isSecure(), false, false);
-
- setParameter("proxyUrl",rewriter.rewrite("/" + pubId));
+ getSourceURL(), request.isSecure(), false, false);
+
+ setParameter("proxyUrl", rewriter.rewrite("/" + pubId));
}
/**
@@ -122,10 +122,9 @@
}
/**
- * Save the content to the document source. After saving, the XML is
- * validated. If validation errors occur, the usecase transaction is rolled
- * back, so the changes are not persistent. If the validation succeeded, the
- * workflow event is invoked.
+ * Save the content to the document source. After saving, the XML is validated. If validation
+ * errors occur, the usecase transaction is rolled back, so the changes are not persistent. If
+ * the validation succeeded, the workflow event is invoked.
* @param encoding The encoding to use.
* @param content The content to save.
* @throws Exception if an error occurs.
@@ -202,8 +201,6 @@
}
}
-
-
// Try to clean the xml using xslt
ResourceType resType = getSourceDocument().getResourceType();
String[] formats = resType.getFormats();
@@ -232,7 +229,7 @@
}
// Convert URLs back to UUIDs. convert() does a save
LinkConverter converter = new LinkConverter(this.manager, getLogger());
- converter.convertUrlsToUuids(getSourceDocument(),false);
+ converter.convertUrlsToUuids(getSourceDocument(), false);
xmlDoc = DocumentHelper.readDocument(getSourceDocument().getInputStream());
@@ -244,8 +241,7 @@
.validate(this.manager, xmlDoc, schema, new UsecaseErrorHandler(this));
if (!hasErrors()) {
- WorkflowUtil.invoke(this.manager, getSession(), getLogger(),
- getSourceDocument(), getEvent());
+ WorkflowUtil.invoke(this.manager, getLogger(), getSourceDocument(), getEvent());
}
}
Modified: lenya/trunk/org.apache.lenya.module.lucene/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/pom.xml Thu Feb 5 15:40:42 2009
@@ -24,6 +24,10 @@
<artifactId>cocoon-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-lucene-impl</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
@@ -36,6 +40,10 @@
<artifactId>lucene-core</artifactId>
<version>${lucene.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
<properties>
<!-- TODO Update Lucene version -->
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableAnalyzer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableAnalyzer.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableAnalyzer.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableAnalyzer.java Thu Feb 5 15:40:42 2009
@@ -22,6 +22,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.components.search.components.AnalyzerManager;
import org.apache.cocoon.components.search.utils.SourceHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.excalibur.source.Source;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@@ -31,8 +33,9 @@
*
* @author Nicolas Maisonneuve
*/
-public abstract class ConfigurableAnalyzer extends Analyzer implements {
- private static final Log logger = LogFactory.getLog(ConfigurableAnalyzer.class);
+public abstract class ConfigurableAnalyzer extends Analyzer {
+ private static final Log logger = LogFactory.getLog(ConfigurableAnalyzer.class);
+
/**
* the lucene analyzer
*/
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableStopwordAnalyzer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableStopwordAnalyzer.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableStopwordAnalyzer.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableStopwordAnalyzer.java Thu Feb 5 15:40:42 2009
@@ -18,6 +18,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
/**
@@ -32,6 +34,8 @@
*/
public class ConfigurableStopwordAnalyzer extends ConfigurableAnalyzer {
+ private static final Log logger = LogFactory.getLog(ConfigurableStopwordAnalyzer.class);
+
/** The element containing a stop word. */
private static final String STOP_WORD_ELEMENT = "stopword";
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractIndexer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractIndexer.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractIndexer.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractIndexer.java Thu Feb 5 15:40:42 2009
@@ -21,6 +21,7 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.components.search.IndexException;
import org.apache.cocoon.components.search.components.Indexer;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractSearcher.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractSearcher.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractSearcher.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractSearcher.java Thu Feb 5 15:40:42 2009
@@ -24,6 +24,7 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.search.components.Searcher;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lucene.search.Hits;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Sort;
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AnalyzerManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AnalyzerManagerImpl.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AnalyzerManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AnalyzerManagerImpl.java Thu Feb 5 15:40:42 2009
@@ -28,6 +28,7 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.search.analyzer.ConfigurableAnalyzer;
import org.apache.cocoon.components.search.components.AnalyzerManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lucene.analysis.Analyzer;
@@ -122,10 +123,6 @@
+ " error", ex);
}
- if (analyzer instanceof LogEnabled) {
- this.setupLogger(analyzer);
- }
-
if (analyzer instanceof ConfigurableAnalyzer) {
ConfigurableAnalyzer confanalyzer = ((ConfigurableAnalyzer) analyzer);
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java Thu Feb 5 15:40:42 2009
@@ -38,18 +38,15 @@
import org.apache.cocoon.components.search.fieldmodel.FieldDefinition;
import org.apache.cocoon.components.search.utils.SourceHelper;
import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.SourceUtil;
import org.apache.lenya.cms.cocoon.components.context.ContextUtility;
-import org.apache.lenya.cms.metadata.Element;
-import org.apache.lenya.cms.metadata.ElementSet;
import org.apache.lenya.cms.metadata.MetaDataException;
-import org.apache.lenya.cms.metadata.MetaDataRegistry;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.DocumentUtil;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.publication.PublicationManager;
import org.apache.lenya.modules.lucene.MetaDataFieldRegistry;
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexUpdaterImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexUpdaterImpl.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexUpdaterImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexUpdaterImpl.java Thu Feb 5 15:40:42 2009
@@ -25,6 +25,7 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.search.IndexException;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
import org.apache.lenya.cms.observation.DocumentEvent;
import org.apache.lenya.cms.observation.ObservationRegistry;
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java Thu Feb 5 15:40:42 2009
@@ -25,6 +25,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.cms.metadata.Element;
import org.apache.lenya.cms.metadata.ElementSet;
import org.apache.lenya.cms.metadata.MetaDataRegistry;
Modified: lenya/trunk/org.apache.lenya.module.menubar/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.menubar/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.menubar/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.menubar/pom.xml Thu Feb 5 15:40:42 2009
@@ -31,5 +31,9 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-usecase</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.notification/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.notification/pom.xml Thu Feb 5 15:40:42 2009
@@ -34,6 +34,10 @@
<artifactId>lenya-core-usecase</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${javax.mail.version}</version>
Modified: lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/xml/XmlSourceInbox.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/xml/XmlSourceInbox.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/xml/XmlSourceInbox.java (original)
+++ lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/xml/XmlSourceInbox.java Thu Feb 5 15:40:42 2009
@@ -23,6 +23,8 @@
import javax.xml.parsers.ParserConfigurationException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.axis.components.uuid.UUIDGen;
+import org.apache.axis.components.uuid.UUIDGenFactory;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Group;
import org.apache.lenya.ac.Identifiable;
Modified: lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/AbstractNotifier.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/AbstractNotifier.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/AbstractNotifier.java (original)
+++ lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/AbstractNotifier.java Thu Feb 5 15:40:42 2009
@@ -32,6 +32,7 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.transformation.I18nTransformer;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.ac.Group;
Modified: lenya/trunk/org.apache.lenya.module.opendocument/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.opendocument/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.opendocument/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.opendocument/pom.xml Thu Feb 5 15:40:42 2009
@@ -15,5 +15,13 @@
<packaging>jar</packaging>
<name>Apache Lenya Module OpenDocument</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-sitemanagement</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/org/apache/lenya/cms/publication/OpenDocumentWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/org/apache/lenya/cms/publication/OpenDocumentWrapper.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/org/apache/lenya/cms/publication/OpenDocumentWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/org/apache/lenya/cms/publication/OpenDocumentWrapper.java Thu Feb 5 15:40:42 2009
@@ -22,8 +22,10 @@
import java.io.OutputStream;
import org.apache.cocoon.servlet.multipart.Part;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.commons.logging.Log;
/**
* Wrapper class for the ODT resource type.
@@ -46,8 +48,8 @@
* @param doc The document to wrap.
* @param logger The logger.
*/
- public OpenDocumentWrapper(Document doc, Logger logger) {
- enableLogging(logger);
+ public OpenDocumentWrapper(Document doc, Log logger) {
+ setLogger(logger);
this.delegate = doc;
}
Modified: lenya/trunk/org.apache.lenya.module.sitetree/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/pom.xml Thu Feb 5 15:40:42 2009
@@ -19,5 +19,17 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-linking</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-usecase</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java Thu Feb 5 15:40:42 2009
@@ -30,6 +30,8 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.transformation.AbstractSAXTransformer;
import org.apache.lenya.ac.AccessControlException;
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java Thu Feb 5 15:40:42 2009
@@ -25,8 +25,9 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.repository.NodeFactory;
@@ -85,9 +86,8 @@
* @throws SiteException if an error occurs.
*/
protected DefaultSiteTree(DocumentFactory factory, Publication publication, String _area,
- ServiceManager manager, Logger logger) throws SiteException {
-
- ContainerUtil.enableLogging(this, logger);
+ ServiceManager manager, Log logger) throws SiteException {
+ setLogger(logger);
this.factory = factory;
this.pub = publication;
@@ -334,7 +334,6 @@
}
SiteTreeNode newNode = new SiteTreeNodeImpl(this.factory, this, (Element) node, getLogger());
- ContainerUtil.enableLogging(newNode, getLogger());
return newNode;
}
@@ -395,7 +394,6 @@
}
if (node != null) {
treeNode = new SiteTreeNodeImpl(this.factory, this, (Element) node, getLogger());
- ContainerUtil.enableLogging(treeNode, getLogger());
} else {
throw new SiteException("No node contained for path [" + path + "]!");
}
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeFactory.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeFactory.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeFactory.java Thu Feb 5 15:40:42 2009
@@ -17,8 +17,9 @@
*/
package org.apache.lenya.cms.site.tree;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.DocumentUtil;
import org.apache.lenya.cms.publication.Publication;
@@ -41,9 +42,9 @@
* @param manager The service manager.
* @param logger The logger.
*/
- public SiteTreeFactory(ServiceManager manager, Logger logger) {
+ public SiteTreeFactory(ServiceManager manager, Log logger) {
this.manager = manager;
- ContainerUtil.enableLogging(this, logger);
+ setLogger(logger);
}
public RepositoryItem buildItem(Session session, String key) throws RepositoryException {
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java Thu Feb 5 15:40:42 2009
@@ -21,7 +21,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.site.Link;
@@ -94,8 +95,8 @@
*
* @param _node the node which is to be wrapped by this SiteTreeNode
*/
- protected SiteTreeNodeImpl(DocumentFactory factory, DefaultSiteTree tree, Element node, Logger logger) {
- ContainerUtil.enableLogging(this, logger);
+ protected SiteTreeNodeImpl(DocumentFactory factory, DefaultSiteTree tree, Element node, Log logger) {
+ setLogger(logger);
this.node = node;
this.tree = tree;
this.factory = factory;
@@ -443,7 +444,6 @@
&& parentNode.getLocalName().equals(NODE_NAME)) {
parent = new SiteTreeNodeImpl(this.factory, getTree(), (Element) parentNode,
getLogger());
- ContainerUtil.enableLogging(parent, getLogger());
} else {
throw new SiteException("The node [" + this + "] has no parent.");
}
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeBuilder.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeBuilder.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeBuilder.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeBuilder.java Thu Feb 5 15:40:42 2009
@@ -3,6 +3,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.excalibur.xml.sax.SAXParser;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.Link;
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeWriter.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeWriter.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeWriter.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeWriter.java Thu Feb 5 15:40:42 2009
@@ -23,6 +23,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.serialization.Serializer;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.excalibur.xml.sax.XMLizable;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.Link;
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java Thu Feb 5 15:40:42 2009
@@ -17,8 +17,9 @@
*/
package org.apache.lenya.cms.site.tree2;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.DocumentUtil;
@@ -44,9 +45,9 @@
* @param manager The service manager.
* @param logger The logger.
*/
- public SiteTreeFactory(ServiceManager manager, Logger logger) {
+ public SiteTreeFactory(ServiceManager manager, Log logger) {
this.manager = manager;
- ContainerUtil.enableLogging(this, logger);
+ setLogger(logger);
}
public RepositoryItem buildItem(Session session, String key) throws RepositoryException {
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java Thu Feb 5 15:40:42 2009
@@ -21,9 +21,10 @@
import java.util.Map;
import java.util.Set;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.Publication;
@@ -54,8 +55,8 @@
* @param area The area.
* @param logger The logger.
*/
- public SiteTreeImpl(ServiceManager manager, Area area, Logger logger) {
- ContainerUtil.enableLogging(this, logger);
+ public SiteTreeImpl(ServiceManager manager, Area area, Log logger) {
+ setLogger(logger);
this.area = area;
this.manager = manager;
initRoot();
Modified: lenya/trunk/org.apache.lenya.module.svg/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.svg/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.svg/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.svg/pom.xml Thu Feb 5 15:40:42 2009
@@ -19,5 +19,9 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-util</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java (original)
+++ lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java Thu Feb 5 15:40:42 2009
@@ -34,6 +34,7 @@
import org.apache.batik.util.ParsedURLData;
import org.apache.batik.util.ParsedURLProtocolHandler;
import org.apache.cocoon.CascadingIOException;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.util.Assert;
Modified: lenya/trunk/org.apache.lenya.module.tinymce/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.tinymce/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.tinymce/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.tinymce/pom.xml Thu Feb 5 15:40:42 2009
@@ -15,5 +15,29 @@
<packaging>jar</packaging>
<name>Apache Lenya Module TinyMCE</name>
<dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-linking</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-usecase</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-workflow</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java (original)
+++ lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java Thu Feb 5 15:40:42 2009
@@ -177,7 +177,7 @@
LinkConverter converter = new LinkConverter(this.manager, getLogger());
converter.convertUrlsToUuids(doc, false);
- WorkflowUtil.invoke(this.manager, getSession(), getLogger(), doc, getEvent());
+ WorkflowUtil.invoke(this.manager, getLogger(), doc, getEvent());
}
/**
Modified: lenya/trunk/org.apache.lenya.module.webdav/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.webdav/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.webdav/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.webdav/pom.xml Thu Feb 5 15:40:42 2009
@@ -28,5 +28,9 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-sitemanagement</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-workflow</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Put.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Put.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Put.java (original)
+++ lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Put.java Thu Feb 5 15:40:42 2009
@@ -160,7 +160,7 @@
String event = getParameterAsString(EVENT);
if (event != null) {
- WorkflowUtil.invoke(this.manager, getSession(), getLogger(), doc, event);
+ WorkflowUtil.invoke(this.manager, getLogger(), doc, event);
}
} finally {
Modified: lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml Thu Feb 5 15:40:42 2009
@@ -16,6 +16,10 @@
<name>Apache Lenya Optional JCR Source</name>
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
@@ -47,6 +51,10 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-metadata</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-sourcerepository</artifactId>
+ </dependency>
</dependencies>
<properties>
<jcr.version>1.0</jcr.version>
Modified: lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRNodeFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRNodeFactory.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRNodeFactory.java (original)
+++ lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRNodeFactory.java Thu Feb 5 15:40:42 2009
@@ -20,6 +20,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.repository.NodeFactory;
import org.apache.lenya.cms.repository.RepositoryException;
Modified: lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/LenyaRepository.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/LenyaRepository.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/LenyaRepository.java (original)
+++ lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/LenyaRepository.java Thu Feb 5 15:40:42 2009
@@ -17,11 +17,9 @@
*/
package org.apache.lenya.cms.jcr;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import javax.jcr.AccessDeniedException;
@@ -29,24 +27,18 @@
import javax.jcr.NamespaceException;
import javax.jcr.NamespaceRegistry;
import javax.jcr.NoSuchWorkspaceException;
-import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.servlet.http.HttpSession;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException;
-import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl;
import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
-import org.apache.jackrabbit.core.nodetype.PropDef;
-import org.apache.jackrabbit.core.nodetype.PropDefImpl;
-import org.apache.jackrabbit.name.QName;
-import org.apache.lenya.cms.metadata.dublincore.DublinCore;
/**
* Lenya-specific repository implementation.
@@ -83,7 +75,7 @@
Map objectModel = ContextHelper.getObjectModel(this.context);
Request request = ObjectModelHelper.getRequest(objectModel);
- Session session = request.getSession(false);
+ HttpSession session = request.getSession(false);
if (session != null) {
jcrSession = (javax.jcr.Session) session.getAttribute(SESSION_ATTRIBUTE);
if (jcrSession == null) {
Modified: lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java (original)
+++ lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java Thu Feb 5 15:40:42 2009
@@ -28,15 +28,14 @@
import javax.jcr.Property;
import javax.jcr.Value;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.jcr.source.JCRNodeSource;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.metadata.ElementSet;
import org.apache.lenya.cms.metadata.MetaData;
import org.apache.lenya.cms.metadata.MetaDataException;
-import org.apache.lenya.cms.publication.DocumentException;
-import org.apache.lenya.cms.repository.RepositoryException;
/**
* JCR based meta data.
@@ -56,11 +55,11 @@
* @param manager
* @param logger
*/
- public JCRMetaData(String namespace, String sourceUri, ServiceManager manager, Logger logger) {
+ public JCRMetaData(String namespace, String sourceUri, ServiceManager manager, Log logger) {
this.namespace = namespace;
this.sourceUri = sourceUri;
this.manager = manager;
- ContainerUtil.enableLogging(this, logger);
+ setLogger(logger);
}
protected Map getKey2Values() {
Propchange: lenya/trunk/org.apache.lenya.parent/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 5 15:40:42 2009
@@ -0,0 +1,6 @@
+target
+.project
+.classpath
+.settings
+profiles.xml
+
Modified: lenya/trunk/org.apache.lenya.parent/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.parent/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.parent/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.parent/pom.xml Thu Feb 5 15:40:42 2009
@@ -125,6 +125,36 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-lucene-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-util</artifactId>
+ <version>1.6-1</version>
+ </dependency>
+ <dependency>
+ <groupId>xmldb</groupId>
+ <artifactId>xmldb-common</artifactId>
+ <version>20030701</version>
+ </dependency>
+ <dependency>
+ <groupId>xmldb</groupId>
+ <artifactId>xmldb-xupdate</artifactId>
+ <version>20040205</version>
+ </dependency>
+ <dependency>
+ <groupId>xindice</groupId>
+ <artifactId>xindice</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>4aug2000r7-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-mail-impl</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
@@ -205,10 +235,25 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-resource</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-sitetree</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-sourcerepository</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-optional-jcrsource</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
<version>1.4</version>