This commit was manufactured by cvs2svn to create tag 'R3_3_1'.
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.xpath.core/META-INF/MANIFEST.MF
index 6141a8a..8f9c114 100644
--- a/bundles/org.eclipse.wst.xml.xpath.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xml.xpath.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.xml.xpath.core; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/util/XPath20Helper.java b/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/util/XPath20Helper.java
index 8d1ec81..b1476e7 100644
--- a/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/util/XPath20Helper.java
+++ b/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/util/XPath20Helper.java
@@ -8,10 +8,12 @@
* Contributors:
* David Carver (STAR) - bug 226245 - initial API and implementation
* Jesper Steen Moller - bug 343804 - Updated API information
+ * Jesper Steen Moller - bug 348737 - Hook up default namespace from context
*******************************************************************************/
package org.eclipse.wst.xml.xpath.core.util;
+import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;
import javax.xml.xpath.XPathExpressionException;
@@ -53,6 +55,9 @@
public NamespaceContext getNamespaceContext() {
return namespaceContext;
}
+ public String getDefaultNamespace() {
+ return namespaceContext.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX);
+ };
};
private XPath2Expression xPathExpression;
diff --git a/bundles/org.eclipse.wst.xml.xpath2.wtptypes/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.xpath2.wtptypes/META-INF/MANIFEST.MF
index 53b5c7d..4ec35c2 100644
--- a/bundles/org.eclipse.wst.xml.xpath2.wtptypes/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xml.xpath2.wtptypes/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.wst.xml.xpath2.processor;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.xsd.core;bundle-version="[1.1.500,2.0.0)",
+ org.eclipse.wst.xsd.core;bundle-version="[1.1.600,2.0.0)",
org.eclipse.xsd;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.wst.sse.core;bundle-version="1.1.500"
+ org.eclipse.wst.sse.core;bundle-version="1.1.600"
diff --git a/bundles/org.eclipse.wst.xml.xpath2/pom.xml b/bundles/org.eclipse.wst.xml.xpath2/pom.xml
deleted file mode 100644
index 1ad4bb1..0000000
--- a/bundles/org.eclipse.wst.xml.xpath2/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.wst.xml.xpath2</groupId>
- <artifactId>org.eclipse.wst.xml.xpath2-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../../development/athena/org.eclipse.wst.xml.xpath2.releng</relativePath>
- </parent>
-
- <artifactId>org.eclipse.wst.xml.xpath2</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
- <name>PsychoPath XPath 2.0 Processor: Branding Plug-in</name>
-</project>
diff --git a/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml b/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml
index 3c23faa..44e4d61 100644
--- a/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml
+++ b/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>org.eclipse.wst.xml.xpath2.processor.feature</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<name>PsychoPath XPath 2.0 Processor Feature</name>
</project>
diff --git a/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml b/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml
index 9b95295..202a9a0 100644
--- a/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml
+++ b/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>org.eclipse.wst.xml.xpath2.processor.sdk.feature</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<name>PsychoPath XPath 2.0 Processor: SDK Feature</name>
</project>
