[prev in list] [next in list] [prev in thread] [next in thread]
List: xml-cocoon-cvs
Subject: svn commit: r884443 - in /cocoon/cocoon3/trunk/cocoon-sample: ./
From: reinhard () apache ! org
Date: 2009-11-26 7:55:08
Message-ID: 20091126075508.D8CD123889CB () eris ! apache ! org
[Download RAW message or body]
Author: reinhard
Date: Thu Nov 26 07:55:07 2009
New Revision: 884443
URL: http://svn.apache.org/viewvc?rev=884443&view=rev
Log:
add Cocoon-Wicket integration samples
some minor cleanup work
Added:
cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/
cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java \
(with props) cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java \
(with props) cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java \
(with props) cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml \
(with props) cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/xpatch/cocoon-sample-block-deployment.xweb
- copied unchanged from r833327, \
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/xpatch/cocoon-block-deployment.xweb
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html \
(with props) cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html \
(with props) Removed:
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/xpatch/cocoon-block-deployment.xweb
Modified:
cocoon/cocoon3/trunk/cocoon-sample/pom.xml
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple.xslt
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/profiling/ProfilingIntegrationTest.java
cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/SitemapBuilderTest.java
Modified: cocoon/cocoon3/trunk/cocoon-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/pom.xml?rev=884443&r1=884442&r2=884443&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/pom.xml Thu Nov 26 07:55:07 2009
@@ -38,6 +38,7 @@
<description>Cocoon 3 samples.</description>
<dependencies>
+ <!-- Cocoon libraries -->
<dependency>
<groupId>org.apache.cocoon.rest</groupId>
<artifactId>cocoon-rest</artifactId>
@@ -47,6 +48,10 @@
<artifactId>cocoon-stringtemplate</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cocoon.wicket</groupId>
+ <artifactId>cocoon-wicket</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.cocoon.profiling</groupId>
<artifactId>cocoon-profiling</artifactId>
</dependency>
@@ -60,7 +65,7 @@
<scope>provided</scope>
</dependency>
- <!-- Optional Cocoon libraries -->
+ <!-- Optional libraries -->
<dependency>
<groupId>org.apache.cocoon.optional</groupId>
<artifactId>cocoon-optional</artifactId>
@@ -72,15 +77,28 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-serializers-charsets</artifactId>
- </dependency>
-
- <!-- Other dependencies -->
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </dependency>
+
+ <!-- Logging dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>runtime</scope>
</dependency>
-
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -93,9 +111,6 @@
<plugins>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
- <!-- configuration>
- <useProjectReferences>false</useProjectReferences>
- </configuration-->
</plugin>
<plugin>
<groupId>org.apache.cocoon</groupId>
Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java?rev=884443&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java \
(added)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java \
Thu Nov 26 07:55:07 2009 @@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.wicket;
+
+import org.apache.wicket.Page;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
+
+public class CocoonSampleWicketWebapp extends WebApplication {
+
+ @Override
+ public Class<? extends Page> getHomePage() {
+ return HelloWicketPage.class;
+ }
+
+ @Override
+ protected void init() {
+ this.addComponentInstantiationListener(new SpringComponentInjector(this));
+ this.mountBookmarkablePage("hello-wicket", HelloWicketPage.class);
+ }
+}
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java?rev=884443&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java \
(added)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java \
Thu Nov 26 07:55:07 2009 @@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.wicket;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+
+public class HelloWicketPage extends WebPage {
+
+ private AjaxFallbackLink<Object> ajaxFallbackLink;
+ private Label text;
+ private int counter = 1;
+
+ public HelloWicketPage() {
+ this.add(new Label("message", "hello, wicket!"));
+ this.text = new Label("text", "text-1");
+ this.text.setOutputMarkupId(true);
+ this.add(this.text);
+
+ this.ajaxFallbackLink = new AjaxFallbackLink<Object>("link") {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ HelloWicketPage.this.text.setDefaultModelObject("text-" + \
++HelloWicketPage.this.counter); + \
target.addComponent(HelloWicketPage.this.text); + }
+ };
+ this.add(this.ajaxFallbackLink);
+
+ this.add(new Link<Object>("link-other-page") {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick() {
+ this.setResponsePage(OtherPage.class);
+ }
+ });
+ }
+}
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java?rev=884443&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java \
(added)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java \
Thu Nov 26 07:55:07 2009 @@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.wicket;
+
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.Link;
+
+public class OtherPage extends WebPage {
+
+ public OtherPage() {
+ this.add(new Link<Object>("link") {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick() {
+ this.setResponsePage(HelloWicketPage.class);
+ }
+ });
+ }
+}
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html?rev=884443&r1=884442&r2=884443&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html \
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html Thu \
Nov 26 07:55:07 2009 @@ -115,5 +115,9 @@
<li><a href="serializers/exhtml">eXHTML</a>: A pedantinc XHTML serializer \
encoding all recognized entities with their proper HTML names.</li> <li><a \
href="serializers/ehtml">eHTML</a>: A serializer converting XHTML into plain old \
HTML.</li> </ul>
+ <h2>Cocoon-Wicket integration</h2>
+ <ul>
+ <li><a href="wicket/">Wicket Reader</a>: A reader defers redirects a request to a \
Wicket application.</li> + </ul>
</body>
</html>
Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple.xslt
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple.xslt?rev=884443&r1=884442&r2=884443&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple.xslt \
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple.xslt \
Thu Nov 26 07:55:07 2009 @@ -27,9 +27,7 @@
<body>
<h1>Simple Pipeline</h1>
- <p>
- <xsl:value-of select="$myParam" />
- </p>
+ <p><xsl:value-of select="$myParam" /></p>
</body>
</html>
</xsl:template>
Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap?rev=884443&r1=884442&r2=884443&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap \
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap Thu \
Nov 26 07:55:07 2009 @@ -57,7 +57,7 @@
<map:match pattern="sax-pipeline/simple-xml">
<map:generate src="sax-pipeline/simple.xml" />
<map:transform src="sax-pipeline/simple.xslt">
- <map:parameter name="myParam" value="3" />
+ <map:parameter name="myParam" value="3-{jexl:cocoon.request.ssf}" />
</map:transform>
<map:serialize type="xml" />
</map:match>
@@ -140,7 +140,7 @@
<map:transform src="sax-pipeline/simple.xslt">
<map:parameter name="myParam" value="serializer-pipeline" />
</map:transform>
- <map:serialize type="xml" />
+ <map:serialize type="xml" status-code="210"/>
</map:match>
<map:match pattern="ssf/calling-a-transformer-servlet-service">
<map:generate src="sax-pipeline/simple.xml" />
@@ -312,12 +312,12 @@
<!-- ~~~~~~~~~~~~~~~~ aggregation ~~~~~~~~~~~~~~~ -->
<map:pipeline>
- <map:match pattern="aggregation/include-transformer">
+ <map:match equals="aggregation/include-transformer">
<map:generate src="aggregation/include.xml" />
<map:transform type="include" />
<map:serialize type="xml" />
</map:match>
- <map:match pattern="aggregation/sub-request">
+ <map:match equals="aggregation/sub-request">
<map:generate src="aggregation/sub.xml" />
<map:serialize type="xml" />
</map:match>
@@ -325,12 +325,12 @@
<!-- ~~~~~~~~~~~~~~~~ xslt ~~~~~~~~~~~~~~~ -->
<map:pipeline>
- <map:match pattern="xslt/main">
+ <map:match equals="xslt/main">
<map:generate src="sax-pipeline/simple.xml" />
<map:transform src="xslt/main.xslt" />
<map:serialize type="xml" />
</map:match>
- <map:match pattern="xslt/sub-servlet.xslt">
+ <map:match equals="xslt/sub-servlet.xslt">
<map:generate src="xslt/sub-servlet.xslt" />
<map:serialize type="xml" />
</map:match>
@@ -356,7 +356,7 @@
<!-- ~~~~~~~~~~~~~~~~ object model ~~~~~~~~~~~~~~~ -->
<map:pipeline>
- <map:match pattern="object-model/request-parameters">
+ <map:match equals="object-model/request-parameters">
<map:generate type="request-parameters" />
<map:serialize type="xml" />
</map:match>
@@ -364,13 +364,6 @@
<!-- ~~~~~~~~~~~~~~~~ controller ~~~~~~~~~~~~~~~ -->
<map:pipeline>
- <map:match pattern="controller/profiling/{id}.png">
- <map:serialize type="profilingpng" id="{map:id}" />
- </map:match>
- <map:match pattern="controller/profiling/{id}">
- <map:generate type="profiling" id="{map:id}" />
- <map:serialize type="xml" />
- </map:match>
<map:match pattern="controller/{id}/{name}">
<controller:call controller="rest-controller" \
select="org.apache.cocoon.sample.controller.DemoRESTController"> <map:parameter \
name="id" value="{map:id}" /> @@ -385,11 +378,11 @@
<!-- ~~~~~~~~~~~~~~~~ redirect ~~~~~~~~~~~~~~~ -->
<map:pipeline>
- <map:match pattern="redirect/www.orf.at">
+ <map:match equals="redirect/www.orf.at">
<servlet:redirect-to uri="http://www.orf.at" />
</map:match>
<!-- Redirecting to a servlet service doesn't work -->
- <map:match pattern="redirect/sax-pipeline/simple-xml">
+ <map:match equals="redirect/sax-pipeline/simple-xml">
<servlet:redirect-to uri="servlet:/sax-pipeline/simple-xml"/>
</map:match>
</map:pipeline>
@@ -404,7 +397,7 @@
</map:pipeline>
<map:pipeline>
- <map:match pattern="error-handling/custom-error-per-pipeline-error-handling">
+ <map:match equals="error-handling/custom-error-per-pipeline-error-handling">
<map:act type="error-throwing" />
<map:generate src="sax-pipeline/simple.xml" />
<map:serialize type="xml" />
@@ -417,7 +410,7 @@
<!-- FOP -->
<map:pipeline>
- <map:match pattern="fop/test.pdf">
+ <map:match equals="fop/test.pdf">
<map:generate src="fop/page.xml" />
<map:transform src="fop/page2fo.xsl" />
<map:serialize type="fo2pdf" />
@@ -448,6 +441,13 @@
<map:serialize type="ehtml" encoding="iso-8859-1"/>
</map:match>
</map:pipeline>
+
+ <!-- Cocoon Wicket integration -->
+ <map:pipeline type="noncaching">
+ <map:match wildcard="wicket/**">
+ <map:read type="wicket" base-path="/wicket" />
+ </map:match>
+ </map:pipeline>
<!-- Global error handling -->
<map:handle-errors>
Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml?rev=884443&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml \
(added)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml \
Thu Nov 26 07:55:07 2009 @@ -0,0 +1,26 @@
+<?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.
+ -->
+<!-- $Id$ -->
+<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 id="org.apache.cocoon.sample.wicket.CocoonSampleWicketWebapp"
+ class="org.apache.cocoon.sample.wicket.CocoonSampleWicketWebapp"/>
+</beans>
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html?rev=884443&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html \
(added)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html \
Thu Nov 26 07:55:07 2009 @@ -0,0 +1,27 @@
+<?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.
+ -->
+<html>
+ <body>
+ <p wicket:id="message">[title]</p>
+ <p wicket:id="text">[text]</p>
+ <p><a href="#" wicket:id="link">change text</a></p>
+ <p><a href="#" wicket:id="link-other-page">Link to another page</a></p>
+ </body>
+</html>
\ No newline at end of file
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html?rev=884443&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html \
(added)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html \
Thu Nov 26 07:55:07 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.
+ -->
+<html>
+ <body>
+ <p>back to the <a href="#" wicket:id="link">HomePage</a>
+ </body>
+</html>
\ No newline at end of file
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Modified: cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/profiling/ProfilingIntegrationTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org \
/apache/cocoon/profiling/ProfilingIntegrationTest.java?rev=884443&r1=884442&r2=884443&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/profiling/ProfilingIntegrationTest.java \
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/profiling/ProfilingIntegrationTest.java \
Thu Nov 26 07:55:07 2009 @@ -102,7 +102,7 @@
"META-INF/cocoon/spring/cocoon-expression-language.xml",
- "META-INF/cocoon/spring/cocoon-servlet-node.xml",
+ "META-INF/cocoon/spring/cocoon-servlet-collector.xml",
"META-INF/cocoon/spring/cocoon-servlet-component.xml",
Modified: cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/SitemapBuilderTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org \
/apache/cocoon/sitemap/SitemapBuilderTest.java?rev=884443&r1=884442&r2=884443&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/SitemapBuilderTest.java \
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/SitemapBuilderTest.java \
Thu Nov 26 07:55:07 2009 @@ -60,7 +60,6 @@
}
- @SuppressWarnings("unchecked")
public void testErrorHandlingPipeline() throws Exception {
Invocation invocation = \
this.buildInvocation("error-handling/custom-error-per-pipeline-error-handling");
MockHttpServletResponse mockHttpServletResponse = new \
MockHttpServletResponse(); @@ -76,7 +75,6 @@
assertEquals(501, StatusCodeCollector.getStatusCode());
}
- @SuppressWarnings("unchecked")
public void testGenerator() throws Exception {
Invocation invocation = this.buildInvocation("sax-pipeline/unauthorized");
MockHttpServletResponse mockHttpServletResponse = new \
MockHttpServletResponse(); @@ -91,7 +89,6 @@
assertEquals(401, StatusCodeCollector.getStatusCode());
}
- @SuppressWarnings("unchecked")
public void testNoMatchingPipeline() throws Exception {
Invocation invocation = this.buildInvocation("unknown");
InvocationResult invocationResult = this.sitemap.invoke(invocation);
@@ -102,7 +99,6 @@
.getThrowable() instanceof NoMatchingPipelineException);
}
- @SuppressWarnings("unchecked")
public void testController() throws Exception {
Invocation invocation = this.buildInvocation("controller/invoke");
InvocationResult invocationResult = this.sitemap.invoke(invocation);
@@ -110,7 +106,6 @@
assertTrue(invocationResult.isCompleted());
}
- @SuppressWarnings("unchecked")
public void testXSLT() throws Exception {
Invocation invocation = this.buildInvocation("xslt/main");
InvocationResult invocationResult = this.sitemap.invoke(invocation);
@@ -205,7 +200,7 @@
"META-INF/cocoon/spring/cocoon-sitemap-node.xml",
"META-INF/cocoon/spring/cocoon-expression-language.xml",
"META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml",
- "META-INF/cocoon/spring/cocoon-servlet-node.xml",
+ "META-INF/cocoon/spring/cocoon-servlet-collector.xml",
"META-INF/cocoon/spring/cocoon-servlet-component.xml", \
"META-INF/cocoon/spring/cocoon-controller.xml" });
this.componentProvider = (ComponentProvider) applicationContext
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic