ff-attic/imxmi
2
0
Fork 0
Code Activity

renamed better

Browse source
This commit is contained in:
Willem Cazander 2011-12-31 00:07:21 +01:00
parent cc6331b7fe
commit a523cc9122
289 changed files with 2546 additions and 1608 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vasc-xpql/src/main/java/org/x4o/vasc/xpql/QueryStore.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/QueryStore.java
View file

@ -24,13 +24,13 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql;
package net.forwardfire.vasc.xpql;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.x4o.vasc.xpql.query.Query;
import net.forwardfire.vasc.xpql.query.Query;
/**

2
vasc-xpql/src/main/java/org/x4o/vasc/xpql/XPQLParser.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/XPQLParser.java
View file

@ -24,7 +24,7 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql;
package net.forwardfire.vasc.xpql;
import javax.el.ValueExpression;

18
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQuery.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java
View file

@ -24,12 +24,12 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl;
package net.forwardfire.vasc.xpql.impl;
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;
import net.forwardfire.vasc.xpql.query.AbstractQuery;
import net.forwardfire.vasc.xpql.query.Query;
import net.forwardfire.vasc.xpql.query.QueryParameterValue;
import net.forwardfire.vasc.xpql.query.QueryPart;
/**
* This class defines an executable SQL query.
@ -48,7 +48,7 @@ public class DefaultQuery extends AbstractQuery {
// ========= QueryPart interface
/**
* @see org.x4o.vasc.xpql.query.AbstractQueryPart#toEdit()
* @see net.forwardfire.vasc.xpql.query.AbstractQueryPart#toEdit()
*/
@Override
public String toEdit(Query query) {
@ -60,7 +60,7 @@ public class DefaultQuery extends AbstractQuery {
}
/**
* @see org.x4o.vasc.xpql.query.AbstractQueryPart#toPreparedSQL()
* @see net.forwardfire.vasc.xpql.query.AbstractQueryPart#toPreparedSQL()
*/
@Override
public String toPreparedSQL(Query query) {
@ -73,7 +73,7 @@ public class DefaultQuery extends AbstractQuery {
}
/**
* @see org.x4o.vasc.xpql.query.AbstractQueryPart#toSQL()
* @see net.forwardfire.vasc.xpql.query.AbstractQueryPart#toSQL()
*/
@Override
public String toSQL(Query query) {
@ -85,7 +85,7 @@ public class DefaultQuery extends AbstractQuery {
}
/**
* @see org.x4o.vasc.xpql.query.AbstractQueryPart#toXML()
* @see net.forwardfire.vasc.xpql.query.AbstractQueryPart#toXML()
*/
@Override
public String toXML(Query query) {

6
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQueryParameterValue.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQueryParameterValue.java
View file

@ -24,10 +24,10 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl;
package net.forwardfire.vasc.xpql.impl;
import org.x4o.vasc.xpql.query.AbstractQueryParameterValue;
import org.x4o.vasc.xpql.query.QueryParameterValue;
import net.forwardfire.vasc.xpql.query.AbstractQueryParameterValue;
import net.forwardfire.vasc.xpql.query.QueryParameterValue;
/**
*

11
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryInclude.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryInclude.java
View file

@ -24,12 +24,13 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl;
package net.forwardfire.vasc.xpql.impl;
import net.forwardfire.vasc.xpql.XPQLParser;
import net.forwardfire.vasc.xpql.query.AbstractQueryPart;
import net.forwardfire.vasc.xpql.query.Query;
import net.forwardfire.vasc.xpql.query.QueryPart;
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;
/**

10
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryParameter.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java
View file

@ -24,16 +24,16 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl;
package net.forwardfire.vasc.xpql.impl;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
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;
import net.forwardfire.vasc.xpql.query.AbstractQueryPart;
import net.forwardfire.vasc.xpql.query.Query;
import net.forwardfire.vasc.xpql.query.QueryParameterValue;
import net.forwardfire.vasc.xpql.query.QueryPart;
/**

8
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryText.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java
View file

@ -24,11 +24,11 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl;
package net.forwardfire.vasc.xpql.impl;
import org.x4o.vasc.xpql.query.AbstractQueryPart;
import org.x4o.vasc.xpql.query.Query;
import org.x4o.vasc.xpql.query.QueryPart;
import net.forwardfire.vasc.xpql.query.AbstractQueryPart;
import net.forwardfire.vasc.xpql.query.Query;
import net.forwardfire.vasc.xpql.query.QueryPart;
/**
*

5
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/CommentElement.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/CommentElement.java
View file

@ -24,9 +24,10 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl.x4o;
package net.forwardfire.vasc.xpql.impl.x4o;
import net.forwardfire.vasc.xpql.query.Query;
import org.x4o.vasc.xpql.query.Query;
import org.x4o.xml.element.AbstractElement;
import org.x4o.xml.element.ElementException;

5
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java
View file

@ -24,9 +24,10 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl.x4o;
package net.forwardfire.vasc.xpql.impl.x4o;
import net.forwardfire.vasc.xpql.query.QueryParameterValue.QueryParameterType;
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;

13
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryBindingHandler.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java
View file

@ -24,13 +24,14 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl.x4o;
package net.forwardfire.vasc.xpql.impl.x4o;
import net.forwardfire.vasc.xpql.impl.QueryInclude;
import net.forwardfire.vasc.xpql.impl.QueryParameter;
import net.forwardfire.vasc.xpql.query.Query;
import net.forwardfire.vasc.xpql.query.QueryParameterValue;
import net.forwardfire.vasc.xpql.query.QueryPart;
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;

9
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryElementConfigurator.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryElementConfigurator.java
View file

@ -24,11 +24,12 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl.x4o;
package net.forwardfire.vasc.xpql.impl.x4o;
import net.forwardfire.vasc.xpql.QueryStore;
import net.forwardfire.vasc.xpql.XPQLParser;
import net.forwardfire.vasc.xpql.query.Query;
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;

7
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryIncludeElement.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryIncludeElement.java
View file

@ -24,10 +24,11 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl.x4o;
package net.forwardfire.vasc.xpql.impl.x4o;
import net.forwardfire.vasc.xpql.query.Query;
import net.forwardfire.vasc.xpql.query.QueryPart;
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;

7
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryParameterElement.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryParameterElement.java
View file

@ -24,10 +24,11 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl.x4o;
package net.forwardfire.vasc.xpql.impl.x4o;
import net.forwardfire.vasc.xpql.query.Query;
import net.forwardfire.vasc.xpql.query.QueryPart;
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;

5
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java
View file

@ -24,9 +24,10 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl.x4o;
package net.forwardfire.vasc.xpql.impl.x4o;
import net.forwardfire.vasc.xpql.query.Query.QueryType;
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;

7
vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/SQLElement.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/SQLElement.java
View file

@ -24,10 +24,11 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.impl.x4o;
package net.forwardfire.vasc.xpql.impl.x4o;
import net.forwardfire.vasc.xpql.impl.QueryText;
import net.forwardfire.vasc.xpql.query.Query;
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;

53
vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQuery.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java
View file

@ -24,7 +24,7 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.query;
package net.forwardfire.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 org.x4o.vasc.xpql.QueryStore;
import org.x4o.vasc.xpql.impl.DefaultQueryParameterValue;
import net.forwardfire.vasc.xpql.QueryStore;
import net.forwardfire.vasc.xpql.impl.DefaultQueryParameterValue;
/**
@ -67,133 +68,133 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
}
/**
* @see org.x4o.vasc.xpql.query.Query#getName()
* @see net.forwardfire.vasc.xpql.query.Query#getName()
*/
public String getName() {
return name;
}
/**
* @see org.x4o.vasc.xpql.query.Query#setName(java.lang.String)
* @see net.forwardfire.vasc.xpql.query.Query#setName(java.lang.String)
*/
public void setName(String name) {
this.name=name;
}
/**
* @see org.x4o.vasc.xpql.query.Query#addQueryComment(java.lang.String)
* @see net.forwardfire.vasc.xpql.query.Query#addQueryComment(java.lang.String)
*/
public void addQueryComment(String comment) {
queryComments.add(comment);
}
/**
* @see org.x4o.vasc.xpql.query.Query#addQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue)
* @see net.forwardfire.vasc.xpql.query.Query#addQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue)
*/
public void addQueryParameterValue(QueryParameterValue value) {
queryParameterValues.put(value.getName(), value);
}
/**
* @see org.x4o.vasc.xpql.query.Query#addLocalQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue)
* @see net.forwardfire.vasc.xpql.query.Query#addLocalQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue)
*/
public void addLocalQueryParameterValue(QueryParameterValue value) {
localQueryParameterValues.put(value.getName(), value);
}
/**
* @see org.x4o.vasc.xpql.query.Query#addOrderQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue)
* @see net.forwardfire.vasc.xpql.query.Query#addOrderQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue)
*/
public void addOrderQueryParameterValue(QueryParameterValue value) {
orderQueryParameterValues.add(value);
}
/**
* @see org.x4o.vasc.xpql.query.Query#addQueryPart(org.x4o.vasc.xpql.query.QueryPart)
* @see net.forwardfire.vasc.xpql.query.Query#addQueryPart(net.forwardfire.vasc.xpql.query.QueryPart)
*/
public void addQueryPart(QueryPart queryPart) {
queryParts.add(queryPart);
}
/**
* @see org.x4o.vasc.xpql.query.Query#getProperty(java.lang.String)
* @see net.forwardfire.vasc.xpql.query.Query#getProperty(java.lang.String)
*/
public Object getProperty(String name) {
return properties.get(name);
}
/**
* @see org.x4o.vasc.xpql.query.Query#getPropertyString(java.lang.String)
* @see net.forwardfire.vasc.xpql.query.Query#getPropertyString(java.lang.String)
*/
public String getPropertyString(String name) {
return getProperty(name).toString();
}
/**
* @see org.x4o.vasc.xpql.query.Query#getQueryComments()
* @see net.forwardfire.vasc.xpql.query.Query#getQueryComments()
*/
public List<String> getQueryComments() {
return queryComments;
}
/**
* @see org.x4o.vasc.xpql.query.Query#getQueryParameterValue(java.lang.String)
* @see net.forwardfire.vasc.xpql.query.Query#getQueryParameterValue(java.lang.String)
*/
public QueryParameterValue getQueryParameterValue(String name) {
return queryParameterValues.get(name);
}
/**
* @see org.x4o.vasc.xpql.query.Query#getQueryParts()
* @see net.forwardfire.vasc.xpql.query.Query#getQueryParts()
*/
public List<QueryPart> getQueryParts() {
return queryParts;
}
/**
* @see org.x4o.vasc.xpql.query.Query#setProperty(java.lang.String, java.lang.Object)
* @see net.forwardfire.vasc.xpql.query.Query#setProperty(java.lang.String, java.lang.Object)
*/
public void setProperty(String name, Object value) {
properties.put(name,value);
}
/**
* @see org.x4o.vasc.xpql.query.Query#getPropertyKeys()
* @see net.forwardfire.vasc.xpql.query.Query#getPropertyKeys()
*/
public Collection<String> getPropertyKeys() {
return properties.keySet();
}
/**
* @see org.x4o.vasc.xpql.query.Query#getQueryParameters()
* @see net.forwardfire.vasc.xpql.query.Query#getQueryParameters()
*/
public List<String> getQueryParameters() {
return null;
}
/**
* @see org.x4o.vasc.xpql.query.Query#getQueryParameterValues()
* @see net.forwardfire.vasc.xpql.query.Query#getQueryParameterValues()
*/
public Collection<QueryParameterValue> getQueryParameterValues() {
return queryParameterValues.values();
}
/**
* @see org.x4o.vasc.xpql.query.Query#getLocalQueryParameterValues()
* @see net.forwardfire.vasc.xpql.query.Query#getLocalQueryParameterValues()
*/
public Collection<QueryParameterValue> getLocalQueryParameterValues() {
return localQueryParameterValues.values();
}
/**
* @see org.x4o.vasc.xpql.query.Query#getOrderQueryParameterValues()
* @see net.forwardfire.vasc.xpql.query.Query#getOrderQueryParameterValues()
*/
public List<QueryParameterValue> getOrderQueryParameterValues() {
return orderQueryParameterValues;
}
/**
* @see org.x4o.vasc.xpql.query.Query#setQueryParameter(java.lang.String, java.lang.Object)
* @see net.forwardfire.vasc.xpql.query.Query#setQueryParameter(java.lang.String, java.lang.Object)
*/
public void setQueryParameter(String name, Object value) {
if (name==null) {
@ -229,28 +230,28 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
}
/**
* @see org.x4o.vasc.xpql.query.Query#getType()
* @see net.forwardfire.vasc.xpql.query.Query#getType()
*/
public QueryType getType() {
return type;
}
/**
* @see org.x4o.vasc.xpql.query.Query#setType(org.x4o.vasc.xpql.query.Query.QueryType)
* @see net.forwardfire.vasc.xpql.query.Query#setType(net.forwardfire.vasc.xpql.query.Query.QueryType)
*/
public void setType(QueryType type) {
this.type=type;
}
/**
* @see org.x4o.vasc.xpql.query.Query#getQueryStore()
* @see net.forwardfire.vasc.xpql.query.Query#getQueryStore()
*/
public QueryStore getQueryStore() {
return queryStore;
}
/**
* @see org.x4o.vasc.xpql.query.Query#setQueryStore(org.x4o.vasc.xpql.query.QueryStore)
* @see net.forwardfire.vasc.xpql.query.Query#setQueryStore(net.forwardfire.vasc.xpql.query.QueryStore)
*/
public void setQueryStore(QueryStore store) {
this.queryStore=store;

18
vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryParameterValue.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java
View file

@ -24,7 +24,7 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.query;
package net.forwardfire.vasc.xpql.query;
/**
*
@ -40,56 +40,56 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
private Class<?> valueType = null;
/**
* @see org.x4o.vasc.xpql.query.QueryParameterValue#getName()
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getName()
*/
public String getName() {
return name;
}
/**
* @see org.x4o.vasc.xpql.query.QueryParameterValue#setName(java.lang.String)
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setName(java.lang.String)
*/
public void setName(String name) {
this.name=name;
}
/**
* @see org.x4o.vasc.xpql.query.QueryParameterValue#getDefaultValue()
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getDefaultValue()
*/
public Object getDefaultValue() {
return defaultValue;
}
/**
* @see org.x4o.vasc.xpql.query.QueryParameterValue#setDefaultValue(java.lang.Object)
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setDefaultValue(java.lang.Object)
*/
public void setDefaultValue(Object defaultValue) {
this.defaultValue=defaultValue;
}
/**
* @see org.x4o.vasc.xpql.query.QueryParameterValue#getValue()
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getValue()
*/
public Object getValue() {
return value;
}
/**
* @see org.x4o.vasc.xpql.query.QueryParameterValue#setType(org.x4o.vasc.xpql.query.QueryParameterValue.QueryParameterType)
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setType(net.forwardfire.vasc.xpql.query.QueryParameterValue.QueryParameterType)
*/
public void setType(QueryParameterType type) {
this.type=type;
}
/**
* @see org.x4o.vasc.xpql.query.QueryParameterValue#getType()
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getType()
*/
public QueryParameterType getType() {
return type;
}
/**
* @see org.x4o.vasc.xpql.query.QueryParameterValue#setValue(java.lang.Object)
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setValue(java.lang.Object)
*/
public void setValue(Object value) {
this.value=value;

10
vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryPart.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java
View file

@ -24,7 +24,7 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.query;
package net.forwardfire.vasc.xpql.query;
/**
*
@ -34,13 +34,13 @@ package org.x4o.vasc.xpql.query;
abstract public class AbstractQueryPart implements QueryPart {
/**
* @see org.x4o.vasc.xpql.query.QueryPart#toSQL()
* @see net.forwardfire.vasc.xpql.query.QueryPart#toSQL()
*/
abstract public String toSQL(Query query);
/**
* Returns the toSQL() retult.
* @see org.x4o.vasc.xpql.query.QueryPart#toPreparedSQL()
* @see net.forwardfire.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 org.x4o.vasc.xpql.query.QueryPart#toXML()
* @see net.forwardfire.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 org.x4o.vasc.xpql.query.QueryPart#toEdit()
* @see net.forwardfire.vasc.xpql.query.QueryPart#toEdit()
*/
public String toEdit(Query query) {
return toSQL(query);

4
vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/Query.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java
View file

@ -24,13 +24,13 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.query;
package net.forwardfire.vasc.xpql.query;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.x4o.vasc.xpql.QueryStore;
import net.forwardfire.vasc.xpql.QueryStore;
/**

2
vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryParameterValue.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryParameterValue.java
View file

@ -24,7 +24,7 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.query;
package net.forwardfire.vasc.xpql.query;
/**
* A QueryParameterValue

2
vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryPart.java → vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryPart.java
View file

@ -24,7 +24,7 @@
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
*/
package org.x4o.vasc.xpql.query;
package net.forwardfire.vasc.xpql.query;
/**
*

26
vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld
View file

@ -24,28 +24,26 @@
The views and conclusions contained in the software and documentation are those of the authors and
should not be interpreted as representing official policies, either expressed or implied, of IDCA.
elementClassName="org.x4o.vasc.xpql.impl.x4o.QueryElement"
-->
<eld:root xmlns:eld="http://x4o.idcanet.com/eld/eld-lang.eld">
<eld:root xmlns:eld="http://eld.x4o.org/eld/eld-lang.eld">
<eld:elementBindingHandler bean.class="org.x4o.vasc.xpql.impl.x4o.QueryBindingHandler"/>
<eld:elementBindingHandler bean.class="net.forwardfire.vasc.xpql.impl.x4o.QueryBindingHandler"/>
<eld:elementClass tag="xpql" objectClassName="java.lang.Object"/>
<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:elementClass tag="query" objectClassName="net.forwardfire.vasc.xpql.impl.DefaultQuery">
<eld:elementClassAttributeConverter attributeName="type" bean.class="net.forwardfire.vasc.xpql.impl.x4o.QueryTypeAttributeConverter"/>
<eld:elementObjectDefaultValue attributeName="type" value="sql"/>
<eld:elementConfigurator configAction="true" bean.class="org.x4o.vasc.xpql.impl.x4o.QueryElementConfigurator"/>
<eld:elementConfigurator configAction="true" bean.class="net.forwardfire.vasc.xpql.impl.x4o.QueryElementConfigurator"/>
</eld:elementClass>
<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:elementClass tag="sql" elementClassName="net.forwardfire.vasc.xpql.impl.x4o.SQLElement"/>
<eld:elementClass tag="parameter" objectClassName="net.forwardfire.vasc.xpql.impl.QueryParameter" elementClassName="net.forwardfire.vasc.xpql.impl.x4o.QueryParameterElement"/>
<eld:elementClass tag="include" objectClassName="net.forwardfire.vasc.xpql.impl.QueryInclude" elementClassName="net.forwardfire.vasc.xpql.impl.x4o.QueryIncludeElement"/>
<eld:elementClass tag="comment" elementClassName="net.forwardfire.vasc.xpql.impl.x4o.CommentElement"/>
<eld:elementClass tag="parameterValue" objectClassName="net.forwardfire.vasc.xpql.impl.DefaultQueryParameterValue">
<eld:elementClassAttributeConverter attributeName="type" bean.class="net.forwardfire.vasc.xpql.impl.x4o.ParameterTypeAttributeConverter"/>
<eld:elementObjectDefaultValue attributeName="type" value="parameter"/>
<eld:elementClassAttributeConverter attributeName="valueType" bean.class="org.x4o.x4o.impl.lang.ClassConverter"/>
<eld:elementClassAttributeConverter attributeName="valueType" bean.class="org.x4o.xml.impl.lang.ClassConverter"/>
</eld:elementClass>
</eld:root>

2
vasc-xpql/src/test/resources/META-INF/logging.properties
View file

@ -12,7 +12,7 @@ java.util.logging.ConsoleHandler.level = ALL
# Set the default logging level for the root logger
.level = ALL
org.x4o = ALL
net.forwardfire = ALL
# Java 6 has internal logging on many builtin libs
sun.level=OFF