devinsy/kiss4web
devinsy/kiss4web
1
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Refactored build.

Browse source
This commit is contained in:
Christian P. MOMON 2016-09-21 14:27:25 +02:00
parent 2927fd3d38
commit bf94f1abbc
6 changed files with 68 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.classpath
View file

@ -18,11 +18,6 @@
<classpathentry kind="lib" path="lib/UnitTesting/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/UnitTesting/junit-4.11-sources.jar"/>
<classpathentry kind="lib" path="lib/UnitTesting/junit-4.11.jar"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
<attributes>
<attribute name="owner.project.facets" value="jst.utility"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45">
<attributes>
<attribute name="owner.project.facets" value="java"/>

86
buildjar.xml → build-libjar.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<project default="dist" name="jarbuild">
<project default="dist" name="Build-libjar">
<!--ANT 1.7 is required -->
<property name="buildjar.version" value="1.4" />
<property name="buildjar.version" value="1.5" />
<property file="build.properties" />
<property name="build.dir" value="${basedir}/build" />
<property name="build.src" value="${basedir}/src" />
@ -25,23 +25,31 @@
<pathelement path="${test.classes}" />
</path>
<!-- ***** Help ***** -->
<target name="help" description="Display detailed usage information">
<echo>Type ant -p</echo>
</target>
<!-- ***** Clear ***** -->
<target name="clear" description="Clean temporary directories before work">
<delete dir="${build.dir}" />
</target>
<!-- ***** Clean ***** -->
<target name="clean" description="Clean temporary directories">
<target name="clean" description="Clean temporary directories afeter work">
<delete dir="${build.dir}" />
</target>
<!-- ***** Compile ***** -->
<target name="compile" description="Compile main code">
<mkdir dir="${build.dir}/classes" />
<delete dir="${build.classes}" />
<mkdir dir="${build.classes}" />
<javac srcdir="${build.src}" destdir="${build.classes}" debug="${debug}" deprecation="on" includeantruntime="false">
<classpath refid="test.classpath.compile" />
<classpath refid="build.classpath" />
</javac>
<copy todir="${build.classes}">
<fileset dir="${build.src}" excludes="**/*.java" />
</copy>
</target>
<!-- ***** Compile test ***** -->
@ -50,11 +58,13 @@
<javac srcdir="${test.src}" destdir="${test.classes}" debug="${debug}" deprecation="on" includeantruntime="false">
<classpath refid="test.classpath.compile" />
</javac>
<copy todir="${test.classes}">
<fileset dir="${test.src}" excludes="**/*.java" />
</copy>
</target>
<!-- ***** Test ***** -->
<target name="test" description="Run unit tests" depends="clean,compile,compile-test">
<target name="test" description="Run unit tests" depends="clear,compile,compile-test">
<mkdir dir="${build.dir}/test-reports" />
<junit printsummary="yes" haltonfailure="no">
<classpath refid="test.classpath.run" />
@ -77,25 +87,23 @@
</target>
<!-- ***** Dist ***** -->
<target name="dist" description="Build distribution" depends="clean,compile,javadoc">
<!-- -->
<buildnumber file="build.num" description="Id of the build" />
<target name="dist" description="Build distribution" depends="clear,compile,javadoc">
<!-- AUTOMATIC MANAGEMENT -->
<buildnumber file="build.num" description="Id of the build" />
<property name="dist.version" value="${product.revision.major}.${product.revision.minor}.${build.number}" />
<property name="dist.name" value="${product.name}-${dist.version}" />
<property name="dist.dir" value="${basedir}/dist/${dist.name}" />
<!-- -->
<mkdir dir="${dist.dir}" />
<!-- -->
<copy file="LICENSE" todir="${dist.dir}/" overwrite="true" />
<copy file="LICENSE" todir="${dist.dir}/" overwrite="true" failonerror="false" />
<copy file="README" todir="${dist.dir}/" overwrite="true" failonerror="false" />
<copy file="README.md" todir="${dist.dir}/" overwrite="true" failonerror="false" />
<!-- Package main -->
<property name="dist.jar" value="${dist.dir}/${dist.name}.jar" />
<tstamp>
<format property="dist.time" pattern="dd/MM/yyyy HH:mm:ss" />
<!-- TODAY -->
<format property="dist.time" pattern="dd/MM/yyyy HH:mm:ss" />
</tstamp>
<jar destfile="${dist.jar}">
<manifest>
@ -103,7 +111,6 @@
<attribute name="Built-Date" value="${dist.time}" />
</manifest>
<fileset dir="${build.classes}" />
<zipfileset dir="${basedir}/" includes="LICENSE" />
</jar>
<!-- Package sources -->
@ -115,37 +122,40 @@
<!-- Package Javadoc -->
<property name="dist.javadoc.zip" value="${dist.dir}/${dist.name}-javadoc.zip" />
<zip destfile="${dist.javadoc.zip}" update="true" preserve0permissions="true">
<zip destfile="${dist.javadoc.zip}" update="true">
<fileset dir="${build.javadoc}" />
<zipfileset dir="${basedir}/" includes="LICENSE" />
</zip>
<!-- Package lib -->
<copy todir="${dist.dir}/lib" overwrite="true">
<fileset dir="lib" excludes="hamcrest-core*,junit*" />
</copy>
<!-- Zip package -->
<property name="dist.zip" value="${basedir}/dist/${dist.name}.zip" />
<!--
<property name="dist.zip" value="${basedir}/dist/${dist.name}.zip" />
<zip destfile="${dist.zip}" update="true">
<fileset dir="${dist.dir}" />
<zipfileset filemode="755" dir="${dist.dir}/" includes="*.sh *.command" />
</zip>
-->
</target>
<!-- ***** Dist ***** -->
<target name="buildandgit" depends="dist">
<!-- GIT actions-->
<echo message="Commit build.num"/>
<exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true">
<arg line="commit -m 'Build ${dist.version}' build.num"/>
</exec>
<!-- ***** Build and GIT ***** -->
<target name="buildandgit" depends="dist,clean">
<echo message="Commit build.num" />
<exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true">
<arg line="commit -m 'Build ${dist.version}' build.num" />
</exec>
<echo message="${git.commit.out}" />
<echo message="Tag"/>
<exec executable="git" outputproperty="git.tag.out" failifexecutionfails="true">
<arg line="tag -a ${dist.version} -m 'Build ${dist.version}'"/>
</exec>
<echo message="Tag" />
<exec executable="git" outputproperty="git.tag.out" failifexecutionfails="true">
<arg line="tag -a ${dist.version} -m 'Build ${dist.version}'" />
</exec>
<echo message="${git.tag.out}" />
<echo message="Push"/>
<exec executable="git" outputproperty="git.push.out" failifexecutionfails="true">
<arg line="push --follow-tags"/>
</exec>
<echo message="Push" />
<exec executable="git" outputproperty="git.push.out" failifexecutionfails="true">
<arg line="push --follow-tags" />
</exec>
<echo message="${git.push.out}" />
</target>
</project>

4
build.num
View file

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Wed Feb 05 00:08:42 CET 2014
build.number=0
#Wed Sep 21 14:25:05 CEST 2016
build.number=1

10
build.xml
View file

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<project default="dist" name="kiss4web">
<!-- -->
<import file="buildjar.xml" />
<project default="main" name="Build">
<!-- ***** Import ***** -->
<import file="build-libjar.xml" />
<!-- ***** Main ***** -->
<target name="main" description="" depends="dist,clean" />
</project>

8
buildandgit.xml
View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<project default="buildandgit" name="kiss4web">
<!-- -->
<import file="buildjar.xml" />
<project default="main" name="Buildandgit">
<!-- -->
<import file="build.xml" />
<target name="main" description="" depends="buildandgit,clean"/>
</project>

65
src/fr/devinsy/kiss4web/EnvironmentInformation.java
View file

@ -33,7 +33,6 @@
*/
package fr.devinsy.kiss4web;
import javax.mail.Session;
import javax.naming.ConfigurationException;
import javax.naming.Context;
import javax.naming.InitialContext;
@ -43,7 +42,6 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.util.strings.StringList;
import fr.devinsy.util.strings.StringListUtils;
/**
@ -112,69 +110,6 @@ public class EnvironmentInformation
}
}
/**
*
* @param name
* @return
*/
public String getSessionToString(final Context environment, final String name)
{
String result;
try
{
if (environment == null)
{
result = null;
}
else
{
Session session = (Session) environment.lookup(name);
StringList buffer = new StringList();
for (Object key : session.getProperties().keySet().toArray())
{
buffer.append((String) key).append("=").append(session.getProperties().getProperty((String) key)).append(",");
}
buffer.removeLast();
result = buffer.toString();
}
}
catch (NamingException exception)
{
logger.info("Error: {}", exception.getMessage());
result = null;
}
//
return result;
}
/**
*
* @param name
* @return
*/
public String getSessionToString(final String name)
{
String result;
try
{
Context initialContext = new InitialContext();
Context environment = (Context) initialContext.lookup("java:comp/env");
result = getSessionToString(environment, name);
}
catch (NamingException exception)
{
logger.info("Error: {}", exception.getMessage());
result = null;
}
return result;
}
/**
*
* @return