moved package to temparory org.x4o.vasc.etc
This commit is contained in:
Willem Cazander
parent
3d6ceff732
commit
cc6331b7fe
322 changed files with 2032 additions and 1750 deletions
|
|
@ -5,6 +5,7 @@
|
|||
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
|
||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
|
||||
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
</classpath>
|
||||
|
|
|
|||
7
vasc-xpql/.settings/org.eclipse.core.resources.prefs
Normal file
7
vasc-xpql/.settings/org.eclipse.core.resources.prefs
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
#Sun Dec 25 17:29:06 CET 2011
|
||||
eclipse.preferences.version=1
|
||||
encoding//src/main/java=UTF-8
|
||||
encoding//src/main/resources=UTF-8
|
||||
encoding//src/test/java=UTF-8
|
||||
encoding//src/test/resources=UTF-8
|
||||
encoding/<project>=UTF-8
|
||||
5
vasc-xpql/.settings/org.eclipse.m2e.core.prefs
Normal file
5
vasc-xpql/.settings/org.eclipse.m2e.core.prefs
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
#Sun Dec 25 17:29:03 CET 2011
|
||||
activeProfiles=
|
||||
eclipse.preferences.version=1
|
||||
resolveWorkspaceProjects=true
|
||||
version=1
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
<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>
|
||||
<artifactId>vasc-base</artifactId>
|
||||
<groupId>com.idcanet.vasc</groupId>
|
||||
<artifactId>vasc</artifactId>
|
||||
<groupId>org.x4o.vasc</groupId>
|
||||
<version>0.3.5-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>com.idcanet.vasc</groupId>
|
||||
<groupId>org.x4o.vasc</groupId>
|
||||
<artifactId>vasc-xpql</artifactId>
|
||||
<version>0.3.5-SNAPSHOT</version>
|
||||
<name>vasc-xpql</name>
|
||||
<description>vasc xpql parser for queries.</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.idcanet.x4o</groupId>
|
||||
<groupId>org.x4o</groupId>
|
||||
<artifactId>x4o-core</artifactId>
|
||||
<version>${x4o-core.version}</version>
|
||||
</dependency>
|
||||
|
|
@ -23,14 +23,5 @@
|
|||
<version>2.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- Metamodel
|
||||
<dependency>
|
||||
<groupId>dk.eobjects.metamodel</groupId>
|
||||
<artifactId>MetaModel-full</artifactId>
|
||||
<version>1.1.2</version>
|
||||
<scope>compile</scope>
|
||||
<optional />
|
||||
</dependency>
|
||||
-->
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
@ -24,13 +24,14 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql;
|
||||
package org.x4o.vasc.xpql;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import com.idcanet.vasc.xpql.query.Query;
|
||||
import org.x4o.vasc.xpql.query.Query;
|
||||
|
||||
|
||||
/**
|
||||
* Holds all the queries.
|
||||
|
|
@ -24,12 +24,12 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql;
|
||||
package org.x4o.vasc.xpql;
|
||||
|
||||
import javax.el.ValueExpression;
|
||||
|
||||
import com.idcanet.x4o.core.X4OParser;
|
||||
import com.idcanet.x4o.element.ElementContext;
|
||||
import org.x4o.xml.core.X4OParser;
|
||||
import org.x4o.xml.element.ElementContext;
|
||||
|
||||
/**
|
||||
* Parse an xpql file/resource
|
||||
|
|
@ -24,12 +24,12 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl;
|
||||
package org.x4o.vasc.xpql.impl;
|
||||
|
||||
import com.idcanet.vasc.xpql.query.AbstractQuery;
|
||||
import com.idcanet.vasc.xpql.query.Query;
|
||||
import com.idcanet.vasc.xpql.query.QueryParameterValue;
|
||||
import com.idcanet.vasc.xpql.query.QueryPart;
|
||||
import org.x4o.vasc.xpql.query.AbstractQuery;
|
||||
import org.x4o.vasc.xpql.query.Query;
|
||||
import org.x4o.vasc.xpql.query.QueryParameterValue;
|
||||
import org.x4o.vasc.xpql.query.QueryPart;
|
||||
|
||||
/**
|
||||
* This class defines an executable SQL query.
|
||||
|
|
@ -48,7 +48,7 @@ public class DefaultQuery extends AbstractQuery {
|
|||
// ========= QueryPart interface
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.AbstractQueryPart#toEdit()
|
||||
* @see org.x4o.vasc.xpql.query.AbstractQueryPart#toEdit()
|
||||
*/
|
||||
@Override
|
||||
public String toEdit(Query query) {
|
||||
|
|
@ -60,7 +60,7 @@ public class DefaultQuery extends AbstractQuery {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.AbstractQueryPart#toPreparedSQL()
|
||||
* @see org.x4o.vasc.xpql.query.AbstractQueryPart#toPreparedSQL()
|
||||
*/
|
||||
@Override
|
||||
public String toPreparedSQL(Query query) {
|
||||
|
|
@ -73,7 +73,7 @@ public class DefaultQuery extends AbstractQuery {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.AbstractQueryPart#toSQL()
|
||||
* @see org.x4o.vasc.xpql.query.AbstractQueryPart#toSQL()
|
||||
*/
|
||||
@Override
|
||||
public String toSQL(Query query) {
|
||||
|
|
@ -85,7 +85,7 @@ public class DefaultQuery extends AbstractQuery {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.AbstractQueryPart#toXML()
|
||||
* @see org.x4o.vasc.xpql.query.AbstractQueryPart#toXML()
|
||||
*/
|
||||
@Override
|
||||
public String toXML(Query query) {
|
||||
|
|
@ -24,10 +24,10 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl;
|
||||
package org.x4o.vasc.xpql.impl;
|
||||
|
||||
import com.idcanet.vasc.xpql.query.AbstractQueryParameterValue;
|
||||
import com.idcanet.vasc.xpql.query.QueryParameterValue;
|
||||
import org.x4o.vasc.xpql.query.AbstractQueryParameterValue;
|
||||
import org.x4o.vasc.xpql.query.QueryParameterValue;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -24,12 +24,13 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl;
|
||||
package org.x4o.vasc.xpql.impl;
|
||||
|
||||
import org.x4o.vasc.xpql.XPQLParser;
|
||||
import org.x4o.vasc.xpql.query.AbstractQueryPart;
|
||||
import org.x4o.vasc.xpql.query.Query;
|
||||
import org.x4o.vasc.xpql.query.QueryPart;
|
||||
|
||||
import com.idcanet.vasc.xpql.XPQLParser;
|
||||
import com.idcanet.vasc.xpql.query.AbstractQueryPart;
|
||||
import com.idcanet.vasc.xpql.query.Query;
|
||||
import com.idcanet.vasc.xpql.query.QueryPart;
|
||||
|
||||
/**
|
||||
* Handled included query parts
|
||||
|
|
@ -24,16 +24,17 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl;
|
||||
package org.x4o.vasc.xpql.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import com.idcanet.vasc.xpql.query.AbstractQueryPart;
|
||||
import com.idcanet.vasc.xpql.query.Query;
|
||||
import com.idcanet.vasc.xpql.query.QueryParameterValue;
|
||||
import com.idcanet.vasc.xpql.query.QueryPart;
|
||||
import org.x4o.vasc.xpql.query.AbstractQueryPart;
|
||||
import org.x4o.vasc.xpql.query.Query;
|
||||
import org.x4o.vasc.xpql.query.QueryParameterValue;
|
||||
import org.x4o.vasc.xpql.query.QueryPart;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -24,11 +24,11 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl;
|
||||
package org.x4o.vasc.xpql.impl;
|
||||
|
||||
import com.idcanet.vasc.xpql.query.AbstractQueryPart;
|
||||
import com.idcanet.vasc.xpql.query.Query;
|
||||
import com.idcanet.vasc.xpql.query.QueryPart;
|
||||
import org.x4o.vasc.xpql.query.AbstractQueryPart;
|
||||
import org.x4o.vasc.xpql.query.Query;
|
||||
import org.x4o.vasc.xpql.query.QueryPart;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -24,11 +24,12 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl.x4o;
|
||||
package org.x4o.vasc.xpql.impl.x4o;
|
||||
|
||||
import org.x4o.vasc.xpql.query.Query;
|
||||
import org.x4o.xml.element.AbstractElement;
|
||||
import org.x4o.xml.element.ElementException;
|
||||
|
||||
import com.idcanet.x4o.element.AbstractElement;
|
||||
import com.idcanet.x4o.element.ElementException;
|
||||
import com.idcanet.vasc.xpql.query.Query;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -45,7 +46,7 @@ public class CommentElement extends AbstractElement {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.x4o.element.AbstractElement#doCharacters(java.lang.String)
|
||||
* @see org.x4o.xml.element.AbstractElement#doCharacters(java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public void doCharacters(String arg0) {
|
||||
|
|
@ -53,7 +54,7 @@ public class CommentElement extends AbstractElement {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.x4o.element.AbstractElement#doComment(java.lang.String)
|
||||
* @see org.x4o.xml.element.AbstractElement#doComment(java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public void doComment(String arg0) {
|
||||
|
|
@ -61,7 +62,7 @@ public class CommentElement extends AbstractElement {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.x4o.element.AbstractElement#doElementEnd()
|
||||
* @see org.x4o.xml.element.AbstractElement#doElementEnd()
|
||||
*/
|
||||
@Override
|
||||
public void doElementEnd() throws ElementException {
|
||||
|
|
@ -24,12 +24,13 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl.x4o;
|
||||
package org.x4o.vasc.xpql.impl.x4o;
|
||||
|
||||
import org.x4o.vasc.xpql.query.QueryParameterValue.QueryParameterType;
|
||||
import org.x4o.xml.element.AbstractElementAttributeConverter;
|
||||
import org.x4o.xml.element.Element;
|
||||
import org.x4o.xml.element.ElementAttributeConverterException;
|
||||
|
||||
import com.idcanet.x4o.element.AbstractElementAttributeConverter;
|
||||
import com.idcanet.x4o.element.Element;
|
||||
import com.idcanet.x4o.element.ElementAttributeConverterException;
|
||||
import com.idcanet.vasc.xpql.query.QueryParameterValue.QueryParameterType;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -39,7 +40,7 @@ import com.idcanet.vasc.xpql.query.QueryParameterValue.QueryParameterType;
|
|||
public class ParameterTypeAttributeConverter extends AbstractElementAttributeConverter {
|
||||
|
||||
/**
|
||||
* @see com.idcanet.x4o.element.AbstractElementClassParameterConverter#doConvertAttribute(com.idcanet.x4o.element.Element, java.lang.Object)
|
||||
* @see org.x4o.xml.element.AbstractElementClassParameterConverter#doConvertAttribute(org.x4o.xml.element.Element, java.lang.Object)
|
||||
*/
|
||||
public Object doConvertAttribute(Element arg0, Object value) throws ElementAttributeConverterException {
|
||||
try {
|
||||
|
|
@ -24,16 +24,17 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl.x4o;
|
||||
package org.x4o.vasc.xpql.impl.x4o;
|
||||
|
||||
import org.x4o.vasc.xpql.impl.QueryInclude;
|
||||
import org.x4o.vasc.xpql.impl.QueryParameter;
|
||||
import org.x4o.vasc.xpql.query.Query;
|
||||
import org.x4o.vasc.xpql.query.QueryParameterValue;
|
||||
import org.x4o.vasc.xpql.query.QueryPart;
|
||||
import org.x4o.xml.element.AbstractElementBindingHandler;
|
||||
import org.x4o.xml.element.Element;
|
||||
import org.x4o.xml.element.ElementBindingHandlerException;
|
||||
|
||||
import com.idcanet.x4o.element.AbstractElementBindingHandler;
|
||||
import com.idcanet.x4o.element.Element;
|
||||
import com.idcanet.x4o.element.ElementBindingHandlerException;
|
||||
import com.idcanet.vasc.xpql.impl.QueryInclude;
|
||||
import com.idcanet.vasc.xpql.impl.QueryParameter;
|
||||
import com.idcanet.vasc.xpql.query.Query;
|
||||
import com.idcanet.vasc.xpql.query.QueryParameterValue;
|
||||
import com.idcanet.vasc.xpql.query.QueryPart;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -24,14 +24,15 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl.x4o;
|
||||
package org.x4o.vasc.xpql.impl.x4o;
|
||||
|
||||
import org.x4o.vasc.xpql.QueryStore;
|
||||
import org.x4o.vasc.xpql.XPQLParser;
|
||||
import org.x4o.vasc.xpql.query.Query;
|
||||
import org.x4o.xml.element.AbstractElementConfigurator;
|
||||
import org.x4o.xml.element.Element;
|
||||
import org.x4o.xml.element.ElementConfiguratorException;
|
||||
|
||||
import com.idcanet.x4o.element.AbstractElementConfigurator;
|
||||
import com.idcanet.x4o.element.Element;
|
||||
import com.idcanet.x4o.element.ElementConfiguratorException;
|
||||
import com.idcanet.vasc.xpql.QueryStore;
|
||||
import com.idcanet.vasc.xpql.XPQLParser;
|
||||
import com.idcanet.vasc.xpql.query.Query;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -41,7 +42,7 @@ import com.idcanet.vasc.xpql.query.Query;
|
|||
public class QueryElementConfigurator extends AbstractElementConfigurator {
|
||||
|
||||
/**
|
||||
* @see com.idcanet.x4o.element.ElementConfigurator#doConfigElement(com.idcanet.x4o.element.Element)
|
||||
* @see org.x4o.xml.element.ElementConfigurator#doConfigElement(org.x4o.xml.element.Element)
|
||||
*/
|
||||
public void doConfigElement(Element element) throws ElementConfiguratorException {
|
||||
if ((element.getElementObject() instanceof Query)==false) {
|
||||
|
|
@ -24,12 +24,13 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl.x4o;
|
||||
package org.x4o.vasc.xpql.impl.x4o;
|
||||
|
||||
import org.x4o.vasc.xpql.query.Query;
|
||||
import org.x4o.vasc.xpql.query.QueryPart;
|
||||
import org.x4o.xml.element.AbstractElement;
|
||||
import org.x4o.xml.element.ElementException;
|
||||
|
||||
import com.idcanet.x4o.element.AbstractElement;
|
||||
import com.idcanet.x4o.element.ElementException;
|
||||
import com.idcanet.vasc.xpql.query.Query;
|
||||
import com.idcanet.vasc.xpql.query.QueryPart;
|
||||
|
||||
/**
|
||||
* Inserts the query inlude element direct on start-tag
|
||||
|
|
@ -40,7 +41,7 @@ import com.idcanet.vasc.xpql.query.QueryPart;
|
|||
public class QueryIncludeElement extends AbstractElement {
|
||||
|
||||
/**
|
||||
* @see com.idcanet.x4o.element.AbstractElement#doElementEnd()
|
||||
* @see org.x4o.xml.element.AbstractElement#doElementEnd()
|
||||
*/
|
||||
@Override
|
||||
public void doElementStart() throws ElementException {
|
||||
|
|
@ -24,12 +24,13 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl.x4o;
|
||||
package org.x4o.vasc.xpql.impl.x4o;
|
||||
|
||||
import org.x4o.vasc.xpql.query.Query;
|
||||
import org.x4o.vasc.xpql.query.QueryPart;
|
||||
import org.x4o.xml.element.AbstractElement;
|
||||
import org.x4o.xml.element.ElementException;
|
||||
|
||||
import com.idcanet.x4o.element.AbstractElement;
|
||||
import com.idcanet.x4o.element.ElementException;
|
||||
import com.idcanet.vasc.xpql.query.Query;
|
||||
import com.idcanet.vasc.xpql.query.QueryPart;
|
||||
|
||||
/**
|
||||
* Inserts the query element direct on start-tag
|
||||
|
|
@ -40,7 +41,7 @@ import com.idcanet.vasc.xpql.query.QueryPart;
|
|||
public class QueryParameterElement extends AbstractElement {
|
||||
|
||||
/**
|
||||
* @see com.idcanet.x4o.element.AbstractElement#doElementEnd()
|
||||
* @see org.x4o.xml.element.AbstractElement#doElementEnd()
|
||||
*/
|
||||
@Override
|
||||
public void doElementStart() throws ElementException {
|
||||
|
|
@ -24,12 +24,13 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl.x4o;
|
||||
package org.x4o.vasc.xpql.impl.x4o;
|
||||
|
||||
import org.x4o.vasc.xpql.query.Query.QueryType;
|
||||
import org.x4o.xml.element.AbstractElementAttributeConverter;
|
||||
import org.x4o.xml.element.Element;
|
||||
import org.x4o.xml.element.ElementAttributeConverterException;
|
||||
|
||||
import com.idcanet.x4o.element.AbstractElementAttributeConverter;
|
||||
import com.idcanet.x4o.element.Element;
|
||||
import com.idcanet.x4o.element.ElementAttributeConverterException;
|
||||
import com.idcanet.vasc.xpql.query.Query.QueryType;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -39,7 +40,7 @@ import com.idcanet.vasc.xpql.query.Query.QueryType;
|
|||
public class QueryTypeAttributeConverter extends AbstractElementAttributeConverter {
|
||||
|
||||
/**
|
||||
* @see com.idcanet.x4o.element.AbstractElementClassParameterConverter#doConvertAttribute(com.idcanet.x4o.element.Element, java.lang.Object)
|
||||
* @see org.x4o.xml.element.AbstractElementClassParameterConverter#doConvertAttribute(org.vasc.x4o.element.Element, java.lang.Object)
|
||||
*/
|
||||
public Object doConvertAttribute(Element arg0, Object value) throws ElementAttributeConverterException {
|
||||
try {
|
||||
|
|
@ -24,12 +24,13 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.impl.x4o;
|
||||
package org.x4o.vasc.xpql.impl.x4o;
|
||||
|
||||
import org.x4o.vasc.xpql.impl.QueryText;
|
||||
import org.x4o.vasc.xpql.query.Query;
|
||||
import org.x4o.xml.element.AbstractElement;
|
||||
import org.x4o.xml.element.ElementException;
|
||||
|
||||
import com.idcanet.x4o.element.AbstractElement;
|
||||
import com.idcanet.x4o.element.ElementException;
|
||||
import com.idcanet.vasc.xpql.impl.QueryText;
|
||||
import com.idcanet.vasc.xpql.query.Query;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -46,7 +47,7 @@ public class SQLElement extends AbstractElement {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.x4o.element.AbstractElement#doCharacters(java.lang.String)
|
||||
* @see org.x4o.xml.element.AbstractElement#doCharacters(java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public void doCharacters(String text) throws ElementException {
|
||||
|
|
@ -62,7 +63,7 @@ public class SQLElement extends AbstractElement {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.x4o.element.AbstractElement#doComment(java.lang.String)
|
||||
* @see org.x4o.xml.element.AbstractElement#doComment(java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public void doComment(String arg0) {
|
||||
|
|
@ -70,7 +71,7 @@ public class SQLElement extends AbstractElement {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.x4o.element.AbstractElement#getElementObject()
|
||||
* @see org.x4o.xml.element.AbstractElement#getElementObject()
|
||||
*/
|
||||
@Override
|
||||
public Object getElementObject() {
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.query;
|
||||
package org.x4o.vasc.xpql.query;
|
||||
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -33,8 +33,9 @@ import java.util.HashMap;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.idcanet.vasc.xpql.QueryStore;
|
||||
import com.idcanet.vasc.xpql.impl.DefaultQueryParameterValue;
|
||||
import org.x4o.vasc.xpql.QueryStore;
|
||||
import org.x4o.vasc.xpql.impl.DefaultQueryParameterValue;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -66,133 +67,133 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getName()
|
||||
* @see org.x4o.vasc.xpql.query.Query#getName()
|
||||
*/
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#setName(java.lang.String)
|
||||
* @see org.x4o.vasc.xpql.query.Query#setName(java.lang.String)
|
||||
*/
|
||||
public void setName(String name) {
|
||||
this.name=name;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#addQueryComment(java.lang.String)
|
||||
* @see org.x4o.vasc.xpql.query.Query#addQueryComment(java.lang.String)
|
||||
*/
|
||||
public void addQueryComment(String comment) {
|
||||
queryComments.add(comment);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#addQueryParameterValue(com.idcanet.xtes.xpql.query.QueryParameterValue)
|
||||
* @see org.x4o.vasc.xpql.query.Query#addQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue)
|
||||
*/
|
||||
public void addQueryParameterValue(QueryParameterValue value) {
|
||||
queryParameterValues.put(value.getName(), value);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#addLocalQueryParameterValue(com.idcanet.xtes.xpql.query.QueryParameterValue)
|
||||
* @see org.x4o.vasc.xpql.query.Query#addLocalQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue)
|
||||
*/
|
||||
public void addLocalQueryParameterValue(QueryParameterValue value) {
|
||||
localQueryParameterValues.put(value.getName(), value);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#addOrderQueryParameterValue(com.idcanet.xtes.xpql.query.QueryParameterValue)
|
||||
* @see org.x4o.vasc.xpql.query.Query#addOrderQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue)
|
||||
*/
|
||||
public void addOrderQueryParameterValue(QueryParameterValue value) {
|
||||
orderQueryParameterValues.add(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#addQueryPart(com.idcanet.xtes.xpql.query.QueryPart)
|
||||
* @see org.x4o.vasc.xpql.query.Query#addQueryPart(org.x4o.vasc.xpql.query.QueryPart)
|
||||
*/
|
||||
public void addQueryPart(QueryPart queryPart) {
|
||||
queryParts.add(queryPart);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getProperty(java.lang.String)
|
||||
* @see org.x4o.vasc.xpql.query.Query#getProperty(java.lang.String)
|
||||
*/
|
||||
public Object getProperty(String name) {
|
||||
return properties.get(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getPropertyString(java.lang.String)
|
||||
* @see org.x4o.vasc.xpql.query.Query#getPropertyString(java.lang.String)
|
||||
*/
|
||||
public String getPropertyString(String name) {
|
||||
return getProperty(name).toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getQueryComments()
|
||||
* @see org.x4o.vasc.xpql.query.Query#getQueryComments()
|
||||
*/
|
||||
public List<String> getQueryComments() {
|
||||
return queryComments;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getQueryParameterValue(java.lang.String)
|
||||
* @see org.x4o.vasc.xpql.query.Query#getQueryParameterValue(java.lang.String)
|
||||
*/
|
||||
public QueryParameterValue getQueryParameterValue(String name) {
|
||||
return queryParameterValues.get(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getQueryParts()
|
||||
* @see org.x4o.vasc.xpql.query.Query#getQueryParts()
|
||||
*/
|
||||
public List<QueryPart> getQueryParts() {
|
||||
return queryParts;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#setProperty(java.lang.String, java.lang.Object)
|
||||
* @see org.x4o.vasc.xpql.query.Query#setProperty(java.lang.String, java.lang.Object)
|
||||
*/
|
||||
public void setProperty(String name, Object value) {
|
||||
properties.put(name,value);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getPropertyKeys()
|
||||
* @see org.x4o.vasc.xpql.query.Query#getPropertyKeys()
|
||||
*/
|
||||
public Collection<String> getPropertyKeys() {
|
||||
return properties.keySet();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getQueryParameters()
|
||||
* @see org.x4o.vasc.xpql.query.Query#getQueryParameters()
|
||||
*/
|
||||
public List<String> getQueryParameters() {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getQueryParameterValues()
|
||||
* @see org.x4o.vasc.xpql.query.Query#getQueryParameterValues()
|
||||
*/
|
||||
public Collection<QueryParameterValue> getQueryParameterValues() {
|
||||
return queryParameterValues.values();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getLocalQueryParameterValues()
|
||||
* @see org.x4o.vasc.xpql.query.Query#getLocalQueryParameterValues()
|
||||
*/
|
||||
public Collection<QueryParameterValue> getLocalQueryParameterValues() {
|
||||
return localQueryParameterValues.values();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getOrderQueryParameterValues()
|
||||
* @see org.x4o.vasc.xpql.query.Query#getOrderQueryParameterValues()
|
||||
*/
|
||||
public List<QueryParameterValue> getOrderQueryParameterValues() {
|
||||
return orderQueryParameterValues;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#setQueryParameter(java.lang.String, java.lang.Object)
|
||||
* @see org.x4o.vasc.xpql.query.Query#setQueryParameter(java.lang.String, java.lang.Object)
|
||||
*/
|
||||
public void setQueryParameter(String name, Object value) {
|
||||
if (name==null) {
|
||||
|
|
@ -228,28 +229,28 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getType()
|
||||
* @see org.x4o.vasc.xpql.query.Query#getType()
|
||||
*/
|
||||
public QueryType getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#setType(com.idcanet.xtes.xpql.query.Query.QueryType)
|
||||
* @see org.x4o.vasc.xpql.query.Query#setType(org.x4o.vasc.xpql.query.Query.QueryType)
|
||||
*/
|
||||
public void setType(QueryType type) {
|
||||
this.type=type;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#getQueryStore()
|
||||
* @see org.x4o.vasc.xpql.query.Query#getQueryStore()
|
||||
*/
|
||||
public QueryStore getQueryStore() {
|
||||
return queryStore;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.Query#setQueryStore(com.idcanet.xtes.xpql.QueryStore)
|
||||
* @see org.x4o.vasc.xpql.query.Query#setQueryStore(org.x4o.vasc.xpql.query.QueryStore)
|
||||
*/
|
||||
public void setQueryStore(QueryStore store) {
|
||||
this.queryStore=store;
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.query;
|
||||
package org.x4o.vasc.xpql.query;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -40,56 +40,56 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
|
|||
private Class<?> valueType = null;
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.QueryParameterValue#getName()
|
||||
* @see org.x4o.vasc.xpql.query.QueryParameterValue#getName()
|
||||
*/
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.QueryParameterValue#setName(java.lang.String)
|
||||
* @see org.x4o.vasc.xpql.query.QueryParameterValue#setName(java.lang.String)
|
||||
*/
|
||||
public void setName(String name) {
|
||||
this.name=name;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.QueryParameterValue#getDefaultValue()
|
||||
* @see org.x4o.vasc.xpql.query.QueryParameterValue#getDefaultValue()
|
||||
*/
|
||||
public Object getDefaultValue() {
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.QueryParameterValue#setDefaultValue(java.lang.Object)
|
||||
* @see org.x4o.vasc.xpql.query.QueryParameterValue#setDefaultValue(java.lang.Object)
|
||||
*/
|
||||
public void setDefaultValue(Object defaultValue) {
|
||||
this.defaultValue=defaultValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.QueryParameterValue#getValue()
|
||||
* @see org.x4o.vasc.xpql.query.QueryParameterValue#getValue()
|
||||
*/
|
||||
public Object getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.QueryParameterValue#setType(com.idcanet.xtes.xpql.query.QueryParameterValue.QueryParameterType)
|
||||
* @see org.x4o.vasc.xpql.query.QueryParameterValue#setType(org.x4o.vasc.xpql.query.QueryParameterValue.QueryParameterType)
|
||||
*/
|
||||
public void setType(QueryParameterType type) {
|
||||
this.type=type;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.QueryParameterValue#getType()
|
||||
* @see org.x4o.vasc.xpql.query.QueryParameterValue#getType()
|
||||
*/
|
||||
public QueryParameterType getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.QueryParameterValue#setValue(java.lang.Object)
|
||||
* @see org.x4o.vasc.xpql.query.QueryParameterValue#setValue(java.lang.Object)
|
||||
*/
|
||||
public void setValue(Object value) {
|
||||
this.value=value;
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.query;
|
||||
package org.x4o.vasc.xpql.query;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -34,13 +34,13 @@ package com.idcanet.vasc.xpql.query;
|
|||
abstract public class AbstractQueryPart implements QueryPart {
|
||||
|
||||
/**
|
||||
* @see com.idcanet.xtes.xpql.query.QueryPart#toSQL()
|
||||
* @see org.x4o.vasc.xpql.query.QueryPart#toSQL()
|
||||
*/
|
||||
abstract public String toSQL(Query query);
|
||||
|
||||
/**
|
||||
* Returns the toSQL() retult.
|
||||
* @see com.idcanet.xtes.xpql.query.QueryPart#toPreparedSQL()
|
||||
* @see org.x4o.vasc.xpql.query.QueryPart#toPreparedSQL()
|
||||
*/
|
||||
public String toPreparedSQL(Query query) {
|
||||
return toSQL(query);
|
||||
|
|
@ -48,7 +48,7 @@ abstract public class AbstractQueryPart implements QueryPart {
|
|||
|
||||
/**
|
||||
* XML escapes the toSQL() return String.
|
||||
* @see com.idcanet.xtes.xpql.query.QueryPart#toXML()
|
||||
* @see org.x4o.vasc.xpql.query.QueryPart#toXML()
|
||||
*/
|
||||
public String toXML(Query query) {
|
||||
return escapeXML(toSQL(query));
|
||||
|
|
@ -56,7 +56,7 @@ abstract public class AbstractQueryPart implements QueryPart {
|
|||
|
||||
/**
|
||||
* Returns the toSQL() retult.
|
||||
* @see com.idcanet.xtes.xpql.query.QueryPart#toEdit()
|
||||
* @see org.x4o.vasc.xpql.query.QueryPart#toEdit()
|
||||
*/
|
||||
public String toEdit(Query query) {
|
||||
return toSQL(query);
|
||||
|
|
@ -24,13 +24,14 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.query;
|
||||
package org.x4o.vasc.xpql.query;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.idcanet.vasc.xpql.QueryStore;
|
||||
import org.x4o.vasc.xpql.QueryStore;
|
||||
|
||||
|
||||
/**
|
||||
* TODO: add clonale support
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.query;
|
||||
package org.x4o.vasc.xpql.query;
|
||||
|
||||
/**
|
||||
* A QueryParameterValue
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package com.idcanet.vasc.xpql.query;
|
||||
package org.x4o.vasc.xpql.query;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -25,27 +25,27 @@
|
|||
should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
|
||||
|
||||
elementClassName="com.idcanet.vasc.xpql.impl.x4o.QueryElement"
|
||||
elementClassName="org.x4o.vasc.xpql.impl.x4o.QueryElement"
|
||||
-->
|
||||
<eld:root xmlns:eld="http://x4o.idcanet.com/eld/eld-lang.eld">
|
||||
|
||||
<eld:elementBindingHandler bean.class="com.idcanet.vasc.xpql.impl.x4o.QueryBindingHandler"/>
|
||||
<eld:elementBindingHandler bean.class="org.x4o.vasc.xpql.impl.x4o.QueryBindingHandler"/>
|
||||
|
||||
<eld:elementClass tag="xpql" objectClassName="java.lang.Object"/>
|
||||
|
||||
<eld:elementClass tag="query" objectClassName="com.idcanet.vasc.xpql.impl.DefaultQuery">
|
||||
<eld:elementClassAttributeConverter attributeName="type" bean.class="com.idcanet.vasc.xpql.impl.x4o.QueryTypeAttributeConverter"/>
|
||||
<eld:elementClass tag="query" objectClassName="org.x4o.vasc.xpql.impl.DefaultQuery">
|
||||
<eld:elementClassAttributeConverter attributeName="type" bean.class="org.x4o.vasc.xpql.impl.x4o.QueryTypeAttributeConverter"/>
|
||||
<eld:elementObjectDefaultValue attributeName="type" value="sql"/>
|
||||
<eld:elementConfigurator configAction="true" bean.class="com.idcanet.vasc.xpql.impl.x4o.QueryElementConfigurator"/>
|
||||
<eld:elementConfigurator configAction="true" bean.class="org.x4o.vasc.xpql.impl.x4o.QueryElementConfigurator"/>
|
||||
</eld:elementClass>
|
||||
<eld:elementClass tag="sql" elementClassName="com.idcanet.vasc.xpql.impl.x4o.SQLElement"/>
|
||||
<eld:elementClass tag="parameter" objectClassName="com.idcanet.vasc.xpql.impl.QueryParameter" elementClassName="com.idcanet.vasc.xpql.impl.x4o.QueryParameterElement"/>
|
||||
<eld:elementClass tag="include" objectClassName="com.idcanet.vasc.xpql.impl.QueryInclude" elementClassName="com.idcanet.vasc.xpql.impl.x4o.QueryIncludeElement"/>
|
||||
<eld:elementClass tag="comment" elementClassName="com.idcanet.vasc.xpql.impl.x4o.CommentElement"/>
|
||||
<eld:elementClass tag="parameterValue" objectClassName="com.idcanet.vasc.xpql.impl.DefaultQueryParameterValue">
|
||||
<eld:elementClassAttributeConverter attributeName="type" bean.class="com.idcanet.vasc.xpql.impl.x4o.ParameterTypeAttributeConverter"/>
|
||||
<eld:elementClass tag="sql" elementClassName="org.x4o.vasc.xpql.impl.x4o.SQLElement"/>
|
||||
<eld:elementClass tag="parameter" objectClassName="org.x4o.vasc.xpql.impl.QueryParameter" elementClassName="org.x4o.vasc.xpql.impl.x4o.QueryParameterElement"/>
|
||||
<eld:elementClass tag="include" objectClassName="org.x4o.vasc.xpql.impl.QueryInclude" elementClassName="org.x4o.vasc.xpql.impl.x4o.QueryIncludeElement"/>
|
||||
<eld:elementClass tag="comment" elementClassName="org.x4o.vasc.xpql.impl.x4o.CommentElement"/>
|
||||
<eld:elementClass tag="parameterValue" objectClassName="org.x4o.vasc.xpql.impl.DefaultQueryParameterValue">
|
||||
<eld:elementClassAttributeConverter attributeName="type" bean.class="org.x4o.vasc.xpql.impl.x4o.ParameterTypeAttributeConverter"/>
|
||||
<eld:elementObjectDefaultValue attributeName="type" value="parameter"/>
|
||||
<eld:elementClassAttributeConverter attributeName="valueType" bean.class="com.idcanet.x4o.impl.lang.ClassConverter"/>
|
||||
<eld:elementClassAttributeConverter attributeName="valueType" bean.class="org.x4o.x4o.impl.lang.ClassConverter"/>
|
||||
</eld:elementClass>
|
||||
</eld:root>
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ java.util.logging.ConsoleHandler.level = ALL
|
|||
# Set the default logging level for the root logger
|
||||
.level = ALL
|
||||
|
||||
com.idcanet.x4o = ALL
|
||||
org.x4o = ALL
|
||||
|
||||
# Java 6 has internal logging on many builtin libs
|
||||
sun.level=OFF
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue