[prev in list] [next in list] [prev in thread] [next in thread]
List: xml-cocoon-cvs
Subject: svn commit: r833328 - in /cocoon/cocoon3/trunk/cocoon-profiling/src:
From: reinhard () apache ! org
Date: 2009-11-06 9:36:42
Message-ID: 20091106093642.B2806238888F () eris ! apache ! org
[Download RAW message or body]
Author: reinhard
Date: Fri Nov 6 09:36:42 2009
New Revision: 833328
URL: http://svn.apache.org/viewvc?rev=833328&view=rev
Log:
cleanup the URI space for profiling URLs
Modified:
cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/profiler/ServletProfiler.java
cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/COB-INF/sitemap.xmap
cocoon/cocoon3/trunk/cocoon-profiling/src/test/java/org/apache/cocoon/profiling/TestServletProfiler.java
cocoon/cocoon3/trunk/cocoon-profiling/src/test/resources/org/apache/cocoon/profiling/simple.xml
Modified: cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/profiler/ServletProfiler.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/ \
org/apache/cocoon/profiling/profiler/ServletProfiler.java?rev=833328&r1=833327&r2=833328&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/profiler/ServletProfiler.java \
(original)
+++ cocoon/cocoon3/trunk/cocoon-profiling/src/main/java/org/apache/cocoon/profiling/profiler/ServletProfiler.java \
Fri Nov 6 09:36:42 2009 @@ -30,7 +30,7 @@
*/
public class ServletProfiler extends Profiler<Servlet> {
- private final static String PROFILING_CONTROLLER_PATH = "controller/profiling/";
+ private final static String PROFILING_CONTROLLER_PATH = "cocoon-profiling/";
private final static String PROFILING_ID_HEADER = "X-Cocoon-Profiling-ID";
private final static String PROFILING_URL_HEADER = "X-Cocoon-Profiling-URL";
private String mountPath;
Modified: cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/COB-INF/sitemap.xmap?rev=833328&r1=833327&r2=833328&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/COB-INF/sitemap.xmap \
(original)
+++ cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/COB-INF/sitemap.xmap Fri \
Nov 6 09:36:42 2009 @@ -21,17 +21,15 @@
xmlns:servlet="http://apache.org/cocoon/servlet" \
xmlns:controller="http://apache.org/cocoon/controller">
<map:pipelines>
-
<!-- ~~~~~~~~~~~~~~~~ profiling controller ~~~~~~~~~~~~~~~ -->
<map:pipeline>
- <map:match pattern="controller/profiling/{id}.png">
+ <map:match pattern="{id}.png">
<map:serialize type="profilingpng" id="{map:id}" />
</map:match>
- <map:match pattern="controller/profiling/{id}">
+ <map:match pattern="{id}">
<map:generate type="profiling" id="{map:id}" />
<map:serialize type="xml" />
</map:match>
</map:pipeline>
-
</map:pipelines>
</map:sitemap>
Modified: cocoon/cocoon3/trunk/cocoon-profiling/src/test/java/org/apache/cocoon/profiling/TestServletProfiler.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/src/test/java/ \
org/apache/cocoon/profiling/TestServletProfiler.java?rev=833328&r1=833327&r2=833328&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/src/test/java/org/apache/cocoon/profiling/TestServletProfiler.java \
(original)
+++ cocoon/cocoon3/trunk/cocoon-profiling/src/test/java/org/apache/cocoon/profiling/TestServletProfiler.java \
Fri Nov 6 09:36:42 2009 @@ -36,25 +36,25 @@
@Test
public void testRelativeUrl() {
- assertEquals("controller/profiling/ID", \
this.servletProfiler.createRelativeUrl( + assertEquals("cocoon-profiling/ID", \
this.servletProfiler.createRelativeUrl( "http://localhost/myproject/home.html", \
"ID"));
- assertEquals("../controller/profiling/ID", \
this.servletProfiler.createRelativeUrl( + \
assertEquals("../cocoon-profiling/ID", this.servletProfiler.createRelativeUrl( \
"http://localhost/myproject/foo/home.html", "ID"));
- assertEquals("../../controller/profiling/ID", \
this.servletProfiler.createRelativeUrl( + \
assertEquals("../../cocoon-profiling/ID", this.servletProfiler.createRelativeUrl( \
"http://localhost/myproject/foo/bar/home.html", "ID"));
- assertEquals("../../../controller/profiling/ID", \
this.servletProfiler.createRelativeUrl( + \
assertEquals("../../../cocoon-profiling/ID", \
this.servletProfiler.createRelativeUrl(
"http://localhost/myproject/foo/bar/buz/home.html", "ID"));
- assertEquals("../../../controller/profiling/ID", \
this.servletProfiler.createRelativeUrl( + \
assertEquals("../../../cocoon-profiling/ID", \
this.servletProfiler.createRelativeUrl(
"http://localhost/myproject/foo/bar/buz/home.html?a=1", "ID"));
- assertEquals("../../../controller/profiling/ID", \
this.servletProfiler.createRelativeUrl( + \
assertEquals("../../../cocoon-profiling/ID", \
this.servletProfiler.createRelativeUrl(
"http://localhost/myproject/foo/bar/buz/home.html?a=1&b=2", "ID"));
- assertEquals("../../../controller/profiling/ID", \
this.servletProfiler.createRelativeUrl( + \
assertEquals("../../../cocoon-profiling/ID", \
this.servletProfiler.createRelativeUrl(
"http://localhost/myproject/foo/bar/buz/home.html?a=1&b=/", "ID"));
}
}
Modified: cocoon/cocoon3/trunk/cocoon-profiling/src/test/resources/org/apache/cocoon/profiling/simple.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/src/test/resou \
rces/org/apache/cocoon/profiling/simple.xml?rev=833328&r1=833327&r2=833328&view=diff \
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/src/test/resources/org/apache/cocoon/profiling/simple.xml \
(original)
+++ cocoon/cocoon3/trunk/cocoon-profiling/src/test/resources/org/apache/cocoon/profiling/simple.xml \
Fri Nov 6 09:36:42 2009 @@ -1,17 +1,20 @@
<?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
+<!--
+ 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.
- -->
+ 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.
+ -->
<simple>simple-text</simple>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic