diff --git a/lib/idcanet-x4o-bin.jar b/lib/idcanet-x4o-bin.jar index 7369419..49d45e8 100644 Binary files a/lib/idcanet-x4o-bin.jar and b/lib/idcanet-x4o-bin.jar differ diff --git a/src/META-INF/events.eld b/src/META-INF/events.eld index fa7a08b..7a8a84c 100644 --- a/src/META-INF/events.eld +++ b/src/META-INF/events.eld @@ -24,10 +24,6 @@ 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. --> - - - events.eld - All event foei objects - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/META-INF/filters.eld b/src/META-INF/filters.eld index bc43aef..676d2b0 100644 --- a/src/META-INF/filters.eld +++ b/src/META-INF/filters.eld @@ -24,34 +24,11 @@ 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. --> - - - filters.eld - All core foei objects - + + + + + + - - filter - Filters an object by its eventSteps - com.idcanet.foei.components.lang.Filter - - - - stringFilter - filters an String on a regex - com.idcanet.foei.components.steps.filters.StringFilter - - - - classFilter - filters for a class on an object - com.idcanet.foei.components.steps.filters.ClassFilter - - - - dateFilter - filters an date of an Date - com.idcanet.foei.components.steps.filters.DateFilter - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/META-INF/foei-namespaces.properties b/src/META-INF/foei-namespaces.properties deleted file mode 100644 index 1f3711a..0000000 --- a/src/META-INF/foei-namespaces.properties +++ /dev/null @@ -1,7 +0,0 @@ - -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/META-INF/foei-namespaces.xml b/src/META-INF/foei-namespaces.xml new file mode 100644 index 0000000..cecfb7f --- /dev/null +++ b/src/META-INF/foei-namespaces.xml @@ -0,0 +1,13 @@ + + + + + Foei namespace + + /META-INF/events.eld + /META-INF/filters.eld + /META-INF/io.eld + /META-INF/lang.eld + /META-INF/logging.eld + /META-INF/printers.eld + \ No newline at end of file diff --git a/src/META-INF/io.eld b/src/META-INF/io.eld index 4d9c2e6..2356992 100644 --- a/src/META-INF/io.eld +++ b/src/META-INF/io.eld @@ -24,30 +24,10 @@ 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. --> - - - - io.eld - io foei objects - - - - standardOutput - This Object printer prints to the std-out - com.idcanet.foei.components.io.StandardOutput - - - - - errorOutput - This Object printer prints to the err-out - com.idcanet.foei.components.io.ErrorOutput - + + + + + - - fileOutput - This Object printer prints to a file - com.idcanet.foei.components.io.FileOutput - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/META-INF/lang.eld b/src/META-INF/lang.eld index 69ecdb7..df3d882 100644 --- a/src/META-INF/lang.eld +++ b/src/META-INF/lang.eld @@ -24,82 +24,21 @@ 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. --> - - - lang.eld - All core lang foei objects - - - - bind - com.idcanet.foei.core.x4o.BindAttributeHandler - Binds the EventPort to getter - + + + + - - id - com.idcanet.foei.core.x4o.IdAttributeHandler - Adds the object into the context - + - - com.idcanet.foei.core.x4o.EventStepBindRuleHandler - - - - - bind - Binds 2 eventPorts together - com.idcanet.foei.core.x4o.ObjectBindingElement - + + + + + + + + + - - dummyOutputPort - An dummy output, mostly used to send events into foei. - com.idcanet.foei.components.lang.DummyOutputPort - - - - objectChangedBuffer - Buffers objects an only fires when it is not equal - com.idcanet.foei.components.lang.ObjectChangedBuffer - - - - destroyFoeiProcess - Destroys the current process - com.idcanet.foei.components.lang.DestroyFoeiProcess - - - - setBeanProperty - Sets an property on a bean. - com.idcanet.foei.components.lang.SetBeanProperty - - - - getBeanProperty - Gets an property on a bean. - com.idcanet.foei.components.lang.GetBeanProperty - - - - - getBeanPropertyStep - gets an property of an obeject - com.idcanet.foei.components.steps.lang.GetBeanPropertyStep - - - - mapValue - gets an Value out of an Map - com.idcanet.foei.components.steps.lang.MapValue - - - - listValue - gets an Value out of an List - com.idcanet.foei.components.steps.lang.ListValue - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/META-INF/logging.eld b/src/META-INF/logging.eld index 71e9e59..778138b 100644 --- a/src/META-INF/logging.eld +++ b/src/META-INF/logging.eld @@ -24,12 +24,6 @@ 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. --> - - - - loggerInput - Java Logger InputHandler - com.idcanet.foei.components.logging.LoggerInput - - - \ No newline at end of file + + + diff --git a/src/META-INF/printers.eld b/src/META-INF/printers.eld index 0a5e19d..8aba60e 100644 --- a/src/META-INF/printers.eld +++ b/src/META-INF/printers.eld @@ -24,38 +24,9 @@ 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. --> - + - - printers.eld - A few standaard (step)printers - - - - - defaultPrinter - This EventStep uses to toString() to print an object. - com.idcanet.foei.components.steps.printers.DefaultPrinter - - - prefix - java.lang.String - null - Prints the prefix of this printer - - - postfix - java.lang.String - null - Prints the postfix of this printer - - - - - - datePrinter - This eventStep prints an date object including formating - com.idcanet.foei.components.steps.printers.DatePrinter - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/src/com/idcanet/foei/core/impl/FoeiEventBindingRuleHandler.java b/src/com/idcanet/foei/core/impl/FoeiEventBindingRuleHandler.java index d2fb1bd..5071a26 100644 --- a/src/com/idcanet/foei/core/impl/FoeiEventBindingRuleHandler.java +++ b/src/com/idcanet/foei/core/impl/FoeiEventBindingRuleHandler.java @@ -6,10 +6,8 @@ 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.context.BindingRuleHandler; import com.idcanet.x4o.element.Element; - -import java.util.Map; +import com.idcanet.x4o.element.ElementBindingHandler; /** * @@ -18,16 +16,8 @@ import java.util.Map; * @author Willem Cazander * @version 1.0 Feb 24, 2006 */ -public class FoeiEventBindingRuleHandler implements BindingRuleHandler { - - /** - * - * @param parameters - */ - public void setParameters(Map parameters) { +public class FoeiEventBindingRuleHandler implements ElementBindingHandler { - } - /** * * @param object1 diff --git a/src/com/idcanet/foei/core/x4o/BindAttributeHandler.java b/src/com/idcanet/foei/core/x4o/BindAttributeHandler.java index b37ba9c..8045374 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.context.GlobalParameterHandler; +import com.idcanet.x4o.element.AbstractElementParameterHandler; import com.idcanet.x4o.element.Element; import com.idcanet.x4o.element.ElementException; @@ -41,14 +41,13 @@ import com.idcanet.x4o.element.ElementException; * @author Willem Cazander * @version 1.0 Apr 15, 2006 */ -public class BindAttributeHandler implements GlobalParameterHandler { - - private String parameterName =null; +public class BindAttributeHandler extends AbstractElementParameterHandler { /** * @see com.idca.foei.xml.x2o.eld.GlobalParameterHandler#doParameter(java.lang.Object, java.lang.String) */ - public void doParameter(Element element,String parameterValue) { + @Override + public void doParameterStartTag(Element element,String parameterValue) throws Exception { String[] port = parameterValue.split(":"); if(port.length!=2) { return; @@ -80,22 +79,4 @@ public class BindAttributeHandler implements GlobalParameterHandler { e.printStackTrace(); } } - - /** - * @see com.idca.foei.xml.x2o.eld.GlobalParameterHandler#getParameterName() - */ - public String getParameterName() { - return parameterName; - } - - public void setParameterName(String parameterName) { - this.parameterName=parameterName; - } - - /** - * @see com.idcanet.x4o.context.GlobalParameterHandler#getProcessCloseTag() - */ - public Boolean getProcessCloseTag() { - return false; - } } diff --git a/src/com/idcanet/foei/core/x4o/EventStepBindRuleHandler.java b/src/com/idcanet/foei/core/x4o/EventStepBindRuleHandler.java index 43840ec..c982f76 100644 --- a/src/com/idcanet/foei/core/x4o/EventStepBindRuleHandler.java +++ b/src/com/idcanet/foei/core/x4o/EventStepBindRuleHandler.java @@ -28,10 +28,8 @@ package com.idcanet.foei.core.x4o; import com.idcanet.foei.event.EventStep; import com.idcanet.foei.event.EventStepController; -import com.idcanet.x4o.context.BindingRuleHandler; import com.idcanet.x4o.element.Element; - -import java.util.Map; +import com.idcanet.x4o.element.ElementBindingHandler; /** * @@ -39,9 +37,7 @@ import java.util.Map; * @author Willem Cazander * @version 1.0 Apr 16, 2006 */ -public class EventStepBindRuleHandler implements BindingRuleHandler { - - private Map parameters = null; +public class EventStepBindRuleHandler implements ElementBindingHandler { /** * @see com.idca.foei.xml.x2o.eld.BindingRuleHandler#canBind(java.lang.Object, java.lang.Object) @@ -66,11 +62,4 @@ public class EventStepBindRuleHandler implements BindingRuleHandler { Object child = element.getElementObject(); ((EventStepController)parent).addEventStep((EventStep)child); } - - /** - * @see com.idca.foei.xml.x2o.eld.BindingRuleHandler#setParameters(java.util.Map) - */ - public void setParameters(Map parameters) { - this.parameters=parameters; - } } \ No newline at end of file diff --git a/src/com/idcanet/foei/core/x4o/IdAttributeHandler.java b/src/com/idcanet/foei/core/x4o/IdAttributeHandler.java index 31cda4c..d876b7c 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.context.GlobalParameterHandler; +import com.idcanet.x4o.element.AbstractElementParameterHandler; import com.idcanet.x4o.element.Element; /** @@ -37,14 +37,13 @@ import com.idcanet.x4o.element.Element; * @author Willem Cazander * @version 1.0 Jul 8, 2006 */ -public class IdAttributeHandler implements GlobalParameterHandler { +public class IdAttributeHandler extends AbstractElementParameterHandler { - private String parameterName =null; - /** * @see com.idca.foei.xml.x2o.eld.GlobalParameterHandler#doParameter(java.lang.Object, java.lang.String) */ - public void doParameter(Element element,String parameterValue) { + @Override + public void doParameterStartTag(Element element,String parameterValue) throws Exception { // add to objext context if(element.getElementObject()==null | "".equals(parameterValue)) { parameterValue= "auto."+Integer.toHexString(element.getElementObject().hashCode()); @@ -53,22 +52,4 @@ public class IdAttributeHandler implements GlobalParameterHandler { FoeiProcess process = FoeiProcessFactory.getFoeiProcess(); process.addEventObject(element.getElementObject(),parameterValue); } - - /** - * @see com.idca.foei.xml.x2o.eld.GlobalParameterHandler#getParameterName() - */ - public String getParameterName() { - return parameterName; - } - - public void setParameterName(String parameterName) { - this.parameterName=parameterName; - } - - /** - * @see com.idcanet.x4o.context.GlobalParameterHandler#getProcessCloseTag() - */ - public Boolean getProcessCloseTag() { - return false; - } }