diff --git a/.classpath b/.classpath
index ba9359e..0564845 100644
--- a/.classpath
+++ b/.classpath
@@ -1,24 +1,13 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
diff --git a/.project b/.project
index e78fd34..e26af5a 100644
--- a/.project
+++ b/.project
@@ -35,8 +35,14 @@
+
+ org.maven.ide.eclipse.maven2Builder
+
+
+
+ org.maven.ide.eclipse.maven2Nature
com.genuitec.eclipse.ast.deploy.core.deploymentnature
com.genuitec.eclipse.j2eedt.core.webnature
org.eclipse.jem.workbench.JavaEMFNature
diff --git a/lib/idcanet-fff-bin.jar b/lib/idcanet-fff-bin.jar
deleted file mode 100644
index 3a6894f..0000000
Binary files a/lib/idcanet-fff-bin.jar and /dev/null differ
diff --git a/lib/idcanet-jmx-bin.jar b/lib/idcanet-jmx-bin.jar
deleted file mode 100644
index b3b04fa..0000000
Binary files a/lib/idcanet-jmx-bin.jar and /dev/null differ
diff --git a/lib/idcanet-serv5-bin.jar b/lib/idcanet-serv5-bin.jar
deleted file mode 100644
index 2098c9c..0000000
Binary files a/lib/idcanet-serv5-bin.jar and /dev/null differ
diff --git a/lib/idcanet-x4o-bin.jar b/lib/idcanet-x4o-bin.jar
deleted file mode 100644
index 9d465c7..0000000
Binary files a/lib/idcanet-x4o-bin.jar and /dev/null differ
diff --git a/lib/idcanet-xtes-bin.jar b/lib/idcanet-xtes-bin.jar
deleted file mode 100644
index 24664ae..0000000
Binary files a/lib/idcanet-xtes-bin.jar and /dev/null differ
diff --git a/lib/microba-0.4.2-bin.jar b/lib/microba-0.4.2-bin.jar
deleted file mode 100644
index 0d09470..0000000
Binary files a/lib/microba-0.4.2-bin.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 3551a83..639f4dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,166 +1,362 @@
- 4.0.0
- com.idcanet
- vasc
- jar
- 1.0-SNAPSHOT
- Vasc with maven
- http://maven.apache.org
-
-
-
- maven.dev.java.net
- Java.net Repository for Maven
- http://download.java.net/maven/2/
- default
-
+4.0.0
+com.idcanet.vasc
+vasc-main
+jar
+0.8-SNAPSHOT
+vasc
+Simple crud'ing for all.
+http://www.x4o.org/vasc
+
+ IDCA
+ http://www.idca.nl
+
+
+
+ Trac
+ https://decaid.idca.nl/trac/oss/
+
+
+ scm:svn:https://decaid.idca.nl/svn/oss/com.idcanet.vasc/
+ scm:svn:https://decaid.idca.nl/svn/oss/com.idcanet.vasc/
+ https://decaid.idca.nl/svn/oss/com.idcanet.vasc/
+
+
+
+
+ willem.cazander
+ Willem Cazander
+ w.cazander@gmail.com
+ IDCA
+ +2
+
+ Project Manager
+ Architect
+
+
+
+ sqrbass
+ Bas van Oostveen
+
+ IDCA
+ +2
+
+ Architect Reviewer
+
+
+
+
+
- maven.jboss.org
- JBoss.org maven2 Repository
- http://repository.jboss.org/maven2/
- default
-
-
-
-
-
-
-
- junit
- junit
- 4.0
- test
-
-
- dk.eobjects.metamodel
- MetaModel-full
- 1.1.1
-
-
-
- de.odysseus.juel
- juel
- 2.1.0
-
-
-
- org.codehaus.mojo
- hibernate3-maven-plugin
- 2.1
-
-
-
- com.novell.ldap
- jldap
- 4.3
-
-
-
- com.idcanet
- x4o
+ jboss
+ JBoss Repository Switchboard
+ default
+ http://repository.jboss.com/maven2/
+ true
+ false
+
+
+ ops4j-microba
+ ops4j.org
+ default
+ http://repository.ops4j.org/maven2/
+ false
+
+
+
+
+
+
+
+ com.idcanet.x4o
+ x4o-main
0.8-SNAPSHOT
-
+
-
-
- target
- target/classes
- ${project.artifactId}-${project.version}
- target/test-classes
- src/
- tests/
-
+
+ com.idcanet.serv5
+ serv5-main
+ 0.6-SNAPSHOT
+
+
+
+
+ com.idcanet.xtes
+ xtes-main
+ 0.6-SNAPSHOT
+
+
+
+
+ com.idcanet.fff
+ fff-main
+ 0.8-SNAPSHOT
+
+
+
+
+ com.novell.ldap
+ jldap
+ 4.3
+
+
+
+
+ com.michaelbaranov
+ microba
+ 0.4.4.1
+
+
+
+
+ org.eclipse
+ swt
+ 3.3.0-v3346
+
+
+
+
+ org.testng
+ testng
+ 5.8
+ test
+ jdk15
+
+
+
+
+
-
-
-
- maven-compiler-plugin
-
- UTF-8
- 1.5
- 1.5
-
-
-
- maven-site-plugin
- 2.0-beta-7
-
- UTF-8
-
-
-
+
+
+
+
+
+ maven-compiler-plugin
+
+ UTF-8
+ 1.5
+ 1.5
+
+
+
+
+
+ maven-site-plugin
+ 2.0-beta-7
+
+ UTF-8
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.4
+
+
-
-
+
+
+ com.agilejava.docbkx
+ docbkx-maven-plugin
+
+
+
+ src/main/docbook/
+ target/site/docbook/
+
+
+ *.xml
+
+
+
+ true
+
+
+ version
+ ${version}
+
+
+
+
+ true
+
+
+
+
-
-
-
-
-
-
-
-
- target/site
-
-
-
-
-
-
+ file:///${basedir}/src/main/docbook/
+
+
+
+
+ create-html-docs
+ site
+ generate-html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.docbook
+ docbook-xml
+ 4.4
+ runtime
+
+
+
+
+
+
- -->
+
+
+ target/site
+
+
+ org.codehaus.mojo
+ cobertura-maven-plugin
+
+
+ org.apache.maven.plugins
+ maven-surefire-report-plugin
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ org.apache.maven.plugins
+ maven-project-info-reports-plugin
+
+
+
+ summary
+ dependencies
+ project-team
+
+
+
+
+
+ org.codehaus.mojo
+ jxr-maven-plugin
+
+
+ org.apache.maven.plugins
+ maven-surefire-report-plugin
+ 2.4.2
+
+
+ org.codehaus.mojo
+ jdepend-maven-plugin
+
+
+ org.apache.maven.plugins
+ maven-changes-plugin
+ 2.0
+
+ ${basedir}/src/site/changes.xml
+
+
+
+ changes-report
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test/java/com/idcanet/vasc/SWTTest.java b/src/test/java/com/idcanet/vasc/SWTTest.java
index 7d9e8e5..6732807 100644
--- a/src/test/java/com/idcanet/vasc/SWTTest.java
+++ b/src/test/java/com/idcanet/vasc/SWTTest.java
@@ -29,9 +29,6 @@ package com.idcanet.vasc;
import java.io.InputStream;
import java.util.logging.LogManager;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
import com.idcanet.vasc.frontends.swt.SwtVascFrontend;
@@ -60,6 +57,7 @@ public class SWTTest extends TestCase {
public void testAll() throws Exception {
// get GUI
+ /*
Display display = new Display();
Shell shell = new Shell(display);
shell.setText("Vasc Test - Swt");
@@ -79,6 +77,8 @@ public class SWTTest extends TestCase {
}
}
display.dispose();
+
+ */
}
diff --git a/src/test/java/com/idcanet/vasc/TestTable.java b/src/test/java/com/idcanet/vasc/TestTable.java
index dc50243..857e934 100644
--- a/src/test/java/com/idcanet/vasc/TestTable.java
+++ b/src/test/java/com/idcanet/vasc/TestTable.java
@@ -117,7 +117,7 @@ public class TestTable {
VascController c = getDefaultVascController();
VascParser parser = new VascParser(c);
- parser.parseResource("resources/vasc/tables.xml");
+ parser.parseResource("vasc/tables.xml");
VascEntry entry = parser.getVascController().getVascEntryControllerResolver().getVascEntryController().getVascEntryById("test1");
fill(entry,c);