Author: andreas
Date: Fri Feb 6 01:31:19 2009
New Revision: 741365
URL: http://svn.apache.org/viewvc?rev=741365&view=rev
Log:
Continue springification of source factories and related classes.
Added:
lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-sourceFactories.xml
lenya/trunk/org.apache.lenya.core.templating/src/main/resources/
lenya/trunk/org.apache.lenya.core.templating/src/main/resources/META-INF/
lenya/trunk/org.apache.lenya.core.templating/src/main/resources/META-INF/cocoon/
lenya/trunk/org.apache.lenya.core.templating/src/main/resources/META-INF/cocoon/spring/
lenya/trunk/org.apache.lenya.core.templating/src/main/resources/META-INF/cocoon/spring/lenya-core-templating-components.xml
Modified:
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingSource.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java
lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml
lenya/trunk/org.apache.lenya.parent/pom.xml
lenya/trunk/org.apache.lenya.welcome/pom.xml
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java?rev=741365&r1=741364&r2=741365&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java Fri Feb 6 01:31:19 2009
@@ -28,13 +28,12 @@
import org.apache.cocoon.environment.Request;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.store.impl.MRUMemoryStore;
-import org.apache.lenya.cms.module.ModuleManager;
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.URLInformation;
import org.apache.lenya.cms.publication.templating.AllExistingSourceResolver;
-import org.apache.lenya.cms.publication.templating.PublicationTemplateManager;
+import org.apache.lenya.cms.repository.RepositoryUtil;
+import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.util.ServletHelper;
/**
@@ -86,7 +85,7 @@
else {
uris = findUris(location, parameters);
}
- return new AggregatingSource(location, uris, this.manager);
+ return new AggregatingSource(location, uris, getSourceResolver());
}
protected String[] findUris(final String location, Map parameters) throws IOException,
@@ -96,10 +95,7 @@
String pubId = uri.getPubId();
String path = uri.getPath();
- PublicationTemplateManager templateManager = null;
try {
- templateManager = (PublicationTemplateManager) this.manager
- .lookup(PublicationTemplateManager.ROLE);
Request request = ContextHelper.getRequest(this.context);
@@ -109,14 +105,15 @@
pubId = info.getPublicationId();
}
- DocumentFactory factory = DocumentUtil.getDocumentFactory(this.manager, request);
+ Session session = RepositoryUtil.getSession(getRepositoryManager(), request);
+ DocumentFactory factory = getDocumentFactoryBuilder().createDocumentFactory(session);
String[] uris;
if (factory.existsPublication(pubId)) {
Publication pub = factory.getPublication(pubId);
AllExistingSourceResolver resolver = new AllExistingSourceResolver();
- templateManager.visit(pub, path, resolver);
+ getTemplateManager().visit(pub, path, resolver);
uris = resolver.getUris();
} else {
uris = new String[0];
@@ -127,22 +124,14 @@
String contextSourceUri = null;
if (path.startsWith("lenya/modules/")) {
- ModuleManager moduleMgr = null;
- try {
- moduleMgr = (ModuleManager) this.manager.lookup(ModuleManager.ROLE);
- final String moduleShortcut = path.split("/")[2];
- String baseUri = moduleMgr.getBaseURI(moduleShortcut);
- final String modulePath = path.substring(("lenya/modules/" + moduleShortcut).length());
- contextSourceUri = baseUri + modulePath;
- } finally {
- if (moduleMgr != null) {
- this.manager.release(moduleMgr);
- }
- }
+ final String moduleShortcut = path.split("/")[2];
+ String baseUri = getModuleManager().getBaseURI(moduleShortcut);
+ final String modulePath = path.substring(("lenya/modules/" + moduleShortcut).length());
+ contextSourceUri = baseUri + modulePath;
} else {
contextSourceUri = "context://" + path;
}
- if (org.apache.lenya.cms.cocoon.source.SourceUtil.exists(contextSourceUri, this.manager)) {
+ if (org.apache.lenya.cms.cocoon.source.SourceUtil.exists(contextSourceUri, getSourceResolver())) {
allUris.add(contextSourceUri);
}
@@ -150,10 +139,6 @@
} catch (Exception e) {
throw new RuntimeException("Resolving path [" + location + "] failed: ", e);
- } finally {
- if (templateManager != null) {
- this.manager.release(templateManager);
- }
}
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingSource.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingSource.java?rev=741365&r1=741364&r2=741365&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingSource.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingSource.java Fri Feb 6 01:31:19 2009
@@ -5,7 +5,6 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.components.source.impl.MultiSourceValidity;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceNotFoundException;
@@ -23,17 +22,16 @@
private String uri;
private String[] sourceUris;
- private ServiceManager manager;
+ private SourceResolver resolver;
/**
* @param uri
* @param uris
- * @param manager
*/
- public AggregatingSource(String uri, String[] uris, ServiceManager manager) {
- this.manager = manager;
+ public AggregatingSource(String uri, String[] uris, SourceResolver resolver) {
this.sourceUris = (String[]) uris.clone();
this.uri = uri;
+ this.resolver = resolver;
}
public String toString() {
@@ -43,7 +41,8 @@
protected void loadDom() {
try {
for (int i = 0; i < sourceUris.length; i++) {
- Document sourceDom = SourceUtil.readDOM(sourceUris[i], this.manager);
+
+ Document sourceDom = SourceUtil.readDOM(sourceUris[i], this.resolver);
if (sourceDom == null) {
throw new RuntimeException("The source [" + sourceUris[i]
@@ -124,7 +123,7 @@
for (int i = 0; i < this.sourceUris.length; i++) {
try {
lastModified = Math.max(lastModified, SourceUtil.getLastModified(sourceUris[i],
- this.manager));
+ this.resolver));
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -148,9 +147,7 @@
public SourceValidity getValidity() {
if (this.validity == null) {
- SourceResolver resolver = null;
try {
- resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
MultiSourceValidity aggregatedValidity = new MultiSourceValidity(resolver,
MultiSourceValidity.CHECK_ALWAYS);
for (int i = 0; i < this.sourceUris.length; i++) {
@@ -168,10 +165,6 @@
this.validity = aggregatedValidity;
} catch (Exception e) {
throw new RuntimeException(e);
- } finally {
- if (resolver != null) {
- this.manager.release(resolver);
- }
}
}
return this.validity;
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java?rev=741365&r1=741364&r2=741365&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java Fri Feb 6 01:31:19 2009
@@ -23,9 +23,6 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-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.components.ContextHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.util.AbstractLogEnabled;
@@ -37,12 +34,13 @@
import org.apache.excalibur.store.impl.MRUMemoryStore;
import org.apache.lenya.cms.module.ModuleManager;
import org.apache.lenya.cms.publication.DocumentFactory;
-import org.apache.lenya.cms.publication.DocumentUtil;
+import org.apache.lenya.cms.publication.DocumentFactoryBuilder;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.publication.templating.ExistingSourceResolver;
import org.apache.lenya.cms.publication.templating.PublicationTemplateManager;
import org.apache.lenya.cms.publication.templating.VisitingSourceResolver;
+import org.apache.lenya.cms.repository.RepositoryManager;
import org.apache.lenya.cms.repository.RepositoryUtil;
import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.util.ServletHelper;
@@ -60,9 +58,14 @@
* @version $Id$
*/
public class FallbackSourceFactory extends AbstractLogEnabled implements SourceFactory,
- Serviceable, Contextualizable, URIAbsolutizer {
+ Contextualizable, URIAbsolutizer {
protected MRUMemoryStore store;
+ private SourceResolver resolver;
+ private RepositoryManager repositoryManager;
+ private DocumentFactoryBuilder documentFactoryBuilder;
+ private PublicationTemplateManager templateManager;
+ private ModuleManager moduleManager;
/**
* Configure the spring bean accordingly if you want to use a store.
@@ -80,6 +83,46 @@
protected MRUMemoryStore getStore() {
return this.store;
}
+
+ public void setSourceResolver(SourceResolver resolver) {
+ this.resolver = resolver;
+ }
+
+ protected SourceResolver getSourceResolver() {
+ return this.resolver;
+ }
+
+ public void setRepositoryManager(RepositoryManager repoMgr) {
+ this.repositoryManager = repoMgr;
+ }
+
+ protected RepositoryManager getRepositoryManager() {
+ return this.repositoryManager;
+ }
+
+ public void setDocumentFactoryBuilder(DocumentFactoryBuilder builder) {
+ this.documentFactoryBuilder = builder;
+ }
+
+ protected DocumentFactoryBuilder getDocumentFactoryBuilder() {
+ return this.documentFactoryBuilder;
+ }
+
+ public void setTemplateManager(PublicationTemplateManager mgr) {
+ this.templateManager = mgr;
+ }
+
+ protected PublicationTemplateManager getTemplateManager() {
+ return this.templateManager;
+ }
+
+ public void setModuleManager(ModuleManager mgr) {
+ this.moduleManager = mgr;
+ }
+
+ protected ModuleManager getModuleManager() {
+ return this.moduleManager;
+ }
/**
* @see org.apache.excalibur.source.SourceFactory#getSource(java.lang.String, java.util.Map)
@@ -105,17 +148,7 @@
+ resolvedSourceUri);
}
} else {
- SourceResolver resolver = null;
- try {
- resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
- source = resolver.resolveURI(cachedSourceUri);
- } catch (ServiceException e) {
- throw new RuntimeException(e);
- } finally {
- if (resolver != null) {
- this.manager.release(resolver);
- }
- }
+ source = this.resolver.resolveURI(cachedSourceUri);
if (getLogger().isDebugEnabled()) {
getLogger().debug(
"Using cached source URI " + cachedSourceUri + " for key " + cacheKey);
@@ -145,8 +178,8 @@
URLInformation info = new URLInformation(webappUri);
String pubId = null;
try {
- Session session = RepositoryUtil.getSession(this.manager, request);
- DocumentFactory factory = DocumentUtil.createDocumentFactory(this.manager, session);
+ Session session = RepositoryUtil.getSession(this.repositoryManager, request);
+ DocumentFactory factory = this.documentFactoryBuilder.createDocumentFactory(session);
String pubIdCandidate = info.getPublicationId();
if (pubIdCandidate != null && factory.existsPublication(pubIdCandidate)) {
pubId = pubIdCandidate;
@@ -165,14 +198,8 @@
String pubId = uri.getPubId();
String path = uri.getPath();
- PublicationTemplateManager templateManager = null;
- SourceResolver sourceResolver = null;
Source source = null;
try {
- sourceResolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
-
- templateManager = (PublicationTemplateManager) this.manager
- .lookup(PublicationTemplateManager.ROLE);
Request request = ContextHelper.getRequest(this.context);
@@ -184,32 +211,25 @@
pubId = info.getPublicationId();
}
- DocumentFactory factory = DocumentUtil.getDocumentFactory(this.manager, request);
+ Session session = RepositoryUtil.getSession(this.repositoryManager, request);
+ DocumentFactory factory = this.documentFactoryBuilder.createDocumentFactory(session);
if (factory.existsPublication(pubId)) {
Publication pub = factory.getPublication(pubId);
VisitingSourceResolver resolver = getSourceVisitor();
- templateManager.visit(pub, path, resolver);
+ this.templateManager.visit(pub, path, resolver);
source = resolver.getSource();
}
if (source == null) {
if (path.startsWith("lenya/modules/")) {
- ModuleManager moduleMgr = null;
- try {
- moduleMgr = (ModuleManager) this.manager.lookup(ModuleManager.ROLE);
- final String moduleShortcut = path.split("/")[2];
- String baseUri = moduleMgr.getBaseURI(moduleShortcut);
- final String modulePath = path
- .substring(("lenya/modules/" + moduleShortcut).length());
- source = sourceResolver.resolveURI(baseUri + modulePath);
- } finally {
- if (moduleMgr != null) {
- this.manager.release(moduleMgr);
- }
- }
+ final String moduleShortcut = path.split("/")[2];
+ String baseUri = this.moduleManager.getBaseURI(moduleShortcut);
+ final String modulePath = path
+ .substring(("lenya/modules/" + moduleShortcut).length());
+ source = this.resolver.resolveURI(baseUri + modulePath);
} else {
String contextUri = "context://" + path;
- source = sourceResolver.resolveURI(contextUri);
+ source = this.resolver.resolveURI(contextUri);
}
}
@@ -219,13 +239,6 @@
} catch (Exception e) {
throw new RuntimeException("Resolving path [" + location + "] failed: ", e);
- } finally {
- if (templateManager != null) {
- this.manager.release(templateManager);
- }
- if (sourceResolver != null) {
- this.manager.release(sourceResolver);
- }
}
return source;
@@ -237,16 +250,6 @@
protected org.apache.avalon.framework.context.Context context;
- /** The ServiceManager */
- protected ServiceManager manager;
-
- /**
- * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
- */
- public void service(ServiceManager _manager) throws ServiceException {
- this.manager = _manager;
- }
-
/**
* @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
*/
@@ -266,15 +269,7 @@
if (this.getLogger().isDebugEnabled()) {
this.getLogger().debug("Releasing source " + source.getURI());
}
- SourceResolver resolver = null;
- try {
- resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
- resolver.release(source);
- } catch (ServiceException ignore) {
- // ignore the exception
- } finally {
- this.manager.release(resolver);
- }
+ this.resolver.release(source);
}
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java?rev=741365&r1=741364&r2=741365&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SourceUtil.java Fri Feb 6 01:31:19 2009
@@ -170,6 +170,7 @@
* @throws ParserConfigurationException if an error occurs.
* @throws SAXException if an error occurs.
* @throws IOException if an error occurs.
+ * @deprecated
*/
public static Document readDOM(String sourceUri, ServiceManager manager)
throws ServiceException, SourceNotFoundException, ParserConfigurationException,
@@ -197,6 +198,37 @@
}
/**
+ * Reads a DOM from a source.
+ * @param sourceUri The source URI.
+ * @param manager The service manager.
+ * @return A document or <code>null</code> if the source does not exist.
+ * @throws ServiceException if an error occurs.
+ * @throws SourceNotFoundException if an error occurs.
+ * @throws ParserConfigurationException if an error occurs.
+ * @throws SAXException if an error occurs.
+ * @throws IOException if an error occurs.
+ */
+ public static Document readDOM(String sourceUri, SourceResolver resolver)
+ throws ServiceException, SourceNotFoundException, ParserConfigurationException,
+ SAXException, IOException {
+ Source source = null;
+ Document document = null;
+ try {
+ source = resolver.resolveURI(sourceUri);
+ if (source.exists()) {
+ document = DocumentHelper.readDocument(source.getInputStream());
+ }
+ } finally {
+ if (resolver != null) {
+ if (source != null) {
+ resolver.release(source);
+ }
+ }
+ }
+ return document;
+ }
+
+ /**
* Writes a DOM to a source.
* @param document The document.
* @param sourceUri The source URI.
@@ -321,6 +353,7 @@
* @throws ServiceException if an error occurs.
* @throws MalformedURLException if an error occurs.
* @throws IOException if an error occurs.
+ * @deprecated
*/
public static boolean exists(String sourceUri, ServiceManager manager) throws ServiceException,
MalformedURLException, IOException {
@@ -343,6 +376,27 @@
}
/**
+ * Checks if a source exists.
+ * @param sourceUri The source URI.
+ * @return A boolean value.
+ * @throws ServiceException if an error occurs.
+ * @throws MalformedURLException if an error occurs.
+ * @throws IOException if an error occurs.
+ */
+ public static boolean exists(String sourceUri, SourceResolver resolver) throws ServiceException,
+ MalformedURLException, IOException {
+ Source source = null;
+ try {
+ source = resolver.resolveURI(sourceUri);
+ return source.exists();
+ } finally {
+ if (source != null) {
+ resolver.release(source);
+ }
+ }
+ }
+
+ /**
* Returns the last modification date of a source.
* @param sourceUri The source URI.
* @param manager The service manager.
@@ -350,6 +404,7 @@
* @throws ServiceException if an error occurs.
* @throws MalformedURLException if an error occurs.
* @throws IOException if an error occurs.
+ * @deprecated
*/
public static long getLastModified(String sourceUri, ServiceManager manager)
throws ServiceException, MalformedURLException, IOException {
@@ -372,6 +427,28 @@
}
/**
+ * Returns the last modification date of a source.
+ * @param sourceUri The source URI.
+ * @param manager The service manager.
+ * @return A long value.
+ * @throws ServiceException if an error occurs.
+ * @throws MalformedURLException if an error occurs.
+ * @throws IOException if an error occurs.
+ */
+ public static long getLastModified(String sourceUri, SourceResolver resolver)
+ throws ServiceException, MalformedURLException, IOException {
+ Source source = null;
+ try {
+ source = resolver.resolveURI(sourceUri);
+ return source.getLastModified();
+ } finally {
+ if (source != null) {
+ resolver.release(source);
+ }
+ }
+ }
+
+ /**
* Checks out a repository source.
* @param sourceUri The source URI.
* @param manager The service manager.
Added: lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-sourceFactories.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-sourceFactories.xml?rev=741365&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-sourceFactories.xml (added)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-sourceFactories.xml Fri Feb 6 01:31:19 2009
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+ <bean name="org.apache.excalibur.source.SourceFactory/fallback"
+ class="org.apache.lenya.cms.cocoon.source.FallbackSourceFactory">
+ <property name="moduleManager" ref="org.apache.lenya.cms.module.ModuleManager"/>
+ <property name="documentFactoryBuilder" ref="org.apache.lenya.cms.publication.DocumentFactoryBuilder"/>
+ <property name="repositoryManager" ref="org.apache.lenya.cms.repository.RepositoryManager"/>
+ <property name="templateManager" ref="org.apache.lenya.cms.publication.templating.PublicationTemplateManager"/>
+ <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
+ </bean>
+</beans>
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml?rev=741365&r1=741364&r2=741365&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml Fri Feb 6 01:31:19 2009
@@ -23,4 +23,6 @@
class="org.apache.lenya.cms.repository.RepositoryManagerImpl"/>
<bean name="org.apache.lenya.cms.publication.DocumentFactoryBuilder"
class="org.apache.lenya.cms.publication.DocumentFactoryBuilderImpl"/>
+ <bean name="org.apache.lenya.cms.module.ModuleManager"
+ class="org.apache.lenya.cms.module.ModuleManagerImpl"/>
</beans>
Added: lenya/trunk/org.apache.lenya.core.templating/src/main/resources/META-INF/cocoon/spring/lenya-core-templating-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.templating/src/main/resources/META-INF/cocoon/spring/lenya-core-templating-components.xml?rev=741365&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.templating/src/main/resources/META-INF/cocoon/spring/lenya-core-templating-components.xml (added)
+++ lenya/trunk/org.apache.lenya.core.templating/src/main/resources/META-INF/cocoon/spring/lenya-core-templating-components.xml Fri Feb 6 01:31:19 2009
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"
+ xmlns="http://www.springframework.org/schema/beans">
+ <bean name="org.apache.lenya.cms.publication.templating.PublicationTemplateManager"
+ class="org.apache.lenya.cms.publication.templating.PublicationTemplateManagerImpl"/>
+</beans>
Modified: lenya/trunk/org.apache.lenya.parent/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.parent/pom.xml?rev=741365&r1=741364&r2=741365&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.parent/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.parent/pom.xml Fri Feb 6 01:31:19 2009
@@ -324,6 +324,11 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-templating</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-usecase</artifactId>
<version>${project.version}</version>
</dependency>
Modified: lenya/trunk/org.apache.lenya.welcome/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.welcome/pom.xml?rev=741365&r1=741364&r2=741365&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.welcome/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.welcome/pom.xml Fri Feb 6 01:31:19 2009
@@ -90,6 +90,10 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-templating</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-usecase</artifactId>
</dependency>
</dependencies>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.