From 18762fee9ddbbdf79f7cd195bc9a752c96cc6cf4 Mon Sep 17 00:00:00 2001
From: willemc <devnull@localhost>
Date: Mon, 31 Jan 2011 01:38:04 +0100
Subject: [PATCH] was xpql x4o config forgotten , and prefixed vasc side
 languages in x4o xml:ns

---
 .../fieldtype/fieldtype-namespaces.xml        |  2 +-
 .../main/resources/META-INF/fieldtypes.xml    |  2 +-
 .../resources/META-INF/xpql/xpql-lang.eld     | 51 +++++++++++++++++++
 .../META-INF/xpql/xpql-namespaces.xml         | 12 +++++
 4 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld
 create mode 100644 vasc-xpql/src/main/resources/META-INF/xpql/xpql-namespaces.xml

diff --git a/vasc-core/src/main/resources/META-INF/fieldtype/fieldtype-namespaces.xml b/vasc-core/src/main/resources/META-INF/fieldtype/fieldtype-namespaces.xml
index ea0c8b2..e745836 100644
--- a/vasc-core/src/main/resources/META-INF/fieldtype/fieldtype-namespaces.xml
+++ b/vasc-core/src/main/resources/META-INF/fieldtype/fieldtype-namespaces.xml
@@ -4,5 +4,5 @@
 	<comment>
 		Vasc namespace for the fieldtype language
 	</comment>
-	<entry key="eld.http://vasc.idcanet.com/eld/fieldtype-lang.eld">fieldtype-lang.eld</entry>
+	<entry key="eld.http://vasc-fieldtype.idcanet.com/eld/fieldtype-lang.eld">fieldtype-lang.eld</entry>
 </properties>
\ No newline at end of file
diff --git a/vasc-core/src/main/resources/META-INF/fieldtypes.xml b/vasc-core/src/main/resources/META-INF/fieldtypes.xml
index 5cda54d..1810fbd 100644
--- a/vasc-core/src/main/resources/META-INF/fieldtypes.xml
+++ b/vasc-core/src/main/resources/META-INF/fieldtypes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <x4o:root
-	xmlns:vf="http://vasc.idcanet.com/eld/fieldtype-lang.eld"
+	xmlns:vf="http://vasc-fieldtype.idcanet.com/eld/fieldtype-lang.eld"
 	xmlns:x4o="http://x4o.idcanet.com/eld/x4o-lang.eld"
 	>
 
diff --git a/vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld b/vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld
new file mode 100644
index 0000000..670b0e4
--- /dev/null
+++ b/vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+		Copyright 2004-2006 IDCA. All rights reserved.
+
+		Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+		following conditions are met:
+
+ 	   1. Redistributions of source code must retain the above copyright notice, this list of conditions and
+		       the following disclaimer.
+		   2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+		       and the following disclaimer in the documentation and/or other materials provided with the
+		       distribution.
+
+		THIS SOFTWARE IS PROVIDED BY IDCA AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED
+		WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+		FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL IDCA OR
+		CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+		CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+		SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+		THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+		OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+		POSSIBILITY OF SUCH DAMAGE.
+
+		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="com.idcanet.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: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:elementObjectDefaultValue attributeName="type" value="sql"/>
+			<eld:elementConfigurator configAction="true" bean.class="com.idcanet.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:elementObjectDefaultValue attributeName="type" value="parameter"/>
+		<eld:elementClassAttributeConverter attributeName="valueType" bean.class="com.idcanet.x4o.impl.lang.ClassConverter"/>
+	</eld:elementClass>
+</eld:root>
+
diff --git a/vasc-xpql/src/main/resources/META-INF/xpql/xpql-namespaces.xml b/vasc-xpql/src/main/resources/META-INF/xpql/xpql-namespaces.xml
new file mode 100644
index 0000000..b1aeb24
--- /dev/null
+++ b/vasc-xpql/src/main/resources/META-INF/xpql/xpql-namespaces.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+	<comment>
+		xpql namespace
+	</comment>
+	<entry key="eld.http://vasc-xpql.idcanet.com/eld/xpql-lang.eld">xpql-lang.eld</entry>
+	<!-- 
+	<entry key="eld.http://xtes.idcanet.com/eld/xtes-xpql.eld">xtes-xpql.eld</entry>
+	<entry key="eld.http://xtes.idcanet.com/eld/xtes-xslt.eld">xtes-xslt.eld</entry>
+	-->
+</properties>
\ No newline at end of file