You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/11/18 22:02:36 UTC
svn commit: r1036623 - in /karaf/trunk/jaas/config/src/main:
java/org/apache/karaf/jaas/config/ java/org/apache/karaf/jaas/config/impl/
resources/OSGI-INF/blueprint/ resources/org/apache/karaf/jaas/config/
Author: gnodet
Date: Thu Nov 18 21:02:36 2010
New Revision: 1036623
URL: http://svn.apache.org/viewvc?rev=1036623&view=rev
Log:
[KARAF-287] Make sure both version are supported
Added:
karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd
- copied, changed from r1036621, karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd
Removed:
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd
Modified:
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/NamespaceHandler.java
karaf/trunk/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml
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=1036623&r1=1036622&r2=1036623&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 21:02:36 2010
@@ -36,7 +36,11 @@ 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-1.1.0.xsd");
+ if ("http://karaf.apache.org/xmlns/jaas/v1.0.0".equals(namespace)) {
+ return getClass().getResource("/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd");
+ } else {
+ return getClass().getResource("/org/apache/karaf/jaas/config/karaf-jaas-1.1.0.xsd");
+ }
}
public Set<Class> getManagedClasses() {
@@ -70,7 +74,10 @@ public class NamespaceHandler implements
if (rank != null && rank.length() > 0) {
bean.addProperty("rank", createValue(context, rank));
}
- NodeList childElements = element.getElementsByTagNameNS("http://karaf.apache.org/xmlns/jaas/v1.0.0", "module");
+ NodeList childElements = element.getElementsByTagNameNS("http://karaf.apache.org/xmlns/jaas/v1.1.0", "module");
+ if (childElements != null && childElements.getLength() > 0) {
+ childElements = element.getElementsByTagNameNS("http://karaf.apache.org/xmlns/jaas/v1.0.0", "module");
+ }
if (childElements != null && childElements.getLength() > 0) {
MutableCollectionMetadata children = context.createMetadata(MutableCollectionMetadata.class);
for (int i = 0; i < childElements.getLength(); ++i) {
Modified: karaf/trunk/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml?rev=1036623&r1=1036622&r2=1036623&view=diff
==============================================================================
--- karaf/trunk/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml (original)
+++ karaf/trunk/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml Thu Nov 18 21:02:36 2010
@@ -46,7 +46,12 @@
<service interface="org.apache.aries.blueprint.NamespaceHandler">
<service-properties>
- <entry key="osgi.service.blueprint.namespace" value="http://karaf.apache.org/xmlns/jaas/v1.0.0"/>
+ <entry key="osgi.service.blueprint.namespace">
+ <array>
+ <value>http://karaf.apache.org/xmlns/jaas/v1.0.0</value>
+ <value>http://karaf.apache.org/xmlns/jaas/v1.1.0</value>
+ </array>
+ </entry>
</service-properties>
<bean class="org.apache.karaf.jaas.config.impl.NamespaceHandler"/>
</service>
Copied: karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd (from r1036621, 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/resources/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd?p2=karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd&p1=karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/karaf-jaas-1.0.0.xsd&r1=1036621&r2=1036623&rev=1036623&view=diff
==============================================================================
(empty)