diff --git a/vipra-cmd/.classpath b/vipra-cmd/.classpath
index 1d99666bcace8e15a36c9dd09f3d921742acf5c3..c1b25c8a751fc3ec42efe035c20381dd4fc58d28 100644
--- a/vipra-cmd/.classpath
+++ b/vipra-cmd/.classpath
@@ -1,20 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="src" path="src/test/resources"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <classpathentry combineaccessrules="false" kind="src" path="/vipra-util"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
- <classpathentry combineaccessrules="false" kind="src" path="/vipra-util"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/vipra-cmd/.project b/vipra-cmd/.project
index 42d5a8abc4acc1079b7e84ac965c26a5fce2d48c..e6b85466c1e3c9aa9198c926ed97d5b7c87344ed 100644
--- a/vipra-cmd/.project
+++ b/vipra-cmd/.project
@@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
diff --git a/vipra-cmd/.settings/org.eclipse.core.resources.prefs b/vipra-cmd/.settings/org.eclipse.core.resources.prefs
index 99f26c0203a7844de00dbfc56e6a35d8ed3c022c..29abf999564110a0d6aca109f55f439c72b7031c 100644
--- a/vipra-cmd/.settings/org.eclipse.core.resources.prefs
+++ b/vipra-cmd/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,6 @@
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/vipra-cmd/.settings/org.eclipse.jdt.core.prefs b/vipra-cmd/.settings/org.eclipse.jdt.core.prefs
index c07c252bc5d05edd0375e06b1d52f0a921ae65a0..7677f45f763923b768652ded0a1422b2b83c6d77 100644
--- a/vipra-cmd/.settings/org.eclipse.jdt.core.prefs
+++ b/vipra-cmd/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,16 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.7
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.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/vipra-cmd/.settings/org.eclipse.wst.common.project.facet.core.xml b/vipra-cmd/.settings/org.eclipse.wst.common.project.facet.core.xml
index fd0227a68279180b3dd187cfc58335b8a0914833..70e9d8a35a5f422ae00c692c08349c1a5469a84b 100644
--- a/vipra-cmd/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/vipra-cmd/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
<fixed facet="java"/>
<fixed facet="jst.utility"/>
<installed facet="jst.utility" version="1.0"/>
- <installed facet="java" version="1.8"/>
+ <installed facet="java" version="1.7"/>
</faceted-project>
diff --git a/vipra-cmd/.settings/org.eclipse.wst.validation.prefs b/vipra-cmd/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..04cad8cb752a9761c4e5167d0301d3a27674430f
--- /dev/null
+++ b/vipra-cmd/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/vipra-cmd/vipra-cmd.xml b/vipra-cmd/build.xml
similarity index 100%
rename from vipra-cmd/vipra-cmd.xml
rename to vipra-cmd/build.xml
diff --git a/vipra-cmd/pom.xml b/vipra-cmd/pom.xml
index c8abeb837dcc1b57c6d5829f4671e4e2ea437681..ad440cb717d05db4ef8fc4b675dbd19b5835fea4 100644
--- a/vipra-cmd/pom.xml
+++ b/vipra-cmd/pom.xml
@@ -12,8 +12,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.target>1.8</maven.compiler.target>
- <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
<log4jVersion>2.4.1</log4jVersion>
</properties>
diff --git a/vipra-util/.classpath b/vipra-util/.classpath
index 8e8834b85c6119993d8a437a28cc84a03dbd4179..7673637b2561b9ca3c4c27f60fb951f09e52b948 100644
--- a/vipra-util/.classpath
+++ b/vipra-util/.classpath
@@ -1,14 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
diff --git a/vipra-util/.project b/vipra-util/.project
index 7e5c99aad3e63cb25e06c3a8510fc8cea87fdeef..3eb2ee19593ed7f5d6c146794b6965a00956e603 100644
--- a/vipra-util/.project
+++ b/vipra-util/.project
@@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
diff --git a/vipra-util/.settings/org.eclipse.core.resources.prefs b/vipra-util/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..abdea9ac032d4655898933f93050f48bf9581d14
--- /dev/null
+++ b/vipra-util/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/vipra-util/.settings/org.eclipse.jdt.core.prefs b/vipra-util/.settings/org.eclipse.jdt.core.prefs
index 0f67aafb9462a60cfdb12a1efb87599393e417e4..ffc246f72fb78c1ae361528ae342d1b453c60b82 100644
--- a/vipra-util/.settings/org.eclipse.jdt.core.prefs
+++ b/vipra-util/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.7
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.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/vipra-util/.settings/org.eclipse.wst.common.project.facet.core.xml b/vipra-util/.settings/org.eclipse.wst.common.project.facet.core.xml
index 78e8ebb782bd149152a876e5c227156f0192bd2a..e4a5a385a27fe00926c9c4f46d697547f5e5f783 100644
--- a/vipra-util/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/vipra-util/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
<fixed facet="jst.utility"/>
<fixed facet="java"/>
<installed facet="jst.utility" version="1.0"/>
- <installed facet="java" version="1.8"/>
+ <installed facet="java" version="1.7"/>
</faceted-project>
diff --git a/vipra-util/.settings/org.eclipse.wst.validation.prefs b/vipra-util/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..04cad8cb752a9761c4e5167d0301d3a27674430f
--- /dev/null
+++ b/vipra-util/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/vipra-util/build.xml b/vipra-util/build.xml
deleted file mode 100644
index 638f096f8d1615fd7bc4c713cf0f7ce1af32e843..0000000000000000000000000000000000000000
--- a/vipra-util/build.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- WARNING: Eclipse auto-generated file.
- Any modifications will be overwritten.
- To include a user specific buildfile here, simply create one in the same
- directory with the processing instruction <?eclipse.ant.import?>
- as the first entry and export the buildfile again. --><project basedir="." default="build" name="vipra-util">
- <property environment="env"/>
- <property name="vipra-cmd.location" value="../vipra-cmd"/>
- <property name="vipra-rest.location" value="../vipra-rest"/>
- <property name="ECLIPSE_HOME" value="../../../../../../../../opt/eclipse/"/>
- <property name="debuglevel" value="source,lines,vars"/>
- <property name="target" value="1.6"/>
- <property name="source" value="1.6"/>
- <path id="Maven Dependencies.libraryclasspath">
- <pathelement location="../../../../../../.m2/repository/org/apache/logging/log4j/log4j-api/2.4.1/log4j-api-2.4.1.jar"/>
- <pathelement location="../../../../../../.m2/repository/org/apache/logging/log4j/log4j-core/2.4.1/log4j-core-2.4.1.jar"/>
- <pathelement location="../../../../../../.m2/repository/org/apache/logging/log4j/log4j-slf4j-impl/2.4.1/log4j-slf4j-impl-2.4.1.jar"/>
- <pathelement location="../../../../../../.m2/repository/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar"/>
- <pathelement location="../../../../../../.m2/repository/org/mongodb/mongodb-driver/3.0.4/mongodb-driver-3.0.4.jar"/>
- <pathelement location="../../../../../../.m2/repository/org/mongodb/bson/3.0.4/bson-3.0.4.jar"/>
- <pathelement location="../../../../../../.m2/repository/org/mongodb/mongodb-driver-core/3.0.4/mongodb-driver-core-3.0.4.jar"/>
- </path>
- <path id="EAR Libraries.libraryclasspath"/>
- <path id="vipra-util.classpath">
- <pathelement location="target/classes"/>
- <path refid="Maven Dependencies.libraryclasspath"/>
- <path refid="EAR Libraries.libraryclasspath"/>
- </path>
- <target name="init">
- <mkdir dir="target/classes"/>
- <copy includeemptydirs="false" todir="target/classes">
- <fileset dir="src/main/java">
- <exclude name="**/*.launch"/>
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- <copy includeemptydirs="false" todir="target/classes">
- <fileset dir="src/main/resources">
- <exclude name="**/*.launch"/>
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- </target>
- <target name="clean">
- <delete dir="target/classes"/>
- </target>
- <target depends="clean" name="cleanall"/>
- <target depends="build-subprojects,build-project" name="build"/>
- <target name="build-subprojects"/>
- <target depends="init" name="build-project">
- <echo message="${ant.project.name}: ${ant.file}"/>
- <javac debug="true" debuglevel="${debuglevel}" destdir="target/classes" includeantruntime="false" source="${source}" target="${target}">
- <src path="src/main/java"/>
- <src path="src/main/resources"/>
- <classpath refid="vipra-util.classpath"/>
- </javac>
- </target>
- <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects">
- <ant antfile="build.xml" dir="${vipra-cmd.location}" inheritAll="false" target="clean"/>
- <ant antfile="build.xml" dir="${vipra-cmd.location}" inheritAll="false" target="build">
- <propertyset>
- <propertyref name="build.compiler"/>
- </propertyset>
- </ant>
- <ant antfile="build.xml" dir="${vipra-rest.location}" inheritAll="false" target="clean"/>
- <ant antfile="build.xml" dir="${vipra-rest.location}" inheritAll="false" target="build">
- <propertyset>
- <propertyref name="build.compiler"/>
- </propertyset>
- </ant>
- </target>
- <target description="copy Eclipse compiler jars to ant lib directory" name="init-eclipse-compiler">
- <copy todir="${ant.library.dir}">
- <fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
- </copy>
- <unzip dest="${ant.library.dir}">
- <patternset includes="jdtCompilerAdapter.jar"/>
- <fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
- </unzip>
- </target>
- <target description="compile project with Eclipse compiler" name="build-eclipse-compiler">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- <antcall target="build"/>
- </target>
-</project>
diff --git a/vipra-util/pom.xml b/vipra-util/pom.xml
index e910aa267b5ac70259198d53c04789fb9cd64719..c48b7dc1a70a22a9fae7b8d62c347fa1ae2a090f 100644
--- a/vipra-util/pom.xml
+++ b/vipra-util/pom.xml
@@ -7,6 +7,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
<log4jVersion>2.4.1</log4jVersion>
</properties>
@@ -42,18 +44,4 @@
<version>2.1.0</version>
</dependency>
</dependencies>
-
- <build>
- <sourceDirectory>src</sourceDirectory>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file