Author: mrglavas
Date: Mon Nov 16 06:04:32 2009
New Revision: 880604
URL: http://svn.apache.org/viewvc?rev=880604&view=rev
Log:
Adding SVN properties.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java
(contents, props changed)
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathImpl.java
(contents, props changed)
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java?rev=880604&r1=880603&r2=880604&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java
Mon Nov 16 06:04:32 2009
@@ -1,41 +1,41 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.xerces.impl.dv.xs;
-
-import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
-import org.apache.xerces.impl.dv.ValidationContext;
-
-/**
- * Represents the schema type "error"
- *
- * @xerces.internal
- *
- * @author Mukul Gandhi, IBM
- *
- */
-public class ErrorDV extends TypeValidator {
-
- public short getAllowedFacets() {
- return XSSimpleTypeDecl.FACET_NONE;
- }
-
- public Object getActualValue(String content, ValidationContext context)
throws InvalidDatatypeValueException {
- throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.1",
new Object[]{content, "error"});
- }
-
-} // class ErrorDV
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.xerces.impl.dv.xs;
+
+import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
+import org.apache.xerces.impl.dv.ValidationContext;
+
+/**
+ * Represents the schema type "error"
+ *
+ * @xerces.internal
+ *
+ * @author Mukul Gandhi, IBM
+ *
+ */
+public class ErrorDV extends TypeValidator {
+
+ public short getAllowedFacets() {
+ return XSSimpleTypeDecl.FACET_NONE;
+ }
+
+ public Object getActualValue(String content, ValidationContext context)
throws InvalidDatatypeValueException {
+ throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.1",
new Object[]{content, "error"});
+ }
+
+} // class ErrorDV
Propchange:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathImpl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathImpl.java?rev=880604&r1=880603&r2=880604&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathImpl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathImpl.java
Mon Nov 16 06:04:32 2009
@@ -1,120 +1,120 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.xerces.impl.xs;
-
-import java.util.Enumeration;
-import java.util.Map;
-
-import org.apache.xerces.util.NamespaceSupport;
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.xml.xpath2.processor.DefaultDynamicContext;
-import org.eclipse.wst.xml.xpath2.processor.DefaultEvaluator;
-import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
-import org.eclipse.wst.xml.xpath2.processor.DynamicError;
-import org.eclipse.wst.xml.xpath2.processor.Evaluator;
-import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
-import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
-import org.eclipse.wst.xml.xpath2.processor.StaticChecker;
-import org.eclipse.wst.xml.xpath2.processor.StaticError;
-import org.eclipse.wst.xml.xpath2.processor.StaticNameResolver;
-import org.eclipse.wst.xml.xpath2.processor.ast.XPath;
-import org.eclipse.wst.xml.xpath2.processor.function.FnFunctionLibrary;
-import org.eclipse.wst.xml.xpath2.processor.function.XSCtrLibrary;
-import org.eclipse.wst.xml.xpath2.processor.internal.Focus;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyType;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.ElementType;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.XSBoolean;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * A base class, providing common services for XPath 2 evaluation,
- * with PsychoPath XPath 2.0 engine.
- *
- * @author Mukul Gandhi, IBM
- * @version $Id: AbstractPsychoPathImpl.java 836159 2009-11-14 17:47:00Z
mukulg $
- */
-public class AbstractPsychoPathImpl {
-
- private DynamicContext fDynamicContext = null;
- private Document domDoc = null;
-
- protected DynamicContext initDynamicContext(XSModel schema,
- Document document,
- Map psychoPathParams) {
-
- fDynamicContext = new DefaultDynamicContext(schema, document);
- // populate the PsychoPath XPath 2.0 static context, with namespace
bindings
- // derived from the XSD Schema
- NamespaceSupport xpath2NamespaceContext = (NamespaceSupport)
psychoPathParams.get("XPATH2_NS_CONTEXT");
- Enumeration currPrefixes = xpath2NamespaceContext.getAllPrefixes();
- while (currPrefixes.hasMoreElements()) {
- String prefix = (String)currPrefixes.nextElement();
- String uri = xpath2NamespaceContext.getURI(prefix);
- fDynamicContext.add_namespace(prefix, uri);
- }
- fDynamicContext.add_function_library(new FnFunctionLibrary());
- fDynamicContext.add_function_library(new XSCtrLibrary());
- domDoc = document;
-
- return fDynamicContext;
- } //initDynamicContext
-
- protected boolean evaluatePsychoPathExpr(XPath xp,
- String xPathDefaultNamespace,
- Element contextNode)
- throws StaticError, DynamicError {
- if (xPathDefaultNamespace != null) {
- fDynamicContext.add_namespace(null, xPathDefaultNamespace);
- }
- StaticChecker sc = new StaticNameResolver(fDynamicContext);
- sc.check(xp);
-
- Evaluator eval = new DefaultEvaluator(fDynamicContext, domDoc);
-
- // change focus to the top most element
- ResultSequence nodeEvalRS = ResultSequenceFactory.create_new();
- nodeEvalRS.add(new ElementType(contextNode,
- fDynamicContext.node_position(contextNode)));
-
- fDynamicContext.set_focus(new Focus(nodeEvalRS));
-
- ResultSequence rs = eval.evaluate(xp);
-
- boolean result = false;
-
- if (rs == null) {
- result = false;
- } else {
- if (rs.size() == 1) {
- AnyType rsReturn = rs.get(0);
- if (rsReturn instanceof XSBoolean) {
- XSBoolean returnResultBool = (XSBoolean) rsReturn;
- result = returnResultBool.value();
- } else {
- result = false;
- }
- } else {
- result = false;
- }
- }
-
- return result;
- } //evaluatePsychoPathExpr
-
-} //AbstractPsychoPathImpl
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.xerces.impl.xs;
+
+import java.util.Enumeration;
+import java.util.Map;
+
+import org.apache.xerces.util.NamespaceSupport;
+import org.apache.xerces.xs.XSModel;
+import org.eclipse.wst.xml.xpath2.processor.DefaultDynamicContext;
+import org.eclipse.wst.xml.xpath2.processor.DefaultEvaluator;
+import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
+import org.eclipse.wst.xml.xpath2.processor.DynamicError;
+import org.eclipse.wst.xml.xpath2.processor.Evaluator;
+import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
+import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
+import org.eclipse.wst.xml.xpath2.processor.StaticChecker;
+import org.eclipse.wst.xml.xpath2.processor.StaticError;
+import org.eclipse.wst.xml.xpath2.processor.StaticNameResolver;
+import org.eclipse.wst.xml.xpath2.processor.ast.XPath;
+import org.eclipse.wst.xml.xpath2.processor.function.FnFunctionLibrary;
+import org.eclipse.wst.xml.xpath2.processor.function.XSCtrLibrary;
+import org.eclipse.wst.xml.xpath2.processor.internal.Focus;
+import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyType;
+import org.eclipse.wst.xml.xpath2.processor.internal.types.ElementType;
+import org.eclipse.wst.xml.xpath2.processor.internal.types.XSBoolean;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * A base class, providing common services for XPath 2 evaluation,
+ * with PsychoPath XPath 2.0 engine.
+ *
+ * @author Mukul Gandhi, IBM
+ * @version $Id$
+ */
+public class AbstractPsychoPathImpl {
+
+ private DynamicContext fDynamicContext = null;
+ private Document domDoc = null;
+
+ protected DynamicContext initDynamicContext(XSModel schema,
+ Document document,
+ Map psychoPathParams) {
+
+ fDynamicContext = new DefaultDynamicContext(schema, document);
+ // populate the PsychoPath XPath 2.0 static context, with namespace
bindings
+ // derived from the XSD Schema
+ NamespaceSupport xpath2NamespaceContext = (NamespaceSupport)
psychoPathParams.get("XPATH2_NS_CONTEXT");
+ Enumeration currPrefixes = xpath2NamespaceContext.getAllPrefixes();
+ while (currPrefixes.hasMoreElements()) {
+ String prefix = (String)currPrefixes.nextElement();
+ String uri = xpath2NamespaceContext.getURI(prefix);
+ fDynamicContext.add_namespace(prefix, uri);
+ }
+ fDynamicContext.add_function_library(new FnFunctionLibrary());
+ fDynamicContext.add_function_library(new XSCtrLibrary());
+ domDoc = document;
+
+ return fDynamicContext;
+ } //initDynamicContext
+
+ protected boolean evaluatePsychoPathExpr(XPath xp,
+ String xPathDefaultNamespace,
+ Element contextNode)
+ throws StaticError, DynamicError {
+ if (xPathDefaultNamespace != null) {
+ fDynamicContext.add_namespace(null, xPathDefaultNamespace);
+ }
+ StaticChecker sc = new StaticNameResolver(fDynamicContext);
+ sc.check(xp);
+
+ Evaluator eval = new DefaultEvaluator(fDynamicContext, domDoc);
+
+ // change focus to the top most element
+ ResultSequence nodeEvalRS = ResultSequenceFactory.create_new();
+ nodeEvalRS.add(new ElementType(contextNode,
+ fDynamicContext.node_position(contextNode)));
+
+ fDynamicContext.set_focus(new Focus(nodeEvalRS));
+
+ ResultSequence rs = eval.evaluate(xp);
+
+ boolean result = false;
+
+ if (rs == null) {
+ result = false;
+ } else {
+ if (rs.size() == 1) {
+ AnyType rsReturn = rs.get(0);
+ if (rsReturn instanceof XSBoolean) {
+ XSBoolean returnResultBool = (XSBoolean) rsReturn;
+ result = returnResultBool.value();
+ } else {
+ result = false;
+ }
+ } else {
+ result = false;
+ }
+ }
+
+ return result;
+ } //evaluatePsychoPathExpr
+
+} //AbstractPsychoPathImpl
Propchange:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
