Author: andreas
Date: Wed Feb 11 23:25:43 2009
New Revision: 743560
URL: http://svn.apache.org/viewvc?rev=743560&view=rev
Log:
Adding workflow test resources, adding mock resource type for tests to avoid dependency from workflow to resource type modules.
Added:
lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/lenya/
lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/lenya/resourcetypes/
lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/lenya/resourcetypes/mock.xml
lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/
lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/
lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/cocoon/
lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/cocoon/spring/
lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/cocoon/spring/lenya-core-workflow-components.xml
lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/lenya/
lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/lenya/metadata/
lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/lenya/metadata/workflow.xml
lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/
lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/
lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/
lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/
lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/
lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/workflow/
lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/workflow/WorkflowTest.spring.xml
lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/workflow/WorkflowTest.xtest
lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/test-components.xml
Modified:
lenya/trunk/org.apache.lenya.core.impl/pom.xml
lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/cocoon/spring/lenya-core-resourcetype-components.xml
lenya/trunk/org.apache.lenya.core.workflow/pom.xml
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java
lenya/trunk/org.apache.lenya.parent/pom.xml
lenya/trunk/pom.xml
lenya/trunk/pubs/test/config/access-control/access-control.xml
lenya/trunk/pubs/test/content/authoring/bc6c4770-f775-11dd-baf5-ec0f263a3b87/de.meta
lenya/trunk/pubs/test/content/authoring/bc6c4770-f775-11dd-baf5-ec0f263a3b87/en.meta
lenya/trunk/pubs/test/content/authoring/bc703f10-f775-11dd-baf5-ec0f263a3b87/de.meta
lenya/trunk/pubs/test/content/authoring/bc703f10-f775-11dd-baf5-ec0f263a3b87/en.meta
lenya/trunk/pubs/test/content/authoring/bc719ea0-f775-11dd-baf5-ec0f263a3b87/de.meta
lenya/trunk/pubs/test/content/authoring/bc719ea0-f775-11dd-baf5-ec0f263a3b87/en.meta
lenya/trunk/pubs/test/content/authoring/bc72b010-f775-11dd-baf5-ec0f263a3b87/de.meta
lenya/trunk/pubs/test/content/authoring/bc72b010-f775-11dd-baf5-ec0f263a3b87/en.meta
lenya/trunk/pubs/test/content/authoring/bc73e890-f775-11dd-baf5-ec0f263a3b87/de.meta
lenya/trunk/pubs/test/content/authoring/bc73e890-f775-11dd-baf5-ec0f263a3b87/en.meta
lenya/trunk/pubs/test/content/authoring/bc752110-f775-11dd-baf5-ec0f263a3b87/de.meta
lenya/trunk/pubs/test/content/authoring/bc752110-f775-11dd-baf5-ec0f263a3b87/en.meta
lenya/trunk/pubs/test/content/authoring/bc765990-f775-11dd-baf5-ec0f263a3b87/de.meta
lenya/trunk/pubs/test/content/authoring/bc765990-f775-11dd-baf5-ec0f263a3b87/en.meta
lenya/trunk/pubs/test/content/authoring/bc7743f0-f775-11dd-baf5-ec0f263a3b87/de.meta
lenya/trunk/pubs/test/content/authoring/bc7743f0-f775-11dd-baf5-ec0f263a3b87/en.meta
lenya/trunk/pubs/test/content/authoring/bc7966d0-f775-11dd-baf5-ec0f263a3b87/de.meta
lenya/trunk/pubs/test/content/authoring/bc7966d0-f775-11dd-baf5-ec0f263a3b87/en.meta
lenya/trunk/pubs/test/content/authoring/bc7c7410-f775-11dd-baf5-ec0f263a3b87/de.meta
lenya/trunk/pubs/test/content/authoring/bc7c7410-f775-11dd-baf5-ec0f263a3b87/en.meta
Modified: lenya/trunk/org.apache.lenya.core.impl/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/pom.xml?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.impl/pom.xml Wed Feb 11 23:25:43 2009
@@ -16,40 +16,6 @@
<name>Apache Lenya Core Implementation</name>
<build>
- <plugins>
- <plugin>
- <!-- export our test classes in a separate jar -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.class</include>
- <include>**/*Test.class</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.class</exclude>
- </excludes>
- <!-- currently triggers NPE in surefire plugin
- <systemProperties>
- <property>
- <name>junit.test.loglevel</name>
- <value>3</value>
- </property>
- </systemProperties>
- -->
- </configuration>
- </plugin>
- </plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -103,70 +69,5 @@
<artifactId>excalibur-sourceresolve</artifactId>
<version>2.2.3</version>
</dependency>
-
- <!-- Tests -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <!-- FIXME: This dependency is transitive and should be obtained automatically
- see http://jira.codehaus.org/browse/MNG-1378 -->
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-sitemap-impl</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-ac</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <!-- FIXME: maybe the tests can be organized with less dependencies -->
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-sitetree</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-sourcerepository</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-xhtml</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-links</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-opendocument</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-cforms</artifactId>
- <scope>runtime</scope>
- </dependency>
-
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/cocoon/spring/lenya-core-resourcetype-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/cocoon/spring/lenya-core-resourcetype-components.xml?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/cocoon/spring/lenya-core-resourcetype-components.xml (original)
+++ lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/cocoon/spring/lenya-core-resourcetype-components.xml Wed Feb 11 23:25:43 2009
@@ -25,4 +25,11 @@
<property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
</bean>
+ <!-- Mock resource type, used for tests. -->
+ <bean name="org.apache.lenya.cms.publication.ResourceType/mock"
+ factory-bean="org.apache.lenya.cms.publication.ResourceTypeFactory"
+ factory-method="createResourceType">
+ <constructor-arg value="resource://META-INF/lenya/resourcetypes/mock.xml"/>
+ </bean>
+
</beans>
Added: lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/lenya/resourcetypes/mock.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/lenya/resourcetypes/mock.xml?rev=743560&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/lenya/resourcetypes/mock.xml (added)
+++ lenya/trunk/org.apache.lenya.core.resourcetype/src/main/resources/META-INF/lenya/resourcetypes/mock.xml Wed Feb 11 23:25:43 2009
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<resource-type name="mock"/>
Modified: lenya/trunk/org.apache.lenya.core.workflow/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/pom.xml?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/pom.xml Wed Feb 11 23:25:43 2009
@@ -75,6 +75,38 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <!-- FIXME: Needed for component declarations. This can hopefully be removed. -->
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-ac</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl</artifactId>
+ <type>test-jar</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-resourcetype</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-sitetree</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-sourcerepository</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java Wed Feb 11 23:25:43 2009
@@ -20,11 +20,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.excalibur.pool.Poolable;
-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.source.SourceResolver;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
import org.apache.lenya.workflow.Workflow;
import org.apache.lenya.workflow.WorkflowEngine;
@@ -38,10 +35,10 @@
*
* @version $Id: WorkflowManagerImpl.java 179751 2005-06-03 09:13:35Z andreas $
*/
-public class WorkflowManagerImpl extends AbstractLogEnabled implements WorkflowManager,
- Serviceable, Poolable {
+public class WorkflowManagerImpl extends AbstractLogEnabled implements WorkflowManager {
private Map uri2workflow = new HashMap();
+ private SourceResolver sourceResolver;
/**
* @see org.apache.lenya.workflow.WorkflowManager#invoke(org.apache.lenya.workflow.Workflowable,
@@ -87,15 +84,6 @@
return canInvoke;
}
- 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.lenya.workflow.WorkflowManager#getWorkflowSchema(org.apache.lenya.workflow.Workflowable)
*/
@@ -108,7 +96,7 @@
if (uri != null) {
workflow = (WorkflowImpl) this.uri2workflow.get(uri);
if (workflow == null) {
- Document document = SourceUtil.readDOM(uri, this.manager);
+ Document document = SourceUtil.readDOM(uri, this.sourceResolver);
if (document == null) {
throw new WorkflowException("Could not read workflow schema from URI ["
+ uri + "]!");
@@ -134,4 +122,8 @@
return workflowable.getWorkflowSchemaURI() != null;
}
+ public void setSourceResolver(SourceResolver sourceResolver) {
+ this.sourceResolver = sourceResolver;
+ }
+
}
Added: lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/cocoon/spring/lenya-core-workflow-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/cocoon/spring/lenya-core-workflow-components.xml?rev=743560&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/cocoon/spring/lenya-core-workflow-components.xml (added)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/cocoon/spring/lenya-core-workflow-components.xml Wed Feb 11 23:25:43 2009
@@ -0,0 +1,37 @@
+<?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.workflow.WorkflowManager"
+ class="org.apache.lenya.workflow.impl.WorkflowManagerImpl">
+ <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
+ </bean>
+
+ <!-- Meta Data -->
+ <bean init-method="register"
+ name="org.apache.lenya.cms.repository.metadata.ElementSet/http://apache.org/lenya/metadata/workflow/1.0"
+ class="org.apache.lenya.cms.repository.metadata.impl.ConfigurableElementSet">
+ <property name="configUri" value="resource://META-INF/lenya/metadata/workflow.xml"/>
+ <property name="registry" ref="org.apache.lenya.cms.repository.metadata.MetaDataRegistry"/>
+ <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
+ </bean>
+
+</beans>
Added: lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/lenya/metadata/workflow.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/lenya/metadata/workflow.xml?rev=743560&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/lenya/metadata/workflow.xml (added)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/resources/META-INF/lenya/metadata/workflow.xml Wed Feb 11 23:25:43 2009
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<metadata namespace="http://apache.org/lenya/metadata/workflow/1.0">
+ <element name="workflowVersion" multiple="true" onCopy="delete"/>
+</metadata>
Added: lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/workflow/WorkflowTest.spring.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/workflow/WorkflowTest.spring.xml?rev=743560&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/workflow/WorkflowTest.spring.xml (added)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/workflow/WorkflowTest.spring.xml Wed Feb 11 23:25:43 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="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">
+ <import resource="classpath:META-INF/cocoon/spring/lenya-core-workflow-components.xml"/>
+ <import resource="classpath:test-components.xml"/>
+</beans>
Added: lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/workflow/WorkflowTest.xtest
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/workflow/WorkflowTest.xtest?rev=743560&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/workflow/WorkflowTest.xtest (added)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/org/apache/lenya/cms/workflow/WorkflowTest.xtest Wed Feb 11 23:25:43 2009
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<!--
+ 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.
+-->
+<testcase>
+ <roles>
+ <role name="org.apache.excalibur.source.SourceFactorySelector"
+ shorthand="source-factories"
+ default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+ <role name="org.apache.excalibur.source.SourceResolver"
+ shorthand="source-resolver"
+ default-class="org.apache.excalibur.source.impl.SourceResolverImpl"
+ />
+ </roles>
+
+ <components>
+
+ <source-factories>
+ <component-instance class="org.apache.cocoon.components.source.impl.XMLizableSourceFactory" name="xml" logger="core.xmlsource"/>
+ <component-instance class="org.apache.excalibur.source.impl.FileSourceFactory" name="file" logger="core.filesource"/>
+ <component-instance class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource" logger="core.resourcesource"/>
+ <component-instance class="org.apache.cocoon.components.source.impl.ContextSourceFactory" name="context"/>
+ <component-instance class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
+ </source-factories>
+
+ </components>
+
+</testcase>
Added: lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/test-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/test-components.xml?rev=743560&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/test-components.xml (added)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/test/resources/test-components.xml Wed Feb 11 23:25:43 2009
@@ -0,0 +1,32 @@
+<?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">
+
+ <import resource="classpath:META-INF/cocoon/spring/lenya-core-ac-components.xml"/>
+ <import resource="classpath:META-INF/cocoon/spring/lenya-core-impl-components.xml"/>
+ <import resource="classpath:META-INF/cocoon/spring/lenya-core-observation-components.xml"/>
+ <import resource="classpath:META-INF/cocoon/spring/lenya-core-repository-components.xml"/>
+ <import resource="classpath:META-INF/cocoon/spring/lenya-core-resourcetype-components.xml"/>
+ <import resource="classpath:META-INF/cocoon/spring/lenya-module-sitetree-components.xml"/>
+ <import resource="classpath:META-INF/cocoon/spring/lenya-module-sourcerepository-components.xml"/>
+ <import resource="classpath:META-INF/cocoon/spring/cocoon-xml-impl.xml"/>
+
+</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=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.parent/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.parent/pom.xml Wed Feb 11 23:25:43 2009
@@ -548,6 +548,11 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl-tests</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-impl</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
Modified: lenya/trunk/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/pom.xml?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pom.xml (original)
+++ lenya/trunk/pom.xml Wed Feb 11 23:25:43 2009
@@ -42,6 +42,7 @@
<module>org.apache.lenya.core.gui</module>
<module>org.apache.lenya.core.i18n</module>
<module>org.apache.lenya.core.impl</module>
+ <module>org.apache.lenya.core.impl.tests</module>
<module>org.apache.lenya.core.janitor</module>
<module>org.apache.lenya.core.ldap</module>
<module>org.apache.lenya.core.linking</module>
Modified: lenya/trunk/pubs/test/config/access-control/access-control.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/config/access-control/access-control.xml?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/config/access-control/access-control.xml (original)
+++ lenya/trunk/pubs/test/config/access-control/access-control.xml Wed Feb 11 23:25:43 2009
@@ -21,7 +21,7 @@
<access-controller type="bypassable">
<accreditable-manager type="file">
- <parameter name="directory" value="resource://pubs/test/config/access-control/passwd"/>
+ <parameter name="directory" value="/Users/nobby/apache/lenya/trunk/pubs/test/config/access-control/passwd"/>
<user-manager>
<user-type class="org.apache.lenya.ac.file.FileUser" create-use-case="admin.addUser">Local User</user-type>
@@ -32,7 +32,7 @@
<policy-manager type="document">
<policy-manager type="file">
- <parameter name="directory" value="resource://pubs/test/config/access-control/policies"/>
+ <parameter name="directory" value="/Users/nobby/apache/lenya/trunk/pubs/test/config/access-control/policies"/>
</policy-manager>
</policy-manager>
<!--
Modified: lenya/trunk/pubs/test/content/authoring/bc6c4770-f775-11dd-baf5-ec0f263a3b87/de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc6c4770-f775-11dd-baf5-ec0f263a3b87/de.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc6c4770-f775-11dd-baf5-ec0f263a3b87/de.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc6c4770-f775-11dd-baf5-ec0f263a3b87/de.meta Wed Feb 11 23:25:43 2009
@@ -37,7 +37,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>homepage</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc6c4770-f775-11dd-baf5-ec0f263a3b87/en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc6c4770-f775-11dd-baf5-ec0f263a3b87/en.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc6c4770-f775-11dd-baf5-ec0f263a3b87/en.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc6c4770-f775-11dd-baf5-ec0f263a3b87/en.meta Wed Feb 11 23:25:43 2009
@@ -36,7 +36,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>homepage</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc703f10-f775-11dd-baf5-ec0f263a3b87/de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc703f10-f775-11dd-baf5-ec0f263a3b87/de.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc703f10-f775-11dd-baf5-ec0f263a3b87/de.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc703f10-f775-11dd-baf5-ec0f263a3b87/de.meta Wed Feb 11 23:25:43 2009
@@ -37,7 +37,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc703f10-f775-11dd-baf5-ec0f263a3b87/en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc703f10-f775-11dd-baf5-ec0f263a3b87/en.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc703f10-f775-11dd-baf5-ec0f263a3b87/en.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc703f10-f775-11dd-baf5-ec0f263a3b87/en.meta Wed Feb 11 23:25:43 2009
@@ -36,7 +36,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc719ea0-f775-11dd-baf5-ec0f263a3b87/de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc719ea0-f775-11dd-baf5-ec0f263a3b87/de.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc719ea0-f775-11dd-baf5-ec0f263a3b87/de.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc719ea0-f775-11dd-baf5-ec0f263a3b87/de.meta Wed Feb 11 23:25:43 2009
@@ -37,7 +37,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc719ea0-f775-11dd-baf5-ec0f263a3b87/en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc719ea0-f775-11dd-baf5-ec0f263a3b87/en.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc719ea0-f775-11dd-baf5-ec0f263a3b87/en.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc719ea0-f775-11dd-baf5-ec0f263a3b87/en.meta Wed Feb 11 23:25:43 2009
@@ -36,7 +36,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc72b010-f775-11dd-baf5-ec0f263a3b87/de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc72b010-f775-11dd-baf5-ec0f263a3b87/de.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc72b010-f775-11dd-baf5-ec0f263a3b87/de.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc72b010-f775-11dd-baf5-ec0f263a3b87/de.meta Wed Feb 11 23:25:43 2009
@@ -19,7 +19,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>links</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc72b010-f775-11dd-baf5-ec0f263a3b87/en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc72b010-f775-11dd-baf5-ec0f263a3b87/en.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc72b010-f775-11dd-baf5-ec0f263a3b87/en.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc72b010-f775-11dd-baf5-ec0f263a3b87/en.meta Wed Feb 11 23:25:43 2009
@@ -18,7 +18,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>links</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc73e890-f775-11dd-baf5-ec0f263a3b87/de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc73e890-f775-11dd-baf5-ec0f263a3b87/de.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc73e890-f775-11dd-baf5-ec0f263a3b87/de.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc73e890-f775-11dd-baf5-ec0f263a3b87/de.meta Wed Feb 11 23:25:43 2009
@@ -37,7 +37,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc73e890-f775-11dd-baf5-ec0f263a3b87/en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc73e890-f775-11dd-baf5-ec0f263a3b87/en.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc73e890-f775-11dd-baf5-ec0f263a3b87/en.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc73e890-f775-11dd-baf5-ec0f263a3b87/en.meta Wed Feb 11 23:25:43 2009
@@ -36,7 +36,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc752110-f775-11dd-baf5-ec0f263a3b87/de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc752110-f775-11dd-baf5-ec0f263a3b87/de.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc752110-f775-11dd-baf5-ec0f263a3b87/de.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc752110-f775-11dd-baf5-ec0f263a3b87/de.meta Wed Feb 11 23:25:43 2009
@@ -37,7 +37,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc752110-f775-11dd-baf5-ec0f263a3b87/en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc752110-f775-11dd-baf5-ec0f263a3b87/en.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc752110-f775-11dd-baf5-ec0f263a3b87/en.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc752110-f775-11dd-baf5-ec0f263a3b87/en.meta Wed Feb 11 23:25:43 2009
@@ -36,7 +36,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc765990-f775-11dd-baf5-ec0f263a3b87/de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc765990-f775-11dd-baf5-ec0f263a3b87/de.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc765990-f775-11dd-baf5-ec0f263a3b87/de.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc765990-f775-11dd-baf5-ec0f263a3b87/de.meta Wed Feb 11 23:25:43 2009
@@ -37,7 +37,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc765990-f775-11dd-baf5-ec0f263a3b87/en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc765990-f775-11dd-baf5-ec0f263a3b87/en.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc765990-f775-11dd-baf5-ec0f263a3b87/en.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc765990-f775-11dd-baf5-ec0f263a3b87/en.meta Wed Feb 11 23:25:43 2009
@@ -36,7 +36,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc7743f0-f775-11dd-baf5-ec0f263a3b87/de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc7743f0-f775-11dd-baf5-ec0f263a3b87/de.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc7743f0-f775-11dd-baf5-ec0f263a3b87/de.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc7743f0-f775-11dd-baf5-ec0f263a3b87/de.meta Wed Feb 11 23:25:43 2009
@@ -25,7 +25,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>links</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc7743f0-f775-11dd-baf5-ec0f263a3b87/en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc7743f0-f775-11dd-baf5-ec0f263a3b87/en.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc7743f0-f775-11dd-baf5-ec0f263a3b87/en.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc7743f0-f775-11dd-baf5-ec0f263a3b87/en.meta Wed Feb 11 23:25:43 2009
@@ -24,7 +24,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>links</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc7966d0-f775-11dd-baf5-ec0f263a3b87/de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc7966d0-f775-11dd-baf5-ec0f263a3b87/de.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc7966d0-f775-11dd-baf5-ec0f263a3b87/de.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc7966d0-f775-11dd-baf5-ec0f263a3b87/de.meta Wed Feb 11 23:25:43 2009
@@ -25,7 +25,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>cforms</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc7966d0-f775-11dd-baf5-ec0f263a3b87/en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc7966d0-f775-11dd-baf5-ec0f263a3b87/en.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc7966d0-f775-11dd-baf5-ec0f263a3b87/en.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc7966d0-f775-11dd-baf5-ec0f263a3b87/en.meta Wed Feb 11 23:25:43 2009
@@ -24,7 +24,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>cforms</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc7c7410-f775-11dd-baf5-ec0f263a3b87/de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc7c7410-f775-11dd-baf5-ec0f263a3b87/de.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc7c7410-f775-11dd-baf5-ec0f263a3b87/de.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc7c7410-f775-11dd-baf5-ec0f263a3b87/de.meta Wed Feb 11 23:25:43 2009
@@ -37,7 +37,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
Modified: lenya/trunk/pubs/test/content/authoring/bc7c7410-f775-11dd-baf5-ec0f263a3b87/en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/pubs/test/content/authoring/bc7c7410-f775-11dd-baf5-ec0f263a3b87/en.meta?rev=743560&r1=743559&r2=743560&view=diff
==============================================================================
--- lenya/trunk/pubs/test/content/authoring/bc7c7410-f775-11dd-baf5-ec0f263a3b87/en.meta (original)
+++ lenya/trunk/pubs/test/content/authoring/bc7c7410-f775-11dd-baf5-ec0f263a3b87/en.meta Wed Feb 11 23:25:43 2009
@@ -36,7 +36,7 @@
<value>xml</value>
</element>
<element key="resourceType">
-<value>xhtml</value>
+<value>mock</value>
</element>
<element key="contentType">
<value>xml</value>
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.