Refactored demo section to single app layout.

.gitignore

@@ -10,12 +10,12 @@
 */*/*/*/target
 
 # Inore some artifact dirs;
-vasc-demo/vasc-demo-server/vasc-demo-server-core/conf
+vasc-demo/vasc-demo-server/conf
-vasc-demo/vasc-demo-server/vasc-demo-server-core/data
+vasc-demo/vasc-demo-server/data
-vasc-demo/vasc-demo-server/vasc-demo-server-core/demo
+vasc-demo/vasc-demo-server/demo
-vasc-demo/vasc-demo-server/vasc-demo-server-core/deploy
+vasc-demo/vasc-demo-server/deploy
-vasc-demo/vasc-demo-server/vasc-demo-server-core/logs
+vasc-demo/vasc-demo-server/logs
-vasc-demo/vasc-demo-server/vasc-demo-server-core/workdir
+vasc-demo/vasc-demo-server/workdir
 
 # Ignore leftovers of really failed release build
 release.properties

pom.xml

@@ -3,7 +3,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>net.forwardfire.vasc</groupId>
 <artifactId>vasc</artifactId>
-<version>0.4.1-SNAPSHOT</version>
+<version>0.4.2-SNAPSHOT</version>
 <packaging>pom</packaging>
 <name>vasc</name>
 <description>Very Amazing/Advanced/Amplified Simple CRUD'ing for all.</description>
@@ -26,9 +26,6 @@
 </scm>
 <modules>
 	<module>vasc-core</module>
-	<module>vasc-xpql</module>
-	<module>vasc-xpql-ejb3-server</module>
-	<module>vasc-xpql-ejb3-client</module>
 	<module>vasc-backend</module>
 	<module>vasc-frontend</module>
 	<module>vasc-demo</module>
@@ -80,7 +77,7 @@
 	<juel.version>2.1.0</juel.version> <!-- rm me later -->
 	
 	<!-- vasc-core -->
-	<x4o.version>0.8.5-SNAPSHOT</x4o.version>
+	<x4o.version>0.8.7-SNAPSHOT</x4o.version>
 	
 	<!-- vasc-backend-ldap -->
 	<jldap.version>4.3</jldap.version>

vasc-backend/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>vasc</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>vasc-backend</artifactId>
   <packaging>pom</packaging>

vasc-backend/vasc-backend-jdbc/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>vasc-backend</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>vasc-backend-jdbc</artifactId>

vasc-backend/vasc-backend-jdbc/src/main/resources/META-INF/vasc/vasc-backend-jdbc.eld

@@ -4,8 +4,8 @@
 	xmlns:root="http://eld.x4o.org/xml/ns/eld-root"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd"
-	providerName="vasc.forwardfire.net"
+	providerHost="vasc.forwardfire.net"
-	name="Vasc Backend JDBC"
+	providerName="Vasc Backend JDBC"
 	id="vasc-backend-jdbc"
 	>
 	<description>Provides VASC JDBC backend support.</description>

vasc-backend/vasc-backend-jpa/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>vasc-backend</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>vasc-backend-jpa</artifactId>
   <name>vasc-backend-jpa</name>

vasc-backend/vasc-backend-jpa/src/main/resources/META-INF/vasc/vasc-backend-jpa.eld

@@ -5,8 +5,8 @@
 	xmlns:root="http://eld.x4o.org/xml/ns/eld-root"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd"
-	providerName="vasc.forwardfire.net"
+	providerHost="vasc.forwardfire.net"
-	name="Vasc Backend JPA"
+	providerName="Vasc Backend JPA"
 	id="vasc-backend-jpa"
 	>
 	<description>Provides VASC JPA backend support.</description>

vasc-backend/vasc-backend-ldap/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>vasc-backend</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>vasc-backend-ldap</artifactId>
   <name>vasc-backend-ldap</name>

vasc-backend/vasc-backend-ldap/src/main/resources/META-INF/vasc/vasc-backend-ldap.eld

@@ -4,8 +4,8 @@
 	xmlns:root="http://eld.x4o.org/xml/ns/eld-root"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd"
-	providerName="vasc.forwardfire.net"
+	providerHost="vasc.forwardfire.net"
-	name="Vasc Backend LDAP"
+	providerName="Vasc Backend LDAP"
 	id="vasc-backend-ldap"
 	>
 	<description>Provides VASC LDAP backend support.</description>

vasc-backend/vasc-backend-metamodel/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>vasc-backend</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>vasc-backend-metamodel</artifactId>

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/x4o/SchemaAutoEntryElementConfigurator.java

@@ -24,7 +24,7 @@ package net.forwardfire.vasc.backend.metamodel.x4o;
 
 import net.forwardfire.vasc.backend.metamodel.MetaModelSchemaAutoEntry;
 import net.forwardfire.vasc.core.VascController;
-import net.forwardfire.vasc.impl.x4o.VascParser;
+import net.forwardfire.vasc.impl.x4o.VascDriver;
 
 import org.x4o.xml.element.AbstractElementConfigurator;
 import org.x4o.xml.element.Element;
@@ -50,7 +50,7 @@ public class SchemaAutoEntryElementConfigurator extends AbstractElementConfigura
 			throw new ElementConfiguratorException(this,"ElementObject is not MetaModelSchemaAutoEntry object.");
 		}
 		MetaModelSchemaAutoEntry autoEntry = (MetaModelSchemaAutoEntry)element.getElementObject();
-		VascController vascController = VascParser.getVascController(element.getElementLanguage());
+		VascController vascController = VascDriver.getVascController(element.getLanguageSession());
 		autoEntry.autoFillResult(vascController);
 		autoEntry.autoAddResultToController();
 	}

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/x4o/XmlSaxSchemaElement.java

@@ -17,7 +17,7 @@ public class XmlSaxSchemaElement extends AbstractElement {
 	 */
 	@Override
 	public void doElementRun() throws ElementException {
-		if (getElementClass().getTag().endsWith("Column")) {
+		if (getElementClass().getId().endsWith("Column")) {
 			return; // save one object to code.
 		}
 		if (getParent()==null) {

vasc-backend/vasc-backend-metamodel/src/main/resources/META-INF/vasc/vasc-backend-metamodel.eld

@@ -4,8 +4,8 @@
 	xmlns:root="http://eld.x4o.org/xml/ns/eld-root"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd"
-	providerName="vasc.forwardfire.net"
+	providerHost="vasc.forwardfire.net"
-	name="Vasc Backend MetaModel"
+	providerName="Vasc Backend MetaModel"
 	id="vasc-backend-metamodel"
 	>
 	<description>Provides VASC MetaModel backend support.</description>

vasc-backend/vasc-backend-mongodb/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>vasc-backend</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>vasc-backend-mongodb</artifactId>

vasc-backend/vasc-backend-mongodb/src/main/resources/META-INF/vasc/vasc-backend-mongodb.eld

@@ -4,8 +4,8 @@
 	xmlns:root="http://eld.x4o.org/xml/ns/eld-root"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd"
-	providerName="vasc.forwardfire.net"
+	providerHost="vasc.forwardfire.net"
-	name="Vasc Backend MongoDB"
+	providerName="Vasc Backend MongoDB"
 	id="vasc-backend-mongodb"
 	>
 	<description>Provides VASC MongoDB backend support.</description>

vasc-core-ejb3-client/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.forwardfire.vasc</groupId>
     <artifactId>vasc</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>vasc-core-ejb3-client</artifactId>
   <name>vasc-core-ejb3-client</name>

vasc-core-ejb3-server/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.forwardfire.vasc</groupId>
     <artifactId>vasc</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>vasc-core-ejb3-server</artifactId>
   <name>vasc-core-ejb3-server</name>
@@ -31,11 +31,5 @@
       <version>${persistence-api.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>net.forwardfire.vasc</groupId>
-      <artifactId>vasc-xpql-ejb3-client</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 </project>

vasc-core-ejb3-server/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java

@@ -43,6 +43,8 @@ import javax.ejb.Stateless;
 import javax.naming.InitialContext;
 import javax.persistence.EntityManager;
 
+import org.x4o.xml.io.X4OReader;
+
 import net.forwardfire.vasc.backend.VascBackend;
 import net.forwardfire.vasc.backends.jpa.EntityManagerProvider;
 import net.forwardfire.vasc.core.VascController;
@@ -50,8 +52,8 @@ import net.forwardfire.vasc.core.VascEntry;
 import net.forwardfire.vasc.core.VascEntryControllerLocal;
 import net.forwardfire.vasc.core.VascEntryLocal;
 import net.forwardfire.vasc.impl.DefaultVascFactory;
-import net.forwardfire.vasc.impl.x4o.VascParser;
+import net.forwardfire.vasc.impl.x4o.VascDriver;
-import net.forwardfire.vasc.xpql.ejb3.XpqlQueryManager;
+import net.forwardfire.vasc.xpql.execute.jpa.XpqlQueryManager;
 import net.forwardfire.vasc.xpql.query.Query;
 
 
@@ -108,14 +110,16 @@ public class VascServiceManagerImpl implements VascServiceManagerRemote,VascServ
 				String value = keys.get(key);
 				if (key.startsWith("load")) {
 					// TODO made reuse working.
-					VascParser vp = new VascParser(vascController);
+					VascDriver driver = VascDriver.getInstance();
+					X4OReader<VascController> reader = driver.createReader();
+					driver.addVascController(reader, vascController);
 					if (xpqlController!=null) {
-						vp.addELBean("xpqlController", new XpqlController());
+						reader.addELBeanInstance("xpqlController", new XpqlController());
 					}
 					if (entityManager!=null) {
-						vp.addELBean("entityManagerProvider", new LocalEntityManagerProvider());
+						reader.addELBeanInstance("entityManagerProvider", new LocalEntityManagerProvider());
 					}
-					vp.parseResource(value);
+					reader.readResource(value);
 				}
 			}
 			DefaultVascFactory.fillVascControllerLocalEntries((VascEntryControllerLocal) vascController.getVascEntryController(), vascController);

vasc-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>vasc</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>vasc-core</artifactId>
   <name>vasc-core</name>
@@ -11,7 +11,7 @@
   <dependencies>
     <dependency>
       <groupId>org.x4o</groupId>
-      <artifactId>x4o-core</artifactId>
+      <artifactId>x4o-driver</artifactId>
       <version>${x4o.version}</version>
     </dependency>
     <dependency>
@@ -20,8 +20,8 @@
         <version>${x4o.version}</version>
     </dependency>
     <dependency>
-      <groupId>net.forwardfire.vasc</groupId>
+      <groupId>net.forwardfire.vasc.lib</groupId>
-      <artifactId>vasc-xpql</artifactId>
+      <artifactId>vasc-lib-xpql</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

vasc-core/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryFieldValue.java

@@ -26,7 +26,7 @@ import net.forwardfire.vasc.core.VascEntryField;
 import net.forwardfire.vasc.core.entry.VascEntryFieldValue;
 import net.forwardfire.vasc.core.VascException;
 
-import org.x4o.xml.impl.DefaultElementObjectPropertyValue;
+import org.x4o.xml.element.DefaultElementObjectPropertyValue;
 
 /**
  * BeanVascEntryFieldValue provides get/set support for bean based backends.

vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeLocal.java

@@ -22,6 +22,8 @@
 
 package net.forwardfire.vasc.core;
 
+import java.util.List;
+
 import org.x4o.xml.conv.ObjectConverter;
 
 import net.forwardfire.vasc.core.base.VascBaseIdLocal;
@@ -41,6 +43,7 @@ public interface VascEntryFieldTypeLocal extends VascEntryFieldType,VascBaseIdLo
 	
 	public void setAutoDetectClass(Class<?> classObject);
 	
+	public List<VascValidator> getVascValidators();
 	public void addVascValidator(VascValidator vascValidator);
 	public void removeVascValidator(VascValidator vascValidator);
 	

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java

@@ -27,7 +27,7 @@ import net.forwardfire.vasc.core.VascEntryField;
 import net.forwardfire.vasc.core.entry.VascEntryFieldValue;
 import net.forwardfire.vasc.core.VascException;
 
-import org.x4o.xml.impl.DefaultElementObjectPropertyValue;
+import org.x4o.xml.element.DefaultElementObjectPropertyValue;
 
 /**
  * 

vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java

@@ -45,11 +45,9 @@ public class DefaultVascEntryFieldTypeController implements VascEntryFieldTypeCo
 	
 	public DefaultVascEntryFieldTypeController() throws VascException {
 		try {
-			FieldTypeParser parser = new FieldTypeParser();
+			FieldTypeDriver driver = new FieldTypeDriver();
-			parser.parseVascFieldTypes();
-			
 			vascEntryFieldTypes = new HashMap<String,VascEntryFieldTypeLocal>(35);
-			for(VascEntryFieldTypeLocal v:parser.getTypes()) {
+			for(VascEntryFieldTypeLocal v:driver.getVascFieldTypes()) {
 				vascEntryFieldTypes.put(v.getId(),v);
 			}
 		} catch (Exception e) {

vasc-core/src/main/java/net/forwardfire/vasc/impl/type/FieldTypeDriver.java

@@ -22,9 +22,9 @@
 
 package net.forwardfire.vasc.impl.type;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.InvalidPropertiesFormatException;
 import java.util.List;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -32,12 +32,16 @@ import javax.xml.parsers.ParserConfigurationException;
 import net.forwardfire.vasc.core.VascEntryFieldTypeLocal;
 
 import org.xml.sax.SAXException;
-
+import org.x4o.xml.X4ODriver;
+import org.x4o.xml.X4ODriverManager;
 import org.x4o.xml.conv.DefaultObjectConverterProvider;
 import org.x4o.xml.conv.ObjectConverter;
-import org.x4o.xml.core.X4OParser;
-import org.x4o.xml.core.config.X4OLanguageProperty;
 import org.x4o.xml.element.Element;
+import org.x4o.xml.io.X4OConnectionException;
+import org.x4o.xml.io.X4OReaderSession;
+import org.x4o.xml.lang.X4OLanguageSession;
+import org.x4o.xml.lang.X4OLanguageSessionLocal;
+import org.x4o.xml.lang.phase.X4OPhaseException;
 
 /**
  * 
@@ -45,30 +49,35 @@ import org.x4o.xml.element.Element;
  * @author Willem Cazander
  * @version 1.0 Sep 11, 2008
  */
-public class FieldTypeParser extends X4OParser {
+public class FieldTypeDriver extends X4ODriver<Object> {
 
-	static public final String FIELD_TYPE_LANGUAGE = "fieldtype";
+	static public final String LANGUAGE_NAME = "fieldtype";
+	static public final String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION};
 	
-	/**
+	static public FieldTypeDriver getInstance() {
-	 * 
+		return (FieldTypeDriver)X4ODriverManager.getX4ODriver(LANGUAGE_NAME);
-	 * @param language
-	 * @throws IOException 
-	 * @throws InvalidPropertiesFormatException 
-	 * @throws Exception
-	 */
-	public FieldTypeParser() throws InvalidPropertiesFormatException, IOException {
-		super(FIELD_TYPE_LANGUAGE);
-		setProperty(X4OLanguageProperty.PHASE_SKIP_RELEASE.toUri(), true);
 	}
 	
-	public void parseVascFieldTypes() throws IOException, SecurityException, NullPointerException, ParserConfigurationException, SAXException {
+	@Override
-		parseResource("META-INF/fieldtypes.xml");
+	public String getLanguageName() {
+		return LANGUAGE_NAME;
+	}
+
+	@Override
+	public String[] getLanguageVersions() {
+		return LANGUAGE_VERSIONS;
 	}
 	
-	public List<VascEntryFieldTypeLocal> getTypes() {
+	public List<VascEntryFieldTypeLocal> getVascFieldTypes() throws FileNotFoundException, SecurityException, NullPointerException, ParserConfigurationException, SAXException, IOException, X4OPhaseException, X4OConnectionException {
+		X4OReaderSession<Object> reader = createReaderSession();
+		//reader.setProperty(X4OLanguageProperty.PHASE_SKIP_RELEASE.toUri(), true);
+		reader.addPhaseSkip("READ_RELEASE");
+		X4OLanguageSession session = reader.readResourceSession("META-INF/fieldtypes.xml");
+		//((X4OLanguageSessionLocal)session).addPhaseSkip("READ_RELEASE");// TODO: fixme
+		
 		List<VascEntryFieldTypeLocal> result = new ArrayList<VascEntryFieldTypeLocal>(40);
 		DefaultObjectConverterProvider convProvider = new DefaultObjectConverterProvider(true);
-		for (Element e:getDriver().getElementLanguage().getRootElement().getChilderen()) {
+		for (Element e:session.getRootElement().getChilderen()) {
 			VascEntryFieldTypeLocal a = (VascEntryFieldTypeLocal)e.getElementObject();
 			if (a.getObjectConverter()==null && a.getAutoDetectClass()!=null) {
 				ObjectConverter conv = convProvider.getObjectConverterForClass(a.getAutoDetectClass());
@@ -76,6 +85,7 @@ public class FieldTypeParser extends X4OParser {
 			}
 			result.add(a);
 		}
+		reader.releaseSession(session);
 		return result;
 	}
 }

vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/AnnotationParserElement.java

@@ -47,9 +47,9 @@ import net.forwardfire.vasc.impl.DefaultVascEntryField;
 import net.forwardfire.vasc.validators.VascValidator;
 import net.forwardfire.vasc.validators.VascValidatorClassParser;
 
-import org.x4o.xml.core.config.X4OLanguageClassLoader;
 import org.x4o.xml.element.AbstractElement;
 import org.x4o.xml.element.ElementException;
+import org.x4o.xml.lang.X4OLanguageClassLoader;
 
 
 /**
@@ -269,7 +269,7 @@ public class AnnotationParserElement extends AbstractElement {
 			field.addVascValidator(v); // todo: merg with already added list of template so we can override.
 		}
 		
-		VascController vascController = VascParser.getVascController(this.getElementLanguage());
+		VascController vascController = VascDriver.getVascController(this.getLanguageSession());
 		VascChoices vc = parser.getVascChoices							(modelClass, field.getId());
 		if (vc!=null) {
 			VascEntryFieldType type = vascController.getVascEntryFieldTypeController().getVascEntryFieldTypeById("ListField");

vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java

@@ -22,9 +22,11 @@
 
 package	net.forwardfire.vasc.impl.x4o;
 
-
 import net.forwardfire.vasc.core.VascEntryField;
+import net.forwardfire.vasc.core.VascEntryFieldLocal;
 import net.forwardfire.vasc.core.VascEntryFieldType;
+import net.forwardfire.vasc.core.VascEntryListOptionLocal;
+import net.forwardfire.vasc.core.VascEntryLocal;
 import net.forwardfire.vasc.core.ui.VascSelectItemModel;
 
 import org.x4o.xml.element.AbstractElementBindingHandler;
@@ -38,7 +40,7 @@ import org.x4o.xml.element.ElementBindingHandlerException;
  * @author Willem Cazander
  * @version 1.0 Apr 02, 2009
  */
-public class SelectItemModelBindingHandler extends AbstractElementBindingHandler {
+public class SelectItemModelBindingHandler extends AbstractElementBindingHandler<VascEntryField> {
 	
 	private final static Class<?>[] CLASSES_CHILD = new Class[] {
 		VascSelectItemModel.class
@@ -58,16 +60,16 @@ public class SelectItemModelBindingHandler extends AbstractElementBindingHandler
 		return CLASSES_CHILD;
 	}
 	
-	/**
+	@Override
-	 * @see org.x4o.xml.element.ElementBindingHandler#doBind(java.lang.Object, java.lang.Object, org.x4o.xml.element.Element)
+	public void bindChild(Element childElement, VascEntryField parentObject,Object childObject) throws ElementBindingHandlerException {
-	 */
+		if (childObject instanceof VascSelectItemModel) {			
-	public void doBind(Object parentObject, Object childObject,Element childElement) throws ElementBindingHandlerException {
+			VascEntryFieldType type = parentObject.getVascEntryFieldType();
-		if (parentObject instanceof VascEntryField) {
+			type.setDataObject(childObject);
-			VascEntryField parent = (VascEntryField)parentObject;
-			if (childObject instanceof VascSelectItemModel) {			
-				VascEntryFieldType type = parent.getVascEntryFieldType();
-				type.setDataObject(childObject);
-			}
 		}
 	}
+	
+	@Override
+	public void createChilderen(Element parentElement, VascEntryField parentObject)	throws ElementBindingHandlerException {
+		createChild(parentElement, parentObject.getVascEntryFieldType().getDataObject());
+	}
 }

vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SetParameterElement.java

@@ -50,7 +50,7 @@ public class SetParameterElement extends AbstractElement {
 		VascEntry entry = (VascEntry)getParent().getElementObject();
 		logger.fine("Setting parameter name: "+name+" value: "+value+" type: "+type);
 		
-		if ("setUserParameter".equals(getElementClass().getTag())) {
+		if ("setUserParameter".equals(getElementClass().getId())) {
 			if (value==null) {
 				value="id"; // default to ids
 			}

vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java

@@ -48,7 +48,7 @@ public class VascBackendElementConfigurator extends AbstractElementConfigurator
 
 		VascBackend backend = (VascBackend)element.getElementObject();
 		
-		VascController vascController = VascParser.getVascController(element.getElementLanguage());
+		VascController vascController = VascDriver.getVascController(element.getLanguageSession());
 		VascBackendController backendController = vascController.getVascBackendController();
 		
 		if (backendController instanceof VascBackendControllerLocal) {

vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascDriver.java

@@ -22,54 +22,48 @@
 
 package net.forwardfire.vasc.impl.x4o;
 
-import java.util.Map;
-
 import javax.el.ValueExpression;
 
 import net.forwardfire.vasc.core.VascController;
 
-import org.x4o.xml.core.X4OParser;
+import org.x4o.xml.X4ODriver;
-import org.x4o.xml.element.ElementLanguage;
+import org.x4o.xml.X4ODriverManager;
+import org.x4o.xml.io.X4OReader;
+import org.x4o.xml.lang.X4OLanguageSession;
 
 /**
- * VascParser the vasc xml streams.
+ * VascDriver the vasc xml streams.
  * 
  * @author Willem Cazander
  * @version 1.0 Oct 27, 2008
  */
-public class VascParser extends X4OParser {
+public class VascDriver extends X4ODriver<VascController> {
 	
-	static public String VASC_LANGUAGE = "vasc";
+	static final public String LANGUAGE_NAME = "vasc";
-	private VascController vascController = null;
+	static public final String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION};
-	private Map<String,Object> beanMap = null;
+	static final public String EL_VASC_CONTROLLER = "el_vasc_controller";
 	
-	/**
+	static public VascDriver getInstance() {
-	 * @see X4OParser#X4OParser(String)
+		return (VascDriver)X4ODriverManager.getX4ODriver(LANGUAGE_NAME);
-	 */
-	public VascParser(VascController vascController) {
-		super(VASC_LANGUAGE);
-		if (vascController==null) {
-			throw new NullPointerException("vascController may not be null");
-		}
-		this.vascController=vascController;
-		addELBeanInstance("vascController", vascController);
 	}
 	
-	protected VascParser() {
+	@Override
-		super(VASC_LANGUAGE);
+	public String getLanguageName() {
+		return LANGUAGE_NAME;
+	}
+
+	@Override
+	public String[] getLanguageVersions() {
+		return LANGUAGE_VERSIONS;
 	}
 	
-	public void addELBean(String name,Object object) {
+	public void addVascController(X4OReader<VascController> reader,VascController controller) {
-		beanMap.put(name,object);
+		reader.addELBeanInstance(EL_VASC_CONTROLLER, controller);
 	}
 	
-	public VascController getVascController() {
+	static public VascController getVascController(X4OLanguageSession context) {
-		return vascController;
+		ValueExpression ee = context.getExpressionLanguageFactory().createValueExpression(context.getExpressionLanguageContext(),"${"+EL_VASC_CONTROLLER+"}", VascController.class);
-	}
+		VascController con =  (VascController)ee.getValue(context.getExpressionLanguageContext());
-	
-	static public VascController getVascController(ElementLanguage context) {
-		ValueExpression ee = context.getExpressionFactory().createValueExpression(context.getELContext(),"${vascController}", VascController.class);
-		VascController con =  (VascController)ee.getValue(context.getELContext());
 		return con;
 	}
-}
+}

vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryActionElement.java

@@ -27,9 +27,9 @@ import net.forwardfire.vasc.core.actions.ColumnVascActionLocal;
 import net.forwardfire.vasc.core.actions.GlobalVascActionLocal;
 import net.forwardfire.vasc.core.actions.RowVascActionLocal;
 
-import org.x4o.xml.core.config.X4OLanguageClassLoader;
 import org.x4o.xml.element.AbstractElement;
 import org.x4o.xml.element.ElementException;
+import org.x4o.xml.lang.X4OLanguageClassLoader;
 
 /**
  * Handed the eventListener xml tag.

vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java

@@ -45,7 +45,7 @@ public class VascEntryElementConfigurator extends AbstractElementConfigurator {
 	 */
 	public void doConfigElement(Element element) throws ElementConfiguratorException {
 		Object elementObject = element.getElementObject();
-		VascController vascController = VascParser.getVascController(element.getElementLanguage());
+		VascController vascController = VascDriver.getVascController(element.getLanguageSession());
 		VascEntryController entryController = vascController.getVascEntryController();
 		
 		if (entryController instanceof VascEntryControllerLocal) {

vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java

@@ -37,7 +37,7 @@ import org.x4o.xml.element.ElementBindingHandlerException;
  * @author Willem Cazander
  * @version 1.0 Apr 02, 2009
  */
-public class VascEntryFieldBindingHandler extends AbstractElementBindingHandler {
+public class VascEntryFieldBindingHandler extends AbstractElementBindingHandler<VascEntryLocal> {
 	
 	private final static Class<?>[] CLASSES_CHILD = new Class[] {
 		VascEntryFieldLocal.class,
@@ -58,20 +58,25 @@ public class VascEntryFieldBindingHandler extends AbstractElementBindingHandler
 		return CLASSES_CHILD;
 	}
 	
-	/**
+	@Override
-	 * @see org.x4o.xml.element.ElementBindingHandler#doBind(java.lang.Object, java.lang.Object, org.x4o.xml.element.Element)
+	public void bindChild(Element childElement, VascEntryLocal parentObject,Object childObject) throws ElementBindingHandlerException {
-	 */
+		if (childObject instanceof VascEntryFieldLocal & (childObject instanceof VascEntryListOptionLocal)==false) {			
-	public void doBind(Object parentObject, Object childObject,Element childElement) throws ElementBindingHandlerException {
+			VascEntryFieldLocal child = (VascEntryFieldLocal) childObject;
-		if (parentObject instanceof VascEntryLocal) {
+			parentObject.addVascEntryField(child);
-			VascEntryLocal parent = (VascEntryLocal)parentObject;
+		}
-			if (childObject instanceof VascEntryFieldLocal & (childObject instanceof VascEntryListOptionLocal)==false) {			
+		if (childObject instanceof VascEntryListOptionLocal) {			
-				VascEntryFieldLocal child = (VascEntryFieldLocal) childObject;
+			VascEntryListOptionLocal child = (VascEntryListOptionLocal) childObject;
-				parent.addVascEntryField(child);
+			parentObject.addVascEntryListOption(child);
-			}
+		}
-			if (childObject instanceof VascEntryListOptionLocal) {			
+	}
-				VascEntryListOptionLocal child = (VascEntryListOptionLocal) childObject;
+	
-				parent.addVascEntryListOption(child);
+	@Override
-			}
+	public void createChilderen(Element parentElement, VascEntryLocal parentObject)	throws ElementBindingHandlerException {
+		for (VascEntryFieldLocal field:parentObject.getVascEntryFieldsLocal()) {
+			createChild(parentElement, field);
+		}
+		for (VascEntryListOptionLocal field:parentObject.getVascEntryListOptionsLocal()) {
+			createChild(parentElement, field);
 		}
 	}
 }

vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldConfigurator.java

@@ -49,7 +49,7 @@ public class VascEntryFieldConfigurator extends AbstractElementConfigurator {
 		if ("".equals(fieldID)) {
 			fieldID = "TextField"; // ??
 		}
-		VascController controller = VascParser.getVascController(element.getElementLanguage());
+		VascController controller = VascDriver.getVascController(element.getLanguageSession());
 		VascEntryFieldType result = controller.getVascEntryFieldTypeController().getVascEntryFieldTypeById(fieldID);
 		((VascEntryFieldLocal)element.getElementObject()).setVascEntryFieldType(result);
 	}

vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldTypeElement.java

@@ -28,13 +28,13 @@ import java.util.logging.Logger;
 import net.forwardfire.vasc.core.VascEntryField;
 import net.forwardfire.vasc.core.VascEntryFieldType;
 
-import org.x4o.xml.core.X4OPhase;
 import org.x4o.xml.element.AbstractElement;
 import org.x4o.xml.element.ElementException;
+import org.x4o.xml.lang.phase.X4OPhase;
 
 
 /**
- * 
+ * VascEntryFieldTypeElement
  * 
  * @author Willem Cazander
  * @version 1.0 Mar 27, 2009
@@ -56,6 +56,7 @@ public class VascEntryFieldTypeElement extends AbstractElement {
 		VascEntryFieldType type = field.getVascEntryFieldType();
 		setElementObject(type);
 		logger.info("Readding the element for reparsing");
-		getElementLanguage().addDirtyElement(this, X4OPhase.startX4OPhase);
+		X4OPhase startX4OPhase = getLanguageSession().getLanguage().getPhaseManager().getPhase("READ_CONFIG_ELEMENT"); // TODO: back to enum ?
+		getLanguageSession().addDirtyElement(this, startX4OPhase);
 	}
 }

vasc-core/src/main/resources/META-INF/fieldtype/fieldtype-lang.eld

@@ -5,24 +5,23 @@
 	xmlns:root="http://eld.x4o.org/xml/ns/eld-root"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd"
-	providerName="vasc.forwardfire.net"
+	providerHost="vasc.forwardfire.net"
-	name="Vasc Field Type Language"
+	providerName="Vasc Field Type Language"
 	id="mod-fieldtype-lang"
 	>
 	
 	<eld:classBindingHandler	id="VascEntryFieldType-VascValidator"
-								parentClass="net.forwardfire.vasc.core.VascEntryFieldType"
+			parentClass="net.forwardfire.vasc.core.VascEntryFieldTypeLocal"	childClass="net.forwardfire.vasc.validators.VascValidator"
-								childClass="net.forwardfire.vasc.validators.VascValidator"
+			addMethod="addVascValidator"	getMethod="getVascValidators"
-								method="addVascValidator"/>
+		/>
 	<eld:classBindingHandler	id="VascEntryFieldType-ObjectConverter"
-								parentClass="net.forwardfire.vasc.core.VascEntryFieldType"
+			parentClass="net.forwardfire.vasc.core.VascEntryFieldTypeLocal"	childClass="org.x4o.xml.conv.ObjectConverter"
-								childClass="org.x4o.xml.conv.ObjectConverter"
+			addMethod="setObjectConverter"	getMethod="setObjectConverter"
-								method="setObjectConverter"/>
+		/>
 	<eld:classBindingHandler	id="ObjectConverter-ObjectConverter"
-								parentClass="org.x4o.xml.conv.ObjectConverter"
+			parentClass="org.x4o.xml.conv.ObjectConverter" childClass="org.x4o.xml.conv.ObjectConverter"
-								childClass="org.x4o.xml.conv.ObjectConverter"
+			addMethod="addObjectConverter"	getMethod="getObjectConverters"
-								method="addObjectConverter"/>
+		/>
-	
 	
 	<eld:namespace
 		uri="http://fieldtype.vasc.forwardfire.net/xml/ns/fieldtype-root"

vasc-core/src/main/resources/META-INF/fieldtype/fieldtype-modules.xml

@@ -6,6 +6,6 @@
 	>
 	<language version="1.0">
 		<eld-resource>fieldtype-lang.eld</eld-resource>
-		<sibling-loader>org.x4o.xml.meta.MetaLanguageSiblingLoader</sibling-loader>
+		<sibling-loader>org.x4o.xml.lang.meta.MetaLanguageSiblingLoader</sibling-loader>
 	</language>
 </modules>

vasc-core/src/main/resources/META-INF/vasc/vasc-lang.eld

@@ -5,20 +5,44 @@
 	xmlns:root="http://eld.x4o.org/xml/ns/eld-root"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd"
-	providerName="vasc.forwardfire.net"
+	providerHost="vasc.forwardfire.net"
-	name="Vasc Config Language"
+	providerName="Vasc Config Language"
 	id="vasc-lang"
 	>
-	
+	<eld:classBindingHandler id="VascEntryLocal-VascEntryFieldSet"
-	<eld:classBindingHandler id="VascEntryLocal-VascEntryFieldSet"	parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.core.VascEntryFieldSet"		method="addVascEntryFieldSet"/>
+			parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.core.VascEntryFieldSet"
-	<eld:classBindingHandler id="VascEntryLocal-VascEntryLink"		parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.core.VascEntryLinkLocal"		method="addVascEntryLink"/>
+			addMethod="addVascEntryFieldSet"	getMethod="getVascEntryFieldSetsLocal"
-	<eld:classBindingHandler id="VascEntryLocal-VascBackendFilter"	parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.backend.VascBackendFilter"		method="addVascBackendFilter"/>
+		/>
-	<eld:classBindingHandler id="VascEntryLocal-GlobalVascAction"	parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.core.actions.GlobalVascAction"	method="addGlobalAction"/>
+	<eld:classBindingHandler id="VascEntryLocal-VascEntryLink"
-	<eld:classBindingHandler id="VascEntryLocal-RowVascAction"		parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.core.actions.RowVascAction"	method="addRowAction"/>
+			parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.core.VascEntryLinkLocal"
-	<eld:classBindingHandler id="VascEntryLocal-ColumnVascAction"	parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.core.actions.ColumnVascAction"	method="addColumnAction"/>
+			addMethod="addVascEntryLink"		getMethod="getVascEntryLinksLocal"
-	<eld:classBindingHandler id="VascEntryFieldLocal-VascValidator" parentClass="net.forwardfire.vasc.core.VascEntryFieldLocal"	childClass="net.forwardfire.vasc.validators.VascValidator"	method="addVascValidator"/>	
+		/>
-	<eld:bindingHandler id="SelectItemModelBindingHandler" bean.class="net.forwardfire.vasc.impl.x4o.SelectItemModelBindingHandler"/>
+	<eld:classBindingHandler id="VascEntryLocal-VascBackendFilter"
-	<eld:bindingHandler id="VascEntryFieldBindingHandler" bean.class="net.forwardfire.vasc.impl.x4o.VascEntryFieldBindingHandler"/>
+			parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.backend.VascBackendFilter"
+			addMethod="addVascBackendFilter"	getMethod="getVascBackendFilters"
+		/>
+	<eld:classBindingHandler id="VascEntryLocal-GlobalVascAction"
+			parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.core.actions.GlobalVascAction"
+			addMethod="addGlobalAction"			getMethod="getGlobalActionsLocal"
+		/>
+	<eld:classBindingHandler id="VascEntryLocal-RowVascAction"
+			parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.core.actions.RowVascAction"
+			addMethod="addRowAction"			getMethod="getRowActionsLocal"
+		/>
+	<eld:classBindingHandler id="VascEntryLocal-ColumnVascAction"
+			parentClass="net.forwardfire.vasc.core.VascEntryLocal"	childClass="net.forwardfire.vasc.core.actions.ColumnVascAction"
+			addMethod="addColumnAction"			getMethod="getColumnActionsLocal"
+		/>
+	<eld:classBindingHandler id="VascEntryFieldLocal-VascValidator"
+			parentClass="net.forwardfire.vasc.core.VascEntryFieldLocal"	childClass="net.forwardfire.vasc.validators.VascValidator"
+			addMethod="addVascValidator"		getMethod="getVascValidators"
+		/>	
+	<eld:bindingHandler id="SelectItemModelBindingHandler"
+			bean.class="net.forwardfire.vasc.impl.x4o.SelectItemModelBindingHandler"
+		/>
+	<eld:bindingHandler id="VascEntryFieldBindingHandler"
+			bean.class="net.forwardfire.vasc.impl.x4o.VascEntryFieldBindingHandler"
+		/>
 
 	<eld:elementInterface id="VascBackend" interfaceClass="net.forwardfire.vasc.backend.VascBackend">
 		<eld:configurator id="VascBackendElementConfigurator" bean.class="net.forwardfire.vasc.impl.x4o.VascBackendElementConfigurator" configAction="true"/>
@@ -60,7 +84,7 @@
 			<eld:elementParent tag="root" uri="http://vasc.forwardfire.net/xml/ns/vasc-root"/>
 		</eld:element>
 		<eld:element tag="field"		objectClass="net.forwardfire.vasc.impl.DefaultVascEntryField"	elementClass="net.forwardfire.vasc.impl.x4o.VascEntryFieldElement">
-			<eld:attribute name="vascEntryFieldType" runBeanFill="false"/>
+			<eld:attribute name="vascEntryFieldType" runBeanValue="false"/>
 			<eld:configurator id="field-VascEntryFieldConfigurator" bean.class="net.forwardfire.vasc.impl.x4o.VascEntryFieldConfigurator" />
 		</eld:element>
 	
@@ -81,7 +105,7 @@
 		
 		
 		<eld:element tag="fieldSet"	objectClass="net.forwardfire.vasc.impl.DefaultVascEntryFieldSet" elementClass="net.forwardfire.vasc.impl.x4o.VascEntryFieldSetElement">
-			<eld:attribute name="vascEntryFieldIds" runBeanFill="false"/>
+			<eld:attribute name="vascEntryFieldIds" runBeanValue="false"/>
 		</eld:element>
 		
 		<eld:element tag="link"						objectClass="net.forwardfire.vasc.impl.DefaultVascEntryLink">
@@ -93,7 +117,7 @@
 		<eld:element tag="linkCreateFieldValue"		elementClass="net.forwardfire.vasc.impl.x4o.VascEntryLinkParameterElement"/>
 	
 		<eld:element tag="listOption"				objectClass="net.forwardfire.vasc.impl.DefaultVascEntryListOption"	elementClass="net.forwardfire.vasc.impl.x4o.VascEntryFieldElement">
-			<eld:attribute name="vascEntryFieldType" runBeanFill="false"/>
+			<eld:attribute name="vascEntryFieldType" runBeanValue="false"/>
 			<eld:configurator id="listOption-VascEntryFieldConfigurator" bean.class="net.forwardfire.vasc.impl.x4o.VascEntryFieldConfigurator" />
 		</eld:element>
 				

vasc-core/src/main/resources/META-INF/vasc/vasc-modules.xml

@@ -6,6 +6,6 @@
 	>
 	<language version="1.0">
 		<eld-resource>vasc-lang.eld</eld-resource>
-		<sibling-loader>org.x4o.xml.meta.MetaLanguageSiblingLoader</sibling-loader>
+		<sibling-loader>org.x4o.xml.lang.meta.MetaLanguageSiblingLoader</sibling-loader>
 	</language>
 </modules>

vasc-core/src/main/resources/META-INF/x4o-drivers.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2004-2013, Willem Cazander
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without modification, are permitted provided
+    that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of conditions and the
+      following disclaimer.
+    * 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 THE COPYRIGHT HOLDERS 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
+    THE COPYRIGHT HOLDER 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.
+
+-->
+<drivers version="1.0"
+	xmlns="http://language.x4o.org/xml/ns/drivers"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://language.x4o.org/xml/ns/drivers http://language.x4o.org/xml/ns/drivers-1.0.xsd"
+	>
+	<driver language="vasc" className="net.forwardfire.vasc.impl.x4o.VascDriver"/>
+	<driver language="fieldtype" className="net.forwardfire.vasc.impl.type.FieldTypeDriver"/>
+</drivers>

vasc-core/src/test/java/net/forwardfire/vasc/FieldTypesTest.java

@@ -22,11 +22,8 @@
 
 package net.forwardfire.vasc;
 
-import java.io.InputStream;
-import java.util.logging.LogManager;
-
 import net.forwardfire.vasc.core.VascEntryFieldType;
-import net.forwardfire.vasc.impl.type.FieldTypeParser;
+import net.forwardfire.vasc.impl.type.FieldTypeDriver;
 
 
 
@@ -39,27 +36,16 @@ import junit.framework.TestCase;
  * @version 1.0 Jul 24, 2006
  */
 public class FieldTypesTest extends TestCase {
-    
-    public void setUp() throws Exception {
-    	// enable all logs
-    //	//InputStream loggingProperties = this.getClass().getResourceAsStream("/META-INF/logging.properties");
-     //   LogManager.getLogManager().readConfiguration( loggingProperties );
-      //  loggingProperties.close();
-    }
-    
-    public void tearDown() throws Exception {
-    }
-    public void testNull() throws Exception {
-    	assertEquals(true, true);
-    }
 
-    public void testParse() throws Exception {
+	public void testNull() throws Exception {
-    	FieldTypeParser p = new FieldTypeParser();
+		assertEquals(true, true);
-    	p.parseVascFieldTypes();
+	}
-    	
+
-    	System.out.println("Got types;");
+	public void testParse() throws Exception {
-    	for (VascEntryFieldType t:p.getTypes()) {
+		FieldTypeDriver p = new FieldTypeDriver();
-    		System.out.println("t= "+t.getId());	
+		System.out.println("Got types;");
-    	}
+		for (VascEntryFieldType t:p.getVascFieldTypes()) {
-    }
+			System.out.println("t= "+t.getId());
-}
+		}
+	}
+}

vasc-demo/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>vasc</artifactId>
     <groupId>net.forwardfire.vasc</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>vasc-demo</artifactId>
@@ -12,8 +12,10 @@
   <name>vasc-demo</name>
   <description>vasc-demo</description>
   <modules>
-  	<module>vasc-demo-petstore-j2ee5</module>
+    <module>vasc-demo-build</module>
-  	<module>vasc-demo-tech</module>
+    <module>vasc-demo-client-swing</module>
-  	<module>vasc-demo-server</module>
+    <module>vasc-demo-server</module>
+    <module>vasc-demo-tech-domain</module>
+    <module>vasc-demo-tech-web</module>
   </modules>
 </project>

vasc-demo/vasc-demo-build/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>vasc-demo-tech</name>
+	<name>vasc-demo-build</name>
 	<comment></comment>
 	<projects>
 	</projects>

vasc-demo/vasc-demo-build/pom.xml

@@ -1,18 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>vasc-demo</artifactId>
     <groupId>net.forwardfire.vasc.demo</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <artifactId>vasc-demo</artifactId>
-    <relativePath>..</relativePath>
+    <version>0.4.2-SNAPSHOT</version>
   </parent>
-  <artifactId>vasc-demo-tech</artifactId>
+  <groupId>net.forwardfire.vasc.demo.build</groupId>
+  <artifactId>vasc-demo-build</artifactId>
   <packaging>pom</packaging>
-  <name>vasc-demo-tech</name>
+  <name>vasc-demo-build</name>
-  <description>vasc-demo-tech</description>
+  <description>vasc-demo-build</description>
   <modules>
-  	<module>vasc-demo-tech-web</module>
+    <module>vasc-demo-build-server</module>
-  	<module>vasc-demo-tech-client-swing</module>
+    <module>vasc-demo-build-client-swing</module>
-  	<module>vasc-demo-tech-ejb3</module>
   </modules>
 </project>

vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/pom.xml

@@ -1,14 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>net.forwardfire.vasc.demo</groupId>
+    <groupId>net.forwardfire.vasc.demo.build</groupId>
-    <artifactId>vasc-demo-server</artifactId>
+    <artifactId>vasc-demo-build</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
   </parent>
-  <artifactId>vasc-demo-server-build-client-swing</artifactId>
+  <artifactId>vasc-demo-build-client-swing</artifactId>
   <packaging>pom</packaging>
-  <name>vasc-demo-server-build-client-swing</name>
+  <name>vasc-demo-build-client-swing</name>
-  <description>vasc-demo-server-build-client-swing</description>
+  <description>vasc-demo-build-client-swing</description>
   <build>
     <plugins>
       <plugin>
@@ -35,7 +35,7 @@
   <dependencies>
     <dependency>
       <groupId>net.forwardfire.vasc.demo</groupId>
-      <artifactId>vasc-demo-tech-client-swing</artifactId>
+      <artifactId>vasc-demo-client-swing</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

vasc-demo/vasc-demo-build/vasc-demo-build-server/pom.xml

@@ -1,15 +1,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>vasc-demo-server</artifactId>
+    <artifactId>vasc-demo-build</artifactId>
-    <groupId>net.forwardfire.vasc.demo</groupId>
+    <groupId>net.forwardfire.vasc.demo.build</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>vasc-demo-server-build</artifactId>
+  <artifactId>vasc-demo-build-server</artifactId>
   <packaging>pom</packaging>
-  <name>vasc-demo-server-build</name>
+  <name>vasc-demo-build-server</name>
-  <description>Vasc Demo Server Build</description>
+  <description>Vasc Demo Build Server</description>
   <build>
     <plugins>
       <plugin>
@@ -31,6 +31,7 @@
           </execution>
         </executions>
       </plugin>
+      <!-- 
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
@@ -78,12 +79,13 @@
               </dependency>
             </dependencies>
           </plugin>
+           -->
     </plugins>
   </build>
   <dependencies>
     <dependency>
       <groupId>net.forwardfire.vasc.demo</groupId>
-      <artifactId>vasc-demo-server-core</artifactId>
+      <artifactId>vasc-demo-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -92,8 +94,8 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>net.forwardfire.vasc.demo</groupId>
+      <groupId>net.forwardfire.vasc.demo.build</groupId>
-      <artifactId>vasc-demo-server-build-client-swing</artifactId>
+      <artifactId>vasc-demo-build-client-swing</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
     </dependency>

vasc-demo/vasc-demo-client-swing/pom.xml

@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>vasc-demo-tech</artifactId>
+    <artifactId>vasc-demo</artifactId>
     <groupId>net.forwardfire.vasc.demo</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>vasc-demo-tech-client-swing</artifactId>
+  <artifactId>vasc-demo-client-swing</artifactId>
   <dependencies>
     <dependency>
   		<groupId>net.forwardfire.vasc</groupId>
@@ -40,7 +40,7 @@
     </dependency>
     <dependency>
 		<groupId>net.forwardfire.vasc.demo</groupId>
-  		<artifactId>vasc-demo-tech-ejb3</artifactId>
+  		<artifactId>vasc-demo-tech-domain</artifactId>
   		<version>${project.version}</version>
     </dependency>
     <dependency>

vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanel.java

@@ -50,9 +50,9 @@ import net.forwardfire.vasc.core.VascEntryConfigControllerLocal;
 import net.forwardfire.vasc.core.VascEntryControllerLocal;
 import net.forwardfire.vasc.core.VascEntryLocal;
 import net.forwardfire.vasc.core.VascException;
-import net.forwardfire.vasc.demo.tech.ejb3.menu.VascMenuController;
+import net.forwardfire.vasc.demo.tech.domain.menu.VascMenuController;
-import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenu;
+import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenu;
-import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuGroup;
+import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuGroup;
 import net.forwardfire.vasc.ejb3.VascServiceManager;
 import net.forwardfire.vasc.ejb3.VascServiceRemoteBackend;
 import net.forwardfire.vasc.frontend.swing.SwingPanelIntegration;

vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanelMenuBar.java

@@ -31,7 +31,7 @@ import javax.swing.JMenuItem;
 import javax.swing.JTabbedPane;
 
 import net.forwardfire.vasc.core.VascException;
-import net.forwardfire.vasc.demo.tech.ejb3.menu.VascMenuController;
+import net.forwardfire.vasc.demo.tech.domain.menu.VascMenuController;
 
 /**
  * JMainPanelMenuBar Adds all menu bar items.

vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/VascDemoSwingClient.java

@@ -42,8 +42,8 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 
-import net.forwardfire.vasc.demo.tech.ejb3.menu.VascMenuController;
+import net.forwardfire.vasc.demo.tech.domain.menu.VascMenuController;
-import net.forwardfire.vasc.demo.tech.ejb3.user.ClientUserController;
+import net.forwardfire.vasc.demo.tech.domain.user.ClientUserController;
 import net.forwardfire.vasc.ejb3.VascServiceManager;
 import net.forwardfire.vasc.lib.i18n.bundle.RootApplicationBundle;
 

vasc-demo/vasc-demo-petstore-j2ee5/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>demo-petstore</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>

vasc-demo/vasc-demo-petstore-j2ee5/pom.xml

@@ -1,17 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>vasc-demo</artifactId>
-    <groupId>net.forwardfire.vasc.demo</groupId>
-    <version>0.4.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>vasc-demo-petstore-j2ee5</artifactId>
-  <packaging>pom</packaging>
-  <name>vasc-demo-petstore-j2ee5</name>
-  <description>vasc-demo-petstore-j2ee5</description>
-  <modules>
-  	<module>vasc-demo-petstore-j2ee5-ejb</module>
-  	<module>vasc-demo-petstore-j2ee5-war</module>
-  	<module>vasc-demo-petstore-j2ee5-ear</module>
-  </modules>
-</project>

vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.project

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>demo-petstore-ear</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>

vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/pom.xml

@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>vasc-demo-petstore-j2ee5</artifactId>
-    <groupId>net.forwardfire.vasc.demo</groupId>
-    <version>0.4.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>vasc-demo-petstore-j2ee5-ear</artifactId>
-  <name>vasc-demo-petstore-j2ee5-ear</name>
-  <description>vasc-demo-petstore-j2ee5-ear</description>
-</project>

vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.project

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>demo-petstore-ejb</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>

vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/pom.xml

@@ -1,82 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>vasc-demo-petstore-j2ee5</artifactId>
-    <groupId>net.forwardfire.vasc.demo</groupId>
-    <version>0.4.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>vasc-demo-petstore-j2ee5-ejb</artifactId>
-  <packaging>ejb</packaging>
-  <name>vasc-demo-petstore-j2ee5-ejb</name>
-  <description>vasc-demo-petstore-j2ee5-ejb</description>
- <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-ejb-plugin</artifactId>
-        <version>${maven-ejb-plugin.version}</version>
-        <configuration>
-          <ejbVersion>3.0</ejbVersion>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-	<dependency>
-  		<groupId>javax.el</groupId>
-  		<artifactId>el-api</artifactId>
-  		<version>${el-api.version}</version>
-	</dependency>
-    <dependency>
-      <groupId>javax.ejb</groupId>
-      <artifactId>ejb-api</artifactId>
-      <version>${ejb-api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.persistence</groupId>
-      <artifactId>persistence-api</artifactId>
-      <version>${persistence-api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-		<groupId>org.hibernate</groupId>
-		<artifactId>hibernate-annotations</artifactId>
-		<version>${hibernate-annotations.version}</version>
-		<scope>provided</scope>
-    </dependency>
-	<dependency>
-   		<groupId>org.x4o</groupId>
-   		<artifactId>x4o-core</artifactId>
-   		<version>${x4o.version}</version>
-   		<scope>provided</scope>
-	</dependency>
-    <dependency>
-		<groupId>net.forwardfire.vasc</groupId>
-  		<artifactId>vasc-core</artifactId>
-  		<version>${project.version}</version>
-  		<scope>provided</scope>
-    </dependency>
-    <dependency>
-		<groupId>net.forwardfire.vasc</groupId>
-  		<artifactId>vasc-backend-jpa</artifactId>
-  		<version>${project.version}</version>
-  		<scope>provided</scope>
-    </dependency>
-    <dependency>
-		<groupId>net.forwardfire.vasc</groupId>
-  		<artifactId>vasc-xpql</artifactId>
-  		<version>${project.version}</version>
-    </dependency>
-    <dependency>
-		<groupId>net.forwardfire.vasc</groupId>
-  		<artifactId>vasc-xpql-ejb3-client</artifactId>
-  		<version>${project.version}</version>
-    </dependency>
-    <dependency>
-		<groupId>net.forwardfire.vasc</groupId>
-  		<artifactId>vasc-core-ejb3-server</artifactId>
-  		<version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreEntity.java

@@ -1,5 +0,0 @@
-package demo.petstore.models;
-
-abstract public class AbstractPetStoreEntity {
-
-}

vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/persistence.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
-  version="1.0">
-
-	<persistence-unit name="petstore_pu" transaction-type="JTA" >
-		
-		<jta-data-source>java:demo_petstore_dba</jta-data-source>		
-
-		<class>demo.petstore.models.Category</class>
-		<class>demo.petstore.models.CategoryProduct</class>
-		<class>demo.petstore.models.Item</class>
-		<class>demo.petstore.models.ItemInventory</class>
-		<class>demo.petstore.models.ItemSupplier</class>
-		<class>demo.petstore.models.Order</class>
-		<class>demo.petstore.models.OrderLine</class>
-		<class>demo.petstore.models.OrderStatus</class>
-		<class>demo.petstore.models.UserAccount</class>
-		<class>demo.petstore.models.UserCredential</class>
-		<class>demo.petstore.models.UserProfile</class>
-		
-	
-		<properties>
-			<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
-			<property name="hibernate.max_fetch_depth" value="3"/>
-
-			<!-- Print SQL to stdout. -->
-			<property name="hibernate.show_sql" value="false"/>
-			<property name="hibernate.format_sql" value="true"/>			
-		</properties>
-		
-	</persistence-unit>
-
-</persistence>

vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.project

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>demo-petstore-war</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>

vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/pom.xml

@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>vasc-demo-petstore-j2ee5</artifactId>
-    <groupId>net.forwardfire.vasc.demo</groupId>
-    <version>0.4.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>vasc-demo-petstore-j2ee5-war</artifactId>
-  <name>vasc-demo-petstore-j2ee5-war</name>
-  <description>vasc-demo-petstore-j2ee5-war</description>
-</project>

vasc-demo/vasc-demo-server/.project

@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -12,6 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>

vasc-demo/vasc-demo-server/pom.xml

@@ -3,16 +3,303 @@
   <parent>
     <artifactId>vasc-demo</artifactId>
     <groupId>net.forwardfire.vasc.demo</groupId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>vasc-demo-server</artifactId>
-  <packaging>pom</packaging>
   <name>vasc-demo-server</name>
-  <description>Vasc Demo Server</description>
+  <description>vasc-demo-server</description>
-  <modules>
+  <build>
-  	<module>vasc-demo-server-build</module>
+    <plugins>
-  	<module>vasc-demo-server-core</module>
+      <plugin>
-  	<module>vasc-demo-server-build-client-swing</module>
+        <groupId>org.apache.maven.plugins</groupId>
-  </modules>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>${maven-antrun-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>generate-version-class</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <mkdir dir="${project.build.directory}/generated-sources/net/forwardfire/vasc/demo/server/core" />
+                <echo file="${project.build.directory}/generated-sources/net/forwardfire/vasc/demo/server/core/VascTechDemoBuildInfoImpl.java">
+                  package net.forwardfire.vasc.demo.server.core;
+                  /** Automatically generated by ant. */
+                  public class VascTechDemoBuildInfoImpl implements VascTechDemoBuildInfo {
+                    static public final String VERSION = "${project.version}";
+                    static public final String BUILD_DATE = "${maven.build.timestamp}";
+                    public String getVersion() {
+                      return VERSION;
+                    }
+                    public String getBuildDate() {
+                      return BUILD_DATE;
+                    }
+                  }
+                </echo>
+              </target>
+              <sourceRoot>
+                ${project.build.directory}/generated-sources
+              </sourceRoot>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+	  <groupId>org.x4o</groupId>
+  	  <artifactId>x4o-driver</artifactId>
+  	  <version>${x4o.version}</version>
+  	  <exclusions>
+  	    <exclusion>
+  		  <groupId>org.apache.tomcat</groupId>
+  		  <artifactId>jasper-el</artifactId>
+  		</exclusion>
+  		<exclusion>
+  		  <groupId>javax.el</groupId>
+  		  <artifactId>el-api</artifactId>
+  		</exclusion>
+  	  </exclusions>
+	</dependency>
+  	<dependency>
+  		<groupId>net.forwardfire.vasc.demo</groupId>
+  		<artifactId>vasc-demo-tech-web</artifactId>
+  		<version>${project.version}</version>
+  		<type>jar</type>
+  	</dependency>
+	<dependency>
+  		<groupId>net.forwardfire.vasc.demo</groupId>
+  		<artifactId>vasc-demo-tech-domain</artifactId>
+  		<version>${project.version}</version>
+  		<type>jar</type>
+  	</dependency>
+    <dependency>
+  		<groupId>net.forwardfire.vasc</groupId>
+  		<artifactId>vasc-core</artifactId>
+  		<version>${project.version}</version>
+  	</dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc</groupId>
+  		<artifactId>vasc-frontend-swing</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc</groupId>
+  		<artifactId>vasc-frontend-web-jsf</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc</groupId>
+  		<artifactId>vasc-frontend-web-export</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc</groupId>
+  		<artifactId>vasc-frontend-cxf-server</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc</groupId>
+  		<artifactId>vasc-backend-ldap</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc</groupId>
+  		<artifactId>vasc-backend-mongodb</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc</groupId>
+  		<artifactId>vasc-backend-metamodel</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc</groupId>
+  		<artifactId>vasc-backend-jdbc</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc.export</groupId>
+  		<artifactId>vasc-export-jr4o</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc.export</groupId>
+  		<artifactId>vasc-export-json</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc.lib</groupId>
+  		<artifactId>vasc-lib-i18n</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+  		<groupId>net.forwardfire.vasc.lib</groupId>
+  		<artifactId>vasc-lib-editor</artifactId>
+  		<version>${project.version}</version>
+  	</dependency>
+    <dependency>
+		<groupId>net.forwardfire.vasc.test</groupId>
+  		<artifactId>vasc-test-i18n</artifactId>
+  		<version>${project.version}</version>
+    </dependency>
+    <dependency>
+  		<groupId>net.forwardfire.vasc</groupId>
+  		<artifactId>vasc-core-ejb3-server</artifactId>
+  		<version>${project.version}</version>
+  	</dependency>
+    <dependency>
+  		<groupId>net.forwardfire.vasc.demo</groupId>
+  		<artifactId>vasc-demo-tech-web</artifactId>
+  		<version>${project.version}</version>
+  	</dependency>
+    <dependency>
+      <groupId>org.jdesktop.bsaf</groupId>
+      <artifactId>bsaf</artifactId>
+      <version>${bsaf.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>jnlp</artifactId>
+          <groupId>javax.jnlp</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+    	<groupId>commons-io</groupId>
+    	<artifactId>commons-io</artifactId>
+    	<version>${commons-io.version}</version>
+    </dependency>
+    <dependency>
+		<groupId>net.jawr</groupId>
+		<artifactId>jawr</artifactId>
+		<version>${jawr.version}</version>
+    </dependency>
+    <dependency>
+    	<groupId>de.tudarmstadt.ukp.wikipedia</groupId>
+    	<artifactId>de.tudarmstadt.ukp.wikipedia.api</artifactId>
+    	<version>0.9.1</version>
+    	<exclusions>
+    		<exclusion>
+    			<artifactId>log4j</artifactId>
+    			<groupId>log4j</groupId>
+    		</exclusion>
+    		<exclusion>
+    			<artifactId>javassist</artifactId>
+    			<groupId>javassist</groupId>
+    		</exclusion>
+    	</exclusions>
+    </dependency>
+    
+    <dependency>
+    	<groupId>org.apache.openejb</groupId>
+    	<artifactId>tomee-mojarra</artifactId>
+    	<version>${tomee.version}</version>
+    	<exclusions>
+    		<exclusion>
+    			<artifactId>slf4j-jdk14</artifactId>
+    			<groupId>org.slf4j</groupId>
+    		</exclusion>
+    	</exclusions>
+    </dependency>
+    <dependency>
+    	<groupId>org.apache.openejb</groupId>
+    	<artifactId>tomee-embedded</artifactId>
+    	<version>${tomee.version}</version>
+    	<exclusions>
+    		<exclusion>
+    			<artifactId>tomee-myfaces</artifactId>
+    			<groupId>org.apache.openejb</groupId>
+    		</exclusion>
+    		<exclusion>
+    			<artifactId>myfaces-api</artifactId>
+    			<groupId>org.apache.myfaces.core</groupId>
+    		</exclusion>
+    		<exclusion>
+    			<artifactId>myfaces-impl</artifactId>
+    			<groupId>org.apache.myfaces.core</groupId>
+    		</exclusion>
+    	</exclusions>
+    </dependency>
+
+	<!-- Web tech deps -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <version>${jstl.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.faces</artifactId>
+      <version>${javax.faces.version}</version>
+    </dependency>
+            
+    <!-- RichFaces libraries -->
+    <dependency>
+        <groupId>org.richfaces.core</groupId>
+        <artifactId>richfaces-core-impl</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.richfaces.ui</groupId>
+        <artifactId>richfaces-components-ui</artifactId>
+    </dependency>
+	<dependency>
+		<groupId>org.ocpsoft.rewrite</groupId>
+		<artifactId>rewrite-servlet</artifactId>
+		<version>${rewrite-servlet.version}</version>
+	</dependency>
+
+	<!-- Jdbc Drivers for demo -->
+    <dependency>
+    	<groupId>com.h2database</groupId>
+    	<artifactId>h2</artifactId>
+    	<version>${h2.version}</version>
+    </dependency>
+    <dependency>
+    	<groupId>postgresql</groupId>
+    	<artifactId>postgresql</artifactId>
+    	<version>${postgresql.version}</version>
+    </dependency>
+    <dependency>
+    	<groupId>mysql</groupId>
+    	<artifactId>mysql-connector-java</artifactId>
+    	<version>${mysql-connector-java.version}</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.apache.derby</groupId>
+		<artifactId>derby</artifactId>
+		<version>${derby.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.xerial</groupId>
+		<artifactId>sqlite-jdbc</artifactId>
+		<version>3.7.2</version>
+	</dependency>
+
+	<!-- Setup proper logging -->
+	<dependency>
+		<groupId>ch.qos.logback</groupId>
+		<artifactId>logback-access</artifactId>
+		<version>${logback-access.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>ch.qos.logback</groupId>
+		<artifactId>logback-classic</artifactId>
+		<version>${logback-classic.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.slf4j</groupId>
+		<artifactId>jul-to-slf4j</artifactId>
+		<version>${jul-to-slf4j.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.slf4j</groupId>
+		<artifactId>log4j-over-slf4j</artifactId>
+		<version>${log4j-over-slf4j.version}</version>
+	</dependency>
+
+  </dependencies>
 </project>