Permalink
Browse files

Bringing back C2.2 to the 'compilable' world: don't know, though, if …

…everything is still working as expected COCOON-2316 COCOON-2302 COCOON-2184

git-svn-id: https://svn.apache.org/repos/asf/cocoon/trunk@1359672 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 1e5c10d commit 02fce4698694f9fa9826ac258aa9604e3b3567a2 @ilgrosso ilgrosso committed Jul 10, 2012
@@ -85,6 +85,7 @@
<dependency>
<groupId>org.outerj.daisy</groupId>
<artifactId>daisy-htmlcleaner</artifactId>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
@@ -1,31 +1,21 @@
-<?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
+/*
+ * 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.core.container.spring.avalon;
- 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$
- -->
-<xsamples>
-
- <group name="Unsorted And Miscellaneous">
- <sample name="Profiler Block" href="/cocoon-profiler-sample/">
- This example shows the usage of the Profiler component for
- profiling and debugging of pipelines.
- </sample>
- </group>
-
-</xsamples>
+import org.apache.avalon.framework.c
View
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>6-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>cocoon-blocks-modules</artifactId>
View
@@ -27,8 +27,8 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>6-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <version>9</version>
+ <relativePath/>
</parent>
<artifactId>cocoon-licenses</artifactId>
<version>1.0.0-M2-SNAPSHOT</version>
View
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>6-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>org.apache.cocoon</groupId>
@@ -53,10 +53,12 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-expression-language-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-xml-util</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -56,14 +56,17 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-pipeline-impl</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-util</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-xml-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -74,12 +77,14 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-pipeline-impl</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-xml-impl</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -23,7 +23,7 @@
<parent>
<artifactId>cocoon</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>6-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<artifactId>cocoon-servlet-service-components-sample</artifactId>
@@ -24,7 +24,7 @@
<parent>
<artifactId>cocoon</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>6-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<artifactId>cocoon-servlet-service-components</artifactId>
@@ -58,6 +58,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-pipeline-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- Excalibur -->
<dependency>
@@ -56,10 +56,12 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-sitemap-impl</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-pipeline-components</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -68,10 +68,12 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-sitemap-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-expression-language-impl</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -80,18 +82,22 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-pipeline-impl</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-thread-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-xml-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-expression-language-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- Excalibur -->
<dependency>
@@ -60,10 +60,12 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-thread-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-util</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- Commons -->
<dependency>
@@ -54,6 +54,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-thread-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- Commons logging -->
<dependency>
@@ -31,7 +31,7 @@
*
* @version $Id$
*/
-public class AbstractTestCase
+public abstract class AbstractTestCase
extends TestCase {
//~ Instance fields --------------------------------------------------------
@@ -102,10 +102,6 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-servlet-service-impl-sample</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-components-sample</artifactId>
</dependency>
@@ -54,6 +54,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-xml-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -62,6 +62,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-xml-impl</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
View
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>6-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
View
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>6-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>cocoon-dists-modules</artifactId>
View
@@ -2168,7 +2168,7 @@
</dependency>
<!-- Cocoon SNAPSHOT dependencies -->
- <!--<dependency>
+ <dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-ajax-impl</artifactId>
<version>1.1.0-SNAPSHOT</version>
@@ -3026,7 +3026,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>javaflow</artifactId>
<version>1.0-SNAPSHOT</version>
- </dependency>-->
+ </dependency>
</dependencies>
</dependencyManagement>
View
@@ -41,8 +41,6 @@
<module>commons</module>
<module>core</module>
<module>dists</module>
- <!-- sub projects -->
- <module>subprojects</module>
<module>core/cocoon-servlet-service/cocoon-servlet-service-components</module>
<module>core/cocoon-servlet-service/cocoon-servlet-service-components-sample</module>
</modules>
@@ -58,10 +58,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
</dependency>
<!-- test libs -->
@@ -58,10 +58,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
</dependency>
<dependency>
Oops, something went wrong.

0 comments on commit 02fce46

Please sign in to comment.