You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/03/21 18:11:28 UTC
svn commit: r639716 - in /cocoon/whiteboard/corona/trunk/corona-core: ./
src/main/java/org/apache/cocoon/corona/pipeline/
src/main/java/org/apache/cocoon/corona/sitemap/
src/main/java/org/apache/cocoon/corona/sitemap/node/
src/main/resources/META-INF/c...
Author: reinhard
Date: Fri Mar 21 10:11:16 2008
New Revision: 639716
URL: http://svn.apache.org/viewvc?rev=639716&view=rev
Log:
request -> requestURI
ComponentProviderImpl -> SpringComponentProvider
Added:
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java
- copied, changed from r639645, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProviderImpl.java
Removed:
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProviderImpl.java
Modified:
cocoon/whiteboard/corona/trunk/corona-core/ (props changed)
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/AbstractPipeline.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/Invocation.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/AbstractSitemapNode.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/MatchNode.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/PipelinesNode.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/Sitemap.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/resources/META-INF/cocoon/spring/applicationContext.xml
cocoon/whiteboard/corona/trunk/corona-core/src/test/java/org/apache/cocoon/corona/pipeline/PipelineTest.java
Propchange: cocoon/whiteboard/corona/trunk/corona-core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 21 10:11:16 2008
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/AbstractPipeline.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/AbstractPipeline.java?rev=639716&r1=639715&r2=639716&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/AbstractPipeline.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/AbstractPipeline.java Fri Mar 21 10:11:16 2008
@@ -60,11 +60,11 @@
* @see org.apache.cocoon.corona.pipeline.Pipeline#execute(org.apache.cocoon.corona.sitemap.InvocationImpl)
*/
public void execute(Invocation invocation) throws Exception {
- System.out.println("AbstractPipeline.execute(" + invocation.getRequest() + ")");
+ System.out.println("AbstractPipeline.execute(" + invocation.getRequestURI() + ")");
// execute the actions first
for (Action action : this.actions) {
- System.out.println(action + ".execute(" + invocation.getRequest() + ")");
+ System.out.println(action + ".execute(" + invocation.getRequestURI() + ")");
action.execute(invocation);
}
Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/Invocation.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/Invocation.java?rev=639716&r1=639715&r2=639716&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/Invocation.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/Invocation.java Fri Mar 21 10:11:16 2008
@@ -34,7 +34,7 @@
Map<String, Object> getParameters();
- String getRequest();
+ String getRequestURI();
Throwable getThrowable();
Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java?rev=639716&r1=639715&r2=639716&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java Fri Mar 21 10:11:16 2008
@@ -42,7 +42,7 @@
private Pipeline pipeline;
- private String request;
+ private String requestURI;
private SitemapParameters sitemapParameters = new SitemapParameters();
@@ -108,10 +108,10 @@
/**
* {@inheritDoc}
*
- * @see org.apache.cocoon.corona.sitemap.Invocation#getRequest()
+ * @see org.apache.cocoon.corona.sitemap.Invocation#getRequestURI()
*/
- public String getRequest() {
- return this.request;
+ public String getRequestURI() {
+ return this.requestURI;
}
public String getSitemapParameter(String parameterName) {
@@ -226,8 +226,8 @@
this.parameters = parameters;
}
- public void setRequest(String request) {
- this.request = request;
+ public void setRequestURI(String requestURI) {
+ this.requestURI = requestURI;
}
/**
Copied: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java (from r639645, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProviderImpl.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java?p2=cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java&p1=cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProviderImpl.java&r1=639645&r2=639716&rev=639716&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProviderImpl.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java Fri Mar 21 10:11:16 2008
@@ -30,7 +30,7 @@
import org.apache.cocoon.corona.sitemap.expression.LanguageInterpreterFactory;
import org.apache.cocoon.corona.sitemap.resource.ResourceResolver;
-public class ComponentProviderImpl implements ComponentProvider {
+public class SpringComponentProvider implements ComponentProvider {
private ActionFactory actionFactory;
Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/AbstractSitemapNode.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/AbstractSitemapNode.java?rev=639716&r1=639715&r2=639716&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/AbstractSitemapNode.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/AbstractSitemapNode.java Fri Mar 21 10:11:16 2008
@@ -34,7 +34,9 @@
public abstract class AbstractSitemapNode implements SitemapNode {
private final List<SitemapNode> children = new LinkedList<SitemapNode>();
+
private final Map<String, String> parameters = new HashMap<String, String>();
+
private SitemapNode parent;
public void addChild(SitemapNode child) {
@@ -54,9 +56,11 @@
try {
childField.set(this, child);
} catch (IllegalArgumentException e) {
- System.out.println("Failed to set child field for child class '" + child.getClass().getName() + "': " + e);
+ System.out.println("Failed to set child field for child class '" + child.getClass().getName()
+ + "': " + e);
} catch (IllegalAccessException e) {
- System.out.println("Failed to set child field for child class '" + child.getClass().getName() + "': " + e);
+ System.out.println("Failed to set child field for child class '" + child.getClass().getName()
+ + "': " + e);
}
} else {
this.children.add(child);
@@ -78,7 +82,12 @@
InvocationResult result = InvocationResult.NONE;
for (SitemapNode child : this.children) {
- System.out.println(child + ".invoke(" + invocation.getRequest() + ")");
+ System.out.println(child + ".invoke(" + invocation.getRequestURI() + ")");
+
+ // aggregate the results of child invocations, the overall result is
+ // the maximum of all individual results
+ // this is done based on the ordering of the enumeration values
+ // which is significant to java.lang.Comparable
InvocationResult currentResult = child.invoke(invocation);
if (currentResult.compareTo(result) > 0) {
result = currentResult;
@@ -141,7 +150,8 @@
while (currentClass != null) {
Field[] declaredFields = currentClass.getDeclaredFields();
for (Field declaredField : declaredFields) {
- if (declaredField.isAnnotationPresent(NodeChild.class) && declaredField.getType().isAssignableFrom(child.getClass())) {
+ if (declaredField.isAnnotationPresent(NodeChild.class)
+ && declaredField.getType().isAssignableFrom(child.getClass())) {
return declaredField;
}
}
Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/MatchNode.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/MatchNode.java?rev=639716&r1=639715&r2=639716&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/MatchNode.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/MatchNode.java Fri Mar 21 10:11:16 2008
@@ -44,7 +44,7 @@
return InvocationResult.NONE;
}
- Map<String, String> matches = this.getMatches(invocation.getRequest());
+ Map<String, String> matches = this.getMatches(invocation.getRequestURI());
if (matches == null) {
// do not ask our children, there was no match
return InvocationResult.NONE;
Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/PipelinesNode.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/PipelinesNode.java?rev=639716&r1=639715&r2=639716&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/PipelinesNode.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/PipelinesNode.java Fri Mar 21 10:11:16 2008
@@ -43,7 +43,7 @@
}
// none of our children was responsible
- throw new NoMatchingPipelineException("No pipeline matched the request '" + invocation.getRequest() + "'");
+ throw new NoMatchingPipelineException("No pipeline matched the request '" + invocation.getRequestURI() + "'");
} catch (NoMatchingPipelineException nmpex) {
// no error handling when no pipeline matched
throw nmpex;
Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/Sitemap.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/Sitemap.java?rev=639716&r1=639715&r2=639716&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/Sitemap.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/node/Sitemap.java Fri Mar 21 10:11:16 2008
@@ -30,7 +30,7 @@
@Override
public InvocationResult invoke(Invocation invocation) {
System.out.println("========================================");
- System.out.println("Sitemap.invoke(" + invocation.getRequest() + ")");
+ System.out.println("Sitemap.invoke(" + invocation.getRequestURI() + ")");
long start = System.nanoTime();
try {
return super.invoke(invocation);
Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/resources/META-INF/cocoon/spring/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/resources/META-INF/cocoon/spring/applicationContext.xml?rev=639716&r1=639715&r2=639716&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/resources/META-INF/cocoon/spring/applicationContext.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/resources/META-INF/cocoon/spring/applicationContext.xml Fri Mar 21 10:11:16 2008
@@ -23,7 +23,7 @@
<bean name="org.apache.cocoon.corona.sitemap.resource.ResourceResolver" class="org.apache.cocoon.corona.sitemap.resource.ClassPathResourceResolver" />
- <bean name="org.apache.cocoon.corona.sitemap.ComponentProvider" class="org.apache.cocoon.corona.sitemap.ComponentProviderImpl">
+ <bean name="org.apache.cocoon.corona.sitemap.ComponentProvider" class="org.apache.cocoon.corona.sitemap.SpringComponentProvider">
<property name="actionFactory" ref="org.apache.cocoon.corona.pipeline.action.ActionFactory" />
<property name="languageInterpreterFactory" ref="org.apache.cocoon.corona.sitemap.expression.LanguageInterpreterFactory" />
<property name="pipelineComponentFactory" ref="org.apache.cocoon.corona.pipeline.component.PipelineComponentFactory" />
Modified: cocoon/whiteboard/corona/trunk/corona-core/src/test/java/org/apache/cocoon/corona/pipeline/PipelineTest.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/test/java/org/apache/cocoon/corona/pipeline/PipelineTest.java?rev=639716&r1=639715&r2=639716&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/test/java/org/apache/cocoon/corona/pipeline/PipelineTest.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/test/java/org/apache/cocoon/corona/pipeline/PipelineTest.java Fri Mar 21 10:11:16 2008
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
import org.apache.cocoon.corona.pipeline.component.FileReaderComponent;
-import org.apache.cocoon.corona.sitemap.ComponentProviderImpl;
+import org.apache.cocoon.corona.sitemap.SpringComponentProvider;
import org.apache.cocoon.corona.sitemap.InvocationImpl;
import org.apache.cocoon.corona.sitemap.resource.ClassPathResourceResolver;
@@ -46,7 +46,7 @@
InvocationImpl invocationImpl = new InvocationImpl();
invocationImpl.setOutputStream(System.out);
- ComponentProviderImpl componentProviderImpl = new ComponentProviderImpl();
+ SpringComponentProvider componentProviderImpl = new SpringComponentProvider();
componentProviderImpl.setResourceResolver(new ClassPathResourceResolver());
invocationImpl.setComponentProvider(componentProviderImpl);