[infinispan-commits] Infinispan SVN: r2265 - in branches/4.1.x/core/src/main/java/org/infinispan: config/parsing and 4 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Aug 23 03:28:12 EDT 2010
Author: vblagojevic at jboss.com
Date: 2010-08-23 03:28:12 -0400 (Mon, 23 Aug 2010)
New Revision: 2265
Modified:
branches/4.1.x/core/src/main/java/org/infinispan/config/package-info.java
branches/4.1.x/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java
branches/4.1.x/core/src/main/java/org/infinispan/eviction/package-info.java
branches/4.1.x/core/src/main/java/org/infinispan/loaders/decorators/package-info.java
branches/4.1.x/core/src/main/java/org/infinispan/loaders/package-info.java
branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/package-info.java
Log:
[ISPN-591] - Generated Schema declares namespace as 4.0 rather than 4.1
Modified: branches/4.1.x/core/src/main/java/org/infinispan/config/package-info.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/config/package-info.java 2010-08-20 22:35:41 UTC (rev 2264)
+++ branches/4.1.x/core/src/main/java/org/infinispan/config/package-info.java 2010-08-23 07:28:12 UTC (rev 2265)
@@ -2,11 +2,12 @@
* Cache configuration beans and parsers.
* Need @XmlSchema annotation in order to classify all JAXB created schema elements in appropriate XML namespace
*/
- at XmlSchema(namespace = "urn:infinispan:config:4.0", elementFormDefault = XmlNsForm.QUALIFIED, attributeFormDefault = XmlNsForm.UNQUALIFIED,
+ at XmlSchema(namespace = ISPN_NS, elementFormDefault = XmlNsForm.QUALIFIED, attributeFormDefault = XmlNsForm.UNQUALIFIED,
xmlns = {
- @javax.xml.bind.annotation.XmlNs(prefix = "tns", namespaceURI = "urn:infinispan:config:4.0"),
+ @javax.xml.bind.annotation.XmlNs(prefix = "tns", namespaceURI = ISPN_NS),
@javax.xml.bind.annotation.XmlNs(prefix = "xs", namespaceURI = "http://www.w3.org/2001/XMLSchema") })
package org.infinispan.config;
import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.*;
\ No newline at end of file
+import javax.xml.bind.annotation.*;
+import static org.infinispan.config.parsing.NamespaceFilter.ISPN_NS;
\ No newline at end of file
Modified: branches/4.1.x/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java 2010-08-20 22:35:41 UTC (rev 2264)
+++ branches/4.1.x/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java 2010-08-23 07:28:12 UTC (rev 2265)
@@ -9,7 +9,7 @@
*/
public class NamespaceFilter extends XMLFilterImpl {
- private static final String NAMESPACE = "urn:infinispan:config:4.0";
+ public static final String ISPN_NS = "urn:infinispan:config:4.1";
//State variable
private boolean addedNamespace = false;
@@ -25,14 +25,14 @@
public void startElement(String arg0, String arg1, String arg2,
Attributes arg3) throws SAXException {
- super.startElement(this.NAMESPACE, arg1, arg2, arg3);
+ super.startElement(this.ISPN_NS, arg1, arg2, arg3);
}
@Override
public void endElement(String arg0, String arg1, String arg2)
throws SAXException {
- super.endElement(this.NAMESPACE, arg1, arg2);
+ super.endElement(this.ISPN_NS, arg1, arg2);
}
@Override
@@ -45,7 +45,7 @@
if (!this.addedNamespace) {
//We should add namespace since it is set and has not yet been done.
- super.startPrefixMapping("", this.NAMESPACE);
+ super.startPrefixMapping("", this.ISPN_NS);
//Make sure we dont do it twice
this.addedNamespace = true;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/eviction/package-info.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/eviction/package-info.java 2010-08-20 22:35:41 UTC (rev 2264)
+++ branches/4.1.x/core/src/main/java/org/infinispan/eviction/package-info.java 2010-08-23 07:28:12 UTC (rev 2265)
@@ -2,12 +2,13 @@
* Classes related to eviction.
* Need @XmlSchema annotation for EvictionStrategy.java
*/
- at XmlSchema(namespace = "urn:infinispan:config:4.0", elementFormDefault = XmlNsForm.QUALIFIED, attributeFormDefault = XmlNsForm.UNQUALIFIED,
+ at XmlSchema(namespace = ISPN_NS, elementFormDefault = XmlNsForm.QUALIFIED, attributeFormDefault = XmlNsForm.UNQUALIFIED,
xmlns = {
- @javax.xml.bind.annotation.XmlNs(prefix = "tns", namespaceURI = "urn:infinispan:config:4.0"),
+ @javax.xml.bind.annotation.XmlNs(prefix = "tns", namespaceURI =ISPN_NS),
@javax.xml.bind.annotation.XmlNs(prefix = "xs", namespaceURI = "http://www.w3.org/2001/XMLSchema") })
package org.infinispan.eviction;
import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.*;
\ No newline at end of file
+import javax.xml.bind.annotation.*;
+import static org.infinispan.config.parsing.NamespaceFilter.ISPN_NS;
\ No newline at end of file
Modified: branches/4.1.x/core/src/main/java/org/infinispan/loaders/decorators/package-info.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/loaders/decorators/package-info.java 2010-08-20 22:35:41 UTC (rev 2264)
+++ branches/4.1.x/core/src/main/java/org/infinispan/loaders/decorators/package-info.java 2010-08-23 07:28:12 UTC (rev 2265)
@@ -2,11 +2,12 @@
* This package contains loaders and stores, which are used for overflow or persistence.
* Need @XmlSchema annotation for AsyncStoreConfig.java and SingletonStoreConfig.java
*/
- at XmlSchema(namespace = "urn:infinispan:config:4.0", elementFormDefault = XmlNsForm.QUALIFIED, attributeFormDefault = XmlNsForm.UNQUALIFIED,
+ at XmlSchema(namespace = ISPN_NS, elementFormDefault = XmlNsForm.QUALIFIED, attributeFormDefault = XmlNsForm.UNQUALIFIED,
xmlns = {
- @javax.xml.bind.annotation.XmlNs(prefix = "tns", namespaceURI = "urn:infinispan:config:4.0"),
+ @javax.xml.bind.annotation.XmlNs(prefix = "tns", namespaceURI = ISPN_NS),
@javax.xml.bind.annotation.XmlNs(prefix = "xs", namespaceURI = "http://www.w3.org/2001/XMLSchema") })
package org.infinispan.loaders.decorators;
import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.*;
\ No newline at end of file
+import javax.xml.bind.annotation.*;
+import static org.infinispan.config.parsing.NamespaceFilter.ISPN_NS;
\ No newline at end of file
Modified: branches/4.1.x/core/src/main/java/org/infinispan/loaders/package-info.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/loaders/package-info.java 2010-08-20 22:35:41 UTC (rev 2264)
+++ branches/4.1.x/core/src/main/java/org/infinispan/loaders/package-info.java 2010-08-23 07:28:12 UTC (rev 2265)
@@ -2,11 +2,12 @@
* This package contains loaders and stores, which are used for overflow or persistence.
* Need @XmlSchema annotation for CacheLoaderConfig.java and AbstractCacheStoreConfig.java
*/
- at XmlSchema(namespace = "urn:infinispan:config:4.0", elementFormDefault = XmlNsForm.QUALIFIED, attributeFormDefault = XmlNsForm.UNQUALIFIED,
+ at XmlSchema(namespace = ISPN_NS, elementFormDefault = XmlNsForm.QUALIFIED, attributeFormDefault = XmlNsForm.UNQUALIFIED,
xmlns = {
- @javax.xml.bind.annotation.XmlNs(prefix = "tns", namespaceURI = "urn:infinispan:config:4.0"),
+ @javax.xml.bind.annotation.XmlNs(prefix = "tns", namespaceURI = ISPN_NS),
@javax.xml.bind.annotation.XmlNs(prefix = "xs", namespaceURI = "http://www.w3.org/2001/XMLSchema") })
package org.infinispan.loaders;
import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.*;
\ No newline at end of file
+import javax.xml.bind.annotation.*;
+import static org.infinispan.config.parsing.NamespaceFilter.ISPN_NS;
\ No newline at end of file
Modified: branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/package-info.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/package-info.java 2010-08-20 22:35:41 UTC (rev 2264)
+++ branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/package-info.java 2010-08-23 07:28:12 UTC (rev 2265)
@@ -5,18 +5,18 @@
// this annotation is needed since the IsolationLevel enumeration is in this package.
@XmlSchema(
- namespace = "urn:infinispan:config:4.0",
+ namespace =ISPN_NS,
elementFormDefault = QUALIFIED,
attributeFormDefault = UNQUALIFIED,
xmlns = {
- @XmlNs(prefix = "tns", namespaceURI = "urn:infinispan:config:4.0"),
+ @XmlNs(prefix = "tns", namespaceURI = ISPN_NS),
@XmlNs(prefix = "xs", namespaceURI = "http://www.w3.org/2001/XMLSchema") }
)
package org.infinispan.util.concurrent;
import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema;
import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED;
import static javax.xml.bind.annotation.XmlNsForm.UNQUALIFIED;
+import static org.infinispan.config.parsing.NamespaceFilter.ISPN_NS;
\ No newline at end of file
More information about the infinispan-commits
mailing list