diff --git a/.classpath b/.classpath
deleted file mode 100644
index b29c137..0000000
--- a/.classpath
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.gitignore b/.gitignore
index 2ff8523..04182f7 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-/build
+/build/
+/target/
+/.gradle/
/WebContent/WEB-INF/lib/Zutil.jar
\ No newline at end of file
diff --git a/.project b/.project
deleted file mode 100644
index b2c7999..0000000
--- a/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
- Zallery
-
-
- ZUtil
-
-
-
- org.eclipse.wst.jsdt.core.javascriptValidator
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
-
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.wst.common.project.facet.core.nature
- org.eclipse.jdt.core.javanature
- org.eclipse.wst.jsdt.core.jsNature
-
-
diff --git a/Jenkinsfile b/Jenkinsfile
index ea3793b..63549a5 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,40 +1,36 @@
+#!groovy
// Jenkinsfile (Pipeline Script)
+
+mavenConfiguration = [
+ jdk: "jdk7",
+ maven: "m3.5",
+ mavenLocalRepo: ".repository",
+ mavenSettingsConfig: "639c4560-87b7-4502-bb3d-2c44845cd2b5"
+]
+
node {
- // Configure environment
- //env.JAVA_HOME = tool name: 'JDK8'
- env.REPO_URL = "repo.koc.se/zallery.git"
- env.BUILD_NAME = "BUILD-" + env.BUILD_ID
-
-
- checkout scm
-
- stage('Build') {
- sh 'ant clean'
- sh 'ant build'
+ stage('Checkout') {
+ checkout scm
}
- stage('Package') {
- sh 'ant package'
- archiveArtifacts artifacts: 'build/release/*', fingerprint: true
+ withMaven(mavenConfiguration) {
+ def mvnParams = "-Dbuild.number=${BUILD_NUMBER}"
- // Tag artifact
- withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'f8e5f6c6-4adb-4ab2-bb5d-1c8535dff491',
- usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
- sh "git tag ${env.BUILD_NAME}"
- sh "git push 'https://${USERNAME}:${PASSWORD}@${env.REPO_URL}' ${env.BUILD_NAME}"
+ stage('Build') {
+ sh "mvn ${mvnParams} clean compile"
+ }
+
+ stage('Test') {
+ sh "mvn ${mvnParams} test"
+ }
+
+ stage('Package') {
+ sh "mvn ${mvnParams} -DskipStatic -DskipTests package"
+ }
+
+ stage('Deploy') {
+ sh "mvn ${mvnParams} -DskipStatic -DskipTests deploy"
+ sh "mvn ${mvnParams} scm:tag"
}
}
-}
-
-stage('Deploy') {
- timeout(time:2, unit:'HOURS') {
- input message: 'Deploy?', submitter: 'ziver'
- }
- node {
- withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: '46f1d99b-2037-47b9-a7b7-57a1066337fc',
- usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
- sh 'ant -Dtomcat.user=${USERNAME} -Dtomcat.pass=${PASSWORD} deploy'
- }
- }
-}
-
+}
\ No newline at end of file
diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
index 738b6dc..1411997 100755
--- a/WebContent/META-INF/context.xml
+++ b/WebContent/META-INF/context.xml
@@ -2,19 +2,24 @@
-
-
+
+
+
+
-
+
+
+
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="t" tagdir="/WEB-INF/tags" %>
+
+
+