Use JakartaEE namespace instead of JavaEE namespace
Signed-off-by: hussainnm <hussain.nm@cognizant.com>
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java
index 400b2ff..e9971aa 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java
@@ -100,7 +100,7 @@
// we are using schemas for this DDs
bundleNode = appendChildNS(parent, getXMLRootTag().getQName(),
- TagNames.JAVAEE_NAMESPACE);
+ TagNames.JAKARTAEE_NAMESPACE);
addBundleNodeAttributes((Element) bundleNode, descriptor);
} else {
bundleNode = appendChild(parent, getXMLRootTag().getQName());
@@ -208,17 +208,19 @@
return;
if (uri.equals(TagNames.JAVAEE_NAMESPACE))
return;
+ if (uri.equals(TagNames.JAKARTAEE_NAMESPACE))
+ return;
if (uri.equals(W3C_XML_SCHEMA_INSTANCE))
return;
super.addPrefixMapping(prefix, uri);
}
/**
- * @return the complete URL for JAVAEE schemas
+ * @return the complete URL for JAKARTAEE schemas
*/
protected String getSchemaURL() {
// by default, it comes from our web site
- return TagNames.JAVAEE_NAMESPACE + "/" + getSystemID();
+ return TagNames.JAKARTAEE_NAMESPACE + "/" + getSystemID();
}
/**
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/ConnectorNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/ConnectorNode.java
index 875b52a..8c837a4 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/ConnectorNode.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/ConnectorNode.java
@@ -46,6 +46,7 @@
public static final String VERSION_15 = "1.5";
public static final String VERSION_16 = "1.6";
public static final String VERSION_17 = "1.7";
+ public static final String VERSION_20 = "2.0";
private String specVersion;
@@ -66,8 +67,12 @@
public final static String PUBLIC_DTD_ID = PUBLIC_DTD_ID_16;
public final static String SYSTEM_ID = SYSTEM_ID_16;
public final static String SCHEMA_ID_17 = "connector_1_7.xsd";
- public final static String SCHEMA_ID = SCHEMA_ID_17;
- public final static String SPEC_VERSION = VERSION_17;
+
+ //connector2.0
+ public final static String SCHEMA_ID_20 = "connector_2_0.xsd";
+
+ public final static String SCHEMA_ID = SCHEMA_ID_20;
+ public final static String SPEC_VERSION = VERSION_20;
private final static List<String> systemIDs = initSystemIDs();
@@ -307,6 +312,6 @@
* @return the schema URL
*/
protected String getSchemaURL() {
- return TagNames.JAVAEE_NAMESPACE + "/" + getSystemID();
+ return TagNames.JAKARTAEE_NAMESPACE + "/" + getSystemID();
}
}
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DOLUtils.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DOLUtils.java
index 00c9817..d9a1c38 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DOLUtils.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DOLUtils.java
@@ -635,12 +635,14 @@
schema = (String) st.nextElement();
} else {
schema = namespace;
- namespace = TagNames.JAVAEE_NAMESPACE;
+ namespace = TagNames.JAKARTAEE_NAMESPACE;
}
if (namespace.equals(TagNames.J2EE_NAMESPACE))
continue;
if (namespace.equals(TagNames.JAVAEE_NAMESPACE))
continue;
+ if (namespace.equals(TagNames.JAKARTAEE_NAMESPACE))
+ continue;
if (namespace.equals(W3C_XML_SCHEMA))
continue;
sb.append(namespace);
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/xml/TagNames.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/xml/TagNames.java
index ab387d4..7186a8f 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/xml/TagNames.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/xml/TagNames.java
@@ -202,6 +202,7 @@
public static final String J2EE_NAMESPACE = "http://java.sun.com/xml/ns/j2ee";
public static final String JAVAEE_DEFAULTNAMESPACEPREFIX = "javaee";
public static final String JAVAEE_NAMESPACE = "http://xmlns.jcp.org/xml/ns/javaee";
+ public static final String JAKARTAEE_NAMESPACE = "https://jakarta.ee/xml/ns/jakartaee";
public static final String XML_NAMESPACE = "http://www.w3.org/XML/1998/namespace";
public static final String WLS_WEB_APP_NAMESPACE = "http://xmlns.oracle.com/weblogic/weblogic-web-app";
