[svn r125] updated x4o
This commit is contained in:
parent
8c342b16a0
commit
d7f9564f24
|
@ -5,5 +5,7 @@
|
|||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="lib" path="lib/idcanet-x4o-bin.jar"/>
|
||||
<classpathentry kind="lib" path="lib/commons-beanutils.jar"/>
|
||||
<classpathentry kind="lib" path="lib/juel-2.1.0-rc1.jar"/>
|
||||
<classpathentry kind="lib" path="lib/juel-2.1.0-rc1-impl.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
|
Binary file not shown.
BIN
lib/juel-2.1.0-rc1-impl.jar
Normal file
BIN
lib/juel-2.1.0-rc1-impl.jar
Normal file
Binary file not shown.
BIN
lib/juel-2.1.0-rc1.jar
Normal file
BIN
lib/juel-2.1.0-rc1.jar
Normal file
Binary file not shown.
|
@ -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
|
||||
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
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
/**
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
|
|
Loading…
Reference in a new issue