You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mu...@apache.org on 2021/09/23 08:24:27 UTC
svn commit: r1893534 - in /xerces/java/branches/xml-schema-1.1-dev: ./ docs/
src/org/apache/xerces/impl/xs/assertion/ tools/
Author: mukulg
Date: Thu Sep 23 08:24:27 2021
New Revision: 1893534
URL: http://svn.apache.org/viewvc?rev=1893534&view=rev
Log:
minor refactoring of xercesj xml schema 1.1 codebase
Added:
xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.1.LICENSE.html
- copied unchanged from r1893533, xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.0.LICENSE.html
xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.1.jar (with props)
Removed:
xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.0.LICENSE.html
xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.0.jar
Modified:
xerces/java/branches/xml-schema-1.1-dev/NOTICE
xerces/java/branches/xml-schema-1.1-dev/build.xml
xerces/java/branches/xml-schema-1.1-dev/docs/install.xml
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertionXPath2ValueImpl.java
Modified: xerces/java/branches/xml-schema-1.1-dev/NOTICE
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/NOTICE?rev=1893534&r1=1893533&r2=1893534&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/NOTICE (original)
+++ xerces/java/branches/xml-schema-1.1-dev/NOTICE Thu Sep 23 08:24:27 2021
@@ -17,7 +17,7 @@
software copyright (c) 1999.
This product includes/uses the PsychoPath XPath 2.0 Processor
- (org.eclipse.wst.xml.xpath2.processor_1.2.0.jar) developed at
+ (org.eclipse.wst.xml.xpath2.processor_1.2.1.jar) developed at
The Eclipse Foundation (http://www.eclipse.org) and made available under
the Eclipse Public License v1.0.
Modified: xerces/java/branches/xml-schema-1.1-dev/build.xml
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/build.xml?rev=1893534&r1=1893533&r2=1893534&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/build.xml (original)
+++ xerces/java/branches/xml-schema-1.1-dev/build.xml Thu Sep 23 08:24:27 2021
@@ -69,7 +69,7 @@ Authors:
<property name='jar.resolver' value='resolver.jar'/>
<property name='jar.serializer' value='serializer.jar'/>
<property name='jar.charnormalizer' value='icu4j.jar'/>
- <property name='jar.psychopath' value='org.eclipse.wst.xml.xpath2.processor_1.2.0.jar'/>
+ <property name='jar.psychopath' value='org.eclipse.wst.xml.xpath2.processor_1.2.1.jar'/>
<property name='jar.cup' value='cupv10k-runtime.jar'/>
<property name='jar.junit' value='junit.jar'/>
<property name='jar.ant' value='ant.jar'/>
Modified: xerces/java/branches/xml-schema-1.1-dev/docs/install.xml
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/docs/install.xml?rev=1893534&r1=1893533&r2=1893534&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/docs/install.xml (original)
+++ xerces/java/branches/xml-schema-1.1-dev/docs/install.xml Thu Sep 23 08:24:27 2021
@@ -97,7 +97,7 @@ jar xf &ParserName;-tools.&parserversion
<td>Jar file containing ICU4J 4.2</td>
</tr>
<tr>
- <td>org.eclipse.wst.xml.xpath2.processor_1.2.0.jar</td>
+ <td>org.eclipse.wst.xml.xpath2.processor_1.2.1.jar</td>
<td>Jar file containing the Eclipse PsychoPath XPath 2.0 Processor</td>
</tr>
<tr>
@@ -297,7 +297,7 @@ jar xf &ParserName;-tools.&parserversion
<td>License for JUnit 3.8.1</td>
</tr>
<tr>
- <td>org.eclipse.wst.xml.xpath2.processor_1.2.0.jar</td>
+ <td>org.eclipse.wst.xml.xpath2.processor_1.2.1.jar</td>
<td>Jar file containing the Eclipse PsychoPath XPath 2.0 Processor</td>
</tr>
<tr>
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertionXPath2ValueImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertionXPath2ValueImpl.java?rev=1893534&r1=1893533&r2=1893534&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertionXPath2ValueImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertionXPath2ValueImpl.java Thu Sep 23 08:24:27 2021
@@ -34,7 +34,7 @@ import org.apache.xerces.xs.XSObjectList
import org.apache.xerces.xs.XSSimpleTypeDefinition;
import org.apache.xerces.xs.XSTypeDefinition;
import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
-import org.eclipse.wst.xml.xpath2.processor.PsychoPathXPathTypeHelper;
+import org.eclipse.wst.xml.xpath2.processor.XPath20TypeHelper;
import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyAtomicType;
import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyType;
import org.eclipse.wst.xml.xpath2.processor.internal.types.SchemaTypeValueFactory;
@@ -123,7 +123,7 @@ public class XSAssertionXPath2ValueImpl
XSTypeDefinition attrType, boolean isTypeDerivedFromList,
DynamicContext xpath2DynamicContext) throws Exception {
- // dummy schema short code initializer
+ // xsd type short code initializer
short xsdTypecode = -100;
if (listOrUnionType != null) {
@@ -299,13 +299,14 @@ public class XSAssertionXPath2ValueImpl
/*
- * Find the built-in Xerces schema 'type code' for XPath2 variable $value. This function recursively searches the XML schema
- * type hierarchy navigating up the base types, to find the needed built-in type.
+ * Find the built-in Xerces schema 'type code' for XPath2 variable $value. This function
+ * recursively searches the XML schema type hierarchy navigating up the base types, to
+ * find the needed built-in type.
*/
private short getXercesXSDTypeCodeFor$value(XSTypeDefinition elementType) {
if (Constants.NS_XMLSCHEMA.equals(elementType.getNamespace())) {
- short typeCode = -100; // dummy initializer
+ short typeCode = -100; // xsd type short code initializer
boolean isxsd11Type = false;
@@ -313,11 +314,11 @@ public class XSAssertionXPath2ValueImpl
// handling few of schema types within Eclipse XPath engine
final String elementTypeName = elementType.getName();
if ("dayTimeDuration".equals(elementTypeName)) {
- typeCode = PsychoPathXPathTypeHelper.DAYTIMEDURATION_DT;
+ typeCode = XPath20TypeHelper.DAYTIMEDURATION_DT;
isxsd11Type = true;
}
else if ("yearMonthDuration".equals(elementTypeName)) {
- typeCode = PsychoPathXPathTypeHelper.YEARMONTHDURATION_DT;
+ typeCode = XPath20TypeHelper.YEARMONTHDURATION_DT;
isxsd11Type = true;
}
Added: xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.1.jar
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.1.jar?rev=1893534&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org