Author: iocanel
Date: Thu Nov 18 19:15:51 2010
New Revision: 1036579
URL: http://svn.apache.org/viewvc?rev=1036579&view=rev
Log:
[KARAF-287] Bumped karaf-jaas.xsd to reflect changes.
Added:
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd
karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas-1.1.0.xsd
- copied, changed from r1031979,
karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas.xsd
Removed:
karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas.xsd
Modified:
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/NamespaceHandler.java
Modified:
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/NamespaceHandler.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/NamespaceHandler.java?rev=1036579&r1=1036578&r2=1036579&view=diff
==============================================================================
---
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/NamespaceHandler.java
(original)
+++
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/NamespaceHandler.java
Thu Nov 18 19:15:51 2010
@@ -36,7 +36,7 @@ import java.util.Set;
public class NamespaceHandler implements
org.apache.aries.blueprint.NamespaceHandler {
public URL getSchemaLocation(String namespace) {
- return
getClass().getResource("/org/apache/karaf/jaas/config/karaf-jaas.xsd");
+ return
getClass().getResource("/org/apache/karaf/jaas/config/karaf-jaas-1.1.0.xsd");
}
public Set<Class> getManagedClasses() {
Added:
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd?rev=1036579&view=auto
==============================================================================
---
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd
(added)
+++
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd
Thu Nov 18 19:15:51 2010
@@ -0,0 +1,62 @@
+<?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.
+
+-->
+<xs:schema elementFormDefault='qualified'
+ targetNamespace='http://karaf.apache.org/xmlns/jaas/v1.0.0'
+ xmlns:xs='http://www.w3.org/2001/XMLSchema'
+ xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0";
+ xmlns:tns='http://karaf.apache.org/xmlns/jaas/v1.0.0'>
+
+ <xs:import namespace="http://www.osgi.org/xmlns/blueprint/v1.0.0"/>
+
+ <xs:element name="config">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="module" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType mixed="true">
+ <xs:attribute name="className" use="required"
type="xs:string"/>
+ <xs:attribute name="flags" default="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="required"/>
+ <xs:enumeration value="requisite"/>
+ <xs:enumeration value="sufficient"/>
+ <xs:enumeration value="optional"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" use="required" type="xs:string"/>
+ <xs:attribute name="rank" use="optional" default="0"
type="xs:int"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="keystore">
+ <xs:complexType>
+ <xs:attribute name="name" use="required" type="xs:string"/>
+ <xs:attribute name="rank" use="optional" default="0"
type="xs:int"/>
+ <xs:attribute name="path" use="required" type="xs:string"/>
+ <xs:attribute name="keystorePassword" use="optional"
type="xs:string"/>
+ <xs:attribute name="keyPasswords" use="optional" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
Copied:
karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas-1.1.0.xsd
(from r1031979,
karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas.xsd)
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas-1.1.0.xsd?p2=karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas-1.1.0.xsd&p1=karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas.xsd&r1=1031979&r2=1036579&rev=1036579&view=diff
==============================================================================
---
karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas.xsd
(original)
+++
karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas-1.1.0.xsd
Thu Nov 18 19:15:51 2010
@@ -18,10 +18,10 @@
-->
<xs:schema elementFormDefault='qualified'
- targetNamespace='http://karaf.apache.org/xmlns/jaas/v1.0.0'
+ targetNamespace='http://karaf.apache.org/xmlns/jaas/v1.1.0'
xmlns:xs='http://www.w3.org/2001/XMLSchema'
xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0";
- xmlns:tns='http://karaf.apache.org/xmlns/jaas/v1.0.0'>
+ xmlns:tns='http://karaf.apache.org/xmlns/jaas/v1.1.0'>
<xs:import namespace="http://www.osgi.org/xmlns/blueprint/v1.0.0"/>
