You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by un...@apache.org on 2004/08/10 15:47:59 UTC
cvs commit: jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression RDBMSExpressionFactory.java
unico 2004/08/10 06:47:59
Modified: src/stores/org/apache/slide/store/impl/rdbms/expression
RDBMSExpressionFactory.java
Log:
propcontains expression is a proprietary extension,
put it in the slide namespace instead of DAV:
Revision Changes Path
1.10 +9 -9 jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java
Index: RDBMSExpressionFactory.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RDBMSExpressionFactory.java 28 Jul 2004 09:34:09 -0000 1.9
+++ RDBMSExpressionFactory.java 10 Aug 2004 13:47:59 -0000 1.10
@@ -128,12 +128,6 @@
if (RDBMSCompareExpression.COMPARE_OPERATORS.containsKey(element.getName())) {
return new RDBMSCompareExpression(element, _context);
}
- else if (element.getName().equals(Literals.PROPCONTAINS)) {
- return new RDBMSPropContainsExpression(element, _context);
- }
- else if (element.getName().equals(Literals.NOT_PROPCONTAINS)) {
- return new RDBMSNotPropContainsExpression(element, _context);
- }
else if (element.getName().equals(Literals.ISDEFINED)) {
return new RDBMSIsDefinedExpression(element, _context);
}
@@ -156,6 +150,12 @@
}
else if (element.getName().equals(Literals.NOT_ISPRINCIPAL)) {
return new RDBMSNotIsPrincipalExpression(element, _context);
+ }
+ else if (element.getName().equals(Literals.PROPCONTAINS)) {
+ return new RDBMSPropContainsExpression(element, _context);
+ }
+ else if (element.getName().equals(Literals.NOT_PROPCONTAINS)) {
+ return new RDBMSNotPropContainsExpression(element, _context);
}
return super.createExpression(element);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression
RDBMSExpressionFactory.java
Posted by Unico Hommes <un...@hippo.nl>.
Yes of course, I still have to check out that branch first.Will do now :-)
--
Unico
Oliver Zeigermann wrote:
> Hi Unico,
>
> I suppose this is a bug fix that applies to 2.1 as well, isn't it? As
> 2.1 now lives in the SLIDE_2_1_RELEASE_BRANCH branch, would you
> consider applying it there as well?
>
> Thanks,
>
> Oliver
>
> unico@apache.org wrote:
>
>> unico 2004/08/10 06:47:59
>>
>> Modified: src/stores/org/apache/slide/store/impl/rdbms/expression
>> RDBMSExpressionFactory.java
>> Log:
>> propcontains expression is a proprietary extension,
>> put it in the slide namespace instead of DAV:
>> Revision Changes Path
>> 1.10 +9 -9
>> jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java
>>
>> Index: RDBMSExpressionFactory.java
>> ===================================================================
>> RCS file:
>> /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java,v
>>
>> retrieving revision 1.9
>> retrieving revision 1.10
>> diff -u -r1.9 -r1.10
>> --- RDBMSExpressionFactory.java 28 Jul 2004 09:34:09 -0000 1.9
>> +++ RDBMSExpressionFactory.java 10 Aug 2004 13:47:59 -0000 1.10
>> @@ -128,12 +128,6 @@
>> if
>> (RDBMSCompareExpression.COMPARE_OPERATORS.containsKey(element.getName()))
>> {
>> return new RDBMSCompareExpression(element, _context);
>> }
>> - else if
>> (element.getName().equals(Literals.PROPCONTAINS)) {
>> - return new RDBMSPropContainsExpression(element,
>> _context);
>> - }
>> - else if
>> (element.getName().equals(Literals.NOT_PROPCONTAINS)) {
>> - return new RDBMSNotPropContainsExpression(element,
>> _context);
>> - }
>> else if (element.getName().equals(Literals.ISDEFINED)) {
>> return new RDBMSIsDefinedExpression(element,
>> _context);
>> }
>> @@ -156,6 +150,12 @@
>> }
>> else if
>> (element.getName().equals(Literals.NOT_ISPRINCIPAL)) {
>> return new RDBMSNotIsPrincipalExpression(element,
>> _context);
>> + }
>> + else if (element.getName().equals(Literals.PROPCONTAINS)) {
>> + return new RDBMSPropContainsExpression(element,
>> _context);
>> + }
>> + else if
>> (element.getName().equals(Literals.NOT_PROPCONTAINS)) {
>> + return new RDBMSNotPropContainsExpression(element,
>> _context);
>> }
>> return super.createExpression(element);
>> }
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
>> For additional commands, e-mail: slide-dev-help@jakarta.apache.org
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: slide-dev-help@jakarta.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression
RDBMSExpressionFactory.java
Posted by Oliver Zeigermann <ol...@zeigermann.de>.
Hi Unico,
I suppose this is a bug fix that applies to 2.1 as well, isn't it? As
2.1 now lives in the SLIDE_2_1_RELEASE_BRANCH branch, would you consider
applying it there as well?
Thanks,
Oliver
unico@apache.org wrote:
> unico 2004/08/10 06:47:59
>
> Modified: src/stores/org/apache/slide/store/impl/rdbms/expression
> RDBMSExpressionFactory.java
> Log:
> propcontains expression is a proprietary extension,
> put it in the slide namespace instead of DAV:
>
> Revision Changes Path
> 1.10 +9 -9 jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java
>
> Index: RDBMSExpressionFactory.java
> ===================================================================
> RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -r1.9 -r1.10
> --- RDBMSExpressionFactory.java 28 Jul 2004 09:34:09 -0000 1.9
> +++ RDBMSExpressionFactory.java 10 Aug 2004 13:47:59 -0000 1.10
> @@ -128,12 +128,6 @@
> if (RDBMSCompareExpression.COMPARE_OPERATORS.containsKey(element.getName())) {
> return new RDBMSCompareExpression(element, _context);
> }
> - else if (element.getName().equals(Literals.PROPCONTAINS)) {
> - return new RDBMSPropContainsExpression(element, _context);
> - }
> - else if (element.getName().equals(Literals.NOT_PROPCONTAINS)) {
> - return new RDBMSNotPropContainsExpression(element, _context);
> - }
> else if (element.getName().equals(Literals.ISDEFINED)) {
> return new RDBMSIsDefinedExpression(element, _context);
> }
> @@ -156,6 +150,12 @@
> }
> else if (element.getName().equals(Literals.NOT_ISPRINCIPAL)) {
> return new RDBMSNotIsPrincipalExpression(element, _context);
> + }
> + else if (element.getName().equals(Literals.PROPCONTAINS)) {
> + return new RDBMSPropContainsExpression(element, _context);
> + }
> + else if (element.getName().equals(Literals.NOT_PROPCONTAINS)) {
> + return new RDBMSNotPropContainsExpression(element, _context);
> }
> return super.createExpression(element);
> }
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: slide-dev-help@jakarta.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org