diff --git a/.classpath b/.classpath
deleted file mode 100644
index d0bec0f..0000000
--- a/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index 2625eee..fe86331 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,10 @@
*/target
*/*/target
*/*/*/target
+*/*/*/*/target
+
+# Inore some artifact dirs;
+vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/tomcat.*
# Ignore leftovers of really failed release build
release.properties
@@ -21,12 +25,21 @@ pom.xml.versionsBackup
# Ignore C/java/images binary files
*.o
+*.so
+*.dll
*.hex
*.dat
*.bmp
*.gif
*.pdf
+# Ignore ~ backup files.
+*~
+
+# Ignore some eclipse files
+##.settings
+##.classpath
+
# Ignore netbeans directory
nbproject
@@ -37,6 +50,3 @@ nbproject
Thumbs.db
Desktop.ini
-# Ignore auto eclipse plugins settings
-org.eclipse.wst.common.component
-org.eclipse.wst.common.project.facet.core.xml
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 7f9d102..0000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Jan 14 05:41:26 CET 2012
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 90fc076..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri Aug 31 02:30:16 CEST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 5a738b6..0000000
--- a/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Nov 24 20:22:59 CET 2008
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-version=1
diff --git a/vasc-backend/.classpath b/vasc-backend/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-backend/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-backend/.settings/org.eclipse.core.resources.prefs b/vasc-backend/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 26f6df6..0000000
--- a/vasc-backend/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:40:49 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-backend/.settings/org.eclipse.jdt.core.prefs b/vasc-backend/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 17ecd09..0000000
--- a/vasc-backend/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sat Dec 31 00:09:30 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-backend/.settings/org.eclipse.m2e.core.prefs b/vasc-backend/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 7e64ade..0000000
--- a/vasc-backend/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sat Dec 31 00:09:29 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-backend/vasc-backend-jdbc/.classpath b/vasc-backend/vasc-backend-jdbc/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-backend/vasc-backend-jdbc/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-backend/vasc-backend-jdbc/.settings/org.eclipse.core.resources.prefs b/vasc-backend/vasc-backend-jdbc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index dc734e5..0000000
--- a/vasc-backend/vasc-backend-jdbc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 04:21:23 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-backend/vasc-backend-jdbc/.settings/org.eclipse.jdt.core.prefs b/vasc-backend/vasc-backend-jdbc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1fc168e..0000000
--- a/vasc-backend/vasc-backend-jdbc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sat Dec 31 04:21:23 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-backend/vasc-backend-jdbc/.settings/org.eclipse.m2e.core.prefs b/vasc-backend/vasc-backend-jdbc/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 6d08edf..0000000
--- a/vasc-backend/vasc-backend-jdbc/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sat Dec 31 04:21:23 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-backend/vasc-backend-jpa/.classpath b/vasc-backend/vasc-backend-jpa/.classpath
deleted file mode 100644
index 0b58ddc..0000000
--- a/vasc-backend/vasc-backend-jpa/.classpath
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs b/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index efe1633..0000000
--- a/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.jdt.core.prefs b/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9af107f..0000000
--- a/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Jan 02 23:47:23 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.m2e.core.prefs b/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 523f09f..0000000
--- a/vasc-backend/vasc-backend-jpa/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:02 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-backend/vasc-backend-jpa/.settings/org.maven.ide.eclipse.prefs b/vasc-backend/vasc-backend-jpa/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 116bf53..0000000
--- a/vasc-backend/vasc-backend-jpa/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Aug 30 21:55:22 CEST 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-backend/vasc-backend-ldap/.classpath b/vasc-backend/vasc-backend-ldap/.classpath
deleted file mode 100644
index 7106942..0000000
--- a/vasc-backend/vasc-backend-ldap/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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-backend/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs b/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index efe1633..0000000
--- a/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.jdt.core.prefs b/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f908acb..0000000
--- a/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Aug 30 21:55:41 CEST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.m2e.core.prefs b/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 523f09f..0000000
--- a/vasc-backend/vasc-backend-ldap/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:02 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-backend/vasc-backend-ldap/.settings/org.maven.ide.eclipse.prefs b/vasc-backend/vasc-backend-ldap/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 71b266b..0000000
--- a/vasc-backend/vasc-backend-ldap/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Aug 30 21:55:40 CEST 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-backend/vasc-backend-metamodel/.classpath b/vasc-backend/vasc-backend-metamodel/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-backend/vasc-backend-metamodel/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-backend/vasc-backend-metamodel/.settings/org.eclipse.core.resources.prefs b/vasc-backend/vasc-backend-metamodel/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 93e57cf..0000000
--- a/vasc-backend/vasc-backend-metamodel/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 05:51:03 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-backend/vasc-backend-metamodel/.settings/org.eclipse.jdt.core.prefs b/vasc-backend/vasc-backend-metamodel/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d2d382f..0000000
--- a/vasc-backend/vasc-backend-metamodel/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sat Dec 31 05:51:03 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-backend/vasc-backend-metamodel/.settings/org.eclipse.m2e.core.prefs b/vasc-backend/vasc-backend-metamodel/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 1611f69..0000000
--- a/vasc-backend/vasc-backend-metamodel/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sat Dec 31 05:51:03 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-backend/vasc-backend-mongodb/.classpath b/vasc-backend/vasc-backend-mongodb/.classpath
deleted file mode 100644
index 7106942..0000000
--- a/vasc-backend/vasc-backend-mongodb/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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-backend/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs b/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index efe1633..0000000
--- a/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.jdt.core.prefs b/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2489959..0000000
--- a/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Fri Dec 30 00:10:52 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.m2e.core.prefs b/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 6dd737b..0000000
--- a/vasc-backend/vasc-backend-mongodb/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Dec 30 00:10:52 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-core/.classpath b/vasc-core/.classpath
deleted file mode 100644
index 0b58ddc..0000000
--- a/vasc-core/.classpath
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-core/.settings/org.eclipse.core.resources.prefs b/vasc-core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index efe1633..0000000
--- a/vasc-core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-core/.settings/org.eclipse.jdt.core.prefs b/vasc-core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9af107f..0000000
--- a/vasc-core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Jan 02 23:47:23 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-core/.settings/org.eclipse.m2e.core.prefs b/vasc-core/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f91215d..0000000
--- a/vasc-core/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:03 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-core/.settings/org.maven.ide.eclipse.prefs b/vasc-core/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 311bf6b..0000000
--- a/vasc-core/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Aug 30 22:00:12 CEST 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-core/src/main/resources/META-INF/vasc/vasc-lang.eld b/vasc-core/src/main/resources/META-INF/vasc/vasc-lang.eld
index d83c6b3..b648583 100644
--- a/vasc-core/src/main/resources/META-INF/vasc/vasc-lang.eld
+++ b/vasc-core/src/main/resources/META-INF/vasc/vasc-lang.eld
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<eld:root xmlns:eld="http://eld.x4o.org/eld/eld-lang.eld">
-
+
+ <eld:elementClass tag="root" objectClassName="java.lang.Object">
+ <eld:elementDescription>Fake root tag</eld:elementDescription>
+ </eld:elementClass>
+
<eld:elementRefectionBindingHandler parentClass="net.forwardfire.vasc.core.VascEntry" childClass="net.forwardfire.vasc.core.VascEntryFieldSet" method="addVascEntryFieldSet"/>
<eld:elementRefectionBindingHandler parentClass="net.forwardfire.vasc.core.VascEntry" childClass="net.forwardfire.vasc.core.VascLinkEntry" method="addVascLinkEntry"/>
<eld:elementRefectionBindingHandler parentClass="net.forwardfire.vasc.core.VascEntry" childClass="net.forwardfire.vasc.backend.VascBackendFilter" method="addVascBackendFilter"/>
diff --git a/vasc-demo/.classpath b/vasc-demo/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-demo/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-demo/.settings/org.eclipse.core.resources.prefs b/vasc-demo/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 26f6df6..0000000
--- a/vasc-demo/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:40:49 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-demo/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c31f696..0000000
--- a/vasc-demo/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sat Dec 31 00:19:32 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-demo/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 205cdb9..0000000
--- a/vasc-demo/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sat Dec 31 00:19:32 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/.classpath b/vasc-demo/vasc-demo-petstore-j2ee5/.classpath
deleted file mode 100644
index f42fb64..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index ed71e93..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e42f9f9..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Mar 21 21:21:31 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f91215d..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:03 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.maven.ide.eclipse.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 99fa036..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Mar 21 21:21:31 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.classpath b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.classpath
deleted file mode 100644
index 77b6db8..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index ed71e93..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 01efec6..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Mar 21 21:23:56 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f91215d..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:03 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.maven.ide.eclipse.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 77be0cd..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Mar 21 21:23:56 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.classpath b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.classpath
deleted file mode 100644
index 71a9d16..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/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">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 578c639..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4bc493a..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Sat Jan 14 05:41:29 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f91215d..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:03 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.maven.ide.eclipse.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 9eb6d86..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Mar 21 21:23:08 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.classpath b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.classpath
deleted file mode 100644
index 77b6db8..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index ed71e93..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c8854a4..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Mar 21 21:23:30 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f91215d..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:03 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.maven.ide.eclipse.prefs b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index bda79c9..0000000
--- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Mar 21 21:23:30 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-demo/vasc-demo-tech/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-tech/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/vasc-demo/vasc-demo-tech/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/vasc-demo/vasc-demo-tech/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-tech/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/vasc-demo/vasc-demo-tech/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-build/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-tech/vasc-demo-tech-build/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-build/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-build/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-tech/vasc-demo-tech-build/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-build/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-build/src/main/assembly/bin.xml b/vasc-demo/vasc-demo-tech/vasc-demo-tech-build/src/main/assembly/bin.xml
index a4ef952..2010fbc 100644
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-build/src/main/assembly/bin.xml
+++ b/vasc-demo/vasc-demo-tech/vasc-demo-tech-build/src/main/assembly/bin.xml
@@ -26,8 +26,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>bin</id>
<formats>
+ <!-- Save some build time/space as these are about 30MB each.
<format>tar.gz</format>
<format>tar.bz2</format>
+ -->
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
@@ -38,9 +40,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
<scope>runtime</scope>
+ <!--
<includes>
<include>*</include>
</includes>
+ -->
</dependencySet>
</dependencySets>
<fileSets>
@@ -58,5 +62,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<outputDirectory>/</outputDirectory>
<fileMode>755</fileMode>
</fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/files/</directory>
+ <outputDirectory>/auto</outputDirectory>
+ <includes>
+ <include>auto-readme.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/demo/</directory>
+ <outputDirectory>/demo</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/files/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.classpath b/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 29abf99..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index abec6ca..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-editor/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.classpath b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 29abf99..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index abec6ca..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/pom.xml b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/pom.xml
index 071faa7..3979717 100644
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/pom.xml
+++ b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/pom.xml
@@ -10,6 +10,17 @@
<name>vasc-demo-tech-ui</name>
<description>vasc-demo-tech-ui</description>
<dependencies>
+ <dependency>
+ <groupId>org.x4o</groupId>
+ <artifactId>x4o-core</artifactId>
+ <version>${x4o-core.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>net.forwardfire.vasc.demo</groupId>
<artifactId>vasc-demo-tech-editor</artifactId>
@@ -19,6 +30,7 @@
<groupId>net.forwardfire.vasc.demo</groupId>
<artifactId>vasc-demo-tech-web</artifactId>
<version>${project.version}</version>
+ <type>war</type>
</dependency>
<dependency>
<groupId>net.forwardfire.vasc</groupId>
@@ -30,6 +42,11 @@
<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-backend-ldap</artifactId>
@@ -75,6 +92,60 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.6.4</version>
+ </dependency>
+ <!-- Tomcat deps -->
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>7.0.22</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-jasper</artifactId>
+ <version>7.0.22</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <version>7.0.22</version>
+ </dependency>
+ <!-- Web tech deps -->
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.15.B1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_12</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_12</version>
+ </dependency>
+
+ <!-- RichFaces libraries -->
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>3.3.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.3.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>3.3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/TechUI.java b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/TechUI.java
index 51d2240..7846c20 100644
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/TechUI.java
+++ b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/TechUI.java
@@ -35,16 +35,15 @@ import java.util.logging.LogManager;
import java.util.logging.Logger;
import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
import org.apache.juli.logging.LogFactory;
import org.jdesktop.application.Application;
import org.jdesktop.application.FrameView;
import org.jdesktop.application.SingleFrameApplication;
+import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.demo.tech.ui.components.JMainPanel;
import net.forwardfire.vasc.demo.tech.ui.components.JMainPanelMenuBar;
-import net.forwardfire.vasc.demo.tech.web.core.TomcatManager;
public class TechUI extends SingleFrameApplication {
@@ -105,6 +104,7 @@ public class TechUI extends SingleFrameApplication {
} catch (Exception e) {
e.printStackTrace();
}
+ vascManager.stop();
long stopTime = System.currentTimeMillis();
logger.info("TechUI stopped in "+(stopTime-startTime)+" ms.");
}
@@ -134,6 +134,21 @@ public class TechUI extends SingleFrameApplication {
vascManager.start();
autoLoadVasc();
+ tomcatManager = new TomcatManager();
+ tomcatManager.setVascController(vascManager.getVascController());
+
+ Thread t = new Thread(new Runnable() {
+ public void run() {
+ try {
+ Thread.sleep(2000); // let gui come up.
+ tomcatManager.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ t.start();
+
long stopTime = System.currentTimeMillis();
logger.info("TechUI initialized in "+(stopTime-startTime)+" ms.");
}
@@ -149,21 +164,6 @@ public class TechUI extends SingleFrameApplication {
mainView.getFrame().setMinimumSize(new Dimension(1024-64,768-128));
show(mainView);
- tomcatManager = new TomcatManager();
- tomcatManager.setVascController(vascManager.getVascController());
-
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- try {
- tomcatManager.start();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
-
-
-
long stopTime = System.currentTimeMillis();
logger.info("TechUI startup in "+(stopTime-startTime)+" ms total startup in "+(stopTime-startTime)+" ms.");
} catch (Exception e) {
@@ -184,4 +184,8 @@ public class TechUI extends SingleFrameApplication {
public VascManager getVascManager() {
return vascManager;
}
+
+ public VascController getVascController() {
+ return vascManager.getVascController();
+ }
}
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/VascManager.java b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/VascManager.java
index dbeb5ca..2608158 100644
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/VascManager.java
+++ b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/VascManager.java
@@ -38,6 +38,7 @@ public class VascManager {
}
public void start() {
+ logger.finer("Starting vascmanager");
try {
vascController = DefaultVascFactory.getDefaultVascController(2288L,"forwardfire.net","user","admin");
initEditor();
@@ -65,11 +66,12 @@ public class VascManager {
public void openFile(File file) {
+ logger.info("Vasc open file: "+file.getAbsoluteFile());
try {
VascParser parser = new VascParser(vascController);
File f = File.createTempFile("test-vasc", ".xml");
parser.setDebugOutputStream(new FileOutputStream(f));
- parser.parseFile(file.getAbsolutePath());
+ parser.parseFile(file);
DefaultVascFactory.fillVascControllerLocalEntries((VascEntryControllerLocal) vascController.getVascEntryController(), vascController);
} catch (Exception e) {
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/components/JMainPanel.java b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/components/JMainPanel.java
index 34794b4..a736b3e 100644
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/components/JMainPanel.java
+++ b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/components/JMainPanel.java
@@ -193,7 +193,7 @@ public class JMainPanel extends JPanel {
DefaultMutableTreeNode root = (DefaultMutableTreeNode)vascTree.getModel().getRoot();
root.removeAllChildren();
- DefaultMutableTreeNode fieldTypes = new DefaultMutableTreeNode("FieldTypes");
+ DefaultMutableTreeNode fieldTypes = new DefaultMutableTreeNode("VascFieldTypes");
for (String id:vascManager.getVascController().getVascEntryFieldTypeController().getVascEntryFieldTypeIds()) {
DefaultMutableTreeNode typeNode = new DefaultMutableTreeNode(new VascTreeNode(VascTreeNodeType.FIELD_TYPE,id));
fieldTypes.add(typeNode);
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.classpath b/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.project b/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.project
index f238743..e8219c3 100644
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.project
+++ b/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.project
@@ -5,6 +5,16 @@
<projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
@@ -15,9 +25,18 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.settings/org.eclipse.core.resources.prefs b/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 29abf99..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.settings/org.eclipse.jdt.core.prefs b/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index abec6ca..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.settings/org.eclipse.m2e.core.prefs b/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/pom.xml b/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/pom.xml
index 698d3ec..3084111 100644
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/pom.xml
+++ b/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/pom.xml
@@ -9,68 +9,40 @@
<artifactId>vasc-demo-tech-web</artifactId>
<name>vasc-demo-tech-web</name>
<description>vasc-demo-tech-web</description>
+ <packaging>war</packaging>
<dependencies>
<!-- Vasc dep -->
<dependency>
<groupId>net.forwardfire.vasc</groupId>
<artifactId>vasc-frontend-web-jsf</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
- <!-- Tomcat deps -->
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>7.0.22</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-jasper</artifactId>
- <version>7.0.22</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper</artifactId>
- <version>7.0.22</version>
- </dependency>
-
<!-- Web tech deps -->
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.15.B1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.2_12</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>1.2_12</version>
- </dependency>
-
- <!-- RichFaces libraries -->
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/VascFacesController.java b/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/VascFacesController.java
index 9fad205..02bf0bc 100644
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/VascFacesController.java
+++ b/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/VascFacesController.java
@@ -33,7 +33,6 @@ import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener;
-import net.forwardfire.vasc.demo.tech.web.core.TomcatManager;
import net.forwardfire.vasc.frontend.VascFrontendData;
import net.forwardfire.vasc.frontends.web.jsf.AbstractJSFVascFacesControllerBase;
import net.forwardfire.vasc.impl.DefaultVascFactory;
@@ -82,7 +81,20 @@ public class VascFacesController extends AbstractJSFVascFacesControllerBase {
@Override
public VascController getVascController() {
- return TomcatManager.getInstance().getVascController();
+
+ // TODO: rm this by making common tech vasc package ?
+ try {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ if (cl == null) {
+ cl = this.getClass().getClassLoader(); // fallback
+ }
+ Class<?> clazz = cl.loadClass("net.forwardfire.vasc.demo.tech.ui.TechUI");
+ Object instance = clazz.getMethod("getInstance").invoke(null);
+ Object vasc = clazz.getMethod("getVascController").invoke(instance);
+ return (VascController)vasc;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
}
\ No newline at end of file
diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/core/TomcatManager.java b/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/core/TomcatManager.java
deleted file mode 100644
index 963b014..0000000
--- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/core/TomcatManager.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package net.forwardfire.vasc.demo.tech.web.core;
-
-import java.io.File;
-
-import net.forwardfire.vasc.core.VascController;
-
-import org.apache.catalina.startup.Tomcat;
-
-public class TomcatManager {
-
- private Tomcat tomcat = null;
- private VascController vascController = null;
-
- public void start() throws Exception {
- String webappDirLocation = "../vasc-demo-tech-web/src/main/webapp/";
- Tomcat tomcat = new Tomcat();
-
- String webPort = System.getenv("PORT");
- if(webPort == null || webPort.isEmpty()) {
- webPort = "8899";
- }
- tomcat.setPort(Integer.valueOf(webPort));
- tomcat.addWebapp("/demo", new File(webappDirLocation).getAbsolutePath());
- System.out.println("configuring app with basedir: " + new File("./" + webappDirLocation).getAbsolutePath());
-
- instance = this;
-
- tomcat.start();
- }
-
- public void stop() throws Exception {
- if (tomcat==null) {
- return;
- }
- tomcat.stop();
- instance = null;
- }
-
- static private TomcatManager instance = null;
- static public TomcatManager getInstance() {
- return instance; // hackje to rm mvn 1-1 dep with ui
- }
-
- /**
- * @return the vascController
- */
- public VascController getVascController() {
- return vascController;
- }
-
- /**
- * @param vascController the vascController to set
- */
- public void setVascController(VascController vascController) {
- this.vascController = vascController;
- }
-}
diff --git a/vasc-ejb3/.classpath b/vasc-ejb3/.classpath
deleted file mode 100644
index 0b58ddc..0000000
--- a/vasc-ejb3/.classpath
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-ejb3/.settings/org.eclipse.core.resources.prefs b/vasc-ejb3/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index efe1633..0000000
--- a/vasc-ejb3/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-ejb3/.settings/org.eclipse.jdt.core.prefs b/vasc-ejb3/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9af107f..0000000
--- a/vasc-ejb3/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Jan 02 23:47:23 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-ejb3/.settings/org.eclipse.m2e.core.prefs b/vasc-ejb3/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f91215d..0000000
--- a/vasc-ejb3/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:03 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-ejb3/.settings/org.maven.ide.eclipse.prefs b/vasc-ejb3/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 980916a..0000000
--- a/vasc-ejb3/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Fri Sep 10 01:31:36 CEST 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-frontend/.classpath b/vasc-frontend/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-frontend/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-frontend/.settings/org.eclipse.core.resources.prefs b/vasc-frontend/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 26f6df6..0000000
--- a/vasc-frontend/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:40:49 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-frontend/.settings/org.eclipse.jdt.core.prefs b/vasc-frontend/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f417331..0000000
--- a/vasc-frontend/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sat Dec 31 00:15:40 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-frontend/.settings/org.eclipse.m2e.core.prefs b/vasc-frontend/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 0048365..0000000
--- a/vasc-frontend/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sat Dec 31 00:15:40 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-frontend/vasc-frontend-swing/.classpath b/vasc-frontend/vasc-frontend-swing/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-frontend/vasc-frontend-swing/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs b/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index efe1633..0000000
--- a/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.jdt.core.prefs b/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 374aba1..0000000
--- a/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Aug 30 21:56:01 CEST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.m2e.core.prefs b/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 523f09f..0000000
--- a/vasc-frontend/vasc-frontend-swing/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:02 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-frontend/vasc-frontend-swing/.settings/org.maven.ide.eclipse.prefs b/vasc-frontend/vasc-frontend-swing/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 7aaccbf..0000000
--- a/vasc-frontend/vasc-frontend-swing/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Aug 30 21:56:00 CEST 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-frontend/vasc-frontend-swt/.classpath b/vasc-frontend/vasc-frontend-swt/.classpath
deleted file mode 100644
index 7106942..0000000
--- a/vasc-frontend/vasc-frontend-swt/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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-frontend/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs b/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index efe1633..0000000
--- a/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.jdt.core.prefs b/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 82808dc..0000000
--- a/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Aug 30 21:56:52 CEST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.m2e.core.prefs b/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 523f09f..0000000
--- a/vasc-frontend/vasc-frontend-swt/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:02 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-frontend/vasc-frontend-swt/.settings/org.maven.ide.eclipse.prefs b/vasc-frontend/vasc-frontend-swt/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 0f95cd7..0000000
--- a/vasc-frontend/vasc-frontend-swt/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Aug 30 21:56:51 CEST 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-frontend/vasc-frontend-web-jsf/.classpath b/vasc-frontend/vasc-frontend-web-jsf/.classpath
deleted file mode 100644
index 0b58ddc..0000000
--- a/vasc-frontend/vasc-frontend-web-jsf/.classpath
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs b/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index efe1633..0000000
--- a/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.jdt.core.prefs b/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f80aedf..0000000
--- a/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Jan 02 23:47:22 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.m2e.core.prefs b/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f91215d..0000000
--- a/vasc-frontend/vasc-frontend-web-jsf/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:03 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-frontend/vasc-frontend-web-jsf/.settings/org.maven.ide.eclipse.prefs b/vasc-frontend/vasc-frontend-web-jsf/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 195c66b..0000000
--- a/vasc-frontend/vasc-frontend-web-jsf/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Aug 30 21:58:05 CEST 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-test/.settings/org.eclipse.core.resources.prefs b/vasc-test/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b3c37a0..0000000
--- a/vasc-test/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jan 17 02:16:16 CET 2012
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/vasc-test/.settings/org.eclipse.m2e.core.prefs b/vasc-test/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 1d34453..0000000
--- a/vasc-test/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Jan 17 02:16:16 CET 2012
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-test/vasc-test-frontend-data/.classpath b/vasc-test/vasc-test-frontend-data/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-test/vasc-test-frontend-data/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-test/vasc-test-frontend-data/.settings/org.eclipse.core.resources.prefs b/vasc-test/vasc-test-frontend-data/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index da5750d..0000000
--- a/vasc-test/vasc-test-frontend-data/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 17 02:17:53 CET 2012
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-test/vasc-test-frontend-data/.settings/org.eclipse.jdt.core.prefs b/vasc-test/vasc-test-frontend-data/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9560ae8..0000000
--- a/vasc-test/vasc-test-frontend-data/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Jan 17 02:17:53 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-test/vasc-test-frontend-data/.settings/org.eclipse.m2e.core.prefs b/vasc-test/vasc-test-frontend-data/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 58b978e..0000000
--- a/vasc-test/vasc-test-frontend-data/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Jan 17 02:17:52 CET 2012
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-xpql-ejb3-client/.classpath b/vasc-xpql-ejb3-client/.classpath
deleted file mode 100644
index 3c96d64..0000000
--- a/vasc-xpql-ejb3-client/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-xpql-ejb3-client/.settings/org.eclipse.core.resources.prefs b/vasc-xpql-ejb3-client/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index a023909..0000000
--- a/vasc-xpql-ejb3-client/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Jan 11 23:36:06 CET 2012
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-xpql-ejb3-client/.settings/org.eclipse.jdt.core.prefs b/vasc-xpql-ejb3-client/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9016dda..0000000
--- a/vasc-xpql-ejb3-client/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed Jan 11 23:36:06 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-xpql-ejb3-client/.settings/org.eclipse.m2e.core.prefs b/vasc-xpql-ejb3-client/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index b3bbbfe..0000000
--- a/vasc-xpql-ejb3-client/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Jan 11 23:36:06 CET 2012
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-xpql-ejb3-server/.classpath b/vasc-xpql-ejb3-server/.classpath
deleted file mode 100644
index 0b58ddc..0000000
--- a/vasc-xpql-ejb3-server/.classpath
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-xpql-ejb3-server/.settings/org.eclipse.core.resources.prefs b/vasc-xpql-ejb3-server/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index efe1633..0000000
--- a/vasc-xpql-ejb3-server/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-xpql-ejb3-server/.settings/org.eclipse.jdt.core.prefs b/vasc-xpql-ejb3-server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 963be97..0000000
--- a/vasc-xpql-ejb3-server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Jan 02 23:47:24 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-xpql-ejb3-server/.settings/org.eclipse.m2e.core.prefs b/vasc-xpql-ejb3-server/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f91215d..0000000
--- a/vasc-xpql-ejb3-server/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:03 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-xpql-ejb3-server/.settings/org.maven.ide.eclipse.prefs b/vasc-xpql-ejb3-server/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 0e483ca..0000000
--- a/vasc-xpql-ejb3-server/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Jan 10 02:21:43 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/vasc-xpql/.classpath b/vasc-xpql/.classpath
deleted file mode 100644
index 0b58ddc..0000000
--- a/vasc-xpql/.classpath
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <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">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/vasc-xpql/.settings/org.eclipse.core.resources.prefs b/vasc-xpql/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index efe1633..0000000
--- a/vasc-xpql/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Dec 31 00:55:10 CET 2011
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/vasc-xpql/.settings/org.eclipse.jdt.core.prefs b/vasc-xpql/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9af107f..0000000
--- a/vasc-xpql/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Jan 02 23:47:23 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/vasc-xpql/.settings/org.eclipse.m2e.core.prefs b/vasc-xpql/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f91215d..0000000
--- a/vasc-xpql/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Sun Dec 25 17:29:03 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/vasc-xpql/.settings/org.maven.ide.eclipse.prefs b/vasc-xpql/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 6e28e06..0000000
--- a/vasc-xpql/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Jan 10 02:20:38 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1