[jboss-cvs] JBossAS SVN: r89220 - in projects/log-services/trunk: src/main/java/org/jboss/logging/metadata and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 20 18:48:19 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-05-20 18:48:18 -0400 (Wed, 20 May 2009)
New Revision: 89220
Removed:
projects/log-services/trunk/src/main/java/org/jboss/logging/metadata/log4j/
projects/log-services/trunk/src/main/resources/META-INF/schema/jboss-log4j_1_2.xsd
Modified:
projects/log-services/trunk/pom.xml
projects/log-services/trunk/src/main/resources/META-INF/schema/jboss-logging_5_0.xsd
Log:
Morph this into logging-service-metadata
Modified: projects/log-services/trunk/pom.xml
===================================================================
--- projects/log-services/trunk/pom.xml 2009-05-20 22:41:02 UTC (rev 89219)
+++ projects/log-services/trunk/pom.xml 2009-05-20 22:48:18 UTC (rev 89220)
@@ -1,38 +1,26 @@
<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">
- <version>5.0.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.logging</groupId>
- <artifactId>logging-service</artifactId>
+ <artifactId>logging-service-metadata</artifactId>
<packaging>jar</packaging>
- <name>JBoss Logging Services</name>
+ <name>JBoss Logging Service Metadata</name>
<url>http://www.jboss.org</url>
<description>Logging services beans</description>
- <!-- Properties -->
- <properties>
- <version.org.jboss.common.core>2.2.8.GA</version.org.jboss.common.core>
- <version.org.jboss.microcontainer>2.0.4.GA</version.org.jboss.microcontainer>
- <version.log4j>1.2.14</version.log4j>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>${version.org.jboss.common.core}</version>
+ <version>2.2.14.GA</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
- <version>2.0.5.GA</version>
+ <version>2.1.0.GA</version>
</dependency>
- <dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${version.log4j}</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
@@ -41,32 +29,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${version.org.jboss.microcontainer}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>2.0.0.CR1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.1.1.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
- <version>2.0.0.GA</version>
+ <version>2.0.1.GA</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.2.GA</version>
+ <version>2.0.5.GA</version>
</dependency>
</dependencies>
</project>
Deleted: projects/log-services/trunk/src/main/resources/META-INF/schema/jboss-log4j_1_2.xsd
===================================================================
--- projects/log-services/trunk/src/main/resources/META-INF/schema/jboss-log4j_1_2.xsd 2009-05-20 22:41:02 UTC (rev 89219)
+++ projects/log-services/trunk/src/main/resources/META-INF/schema/jboss-log4j_1_2.xsd 2009-05-20 22:48:18 UTC (rev 89220)
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Painstakingly based on log4j.dtd as found in the 1.2.15 distribution of log4j -->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xhtml="http://www.w3.org/1999/xhtml"
- targetNamespace="http://jakarta.apache.org/log4j/"
- xmlns="http://jakarta.apache.org/log4j/"
- elementFormDefault="unqualified"
- attributeFormDefault="unqualified"
- version="1.0">
-
- <xsd:complexType name="configuration">
- <xsd:sequence minOccurs="1" maxOccurs="1">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="renderer" type="renderer"/>
- </xsd:sequence>
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="appender" type="appender"/>
- </xsd:sequence>
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="plugin" type="plugin"/>
- </xsd:sequence>
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:choice>
- <xsd:element name="category" type="category"/>
- <xsd:element name="logger" type="logger"/>
- </xsd:choice>
- </xsd:sequence>
- <xsd:element name="root" minOccurs="0" maxOccurs="1" type="root"/>
- <xsd:choice minOccurs="0" maxOccurs="1">
- <xsd:element name="categoryFactory" type="genericObject"/>
- <xsd:element name="loggerFactory" type="genericObject"/>
- </xsd:choice>
- </xsd:sequence>
-
- <xsd:attribute name="threshold" default="null" use="optional">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="all"/>
- <xsd:enumeration value="trace"/>
- <xsd:enumeration value="debug"/>
- <xsd:enumeration value="info"/>
- <xsd:enumeration value="warn"/>
- <xsd:enumeration value="error"/>
- <xsd:enumeration value="fatal"/>
- <xsd:enumeration value="off"/>
- <xsd:enumeration value="null"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="debug" default="null" use="optional">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="true"/>
- <xsd:enumeration value="false"/>
- <xsd:enumeration value="null"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="reset" default="false" use="optional" type="xsd:boolean"/>
- </xsd:complexType>
-
- <xsd:complexType name="renderer">
- <xsd:attribute name="renderedClass" type="xsd:string" use="required"/>
- <xsd:attribute name="renderingClass" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="appender">
- <xsd:sequence minOccurs="1" maxOccurs="1">
- <xsd:element name="errorHandler" type="errorHandler" minOccurs="0" maxOccurs="1"/>
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="param" type="param"/>
- </xsd:sequence>
- <xsd:element name="rollingPolicy" type="genericObject" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="triggeringPolicy" type="triggeringPolicy" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="connectionSource" type="connectionSource" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="layout" type="genericObject" minOccurs="0" maxOccurs="1"/>
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="filter" type="genericObject"/>
- </xsd:sequence>
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="appender-ref" type="ref"/>
- </xsd:sequence>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="class" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="genericObject">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="param" type="param"/>
- </xsd:sequence>
- <xsd:attribute name="class" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="errorHandler">
- <xsd:sequence minOccurs="1" maxOccurs="1">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="param" type="param"/>
- </xsd:sequence>
- <xsd:element name="root-ref" type="empty" minOccurs="0" maxOccurs="1"/>
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="logger-ref" type="ref"/>
- </xsd:sequence>
- <xsd:element name="appender-ref" type="ref" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- <xsd:attribute name="class" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="ref">
- <xsd:attribute name="ref" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="param">
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="value" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="level">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="param" type="param"/>
- </xsd:sequence>
- <xsd:attribute name="class" type="xsd:string" use="optional"/>
- <xsd:attribute name="value" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="category">
- <xsd:sequence minOccurs="1" maxOccurs="1">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="param" type="param"/>
- </xsd:sequence>
- <xsd:choice minOccurs="0" maxOccurs="1">
- <xsd:element name="priority" type="level"/>
- <xsd:element name="level" type="level"/>
- </xsd:choice>
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="appender-ref" type="ref"/>
- </xsd:sequence>
- </xsd:sequence>
- <xsd:attribute name="class" type="xsd:string" use="optional"/>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="additivity" type="xsd:boolean" use="optional" default="true"/>
- </xsd:complexType>
-
- <xsd:complexType name="logger">
- <xsd:sequence minOccurs="1" maxOccurs="1">
- <xsd:element name="level" type="level" minOccurs="0" maxOccurs="1"/>
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="appender-ref" type="ref"/>
- </xsd:sequence>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="additivity" type="xsd:boolean" use="optional" default="true"/>
- </xsd:complexType>
-
- <xsd:complexType name="plugin">
- <xsd:sequence minOccurs="1" maxOccurs="1">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="param" type="param"/>
- </xsd:sequence>
- <xsd:element name="connectionSource" type="connectionSource" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="class" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="connectionSource">
- <xsd:sequence minOccurs="1" maxOccurs="1">
- <xsd:element name="dataSource" type="genericObject"/>
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="param" type="param"/>
- </xsd:sequence>
- </xsd:sequence>
- <xsd:attribute name="class" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="triggeringPolicy">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:choice>
- <xsd:element name="param" type="param"/>
- <xsd:element name="filter" type="genericObject"/>
- </xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="class" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="root">
- <xsd:sequence minOccurs="1" maxOccurs="1">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="param" type="param"/>
- </xsd:sequence>
- <xsd:choice minOccurs="0" maxOccurs="1">
- <xsd:element name="priority" type="level"/>
- <xsd:element name="level" type="level"/>
- </xsd:choice>
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="appender-ref" type="ref"/>
- </xsd:sequence>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="empty"/>
-
- <xsd:element name="configuration" type="configuration"/>
-</xsd:schema>
Modified: projects/log-services/trunk/src/main/resources/META-INF/schema/jboss-logging_5_0.xsd
===================================================================
--- projects/log-services/trunk/src/main/resources/META-INF/schema/jboss-logging_5_0.xsd 2009-05-20 22:41:02 UTC (rev 89219)
+++ projects/log-services/trunk/src/main/resources/META-INF/schema/jboss-logging_5_0.xsd 2009-05-20 22:48:18 UTC (rev 89220)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
targetNamespace="urn:jboss:jboss-logging:5.0"
xmlns="urn:jboss:jboss-logging:5.0"
@@ -8,11 +8,44 @@
attributeFormDefault="unqualified"
version="1.0">
- <xsd:complexType name="logging">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:choice>
- </xsd:choice>
- </xsd:sequence>
- </xsd:complexType>
+ <xs:complexType name="logging">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:choice>
+ <xs:element name="logger" type="logger"/>
+ </xs:choice>
+ </xs:sequence>
+ <xs:attribute name="context" type="xs:string"/>
+ </xs:complexType>
-</xsd:schema>
\ No newline at end of file
+ <xs:complexType name="logger">
+ <xs:sequence minOccurs="1" maxOccurs="1">
+ <xs:element name="level" type="ref" minOccurs="0"/>
+ <xs:element name="filter-ref" type="ref" minOccurs="0"/>
+ <xs:element name="handler-ref" type="ref" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
+
+ <xs:complexType name="handler">
+ <xs:sequence>
+ <xs:element name="filter-ref" type="ref" minOccurs="0"/>
+ <xs:element name="formatter-ref" type="ref" minOccurs="0"/>
+ <xs:element name="level" type="ref" minOccurs="0"/>
+ <xs:element name="error-manager-ref" type="ref" minOccurs="0"/>
+ <xs:element name="logger" type="logger-ref" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="encoding" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="ref">
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
+
+ <xs:complexType name="logger-ref">
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="context" type="xs:string" use="optional"/>
+ </xs:complexType>
+
+ <xs:element name="logging" type="logging"/>
+</xs:schema>
More information about the jboss-cvs-commits
mailing list