diff --git a/.classpath b/.classpath
index 2ed30db..3c5a163 100644
--- a/.classpath
+++ b/.classpath
@@ -5,5 +5,7 @@
+
+
diff --git a/lib/idcanet-x4o-bin.jar b/lib/idcanet-x4o-bin.jar
index e62c464..6515ce0 100644
Binary files a/lib/idcanet-x4o-bin.jar and b/lib/idcanet-x4o-bin.jar differ
diff --git a/lib/juel-2.1.0-rc1-impl.jar b/lib/juel-2.1.0-rc1-impl.jar
new file mode 100644
index 0000000..40b1a25
Binary files /dev/null and b/lib/juel-2.1.0-rc1-impl.jar differ
diff --git a/lib/juel-2.1.0-rc1.jar b/lib/juel-2.1.0-rc1.jar
new file mode 100644
index 0000000..805f86e
Binary files /dev/null and b/lib/juel-2.1.0-rc1.jar differ
diff --git a/src/META-INF/foei-namespaces.properties b/src/META-INF/foei-namespaces.properties
index a7404d9..1f3711a 100644
--- a/src/META-INF/foei-namespaces.properties
+++ b/src/META-INF/foei-namespaces.properties
@@ -1,18 +1,7 @@
-code.http\://foei.idca.nl/eld/events.eld=com.idcanet.x4o.core.DefaultX4OEldElementProvider
-file.http\://foei.idca.nl/eld/events.eld=/META-INF/events.eld
-
-code.http\://foei.idca.nl/eld/filters.eld=com.idcanet.x4o.core.DefaultX4OEldElementProvider
-file.http\://foei.idca.nl/eld/filters.eld=/META-INF/filters.eld
-
-code.http\://foei.idca.nl/eld/io.eld=com.idcanet.x4o.core.DefaultX4OEldElementProvider
-file.http\://foei.idca.nl/eld/io.eld=/META-INF/io.eld
-
-code.http\://foei.idca.nl/eld/lang.eld=com.idcanet.x4o.core.DefaultX4OEldElementProvider
-file.http\://foei.idca.nl/eld/lang.eld=/META-INF/lang.eld
-
-code.http\://foei.idca.nl/eld/logging.eld=com.idcanet.x4o.core.DefaultX4OEldElementProvider
-file.http\://foei.idca.nl/eld/logging.eld=/META-INF/logging.eld
-
-code.http\://foei.idca.nl/eld/printers.eld=com.idcanet.x4o.core.DefaultX4OEldElementProvider
-file.http\://foei.idca.nl/eld/printers.eld=/META-INF/printers.eld
\ No newline at end of file
+eld.http\://foei.idca.nl/eld/events.eld=/META-INF/events.eld
+eld.http\://foei.idca.nl/eld/filters.eld=/META-INF/filters.eld
+eld.http\://foei.idca.nl/eld/io.eld=/META-INF/io.eld
+eld.http\://foei.idca.nl/eld/lang.eld=/META-INF/lang.eld
+eld.http\://foei.idca.nl/eld/logging.eld=/META-INF/logging.eld
+eld.http\://foei.idca.nl/eld/printers.eld=/META-INF/printers.eld
\ No newline at end of file
diff --git a/src/com/idcanet/foei/core/X2OExecutor.java b/src/com/idcanet/foei/core/X2OExecutor.java
index 1dbd356..0bd02db 100644
--- a/src/com/idcanet/foei/core/X2OExecutor.java
+++ b/src/com/idcanet/foei/core/X2OExecutor.java
@@ -54,18 +54,6 @@ public interface X2OExecutor extends Runnable {
*/
public void setXml(String xml);
- /**
- * Sets the debug state of the X2O Parser.
- * @param debug The debug state to set.
- */
- public void setDebug(boolean debug);
-
- /**
- * Gets the debug state.
- * @return Returns the debug state.
- */
- public boolean getDebug();
-
/**
* Returns true when this X2OExecutor is ready
* @return
diff --git a/src/com/idcanet/foei/core/impl/FoeiEventBindingRuleHandler.java b/src/com/idcanet/foei/core/impl/FoeiEventBindingRuleHandler.java
index a6e1194..d2fb1bd 100644
--- a/src/com/idcanet/foei/core/impl/FoeiEventBindingRuleHandler.java
+++ b/src/com/idcanet/foei/core/impl/FoeiEventBindingRuleHandler.java
@@ -6,7 +6,7 @@ import com.idcanet.foei.event.EventInput;
import com.idcanet.foei.event.EventOutput;
import com.idcanet.foei.event.EventStep;
import com.idcanet.foei.event.EventStepController;
-import com.idcanet.x4o.eld.BindingRuleHandler;
+import com.idcanet.x4o.context.BindingRuleHandler;
import com.idcanet.x4o.element.Element;
import java.util.Map;
diff --git a/src/com/idcanet/foei/core/impl/X2OExecutorImpl.java b/src/com/idcanet/foei/core/impl/X2OExecutorImpl.java
index b205c05..9499610 100644
--- a/src/com/idcanet/foei/core/impl/X2OExecutorImpl.java
+++ b/src/com/idcanet/foei/core/impl/X2OExecutorImpl.java
@@ -47,7 +47,6 @@ public class X2OExecutorImpl implements X2OExecutor {
private String parseFileName = null;
private InputStream parseInputStream = null;
private String parseXml = null;
- private boolean debug = false;
private boolean ready = false;
private Logger logger = null;
@@ -67,8 +66,7 @@ public class X2OExecutorImpl implements X2OExecutor {
// config parser
FoeiProcess foeiProcess = FoeiProcessFactory.getFoeiProcess();
- X4OParser parser = new X4OParser(FoeiConfiguratorImpl.getX2ORootTag(foeiProcess.getFoeiContext().getStartProperties()),"foei");
- parser.setDebug(debug);
+ X4OParser parser = new X4OParser("foei");
parser.getParsingContext().getProperties().putAll(foeiProcess.getFoeiContext().getStartProperties());
logger.info("Executing X2O Parsing.");
@@ -112,20 +110,6 @@ public class X2OExecutorImpl implements X2OExecutor {
public boolean isReady() {
return ready;
}
-
- /**
- * @see com.idcanet.foei.core.X2OExecutor#getDebug()
- */
- public boolean getDebug() {
- return debug;
- }
-
- /**
- * @see com.idcanet.foei.core.X2OExecutor#setDebug(boolean)
- */
- public void setDebug(boolean debug) {
- this.debug=debug;
- }
/**
* @see com.idcanet.foei.core.X2OExecutor#setFileName(java.lang.String)
diff --git a/src/com/idcanet/foei/core/x4o/BindAttributeHandler.java b/src/com/idcanet/foei/core/x4o/BindAttributeHandler.java
index 53593bc..39cc2ae 100644
--- a/src/com/idcanet/foei/core/x4o/BindAttributeHandler.java
+++ b/src/com/idcanet/foei/core/x4o/BindAttributeHandler.java
@@ -31,7 +31,7 @@ import com.idcanet.foei.core.FoeiProcessFactory;
import com.idcanet.foei.event.EventInput;
import com.idcanet.foei.event.EventOutput;
import com.idcanet.foei.event.EventPort;
-import com.idcanet.x4o.eld.GlobalParameterHandler;
+import com.idcanet.x4o.context.GlobalParameterHandler;
import com.idcanet.x4o.element.Element;
import com.idcanet.x4o.element.ElementException;
diff --git a/src/com/idcanet/foei/core/x4o/EventStepBindRuleHandler.java b/src/com/idcanet/foei/core/x4o/EventStepBindRuleHandler.java
index 4b4ef52..43840ec 100644
--- a/src/com/idcanet/foei/core/x4o/EventStepBindRuleHandler.java
+++ b/src/com/idcanet/foei/core/x4o/EventStepBindRuleHandler.java
@@ -28,7 +28,7 @@ package com.idcanet.foei.core.x4o;
import com.idcanet.foei.event.EventStep;
import com.idcanet.foei.event.EventStepController;
-import com.idcanet.x4o.eld.BindingRuleHandler;
+import com.idcanet.x4o.context.BindingRuleHandler;
import com.idcanet.x4o.element.Element;
import java.util.Map;
diff --git a/src/com/idcanet/foei/core/x4o/IdAttributeHandler.java b/src/com/idcanet/foei/core/x4o/IdAttributeHandler.java
index 4442cf6..571b3f8 100644
--- a/src/com/idcanet/foei/core/x4o/IdAttributeHandler.java
+++ b/src/com/idcanet/foei/core/x4o/IdAttributeHandler.java
@@ -28,7 +28,7 @@ package com.idcanet.foei.core.x4o;
import com.idcanet.foei.core.FoeiProcess;
import com.idcanet.foei.core.FoeiProcessFactory;
-import com.idcanet.x4o.eld.GlobalParameterHandler;
+import com.idcanet.x4o.context.GlobalParameterHandler;
import com.idcanet.x4o.element.Element;
/**
diff --git a/src/com/idcanet/foei/server/config/FoeiConfigParser.java b/src/com/idcanet/foei/server/config/FoeiConfigParser.java
index bd0352b..9dcda09 100644
--- a/src/com/idcanet/foei/server/config/FoeiConfigParser.java
+++ b/src/com/idcanet/foei/server/config/FoeiConfigParser.java
@@ -26,9 +26,6 @@
package com.idcanet.foei.server.config;
-import com.idca.foei.xml.AbstractXMLParser;
-import com.idca.foei.xml.XMLDebugTagHandler;
-import com.idca.foei.xml.XMLHandler;
import java.io.IOException;
import java.io.InputStream;
@@ -39,6 +36,9 @@ import javax.xml.parsers.SAXParserFactory;
import org.xml.sax.SAXException;
+import com.idcanet.x4o.xml.AbstractXMLParser;
+import com.idcanet.x4o.xml.XMLHandler;
+
/**
* Parses the foei-config.xml file
*
@@ -53,9 +53,7 @@ public class FoeiConfigParser extends AbstractXMLParser {
*/
public void parse(InputStream inputStream) throws ParserConfigurationException,SAXException,IOException {
XMLHandler handler = new XMLHandler();
- if(isDebug()) {
- handler.addXMLTagHandler(new XMLDebugTagHandler("DEBUG"));
- }
+
/*
X2OTagHandler xth = new X2OTagHandler(rootTag,parsingContext);
xth.setDebug(debug);
diff --git a/src/com/idcanet/foei/server/config/FoeiContextXMLTagHandler.java b/src/com/idcanet/foei/server/config/FoeiContextXMLTagHandler.java
index 7d9398c..09179ea 100644
--- a/src/com/idcanet/foei/server/config/FoeiContextXMLTagHandler.java
+++ b/src/com/idcanet/foei/server/config/FoeiContextXMLTagHandler.java
@@ -26,11 +26,12 @@
package com.idcanet.foei.server.config;
-import com.idca.foei.xml.AbstractXMLTagHandler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
+import com.idcanet.x4o.xml.AbstractXMLTagHandler;
+
/**
*
*