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/09/20 15:50:18 UTC
svn commit: r697363 - in /cocoon/cocoon3/trunk:
cocoon-controller/src/main/java/org/apache/cocoon/controller/
cocoon-controller/src/main/resources/META-INF/cocoon/spring/
cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/
cocoon-sitemap/src/main/j...
Author: reinhard
Date: Sat Sep 20 06:50:18 2008
New Revision: 697363
URL: http://svn.apache.org/viewvc?rev=697363&view=rev
Log:
. remove DemoControllerDispatcher (not necessary anymore because the SpringRESTController, a "real" implementation, is available now)
. rename SitemapParameters to avoid name collisions with Cocoon 2.2 (as explained by Daniel at http://cocoon.markmail.org/message/yxanav6afyzabcnf)
Added:
cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParametersStack.java
- copied, changed from r697104, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java
Removed:
cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/DemoControllerDispatcher.java
cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java
Modified:
cocoon/cocoon3/trunk/cocoon-controller/src/main/resources/META-INF/cocoon/spring/cocoon-controller.xml
cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/objectmodel/ObjectModel.java
Modified: cocoon/cocoon3/trunk/cocoon-controller/src/main/resources/META-INF/cocoon/spring/cocoon-controller.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-controller/src/main/resources/META-INF/cocoon/spring/cocoon-controller.xml?rev=697363&r1=697362&r2=697363&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-controller/src/main/resources/META-INF/cocoon/spring/cocoon-controller.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-controller/src/main/resources/META-INF/cocoon/spring/cocoon-controller.xml Sat Sep 20 06:50:18 2008
@@ -23,6 +23,4 @@
<bean name="controller:default" class="org.apache.cocoon.controller.SpringControllerComponent" scope="prototype" />
- <bean name="org.apache.cocoon.controller.Controller/demo" class="org.apache.cocoon.controller.DemoControllerDispatcher" scope="prototype" />
-
</beans>
Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParametersStack.java (from r697104, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParametersStack.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParametersStack.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java&r1=697104&r2=697363&rev=697363&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParametersStack.java Sat Sep 20 06:50:18 2008
@@ -23,12 +23,12 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-public class SitemapParameters {
+public class SitemapParametersStack {
private static final Pattern ABSOLUTE_PARAMETER_PATTERN = Pattern.compile("([a-zA-z0-9]+)/(.+)");
private static final String RELATIVE_LOCATION_PREFIX = "../";
- private static final Pattern RELATIVE_PARAMETER_PATTERN = Pattern.compile("((" + Pattern.quote(RELATIVE_LOCATION_PREFIX)
- + ")*)(.+)");
+ private static final Pattern RELATIVE_PARAMETER_PATTERN = Pattern.compile("(("
+ + Pattern.quote(RELATIVE_LOCATION_PREFIX) + ")*)(.+)");
private Stack<Entry> entries = new Stack<Entry>();
@@ -88,8 +88,8 @@
final int index = this.entries.size() - level - 1;
if (index < 0) {
throw new IllegalArgumentException("Sitemap parameter '" + relativeParameterMatcher.group()
- + "' could not be resolved. There are only " + this.entries.size() + " entries available, but " + level
- + " entries were requested.");
+ + "' could not be resolved. There are only " + this.entries.size() + " entries available, but "
+ + level + " entries were requested.");
}
Entry entry = this.entries.get(index);
Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/objectmodel/ObjectModel.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/objectmodel/ObjectModel.java?rev=697363&r1=697362&r2=697363&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/objectmodel/ObjectModel.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/objectmodel/ObjectModel.java Sat Sep 20 06:50:18 2008
@@ -19,7 +19,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.cocoon.sitemap.SitemapParameters;
+import org.apache.cocoon.sitemap.SitemapParametersStack;
/**
* Object model for Cocoon 3 that can is used by expression languages.
@@ -28,7 +28,7 @@
private static final String OM_KEY_COCOON = "cocoon";
- private SitemapParameters sitemapParameters = new SitemapParameters();
+ private SitemapParametersStack sitemapParameters = new SitemapParametersStack();
private final Map<String, Object> parameters;
@@ -59,7 +59,7 @@
return (Map<String, Object>) this.parameters.get(OM_KEY_COCOON);
}
- public SitemapParameters getSitemapParameters() {
+ public SitemapParametersStack getSitemapParameters() {
return this.sitemapParameters;
}