You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/12/23 19:43:46 UTC

svn commit: r489916 - in /cocoon/trunk/core: cocoon-core/src/main/java/org/apache/cocoon/core/xml/ cocoon-core/src/main/java/org/apache/cocoon/util/ cocoon-util/ cocoon-util/src/main/java/org/apache/cocoon/util/ cocoon-xml/ cocoon-xml/cocoon-xml-api/ c...

Author: cziegeler
Date: Sat Dec 23 10:43:44 2006
New Revision: 489916

URL: http://svn.apache.org/viewvc?view=rev&rev=489916
Log:
Move AbstractLogEnabled to util package
Add new xml package

Added:
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/AbstractLogEnabled.java
      - copied unchanged from r489702, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/AbstractLogEnabled.java
    cocoon/trunk/core/cocoon-xml/   (with props)
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/   (with props)
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml   (with props)
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/core/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/core/xml/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/core/xml/DOMParser.java
      - copied unchanged from r489702, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/xml/DOMParser.java
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/core/xml/SAXParser.java
      - copied unchanged from r489702, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/xml/SAXParser.java
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/   (with props)
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml   (with props)
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/
      - copied from r489702, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/xml/impl/
    cocoon/trunk/core/cocoon-xml/pom.xml   (with props)
Removed:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/xml/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/AbstractLogEnabled.java
Modified:
    cocoon/trunk/core/cocoon-util/pom.xml

Modified: cocoon/trunk/core/cocoon-util/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-util/pom.xml?view=diff&rev=489916&r1=489915&r2=489916
==============================================================================
--- cocoon/trunk/core/cocoon-util/pom.xml (original)
+++ cocoon/trunk/core/cocoon-util/pom.xml Sat Dec 23 10:43:44 2006
@@ -38,5 +38,20 @@
       <artifactId>cocoon-environment-api</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.4</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>logkit</artifactId>
+          <groupId>logkit</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>avalon-framework</artifactId>
+          <groupId>avalon-framework</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 </project>

Propchange: cocoon/trunk/core/cocoon-xml/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 23 10:43:44 2006
@@ -0,0 +1,9 @@
+*.iml
+target
+.classpath
+.project
+.wtpmodules
+.deployables
+build.properties
+.runtime
+.settings

Propchange: cocoon/trunk/core/cocoon-xml/cocoon-xml-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 23 10:43:44 2006
@@ -0,0 +1,9 @@
+*.iml
+target
+.classpath
+.project
+.wtpmodules
+.deployables
+build.properties
+.runtime
+.settings

Added: cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml?view=auto&rev=489916
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml (added)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml Sat Dec 23 10:43:44 2006
@@ -0,0 +1,35 @@
+<?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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-xml</artifactId>
+    <version>1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cocoon-xml-api</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>Cocoon XML API</name>
+</project>

Propchange: cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 23 10:43:44 2006
@@ -0,0 +1,9 @@
+*.iml
+target
+.classpath
+.project
+.wtpmodules
+.deployables
+build.properties
+.runtime
+.settings

Added: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml?view=auto&rev=489916
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml (added)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml Sat Dec 23 10:43:44 2006
@@ -0,0 +1,57 @@
+<?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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-xml</artifactId>
+    <version>1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cocoon-xml-impl</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>Cocoon XML Implementation</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-xml-api</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-util</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.3.02</version>
+    </dependency>
+    <dependency>
+      <groupId>xml-resolver</groupId>
+      <artifactId>xml-resolver</artifactId>
+      <version>1.1</version>
+    </dependency>
+  </dependencies>
+</project>

Propchange: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/trunk/core/cocoon-xml/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/pom.xml?view=auto&rev=489916
==============================================================================
--- cocoon/trunk/core/cocoon-xml/pom.xml (added)
+++ cocoon/trunk/core/cocoon-xml/pom.xml Sat Dec 23 10:43:44 2006
@@ -0,0 +1,39 @@
+<?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.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-core-modules</artifactId>
+    <version>3-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cocoon-xml</artifactId>
+  <version>1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>Cocoon XML [modules]</name>
+  <modules>
+    <module>cocoon-xml-api</module>
+    <module>cocoon-xml-impl</module>
+  </modules>
+</project>

Propchange: cocoon/trunk/core/cocoon-xml/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-xml/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id