diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eac89ec
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,61 @@
+#
+# Copyright (c) 2011, 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.
+#
+#
+# Ignore some files in the x4o project.
+#
+
+# Ignore all maven target directories
+/target
+*/target
+*/*/target
+*/*/*/target
+
+# Ignore leftovers of really failed release build
+release.properties
+pom.xml.next
+pom.xml.releaseBackup
+pom.xml.backup
+pom.xml.branch
+pom.xml.tag
+# Ignore version plugin backup
+pom.xml.versionsBackup
+
+
+# Ignore C/java/images binary files
+*.o
+*.hex
+*.dat
+*.bmp
+*.gif
+*.pdf
+
+# Ignore netbeans directory
+nbproject
+
+# Ignore mac finder files
+.DS_Store
+
+# Ignore windows files.
+Thumbs.db
+Desktop.ini
+
diff --git a/.project b/.project
index c903031..ca19bfe 100644
--- a/.project
+++ b/.project
@@ -6,12 +6,12 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builders</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/pom.xml b/pom.xml
index c337941..dab44ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
 	<module>vasc-ejb3</module>
 	<module>vasc-xpql</module>
 	<module>vasc-xpql-ejb3</module>
+	<module>demo-petstore</module>
 </modules>
 <properties>
 	<hg.repo.url>https://decaid.idca.nl/hg/com.idcanet.vasc/</hg.repo.url>
@@ -47,6 +48,62 @@
 	<testng.version>5.8</testng.version>
 	<x4o-core.version>0.8.1</x4o-core.version>
 	<jldap.version>4.3</jldap.version>
+	
+	    <!-- Maven plugin versions -->
+    <exec-maven-plugin.version>1.2</exec-maven-plugin.version>
+    <findbugs-maven-plugin.version>2.3.1</findbugs-maven-plugin.version>
+    <cobertura-maven-plugin.version>2.4</cobertura-maven-plugin.version>
+    <sonar-maven-plugin.version>1.0-beta-2</sonar-maven-plugin.version>
+    <xml-maven-plugin.version>1.0-beta-3</xml-maven-plugin.version>
+    <antlr3-maven-plugin.version>3.2</antlr3-maven-plugin.version>
+    <wagon-maven-plugin.version>1.0-beta-3</wagon-maven-plugin.version>
+    <maven-war-plugin.version>2.1</maven-war-plugin.version>
+    <maven-ejb-plugin.version>2.3</maven-ejb-plugin.version>
+    <maven-ear-plugin.version>2.4.2</maven-ear-plugin.version>
+    <maven-compiler-plugin.version>2.0.2</maven-compiler-plugin.version>
+    <maven-source-plugin.version>2.1.2</maven-source-plugin.version>
+    <maven-javadoc-plugin.version>2.7</maven-javadoc-plugin.version>
+    <maven-release-plugin.version>2.1</maven-release-plugin.version>
+    <maven-deploy-plugin.version>2.5</maven-deploy-plugin.version>
+    <maven-site-plugin.version>3.0-beta-3</maven-site-plugin.version>
+    <maven-plugin-api.version>2.0</maven-plugin-api.version>
+    <maven-pmd-plugin.version>2.5</maven-pmd-plugin.version>
+    <maven-jmeter-plugin.version>1.0</maven-jmeter-plugin.version>
+    <maven-surefire-plugin.version>2.4</maven-surefire-plugin.version>
+    <maven-surefire-report-plugin.version>2.5</maven-surefire-report-plugin.version>
+    <maven-checkstyle-plugin.version>2.5</maven-checkstyle-plugin.version>
+    <maven-enforcer-plugin.version>1.0-beta-1</maven-enforcer-plugin.version>
+    <maven-project-info-reports-plugin.version>2.2</maven-project-info-reports-plugin.version>
+	
+	    <!-- WAR deps -->
+    <servlet-api.version>2.4</servlet-api.version>
+    <jstl.version>1.2</jstl.version>
+    <jsp-api.version>2.1</jsp-api.version>
+    <taglibs.version>1.1.2</taglibs.version>
+    <jsf-api.version>1.2_12</jsf-api.version>
+    <jsf-impl.version>1.2_12</jsf-impl.version>
+    <jsf-facelets.version>1.1.15.B1</jsf-facelets.version>
+    <richfaces-api.version>3.3.3.Final</richfaces-api.version>
+    <richfaces-impl.version>3.3.3.Final</richfaces-impl.version>
+    <richfaces-ui.version>3.3.3.Final</richfaces-ui.version>
+    <el-ri.version>1.2</el-ri.version>
+    <el-api.version>1.2</el-api.version>
+
+    <!-- EJB deps -->
+    <ejb-api.version>3.0</ejb-api.version>
+    <persistence-api.version>1.0</persistence-api.version>
+    <hibernate-annotations.version>3.4.0.GA</hibernate-annotations.version>
+    <quartz.version>1.6.3</quartz.version>
+
+    <!-- XML deps -->
+    <saxon.version>9.1.0.8</saxon.version>
+    <xercesImpl.version>2.8.1</xercesImpl.version>
+    <xml-apis.version>1.0.b2</xml-apis.version>
+
+    <!-- JBOSS -->
+    <jbosssx-client.version>3.0.0.CR2</jbosssx-client.version>
+    <jboss-as-tomcat.version>6.0.0.Final</jboss-as-tomcat.version>
+	
 </properties>
 
 <dependencies>
diff --git a/vasc-core/.project b/vasc-core/.project
index fe68099..034375e 100644
--- a/vasc-core/.project
+++ b/vasc-core/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/vasc-ejb3/.classpath b/vasc-ejb3/.classpath
index f42fb64..7106942 100644
--- a/vasc-ejb3/.classpath
+++ b/vasc-ejb3/.classpath
@@ -5,6 +5,7 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/vasc-ejb3/.project b/vasc-ejb3/.project
index 66a9c88..b292980 100644
--- a/vasc-ejb3/.project
+++ b/vasc-ejb3/.project
@@ -11,13 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builders</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/vasc-frontend-swing/.project b/vasc-frontend-swing/.project
index fb329e0..fb551ed 100644
--- a/vasc-frontend-swing/.project
+++ b/vasc-frontend-swing/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/vasc-frontend-swing/src/test/java/com/idcanet/vasc/SwingTest.java b/vasc-frontend-swing/src/test/java/com/idcanet/vasc/SwingTest.java
index 6a7f89e..a94738c 100644
--- a/vasc-frontend-swing/src/test/java/com/idcanet/vasc/SwingTest.java
+++ b/vasc-frontend-swing/src/test/java/com/idcanet/vasc/SwingTest.java
@@ -60,6 +60,7 @@ public class SwingTest extends TestCase {
 
     public void testNull() throws Exception {
     	assertEquals(true, true);
+    	main(new String[] {});
     }
 
     public static void main(String[] argu){
diff --git a/vasc-xpql-ejb3/.project b/vasc-xpql-ejb3/.project
index 0a4e861..79c09ed 100644
--- a/vasc-xpql-ejb3/.project
+++ b/vasc-xpql-ejb3/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/vasc-xpql/.project b/vasc-xpql/.project
index d850219..9829a2b 100644
--- a/vasc-xpql/.project
+++ b/vasc-xpql/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>