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 2010/11/29 02:04:17 UTC
svn commit: r1040001 -
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Author: mukulg
Date: Mon Nov 29 01:04:17 2010
New Revision: 1040001
URL: http://svn.apache.org/viewvc?rev=1040001&view=rev
Log:
forgot to commit a necessary file for the previous refactoring changes. i'm doing so with this commit.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java?rev=1040001&r1=1040000&r2=1040001&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java Mon Nov 29 01:04:17 2010
@@ -65,11 +65,9 @@ public class Test extends AbstractPsycho
}
/*
- * Constructs a "test" for type alternatives. An overloaded constructor,
- * for PsychoPath XPath processor.
+ * Constructs a "test" for type alternatives. An overloaded constructor, for PsychoPath XPath processor.
*/
- public Test(XPath xpath, XSTypeAlternativeImpl typeAlternative,
- NamespaceSupport namespaceContext) {
+ public Test(XPath xpath, XSTypeAlternativeImpl typeAlternative, NamespaceSupport namespaceContext) {
fXPath = null;
fXPathPsychoPath = xpath;
fTypeAlternative = typeAlternative;
@@ -81,8 +79,8 @@ public class Test extends AbstractPsycho
}
/*
- * Returns the test XPath. Return the native XPath expression,
- * or PsychoPath, whichever is available.
+ * Returns the test XPath expression object. Return the native Xerces XPath object or the PsychoPath XPath object,
+ * whichever is available.
*/
public Object getXPath() {
Object xpath = null;
@@ -101,7 +99,7 @@ public class Test extends AbstractPsycho
if (fXPath != null) {
return fXPath.evaluateTest(element, attributes);
} else if (fXPathPsychoPath != null) {
- return evaluateTestWithPsychoPath(element, attributes);
+ return evaluateTestExprWithPsychoPath(element, attributes);
}
else {
return false;
@@ -113,19 +111,17 @@ public class Test extends AbstractPsycho
}
/*
- * Evaluate the XPath "test" expression on an XDM instance, consisting
- * of the specified element and its attributes. Using PsychoPath XPath 2.0
- * engine for the evaluation.
+ * Evaluate the XPath "test" expression on an XDM instance, consisting of the specified element
+ * and its attributes. Uses PsychoPath XPath 2.0 engine for the evaluation.
*/
- private boolean evaluateTestWithPsychoPath(QName element, XMLAttributes attributes) {
+ private boolean evaluateTestExprWithPsychoPath(QName element, XMLAttributes attributes) {
boolean result = false;
try {
- // construct a DOM document (used by psychopath engine as XPath XDM
- // instance). A PSVI DOM is constructed, to comply to PsychoPath
- // architecture. This doesn't seem to affect CTA psychopath evaluations.
- // CTA spec, doesn't require a typed XDM tree.
- // relook...
+ // construct a DOM document (used by psychopath engine as XPath XDM instance).
+ // A PSVI DOM is constructed, to comply to PsychoPath design. This doesn't seem to
+ // affect CTA psychopath evaluations. CTA spec, doesn't require a typed XDM tree.
+ // REVISIT ...
Document document = new PSVIDocumentImpl();
Element elem = document.createElementNS(element.uri, element.rawname);
@@ -144,9 +140,7 @@ public class Test extends AbstractPsycho
psychoPathParams.put("XPATH2_NS_CONTEXT", fXPath2NamespaceContext);
initDynamicContext(null, document, psychoPathParams);
- result = evaluatePsychoPathExpr(fXPathPsychoPath,
- fTypeAlternative.fXPathDefaultNamespace,
- elem);
+ result = evaluateXPathExpr(fXPathPsychoPath, fTypeAlternative.fXPathDefaultNamespace, elem);
}
catch (StaticError ex) {
result = false;
@@ -160,6 +154,6 @@ public class Test extends AbstractPsycho
return result;
- } //evaluateTestWithPsychoPath
+ } // evaluateTestWithPsychoPath
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org
Re: svn commit: r1040001 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Posted by Hiranya Jayathilaka <hi...@gmail.com>.
On Tue, Nov 30, 2010 at 12:25 AM, Michael Glavassevich
<mr...@ca.ibm.com> wrote:
> Hi Hiranya,
>
> Hiranya Jayathilaka <hi...@gmail.com> wrote on 11/29/2010 01:28:01 PM:
>
>> Hi Michae;,
>>
>> On Mon, Nov 29, 2010 at 11:29 AM, Michael Glavassevich
>> <mr...@ca.ibm.com> wrote:
>> > Hi Hiranya,
>> >
>> > Hiranya Jayathilaka <hi...@gmail.com> wrote on 11/29/2010 12:05:33
>> > AM:
>> >
>> >> Hi Michael,
>> >>
>> >> Is our release process documented somewhere?
>> >
>> > It could do with some improvements (some of the details are out-of-date
>> > /
>> > missing since it was written long ago) but it's documented here [1].
>> > Voting
>> > on signed packages is an ASF requirement and needs to occur beforestep 8
>> > in
>> > this process.
>>
>> Thanks for the info
>>
>> >
>> >> I'm just curious to know why we don't branch out of the trunk when
>> >> doing a release.
>> >
>> > 2.11.0 was tagged on Friday. Any commits going on the trunk (or the XML
>> > Schema 1.1 development branch) at this point would be for a follow-on
>> > release. We've never made any other "maintenance" branches because
>> > there's
>> > never been a need for one. We've always just moved forward.
>>
>> For this to work properly, shouldn't we consider the trunk to be
>> 'frozen' during a release cycle?
>
> It generally has been. Have never had to announce a code freeze because the
> committers on previous releases have known to hold off on making changes in
> this relatively short (critical) period around a release. Seems like common
> sense to me, but perhaps we should start formally declaring one as
> (relatively) newer contributors to the project may not recognize that.
+1
I think a small notice saying "please consider the trunk to be frozen
for all development activities except for the features/fixes intended
for the upcoming release" will be greatly helpful :)
Thanks,
Hiranya
>
>> Thanks,
>> Hiranya
>>
>> >
>> >> Thanks,
>> >> Hiranya
>> >
>> > ...
>> >
>> >> ---------------------------------------------------------------------
>> >> To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
>> >> For additional commands, e-mail: j-dev-help@xerces.apache.org
>> >
>> > Thanks.
>> >
>> > [1] http://xerces.apache.org/xerces2-j/faq-contributing.html#faq-2
>> >
>> > Michael Glavassevich
>> > XML Parser Development
>> > IBM Toronto Lab
>> > E-mail: mrglavas@ca.ibm.com
>> > E-mail: mrglavas@apache.org
>>
>>
>>
>> --
>> Hiranya Jayathilaka
>> Senior Software Engineer;
>> WSO2 Inc.; http://wso2.org
>> E-mail: hiranya@wso2.com; Mobile: +94 77 633 3491
>> Blog: http://techfeast-hiranya.blogspot.com
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
>> For additional commands, e-mail: j-dev-help@xerces.apache.org
>
> Thanks.
>
> Michael Glavassevich
> XML Parser Development
> IBM Toronto Lab
> E-mail: mrglavas@ca.ibm.com
> E-mail: mrglavas@apache.org
--
Hiranya Jayathilaka
Senior Software Engineer;
WSO2 Inc.; http://wso2.org
E-mail: hiranya@wso2.com; Mobile: +94 77 633 3491
Blog: http://techfeast-hiranya.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
For additional commands, e-mail: j-dev-help@xerces.apache.org
Re: svn commit: r1040001 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Posted by Michael Glavassevich <mr...@ca.ibm.com>.
Hi Hiranya,
Hiranya Jayathilaka <hi...@gmail.com> wrote on 11/29/2010 01:28:01 PM:
> Hi Michae;,
>
> On Mon, Nov 29, 2010 at 11:29 AM, Michael Glavassevich
> <mr...@ca.ibm.com> wrote:
> > Hi Hiranya,
> >
> > Hiranya Jayathilaka <hi...@gmail.com> wrote on 11/29/2010 12:05:33
AM:
> >
> >> Hi Michael,
> >>
> >> Is our release process documented somewhere?
> >
> > It could do with some improvements (some of the details are
out-of-date /
> > missing since it was written long ago) but it's documented here [1].
Voting
> > on signed packages is an ASF requirement and needs to occur beforestep
8 in
> > this process.
>
> Thanks for the info
>
> >
> >> I'm just curious to know why we don't branch out of the trunk when
> >> doing a release.
> >
> > 2.11.0 was tagged on Friday. Any commits going on the trunk (or the XML
> > Schema 1.1 development branch) at this point would be for a follow-on
> > release. We've never made any other "maintenance" branches because
there's
> > never been a need for one. We've always just moved forward.
>
> For this to work properly, shouldn't we consider the trunk to be
> 'frozen' during a release cycle?
It generally has been. Have never had to announce a code freeze because the
committers on previous releases have known to hold off on making changes in
this relatively short (critical) period around a release. Seems like common
sense to me, but perhaps we should start formally declaring one as
(relatively) newer contributors to the project may not recognize that.
> Thanks,
> Hiranya
>
> >
> >> Thanks,
> >> Hiranya
> >
> > ...
> >
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
> >> For additional commands, e-mail: j-dev-help@xerces.apache.org
> >
> > Thanks.
> >
> > [1] http://xerces.apache.org/xerces2-j/faq-contributing.html#faq-2
> >
> > Michael Glavassevich
> > XML Parser Development
> > IBM Toronto Lab
> > E-mail: mrglavas@ca.ibm.com
> > E-mail: mrglavas@apache.org
>
>
>
> --
> Hiranya Jayathilaka
> Senior Software Engineer;
> WSO2 Inc.; http://wso2.org
> E-mail: hiranya@wso2.com; Mobile: +94 77 633 3491
> Blog: http://techfeast-hiranya.blogspot.com
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
> For additional commands, e-mail: j-dev-help@xerces.apache.org
Thanks.
Michael Glavassevich
XML Parser Development
IBM Toronto Lab
E-mail: mrglavas@ca.ibm.com
E-mail: mrglavas@apache.org
Re: svn commit: r1040001 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Posted by Hiranya Jayathilaka <hi...@gmail.com>.
Hi Michae;,
On Mon, Nov 29, 2010 at 11:29 AM, Michael Glavassevich
<mr...@ca.ibm.com> wrote:
> Hi Hiranya,
>
> Hiranya Jayathilaka <hi...@gmail.com> wrote on 11/29/2010 12:05:33 AM:
>
>> Hi Michael,
>>
>> Is our release process documented somewhere?
>
> It could do with some improvements (some of the details are out-of-date /
> missing since it was written long ago) but it's documented here [1]. Voting
> on signed packages is an ASF requirement and needs to occur before step 8 in
> this process.
Thanks for the info
>
>> I'm just curious to know why we don't branch out of the trunk when
>> doing a release.
>
> 2.11.0 was tagged on Friday. Any commits going on the trunk (or the XML
> Schema 1.1 development branch) at this point would be for a follow-on
> release. We've never made any other "maintenance" branches because there's
> never been a need for one. We've always just moved forward.
For this to work properly, shouldn't we consider the trunk to be
'frozen' during a release cycle?
Thanks,
Hiranya
>
>> Thanks,
>> Hiranya
>
> ...
>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
>> For additional commands, e-mail: j-dev-help@xerces.apache.org
>
> Thanks.
>
> [1] http://xerces.apache.org/xerces2-j/faq-contributing.html#faq-2
>
> Michael Glavassevich
> XML Parser Development
> IBM Toronto Lab
> E-mail: mrglavas@ca.ibm.com
> E-mail: mrglavas@apache.org
--
Hiranya Jayathilaka
Senior Software Engineer;
WSO2 Inc.; http://wso2.org
E-mail: hiranya@wso2.com; Mobile: +94 77 633 3491
Blog: http://techfeast-hiranya.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
For additional commands, e-mail: j-dev-help@xerces.apache.org
Re: svn commit: r1040001 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Posted by Michael Glavassevich <mr...@ca.ibm.com>.
Hi Hiranya,
Hiranya Jayathilaka <hi...@gmail.com> wrote on 11/29/2010 12:05:33 AM:
> Hi Michael,
>
> Is our release process documented somewhere?
It could do with some improvements (some of the details are out-of-date /
missing since it was written long ago) but it's documented here [1]. Voting
on signed packages is an ASF requirement and needs to occur before step 8
in this process.
> I'm just curious to know why we don't branch out of the trunk when
> doing a release.
2.11.0 was tagged on Friday. Any commits going on the trunk (or the XML
Schema 1.1 development branch) at this point would be for a follow-on
release. We've never made any other "maintenance" branches because there's
never been a need for one. We've always just moved forward.
> Thanks,
> Hiranya
...
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
> For additional commands, e-mail: j-dev-help@xerces.apache.org
Thanks.
[1] http://xerces.apache.org/xerces2-j/faq-contributing.html#faq-2
Michael Glavassevich
XML Parser Development
IBM Toronto Lab
E-mail: mrglavas@ca.ibm.com
E-mail: mrglavas@apache.org
Re: svn commit: r1040001 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Posted by Hiranya Jayathilaka <hi...@gmail.com>.
Hi Michael,
Is our release process documented somewhere? I'm just curious to know
why we don't branch out of the trunk when doing a release.
Thanks,
Hiranya
On Mon, Nov 29, 2010 at 10:15 AM, Michael Glavassevich
<mr...@ca.ibm.com> wrote:
> Hi Mukul,
>
> We vote on the packages so yes this would require a re-build and re-vote to
> get into 2.11.0. Since is this is just cosmetic code refactoring (i.e. not
> an observable improvement for the user) can we hold off on including this
> until after 2.11.0 is released?
>
> Thanks.
>
> Michael Glavassevich
> XML Parser Development
> IBM Toronto Lab
> E-mail: mrglavas@ca.ibm.com
> E-mail: mrglavas@apache.org
>
> Mukul Gandhi <mu...@apache.org> wrote on 11/28/2010 11:29:51 PM:
>
>> Hello,
>> I did a commit to Xerces SVN today with few cosmetic re-factoring
>> changes. These changes do not affect the functionality of code-base. I
>> apologize if it requires a re-build of Xerces for 2.11.0 release.
>> Though a re-build is not really necessary for any functional
>> enhancements.
>>
>> I do not have any more commits in mind before 2.11.0 release is published.
>>
>> On Mon, Nov 29, 2010 at 6:34 AM, <mu...@apache.org> wrote:
>> > Author: mukulg
>> > Date: Mon Nov 29 01:04:17 2010
>> > New Revision: 1040001
>> >
>> > URL: http://svn.apache.org/viewvc?rev=1040001&view=rev
>> > Log:
>> > forgot to commit a necessary file for the previous refactoring
>> changes. i'm doing so with this commit.
>>
>>
>>
>>
>> --
>> Regards,
>> Mukul Gandhi
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
>> For additional commands, e-mail: j-dev-help@xerces.apache.org
>
--
Hiranya Jayathilaka
Senior Software Engineer;
WSO2 Inc.; http://wso2.org
E-mail: hiranya@wso2.com; Mobile: +94 77 633 3491
Blog: http://techfeast-hiranya.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
For additional commands, e-mail: j-dev-help@xerces.apache.org
Re: svn commit: r1040001 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Posted by Mukul Gandhi <mu...@apache.org>.
Hi Michael,
On Mon, Nov 29, 2010 at 10:15 AM, Michael Glavassevich
<mr...@ca.ibm.com> wrote:
> Since is this is just cosmetic code refactoring (i.e. not
> an observable improvement for the user) can we hold off on including this
> until after 2.11.0 is released?
It'll be ok that the commit I did today (which this thread is about)
be excluded from the 2.11.0 release. This commit includes only
cosmetic re-factoring and bears no change to functional behavior of
Xerces.
--
Regards,
Mukul Gandhi
---------------------------------------------------------------------
To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
For additional commands, e-mail: j-dev-help@xerces.apache.org
Re: svn commit: r1040001 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Posted by Michael Glavassevich <mr...@ca.ibm.com>.
Hi Mukul,
We vote on the packages so yes this would require a re-build and re-vote to
get into 2.11.0. Since is this is just cosmetic code refactoring (i.e. not
an observable improvement for the user) can we hold off on including this
until after 2.11.0 is released?
Thanks.
Michael Glavassevich
XML Parser Development
IBM Toronto Lab
E-mail: mrglavas@ca.ibm.com
E-mail: mrglavas@apache.org
Mukul Gandhi <mu...@apache.org> wrote on 11/28/2010 11:29:51 PM:
> Hello,
> I did a commit to Xerces SVN today with few cosmetic re-factoring
> changes. These changes do not affect the functionality of code-base. I
> apologize if it requires a re-build of Xerces for 2.11.0 release.
> Though a re-build is not really necessary for any functional
> enhancements.
>
> I do not have any more commits in mind before 2.11.0 release is
published.
>
> On Mon, Nov 29, 2010 at 6:34 AM, <mu...@apache.org> wrote:
> > Author: mukulg
> > Date: Mon Nov 29 01:04:17 2010
> > New Revision: 1040001
> >
> > URL: http://svn.apache.org/viewvc?rev=1040001&view=rev
> > Log:
> > forgot to commit a necessary file for the previous refactoring
> changes. i'm doing so with this commit.
>
>
>
>
> --
> Regards,
> Mukul Gandhi
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
> For additional commands, e-mail: j-dev-help@xerces.apache.org
Re: svn commit: r1040001 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Posted by Mukul Gandhi <mu...@apache.org>.
Hello,
I did a commit to Xerces SVN today with few cosmetic re-factoring
changes. These changes do not affect the functionality of code-base. I
apologize if it requires a re-build of Xerces for 2.11.0 release.
Though a re-build is not really necessary for any functional
enhancements.
I do not have any more commits in mind before 2.11.0 release is published.
On Mon, Nov 29, 2010 at 6:34 AM, <mu...@apache.org> wrote:
> Author: mukulg
> Date: Mon Nov 29 01:04:17 2010
> New Revision: 1040001
>
> URL: http://svn.apache.org/viewvc?rev=1040001&view=rev
> Log:
> forgot to commit a necessary file for the previous refactoring changes. i'm doing so with this commit.
--
Regards,
Mukul Gandhi
---------------------------------------------------------------------
To unsubscribe, e-mail: j-dev-unsubscribe@xerces.apache.org
For additional commands, e-mail: j-dev-help@xerces.apache.org