You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/02/27 07:37:56 UTC

(logging-log4j-site) branch asf-staging updated: Relocate Log4j Changelog schemas

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/logging-log4j-site.git


The following commit(s) were added to refs/heads/asf-staging by this push:
     new bae6cd9f2e Relocate Log4j Changelog schemas
bae6cd9f2e is described below

commit bae6cd9f2e4bc19d7c09226b020fa0bd4b016d3b
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Feb 27 08:37:41 2024 +0100

    Relocate Log4j Changelog schemas
---
 .htaccess           |  2 ++
 changelog-0.1.0.xsd | 82 ----------------------------------------------------
 changelog-0.1.1.xsd | 82 ----------------------------------------------------
 changelog-0.1.2.xsd | 82 ----------------------------------------------------
 changelog-0.1.3.xsd | 83 -----------------------------------------------------
 5 files changed, 2 insertions(+), 329 deletions(-)

diff --git a/.htaccess b/.htaccess
index fff42d83d7..b534f25c21 100644
--- a/.htaccess
+++ b/.htaccess
@@ -2,6 +2,8 @@ RewriteEngine On
 RewriteBase "/log4j/"
 # Latest version
 RewriteRule "^$" "2.x/" [R]
+# Relocation of changelog
+RewriteRule "^changelog-(\d+\.\d+\.\d+)\.xsd$" "/xml/ns/log4j-changelog-$1.xsd" [R=permanent]
 # Aliases for 1.x releases
 RewriteRule "^1\.2(|/(.*))$" "1.x/$2" [R=permanent]
 RewriteRule "^log4j-1\.2\.17(|/(.*))$" "1.x/$2" [R=permanent]
diff --git a/changelog-0.1.0.xsd b/changelog-0.1.0.xsd
deleted file mode 100644
index ee532eabc0..0000000000
--- a/changelog-0.1.0.xsd
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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
-
-      https://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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://logging.apache.org/log4j/changelog"
-        xmlns:cl="http://logging.apache.org/log4j/changelog"
-        elementFormDefault="qualified"
-        version="0.1.0">
-
-  <element name="release">
-    <complexType>
-      <simpleContent>
-        <extension base="string">
-          <attribute name="version" use="required"/>
-          <attribute name="date" type="date" use="required"/>
-        </extension>
-      </simpleContent>
-    </complexType>
-  </element>
-
-  <element name="entry">
-    <complexType>
-      <sequence>
-        <element name="issue" type="cl:issueType" minOccurs="0" maxOccurs="unbounded"/>
-        <element name="author" type="cl:authorType" maxOccurs="unbounded"/>
-        <element name="description" type="cl:descriptionType"/>
-      </sequence>
-      <attribute name="type" type="cl:changeType" use="required"/>
-    </complexType>
-  </element>
-
-  <complexType name="issueType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="id" type="string" use="required"/>
-        <attribute name="link" type="anyURI" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <simpleType name="changeType">
-    <restriction base="string">
-      <enumeration value="added"/>
-      <enumeration value="changed"/>
-      <enumeration value="deprecated"/>
-      <enumeration value="removed"/>
-      <enumeration value="fixed"/>
-    </restriction>
-  </simpleType>
-
-  <complexType name="authorType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="id" type="string"/>
-        <attribute name="name" type="string"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <complexType name="descriptionType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="format" type="string" use="required" fixed="asciidoc"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-</schema>
diff --git a/changelog-0.1.1.xsd b/changelog-0.1.1.xsd
deleted file mode 100644
index 40ce80dbeb..0000000000
--- a/changelog-0.1.1.xsd
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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
-
-      https://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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://logging.apache.org/log4j/changelog"
-        xmlns:cl="http://logging.apache.org/log4j/changelog"
-        elementFormDefault="qualified"
-        version="0.1.1">
-
-  <element name="release">
-    <complexType>
-      <simpleContent>
-        <extension base="string">
-          <attribute name="version" use="required"/>
-          <attribute name="date" type="date" use="required"/>
-        </extension>
-      </simpleContent>
-    </complexType>
-  </element>
-
-  <element name="entry">
-    <complexType>
-      <sequence>
-        <element name="issue" type="cl:issueType" minOccurs="0" maxOccurs="unbounded"/>
-        <element name="author" type="cl:authorType" maxOccurs="unbounded"/>
-        <element name="description" type="cl:descriptionType"/>
-      </sequence>
-      <attribute name="type" type="cl:changeType" use="required"/>
-    </complexType>
-  </element>
-
-  <complexType name="issueType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="id" type="string" use="required"/>
-        <attribute name="link" type="anyURI" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <simpleType name="changeType">
-    <restriction base="string">
-      <enumeration value="added"/>
-      <enumeration value="changed"/>
-      <enumeration value="deprecated"/>
-      <enumeration value="removed"/>
-      <enumeration value="fixed"/>
-    </restriction>
-  </simpleType>
-
-  <complexType name="authorType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="id" type="string"/>
-        <attribute name="name" type="string"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <complexType name="descriptionType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="format" type="string" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-</schema>
diff --git a/changelog-0.1.2.xsd b/changelog-0.1.2.xsd
deleted file mode 100644
index 0a44055774..0000000000
--- a/changelog-0.1.2.xsd
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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
-
-      https://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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://logging.apache.org/log4j/changelog"
-        xmlns:cl="http://logging.apache.org/log4j/changelog"
-        elementFormDefault="qualified"
-        version="0.1.2">
-
-  <element name="release">
-    <complexType>
-      <simpleContent>
-        <extension base="string">
-          <attribute name="version" use="required"/>
-          <attribute name="date" type="date" use="required"/>
-        </extension>
-      </simpleContent>
-    </complexType>
-  </element>
-
-  <element name="entry">
-    <complexType>
-      <sequence>
-        <element name="issue" type="cl:issueType" minOccurs="0" maxOccurs="unbounded"/>
-        <element name="author" type="cl:authorType" minOccurs="0" maxOccurs="unbounded"/>
-        <element name="description" type="cl:descriptionType"/>
-      </sequence>
-      <attribute name="type" type="cl:changeType" use="required"/>
-    </complexType>
-  </element>
-
-  <complexType name="issueType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="id" type="string" use="required"/>
-        <attribute name="link" type="anyURI" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <simpleType name="changeType">
-    <restriction base="string">
-      <enumeration value="added"/>
-      <enumeration value="changed"/>
-      <enumeration value="deprecated"/>
-      <enumeration value="removed"/>
-      <enumeration value="fixed"/>
-    </restriction>
-  </simpleType>
-
-  <complexType name="authorType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="id" type="string"/>
-        <attribute name="name" type="string"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <complexType name="descriptionType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="format" type="string" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-</schema>
diff --git a/changelog-0.1.3.xsd b/changelog-0.1.3.xsd
deleted file mode 100644
index 921d30adf7..0000000000
--- a/changelog-0.1.3.xsd
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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
-
-      https://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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://logging.apache.org/log4j/changelog"
-        xmlns:cl="http://logging.apache.org/log4j/changelog"
-        elementFormDefault="qualified"
-        version="0.1.3">
-
-  <element name="release">
-    <complexType>
-      <simpleContent>
-        <extension base="string">
-          <attribute name="version" use="required"/>
-          <attribute name="date" type="date" use="required"/>
-        </extension>
-      </simpleContent>
-    </complexType>
-  </element>
-
-  <element name="entry">
-    <complexType>
-      <sequence>
-        <element name="issue" type="cl:issueType" minOccurs="0" maxOccurs="unbounded"/>
-        <element name="author" type="cl:authorType" minOccurs="0" maxOccurs="unbounded"/>
-        <element name="description" type="cl:descriptionType"/>
-      </sequence>
-      <attribute name="type" type="cl:changeType" use="required"/>
-    </complexType>
-  </element>
-
-  <complexType name="issueType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="id" type="string" use="required"/>
-        <attribute name="link" type="anyURI" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <simpleType name="changeType">
-    <restriction base="string">
-      <enumeration value="added"/>
-      <enumeration value="changed"/>
-      <enumeration value="deprecated"/>
-      <enumeration value="fixed"/>
-      <enumeration value="removed"/>
-      <enumeration value="updated"/>
-    </restriction>
-  </simpleType>
-
-  <complexType name="authorType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="id" type="string"/>
-        <attribute name="name" type="string"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <complexType name="descriptionType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="format" type="string" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-</schema>