]> git.mxchange.org Git - juser-activity-core.git/commitdiff
JUser-Activity-core has derived from juser-core. This library logs user's activity...
authorRoland Häder <roland@mxchange.org>
Wed, 24 Aug 2016 14:31:27 +0000 (16:31 +0200)
committerRoland Häder <roland@mxchange.org>
Wed, 24 Aug 2016 14:38:23 +0000 (16:38 +0200)
Ideas to expand:
- IP address
- user agent
- referer URL
- data that has been changed (old-new values)
- ???

54 files changed:
build.xml
lib/commons-codec-1.10.jar [deleted file]
lib/jcontacts-core.jar [deleted file]
lib/jcoreee.jar [deleted file]
lib/juser-core.jar [new file with mode: 0644]
nbproject/build-impl.xml
nbproject/project.properties
nbproject/project.xml
src/org/mxchange/jusercore/container/login/LoginContainer.java [deleted file]
src/org/mxchange/jusercore/container/login/UserLoginContainer.java [deleted file]
src/org/mxchange/jusercore/events/confirmation/ConfirmedUserAccountEvent.java [deleted file]
src/org/mxchange/jusercore/events/confirmation/UserConfirmedAccountEvent.java [deleted file]
src/org/mxchange/jusercore/events/login/UserLoggedInEvent.java [deleted file]
src/org/mxchange/jusercore/events/login/UserLoginEvent.java [deleted file]
src/org/mxchange/jusercore/events/logout/ObserveableUserLogoutEvent.java [deleted file]
src/org/mxchange/jusercore/events/logout/UserLogoutEvent.java [deleted file]
src/org/mxchange/jusercore/events/registration/RegisteredUserEvent.java [deleted file]
src/org/mxchange/jusercore/events/registration/UserRegisteredEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/add/AdminAddedUserEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/add/AdminUserAddedEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/linked/AdminLinkedUserEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/linked/AdminUserLinkedEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/locked/AdminLockedUserEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/locked/AdminUserLockedEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/password_change/UpdatedUserPasswordEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/password_change/UserUpdatedPasswordEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/unlocked/AdminUnlockedUserEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/unlocked/AdminUserUnlockedEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/update/AdminUpdatedUserDataEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/update/AdminUserDataUpdatedEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/update/UpdatedUserPersonalDataEvent.java [deleted file]
src/org/mxchange/jusercore/events/user/update/UserUpdatedPersonalDataEvent.java [deleted file]
src/org/mxchange/jusercore/exceptions/DataRepeatMismatchException.java [deleted file]
src/org/mxchange/jusercore/exceptions/EmailAddressAlreadyRegisteredException.java [deleted file]
src/org/mxchange/jusercore/exceptions/UserEmailAddressNotFoundException.java [deleted file]
src/org/mxchange/jusercore/exceptions/UserNameAlreadyRegisteredException.java [deleted file]
src/org/mxchange/jusercore/exceptions/UserNotFoundException.java [deleted file]
src/org/mxchange/jusercore/exceptions/UserPasswordMismatchException.java [deleted file]
src/org/mxchange/jusercore/exceptions/UserPasswordRepeatMismatchException.java [deleted file]
src/org/mxchange/jusercore/exceptions/UserStatusConfirmedException.java [deleted file]
src/org/mxchange/jusercore/exceptions/UserStatusLockedException.java [deleted file]
src/org/mxchange/jusercore/exceptions/UserStatusUnconfirmedException.java [deleted file]
src/org/mxchange/jusercore/model/email_address/ChangeableEmailAddress.java [deleted file]
src/org/mxchange/jusercore/model/email_address/EmailAddressChange.java [deleted file]
src/org/mxchange/jusercore/model/email_address/status/EmailChangeStatus.java [deleted file]
src/org/mxchange/jusercore/model/user/LoginUser.java [deleted file]
src/org/mxchange/jusercore/model/user/User.java [deleted file]
src/org/mxchange/jusercore/model/user/UserUtils.java [deleted file]
src/org/mxchange/jusercore/model/user/activity/LogableUserActivity.java [new file with mode: 0644]
src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java [new file with mode: 0644]
src/org/mxchange/jusercore/model/user/password_history/PasswordHistory.java [deleted file]
src/org/mxchange/jusercore/model/user/password_history/UserPasswordHistory.java [deleted file]
src/org/mxchange/jusercore/model/user/profilemodes/ProfileMode.java [deleted file]
src/org/mxchange/jusercore/model/user/status/UserAccountStatus.java [deleted file]

index 8726c4d71d11ad1bce6a35d478e6394c16532332..d3b275741c9ae2c2543d637ddf8d9b9b82616a1c 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -7,8 +7,8 @@
 <!-- the Compile on Save feature is turned off for the project. -->
 <!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
 <!-- in the project's Project Properties dialog box.-->
-<project name="juser-core" default="default" basedir=".">
-    <description>Builds, tests, and runs the project juser-core.</description>
+<project name="juser-activity" default="default" basedir=".">
+    <description>Builds, tests, and runs the project juser-activity.</description>
     <import file="nbproject/build-impl.xml"/>
     <!--
 
@@ -58,7 +58,7 @@
 
     An example of overriding the target for project execution could look like this:
 
-        <target name="run" depends="juser-core-impl.jar">
+        <target name="run" depends="juser-activity-impl.jar">
             <exec dir="bin" executable="launcher.exe">
                 <arg file="${dist.jar}"/>
             </exec>
diff --git a/lib/commons-codec-1.10.jar b/lib/commons-codec-1.10.jar
deleted file mode 100644 (file)
index 1d7417c..0000000
Binary files a/lib/commons-codec-1.10.jar and /dev/null differ
diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
deleted file mode 100644 (file)
index ce2093f..0000000
Binary files a/lib/jcontacts-core.jar and /dev/null differ
diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
deleted file mode 100644 (file)
index 8f17116..0000000
Binary files a/lib/jcoreee.jar and /dev/null differ
diff --git a/lib/juser-core.jar b/lib/juser-core.jar
new file mode 100644 (file)
index 0000000..1dda7d2
Binary files /dev/null and b/lib/juser-core.jar differ
index c3d2cd996ff727528a5a78194e0b9b598a74ff79..ca053abcaed53dd9d56f3f851541e586790ae62a 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - test compilation
-  - test execution
-  - test debugging
-  - applet
-  - cleanup
-
--->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="juser-core-impl">
-       <fail message="Please build using Ant 1.8.0 or higher.">
-               <condition>
-                       <not>
-                               <antversion atleast="1.8.0"/>
-                       </not>
-               </condition>
-       </fail>
-       <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-       <!--
-               ======================
-               INITIALIZATION SECTION
-               ======================
-       -->
-       <target name="-pre-init">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="-pre-init" name="-init-private">
-               <property file="nbproject/private/config.properties"/>
-               <property file="nbproject/private/configs/${config}.properties"/>
-               <property file="nbproject/private/private.properties"/>
-       </target>
-       <target name="-pre-init-libraries">
-               <property location="./lib/nblibraries.properties" name="libraries.path"/>
-               <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
-               <pathconvert dirsep="/" property="libraries.dir">
-                       <path path="${libraries.dir.nativedirsep}"/>
-               </pathconvert>
-               <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>
-               <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>
-       </target>
-       <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">
-               <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">
-                       <filterchain>
-                               <replacestring from="$${base}" to="${libraries.dir}"/>
-                               <escapeunicode/>
-                       </filterchain>
-               </loadproperties>
-       </target>
-       <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">
-               <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">
-                       <filterchain>
-                               <replacestring from="$${base}" to="${libraries.dir}"/>
-                               <escapeunicode/>
-                       </filterchain>
-               </loadproperties>
-       </target>
-       <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">
-               <property file="${user.properties.file}"/>
-               <!-- The two properties below are usually overridden -->
-               <!-- by the active platform. Just a fallback. -->
-               <property name="default.javac.source" value="1.4"/>
-               <property name="default.javac.target" value="1.4"/>
-       </target>
-       <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
-               <property file="nbproject/configs/${config}.properties"/>
-               <property file="nbproject/project.properties"/>
-       </target>
-       <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-               <property name="platform.java" value="${java.home}/bin/java"/>
-               <available file="${manifest.file}" property="manifest.available"/>
-               <condition property="splashscreen.available">
-                       <and>
-                               <not>
-                                       <equals arg1="${application.splash}" arg2="" trim="true"/>
-                               </not>
-                               <available file="${application.splash}"/>
-                       </and>
-               </condition>
-               <condition property="main.class.available">
-                       <and>
-                               <isset property="main.class"/>
-                               <not>
-                                       <equals arg1="${main.class}" arg2="" trim="true"/>
-                               </not>
-                       </and>
-               </condition>
-               <condition property="profile.available">
-                       <and>
-                               <isset property="javac.profile"/>
-                               <length length="0" string="${javac.profile}" when="greater"/>
-                               <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
-                       </and>
-               </condition>
-               <condition property="do.archive">
-                       <or>
-                               <not>
-                                       <istrue value="${jar.archive.disabled}"/>
-                               </not>
-                               <istrue value="${not.archive.disabled}"/>
-                       </or>
-               </condition>
-               <condition property="do.mkdist">
-                       <and>
-                               <isset property="do.archive"/>
-                               <isset property="libs.CopyLibs.classpath"/>
-                               <not>
-                                       <istrue value="${mkdist.disabled}"/>
-                               </not>
-                       </and>
-               </condition>
-               <condition property="do.archive+manifest.available">
-                       <and>
-                               <isset property="manifest.available"/>
-                               <istrue value="${do.archive}"/>
-                       </and>
-               </condition>
-               <condition property="do.archive+main.class.available">
-                       <and>
-                               <isset property="main.class.available"/>
-                               <istrue value="${do.archive}"/>
-                       </and>
-               </condition>
-               <condition property="do.archive+splashscreen.available">
-                       <and>
-                               <isset property="splashscreen.available"/>
-                               <istrue value="${do.archive}"/>
-                       </and>
-               </condition>
-               <condition property="do.archive+profile.available">
-                       <and>
-                               <isset property="profile.available"/>
-                               <istrue value="${do.archive}"/>
-                       </and>
-               </condition>
-               <condition property="have.tests">
-                       <or>
-                               <available file="${test.src.dir}"/>
-                       </or>
-               </condition>
-               <condition property="have.sources">
-                       <or>
-                               <available file="${src.dir}"/>
-                       </or>
-               </condition>
-               <condition property="netbeans.home+have.tests">
-                       <and>
-                               <isset property="netbeans.home"/>
-                               <isset property="have.tests"/>
-                       </and>
-               </condition>
-               <condition property="no.javadoc.preview">
-                       <and>
-                               <isset property="javadoc.preview"/>
-                               <isfalse value="${javadoc.preview}"/>
-                       </and>
-               </condition>
-               <property name="run.jvmargs" value=""/>
-               <property name="run.jvmargs.ide" value=""/>
-               <property name="javac.compilerargs" value=""/>
-               <property name="work.dir" value="${basedir}"/>
-               <condition property="no.deps">
-                       <and>
-                               <istrue value="${no.dependencies}"/>
-                       </and>
-               </condition>
-               <property name="javac.debug" value="true"/>
-               <property name="javadoc.preview" value="true"/>
-               <property name="application.args" value=""/>
-               <property name="source.encoding" value="${file.encoding}"/>
-               <property name="runtime.encoding" value="${source.encoding}"/>
-               <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-                       <and>
-                               <isset property="javadoc.encoding"/>
-                               <not>
-                                       <equals arg1="${javadoc.encoding}" arg2=""/>
-                               </not>
-                       </and>
-               </condition>
-               <property name="javadoc.encoding.used" value="${source.encoding}"/>
-               <property name="includes" value="**"/>
-               <property name="excludes" value=""/>
-               <property name="do.depend" value="false"/>
-               <condition property="do.depend.true">
-                       <istrue value="${do.depend}"/>
-               </condition>
-               <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
-               <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-                       <and>
-                               <isset property="endorsed.classpath"/>
-                               <not>
-                                       <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
-                               </not>
-                       </and>
-               </condition>
-               <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
-                       <isset property="profile.available"/>
-               </condition>
-               <condition else="false" property="jdkBug6558476">
-                       <and>
-                               <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                               <not>
-                                       <os family="unix"/>
-                               </not>
-                       </and>
-               </condition>
-               <property name="javac.fork" value="${jdkBug6558476}"/>
-               <property name="jar.index" value="false"/>
-               <property name="jar.index.metainf" value="${jar.index}"/>
-               <property name="copylibs.rebase" value="true"/>
-               <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-               <condition property="junit.available">
-                       <or>
-                               <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
-                               <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
-                       </or>
-               </condition>
-               <condition property="testng.available">
-                       <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
-               </condition>
-               <condition property="junit+testng.available">
-                       <and>
-                               <istrue value="${junit.available}"/>
-                               <istrue value="${testng.available}"/>
-                       </and>
-               </condition>
-               <condition else="testng" property="testng.mode" value="mixed">
-                       <istrue value="${junit+testng.available}"/>
-               </condition>
-               <condition else="" property="testng.debug.mode" value="-mixed">
-                       <istrue value="${junit+testng.available}"/>
-               </condition>
-       </target>
-       <target name="-post-init">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
-               <fail unless="src.dir">Must set src.dir</fail>
-               <fail unless="test.src.dir">Must set test.src.dir</fail>
-               <fail unless="build.dir">Must set build.dir</fail>
-               <fail unless="dist.dir">Must set dist.dir</fail>
-               <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-               <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-               <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-               <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-               <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-               <fail unless="dist.jar">Must set dist.jar</fail>
-       </target>
-       <target name="-init-macrodef-property">
-               <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-                       <attribute name="name"/>
-                       <attribute name="value"/>
-                       <sequential>
-                               <property name="@{name}" value="${@{value}}"/>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
-               <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${src.dir}" name="srcdir"/>
-                       <attribute default="${build.classes.dir}" name="destdir"/>
-                       <attribute default="${javac.classpath}" name="classpath"/>
-                       <attribute default="${javac.processorpath}" name="processorpath"/>
-                       <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="${javac.debug}" name="debug"/>
-                       <attribute default="${empty.dir}" name="sourcepath"/>
-                       <attribute default="${empty.dir}" name="gensrcdir"/>
-                       <element name="customize" optional="true"/>
-                       <sequential>
-                               <property location="${build.dir}/empty" name="empty.dir"/>
-                               <mkdir dir="${empty.dir}"/>
-                               <mkdir dir="@{apgeneratedsrcdir}"/>
-                               <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                                       <src>
-                                               <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                                                       <include name="*"/>
-                                               </dirset>
-                                       </src>
-                                       <classpath>
-                                               <path path="@{classpath}"/>
-                                       </classpath>
-                                       <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                                       <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                                       <compilerarg line="${javac.compilerargs}"/>
-                                       <compilerarg value="-processorpath"/>
-                                       <compilerarg path="@{processorpath}:${empty.dir}"/>
-                                       <compilerarg line="${ap.processors.internal}"/>
-                                       <compilerarg line="${annotation.processing.processor.options}"/>
-                                       <compilerarg value="-s"/>
-                                       <compilerarg path="@{apgeneratedsrcdir}"/>
-                                       <compilerarg line="${ap.proc.none.internal}"/>
-                                       <customize/>
-                               </javac>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
-               <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${src.dir}" name="srcdir"/>
-                       <attribute default="${build.classes.dir}" name="destdir"/>
-                       <attribute default="${javac.classpath}" name="classpath"/>
-                       <attribute default="${javac.processorpath}" name="processorpath"/>
-                       <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="${javac.debug}" name="debug"/>
-                       <attribute default="${empty.dir}" name="sourcepath"/>
-                       <attribute default="${empty.dir}" name="gensrcdir"/>
-                       <element name="customize" optional="true"/>
-                       <sequential>
-                               <property location="${build.dir}/empty" name="empty.dir"/>
-                               <mkdir dir="${empty.dir}"/>
-                               <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                                       <src>
-                                               <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                                                       <include name="*"/>
-                                               </dirset>
-                                       </src>
-                                       <classpath>
-                                               <path path="@{classpath}"/>
-                                       </classpath>
-                                       <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                                       <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                                       <compilerarg line="${javac.compilerargs}"/>
-                                       <customize/>
-                               </javac>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
-               <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${src.dir}" name="srcdir"/>
-                       <attribute default="${build.classes.dir}" name="destdir"/>
-                       <attribute default="${javac.classpath}" name="classpath"/>
-                       <sequential>
-                               <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                                       <classpath>
-                                               <path path="@{classpath}"/>
-                                       </classpath>
-                               </depend>
-                       </sequential>
-               </macrodef>
-               <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${build.classes.dir}" name="destdir"/>
-                       <sequential>
-                               <fail unless="javac.includes">Must set javac.includes</fail>
-                               <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
-                                       <path>
-                                               <filelist dir="@{destdir}" files="${javac.includes}"/>
-                                       </path>
-                                       <globmapper from="*.java" to="*.class"/>
-                               </pathconvert>
-                               <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
-                               <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
-                               <delete>
-                                       <files includesfile="${javac.includesfile.binary}"/>
-                               </delete>
-                               <delete>
-                                       <fileset file="${javac.includesfile.binary}"/>
-                               </delete>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target if="${junit.available}" name="-init-macrodef-junit-init">
-               <condition else="false" property="nb.junit.batch" value="true">
-                       <and>
-                               <istrue value="${junit.available}"/>
-                               <not>
-                                       <isset property="test.method"/>
-                               </not>
-                       </and>
-               </condition>
-               <condition else="false" property="nb.junit.single" value="true">
-                       <and>
-                               <istrue value="${junit.available}"/>
-                               <isset property="test.method"/>
-                       </and>
-               </condition>
-       </target>
-       <target name="-init-test-properties">
-               <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
-               <property name="test.binarytestincludes" value=""/>
-               <property name="test.binaryexcludes" value=""/>
-       </target>
-       <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
-               <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <element name="customize" optional="true"/>
-                       <sequential>
-                               <property name="junit.forkmode" value="perTest"/>
-                               <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                                       <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                                       <syspropertyset>
-                                               <propertyref prefix="test-sys-prop."/>
-                                               <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                                       </syspropertyset>
-                                       <formatter type="brief" usefile="false"/>
-                                       <formatter type="xml"/>
-                                       <jvmarg value="-ea"/>
-                                       <customize/>
-                               </junit>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
-               <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <element name="customize" optional="true"/>
-                       <sequential>
-                               <property name="junit.forkmode" value="perTest"/>
-                               <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                                       <batchtest todir="${build.test.results.dir}">
-                                               <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                                                       <filename name="@{testincludes}"/>
-                                               </fileset>
-                                               <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                                                       <filename name="${test.binarytestincludes}"/>
-                                               </fileset>
-                                       </batchtest>
-                                       <syspropertyset>
-                                               <propertyref prefix="test-sys-prop."/>
-                                               <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                                       </syspropertyset>
-                                       <formatter type="brief" usefile="false"/>
-                                       <formatter type="xml"/>
-                                       <jvmarg value="-ea"/>
-                                       <customize/>
-                               </junit>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
-       <target if="${testng.available}" name="-init-macrodef-testng">
-               <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <element name="customize" optional="true"/>
-                       <sequential>
-                               <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
-                                       <isset property="test.method"/>
-                               </condition>
-                               <union id="test.set">
-                                       <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
-                                               <filename name="@{testincludes}"/>
-                                       </fileset>
-                               </union>
-                               <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                               <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="juser-core" testname="TestNG tests" workingDir="${work.dir}">
-                                       <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
-                                       <propertyset>
-                                               <propertyref prefix="test-sys-prop."/>
-                                               <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                                       </propertyset>
-                                       <customize/>
-                               </testng>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target name="-init-macrodef-test-impl">
-               <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <element implicit="true" name="customize" optional="true"/>
-                       <sequential>
-                               <echo>No tests executed.</echo>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
-               <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <element implicit="true" name="customize" optional="true"/>
-                       <sequential>
-                               <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                                       <customize/>
-                               </j2seproject3:junit>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
-               <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <element implicit="true" name="customize" optional="true"/>
-                       <sequential>
-                               <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                                       <customize/>
-                               </j2seproject3:testng>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
-               <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <sequential>
-                               <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                                       <customize>
-                                               <classpath>
-                                                       <path path="${run.test.classpath}"/>
-                                               </classpath>
-                                               <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                                               <jvmarg line="${run.jvmargs}"/>
-                                               <jvmarg line="${run.jvmargs.ide}"/>
-                                       </customize>
-                               </j2seproject3:test-impl>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-               <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <element name="customize" optional="true"/>
-                       <sequential>
-                               <property name="junit.forkmode" value="perTest"/>
-                               <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                                       <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                                       <syspropertyset>
-                                               <propertyref prefix="test-sys-prop."/>
-                                               <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                                       </syspropertyset>
-                                       <formatter type="brief" usefile="false"/>
-                                       <formatter type="xml"/>
-                                       <jvmarg value="-ea"/>
-                                       <jvmarg line="${debug-args-line}"/>
-                                       <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                                       <customize/>
-                               </junit>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-               <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <element name="customize" optional="true"/>
-                       <sequential>
-                               <property name="junit.forkmode" value="perTest"/>
-                               <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                                       <batchtest todir="${build.test.results.dir}">
-                                               <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                                                       <filename name="@{testincludes}"/>
-                                               </fileset>
-                                               <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                                                       <filename name="${test.binarytestincludes}"/>
-                                               </fileset>
-                                       </batchtest>
-                                       <syspropertyset>
-                                               <propertyref prefix="test-sys-prop."/>
-                                               <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                                       </syspropertyset>
-                                       <formatter type="brief" usefile="false"/>
-                                       <formatter type="xml"/>
-                                       <jvmarg value="-ea"/>
-                                       <jvmarg line="${debug-args-line}"/>
-                                       <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                                       <customize/>
-                               </junit>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
-               <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <element implicit="true" name="customize" optional="true"/>
-                       <sequential>
-                               <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                                       <customize/>
-                               </j2seproject3:junit-debug>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target if="${testng.available}" name="-init-macrodef-testng-debug">
-               <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${main.class}" name="testClass"/>
-                       <attribute default="" name="testMethod"/>
-                       <element name="customize2" optional="true"/>
-                       <sequential>
-                               <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
-                                       <isset property="test.method"/>
-                               </condition>
-                               <condition else="-suitename juser-core -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
-                                       <matches pattern=".*\.xml" string="@{testClass}"/>
-                               </condition>
-                               <delete dir="${build.test.results.dir}" quiet="true"/>
-                               <mkdir dir="${build.test.results.dir}"/>
-                               <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                                       <customize>
-                                               <customize2/>
-                                               <jvmarg value="-ea"/>
-                                               <arg line="${testng.debug.mode}"/>
-                                               <arg line="-d ${build.test.results.dir}"/>
-                                               <arg line="-listener org.testng.reporters.VerboseReporter"/>
-                                               <arg line="${testng.cmd.args}"/>
-                                       </customize>
-                               </j2seproject3:debug>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
-               <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${main.class}" name="testClass"/>
-                       <attribute default="" name="testMethod"/>
-                       <element implicit="true" name="customize2" optional="true"/>
-                       <sequential>
-                               <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
-                                       <customize2/>
-                               </j2seproject3:testng-debug>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
-               <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <attribute default="${main.class}" name="testClass"/>
-                       <attribute default="" name="testMethod"/>
-                       <sequential>
-                               <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                                       <customize>
-                                               <classpath>
-                                                       <path path="${run.test.classpath}"/>
-                                               </classpath>
-                                               <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                                               <jvmarg line="${run.jvmargs}"/>
-                                               <jvmarg line="${run.jvmargs.ide}"/>
-                                       </customize>
-                               </j2seproject3:test-debug-impl>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
-               <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${includes}" name="includes"/>
-                       <attribute default="${excludes}" name="excludes"/>
-                       <attribute default="**" name="testincludes"/>
-                       <attribute default="" name="testmethods"/>
-                       <attribute default="${main.class}" name="testClass"/>
-                       <attribute default="" name="testMethod"/>
-                       <sequential>
-                               <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
-                                       <customize2>
-                                               <syspropertyset>
-                                                       <propertyref prefix="test-sys-prop."/>
-                                                       <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                                               </syspropertyset>
-                                       </customize2>
-                               </j2seproject3:testng-debug-impl>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
-       <!--
-               pre NB7.2 profiling section; consider it deprecated
-       -->
-       <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
-       <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
-               <macrodef name="resolve">
-                       <attribute name="name"/>
-                       <attribute name="value"/>
-                       <sequential>
-                               <property name="@{name}" value="${env.@{value}}"/>
-                       </sequential>
-               </macrodef>
-               <macrodef name="profile">
-                       <attribute default="${main.class}" name="classname"/>
-                       <element name="customize" optional="true"/>
-                       <sequential>
-                               <property environment="env"/>
-                               <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                               <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
-                                       <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                                       <jvmarg value="${profiler.info.jvmargs.agent}"/>
-                                       <jvmarg line="${profiler.info.jvmargs}"/>
-                                       <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-                                       <arg line="${application.args}"/>
-                                       <classpath>
-                                               <path path="${run.classpath}"/>
-                                       </classpath>
-                                       <syspropertyset>
-                                               <propertyref prefix="run-sys-prop."/>
-                                               <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                                       </syspropertyset>
-                                       <customize/>
-                               </java>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
-               <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
-               <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
-       </target>
-       <!--
-               end of pre NB7.2 profiling section
-       -->
-       <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-               <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-                       <attribute default="${main.class}" name="name"/>
-                       <attribute default="${debug.classpath}" name="classpath"/>
-                       <attribute default="" name="stopclassname"/>
-                       <sequential>
-                               <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                                       <classpath>
-                                               <path path="@{classpath}"/>
-                                       </classpath>
-                               </nbjpdastart>
-                       </sequential>
-               </macrodef>
-               <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-                       <attribute default="${build.classes.dir}" name="dir"/>
-                       <sequential>
-                               <nbjpdareload>
-                                       <fileset dir="@{dir}" includes="${fix.classes}">
-                                               <include name="${fix.includes}*.class"/>
-                                       </fileset>
-                               </nbjpdareload>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target name="-init-debug-args">
-               <property name="version-output" value="java version &quot;${ant.java.version}"/>
-               <condition property="have-jdk-older-than-1.4">
-                       <or>
-                               <contains string="${version-output}" substring="java version &quot;1.0"/>
-                               <contains string="${version-output}" substring="java version &quot;1.1"/>
-                               <contains string="${version-output}" substring="java version &quot;1.2"/>
-                               <contains string="${version-output}" substring="java version &quot;1.3"/>
-                       </or>
-               </condition>
-               <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-                       <istrue value="${have-jdk-older-than-1.4}"/>
-               </condition>
-               <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-                       <os family="windows"/>
-               </condition>
-               <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-                       <isset property="debug.transport"/>
-               </condition>
-       </target>
-       <target depends="-init-debug-args" name="-init-macrodef-debug">
-               <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${main.class}" name="classname"/>
-                       <attribute default="${debug.classpath}" name="classpath"/>
-                       <element name="customize" optional="true"/>
-                       <sequential>
-                               <java classname="@{classname}" dir="${work.dir}" fork="true">
-                                       <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                                       <jvmarg line="${debug-args-line}"/>
-                                       <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                                       <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                                       <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                                       <jvmarg line="${run.jvmargs}"/>
-                                       <jvmarg line="${run.jvmargs.ide}"/>
-                                       <classpath>
-                                               <path path="@{classpath}"/>
-                                       </classpath>
-                                       <syspropertyset>
-                                               <propertyref prefix="run-sys-prop."/>
-                                               <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                                       </syspropertyset>
-                                       <customize/>
-                               </java>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target name="-init-macrodef-java">
-               <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-                       <attribute default="${main.class}" name="classname"/>
-                       <attribute default="${run.classpath}" name="classpath"/>
-                       <attribute default="jvm" name="jvm"/>
-                       <element name="customize" optional="true"/>
-                       <sequential>
-                               <java classname="@{classname}" dir="${work.dir}" fork="true">
-                                       <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                                       <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                                       <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                                       <jvmarg line="${run.jvmargs}"/>
-                                       <jvmarg line="${run.jvmargs.ide}"/>
-                                       <classpath>
-                                               <path path="@{classpath}"/>
-                                       </classpath>
-                                       <syspropertyset>
-                                               <propertyref prefix="run-sys-prop."/>
-                                               <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                                       </syspropertyset>
-                                       <customize/>
-                               </java>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target name="-init-macrodef-copylibs">
-               <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
-                       <attribute default="${manifest.file}" name="manifest"/>
-                       <element name="customize" optional="true"/>
-                       <sequential>
-                               <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-                               <pathconvert property="run.classpath.without.build.classes.dir">
-                                       <path path="${run.classpath}"/>
-                                       <map from="${build.classes.dir.resolved}" to=""/>
-                               </pathconvert>
-                               <pathconvert pathsep=" " property="jar.classpath">
-                                       <path path="${run.classpath.without.build.classes.dir}"/>
-                                       <chainedmapper>
-                                               <flattenmapper/>
-                                               <filtermapper>
-                                                       <replacestring from=" " to="%20"/>
-                                               </filtermapper>
-                                               <globmapper from="*" to="lib/*"/>
-                                       </chainedmapper>
-                               </pathconvert>
-                               <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                               <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                                       <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-                                       <manifest>
-                                               <attribute name="Class-Path" value="${jar.classpath}"/>
-                                               <customize/>
-                                       </manifest>
-                               </copylibs>
-                       </sequential>
-               </macrodef>
-       </target>
-       <target name="-init-presetdef-jar">
-               <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-                       <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
-                               <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-                       </jar>
-               </presetdef>
-       </target>
-       <target name="-init-ap-cmdline-properties">
-               <property name="annotation.processing.enabled" value="true"/>
-               <property name="annotation.processing.processors.list" value=""/>
-               <property name="annotation.processing.processor.options" value=""/>
-               <property name="annotation.processing.run.all.processors" value="true"/>
-               <property name="javac.processorpath" value="${javac.classpath}"/>
-               <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
-               <condition property="ap.supported.internal" value="true">
-                       <not>
-                               <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
-                       </not>
-               </condition>
-       </target>
-       <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
-               <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
-                       <isfalse value="${annotation.processing.run.all.processors}"/>
-               </condition>
-               <condition else="" property="ap.proc.none.internal" value="-proc:none">
-                       <isfalse value="${annotation.processing.enabled}"/>
-               </condition>
-       </target>
-       <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
-               <property name="ap.cmd.line.internal" value=""/>
-       </target>
-       <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
-       <!--
-               ===================
-               COMPILATION SECTION
-               ===================
-       -->
-       <target name="-deps-jar-init" unless="built-jar.properties">
-               <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
-               <delete file="${built-jar.properties}" quiet="true"/>
-       </target>
-       <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-               <echo level="warn" message="Cycle detected: juser-core was already built"/>
-       </target>
-       <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
-               <mkdir dir="${build.dir}"/>
-               <touch file="${built-jar.properties}" verbose="false"/>
-               <property file="${built-jar.properties}" prefix="already.built.jar."/>
-               <antcall target="-warn-already-built-jar"/>
-               <propertyfile file="${built-jar.properties}">
-                       <entry key="${basedir}" value=""/>
-               </propertyfile>
-       </target>
-       <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-       <target depends="init" name="-check-automatic-build">
-               <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-       </target>
-       <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-               <antcall target="clean"/>
-       </target>
-       <target depends="init,deps-jar" name="-pre-pre-compile">
-               <mkdir dir="${build.classes.dir}"/>
-       </target>
-       <target name="-pre-compile">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target if="do.depend.true" name="-compile-depend">
-               <pathconvert property="build.generated.subdirs">
-                       <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                               <include name="*"/>
-                       </dirset>
-               </pathconvert>
-               <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
-       </target>
-       <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
-               <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
-               <copy todir="${build.classes.dir}">
-                       <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-               </copy>
-       </target>
-       <target if="has.persistence.xml" name="-copy-persistence-xml">
-               <mkdir dir="${build.classes.dir}/META-INF"/>
-               <copy todir="${build.classes.dir}/META-INF">
-                       <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
-               </copy>
-       </target>
-       <target name="-post-compile">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-       <target name="-pre-compile-single">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-               <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-               <j2seproject3:force-recompile/>
-               <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
-       </target>
-       <target name="-post-compile-single">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-       <!--
-               ====================
-               JAR BUILDING SECTION
-               ====================
-       -->
-       <target depends="init" name="-pre-pre-jar">
-               <dirname file="${dist.jar}" property="dist.jar.dir"/>
-               <mkdir dir="${dist.jar.dir}"/>
-       </target>
-       <target name="-pre-jar">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
-               <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-               <touch file="${tmp.manifest.file}" verbose="false"/>
-       </target>
-       <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
-               <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-               <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
-       </target>
-       <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-               <manifest file="${tmp.manifest.file}" mode="update">
-                       <attribute name="Main-Class" value="${main.class}"/>
-               </manifest>
-       </target>
-       <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-               <manifest file="${tmp.manifest.file}" mode="update">
-                       <attribute name="Profile" value="${javac.profile}"/>
-               </manifest>
-       </target>
-       <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
-               <basename file="${application.splash}" property="splashscreen.basename"/>
-               <mkdir dir="${build.classes.dir}/META-INF"/>
-               <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-               <manifest file="${tmp.manifest.file}" mode="update">
-                       <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
-               </manifest>
-       </target>
-       <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
-               <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
-               <echo level="info">To run this application from the command line without Ant, try:</echo>
-               <property location="${dist.jar}" name="dist.jar.resolved"/>
-               <echo level="info">java -jar "${dist.jar.resolved}"</echo>
-       </target>
-       <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
-               <j2seproject1:jar manifest="${tmp.manifest.file}"/>
-               <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-               <property location="${dist.jar}" name="dist.jar.resolved"/>
-               <pathconvert property="run.classpath.with.dist.jar">
-                       <path path="${run.classpath}"/>
-                       <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-               </pathconvert>
-               <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
-                       <isset property="main.class.available"/>
-               </condition>
-               <condition else="debug" property="jar.usage.level" value="info">
-                       <isset property="main.class.available"/>
-               </condition>
-               <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
-       </target>
-       <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
-               <delete>
-                       <fileset file="${tmp.manifest.file}"/>
-               </delete>
-       </target>
-       <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
-       <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
-       <target name="-post-jar">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
-       <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
-       <!--
-               =================
-               EXECUTION SECTION
-               =================
-       -->
-       <target depends="init,compile" description="Run a main class." name="run">
-               <j2seproject1:java>
-                       <customize>
-                               <arg line="${application.args}"/>
-                       </customize>
-               </j2seproject1:java>
-       </target>
-       <target name="-do-not-recompile">
-               <property name="javac.includes.binary" value=""/>
-       </target>
-       <target depends="init,compile-single" name="run-single">
-               <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-               <j2seproject1:java classname="${run.class}"/>
-       </target>
-       <target depends="init,compile-test-single" name="run-test-with-main">
-               <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-               <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
-       </target>
-       <!--
-               =================
-               DEBUGGING SECTION
-               =================
-       -->
-       <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-               <j2seproject1:nbjpdastart name="${debug.class}"/>
-       </target>
-       <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
-               <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
-       </target>
-       <target depends="init,compile" name="-debug-start-debuggee">
-               <j2seproject3:debug>
-                       <customize>
-                               <arg line="${application.args}"/>
-                       </customize>
-               </j2seproject3:debug>
-       </target>
-       <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-       <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-               <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-       </target>
-       <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-       <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-               <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-               <j2seproject3:debug classname="${debug.class}"/>
-       </target>
-       <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-       <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
-               <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-               <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
-       </target>
-       <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
-       <target depends="init" name="-pre-debug-fix">
-               <fail unless="fix.includes">Must set fix.includes</fail>
-               <property name="javac.includes" value="${fix.includes}.java"/>
-       </target>
-       <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-               <j2seproject1:nbjpdareload/>
-       </target>
-       <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-       <!--
-               =================
-               PROFILING SECTION
-               =================
-       -->
-       <!--
-               pre NB7.2 profiler integration
-       -->
-       <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-               <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-               <nbprofiledirect>
-                       <classpath>
-                               <path path="${run.classpath}"/>
-                       </classpath>
-               </nbprofiledirect>
-               <profile/>
-       </target>
-       <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
-               <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-               <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-               <nbprofiledirect>
-                       <classpath>
-                               <path path="${run.classpath}"/>
-                       </classpath>
-               </nbprofiledirect>
-               <profile classname="${profile.class}"/>
-       </target>
-       <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
-               <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-               <nbprofiledirect>
-                       <classpath>
-                               <path path="${run.classpath}"/>
-                       </classpath>
-               </nbprofiledirect>
-               <profile classname="sun.applet.AppletViewer">
-                       <customize>
-                               <arg value="${applet.url}"/>
-                       </customize>
-               </profile>
-       </target>
-       <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
-               <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-               <nbprofiledirect>
-                       <classpath>
-                               <path path="${run.test.classpath}"/>
-                       </classpath>
-               </nbprofiledirect>
-               <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-                       <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-                       <jvmarg value="${profiler.info.jvmargs.agent}"/>
-                       <jvmarg line="${profiler.info.jvmargs}"/>
-                       <test name="${profile.class}"/>
-                       <classpath>
-                               <path path="${run.test.classpath}"/>
-                       </classpath>
-                       <syspropertyset>
-                               <propertyref prefix="test-sys-prop."/>
-                               <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                       </syspropertyset>
-                       <formatter type="brief" usefile="false"/>
-                       <formatter type="xml"/>
-               </junit>
-       </target>
-       <!--
-               end of pre NB72 profiling section
-       -->
-       <target if="netbeans.home" name="-profile-check">
-               <condition property="profiler.configured">
-                       <or>
-                               <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
-                               <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
-                       </or>
-               </condition>
-       </target>
-       <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
-               <startprofiler/>
-               <antcall target="run"/>
-       </target>
-       <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
-               <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-               <startprofiler/>
-               <antcall target="run-single"/>
-       </target>
-       <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
-       <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
-               <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-               <startprofiler/>
-               <antcall target="test-single"/>
-       </target>
-       <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
-               <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-               <startprofiler/>
-               <antcal target="run-test-with-main"/>
-       </target>
-       <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
-               <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-               <startprofiler/>
-               <antcall target="run-applet"/>
-       </target>
-       <!--
-               ===============
-               JAVADOC SECTION
-               ===============
-       -->
-       <target depends="init" if="have.sources" name="-javadoc-build">
-               <mkdir dir="${dist.javadoc.dir}"/>
-               <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
-                       <and>
-                               <isset property="endorsed.classpath.cmd.line.arg"/>
-                               <not>
-                                       <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
-                               </not>
-                       </and>
-               </condition>
-               <condition else="" property="bug5101868workaround" value="*.java">
-                       <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
-               </condition>
-               <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-                       <classpath>
-                               <path path="${javac.classpath}"/>
-                       </classpath>
-                       <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-                               <filename name="**/*.java"/>
-                       </fileset>
-                       <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                               <include name="**/*.java"/>
-                               <exclude name="*.java"/>
-                       </fileset>
-                       <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
-               </javadoc>
-               <copy todir="${dist.javadoc.dir}">
-                       <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                               <filename name="**/doc-files/**"/>
-                       </fileset>
-                       <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                               <include name="**/doc-files/**"/>
-                       </fileset>
-               </copy>
-       </target>
-       <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-               <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-       </target>
-       <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-       <!--
-               =========================
-               TEST COMPILATION SECTION
-               =========================
-       -->
-       <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-               <mkdir dir="${build.test.classes.dir}"/>
-       </target>
-       <target name="-pre-compile-test">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target if="do.depend.true" name="-compile-test-depend">
-               <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-       </target>
-       <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-               <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
-               <copy todir="${build.test.classes.dir}">
-                       <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-               </copy>
-       </target>
-       <target name="-post-compile-test">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-       <target name="-pre-compile-test-single">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-               <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-               <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-               <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-               <copy todir="${build.test.classes.dir}">
-                       <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-               </copy>
-       </target>
-       <target name="-post-compile-test-single">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-       <!--
-               =======================
-               TEST EXECUTION SECTION
-               =======================
-       -->
-       <target depends="init" if="have.tests" name="-pre-test-run">
-               <mkdir dir="${build.test.results.dir}"/>
-       </target>
-       <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-               <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
-       </target>
-       <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-               <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-       </target>
-       <target depends="init" if="have.tests" name="test-report"/>
-       <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-       <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-       <target depends="init" if="have.tests" name="-pre-test-run-single">
-               <mkdir dir="${build.test.results.dir}"/>
-       </target>
-       <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-               <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-               <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
-       </target>
-       <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-               <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-       </target>
-       <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-       <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
-               <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
-               <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-               <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
-       </target>
-       <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
-               <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-       </target>
-       <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
-       <!--
-               =======================
-               TEST DEBUGGING SECTION
-               =======================
-       -->
-       <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
-               <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-               <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
-       </target>
-       <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
-               <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-               <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-               <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
-       </target>
-       <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-               <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-       </target>
-       <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-       <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
-       <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-               <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-       </target>
-       <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-       <!--
-               =========================
-               APPLET EXECUTION SECTION
-               =========================
-       -->
-       <target depends="init,compile-single" name="run-applet">
-               <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-               <j2seproject1:java classname="sun.applet.AppletViewer">
-                       <customize>
-                               <arg value="${applet.url}"/>
-                       </customize>
-               </j2seproject1:java>
-       </target>
-       <!--
-               =========================
-               APPLET DEBUGGING  SECTION
-               =========================
-       -->
-       <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-               <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-               <j2seproject3:debug classname="sun.applet.AppletViewer">
-                       <customize>
-                               <arg value="${applet.url}"/>
-                       </customize>
-               </j2seproject3:debug>
-       </target>
-       <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-       <!--
-               ===============
-               CLEANUP SECTION
-               ===============
-       -->
-       <target name="-deps-clean-init" unless="built-clean.properties">
-               <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
-               <delete file="${built-clean.properties}" quiet="true"/>
-       </target>
-       <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-               <echo level="warn" message="Cycle detected: juser-core was already built"/>
-       </target>
-       <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
-               <mkdir dir="${build.dir}"/>
-               <touch file="${built-clean.properties}" verbose="false"/>
-               <property file="${built-clean.properties}" prefix="already.built.clean."/>
-               <antcall target="-warn-already-built-clean"/>
-               <propertyfile file="${built-clean.properties}">
-                       <entry key="${basedir}" value=""/>
-               </propertyfile>
-       </target>
-       <target depends="init" name="-do-clean">
-               <delete dir="${build.dir}"/>
-               <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
-       </target>
-       <target name="-post-clean">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-       <target name="-check-call-dep">
-               <property file="${call.built.properties}" prefix="already.built."/>
-               <condition property="should.call.dep">
-                       <and>
-                               <not>
-                                       <isset property="already.built.${call.subproject}"/>
-                               </not>
-                               <available file="${call.script}"/>
-                       </and>
-               </condition>
-       </target>
-       <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
-               <ant antfile="${call.script}" inheritall="false" target="${call.target}">
-                       <propertyset>
-                               <propertyref prefix="transfer."/>
-                               <mapper from="transfer.*" to="*" type="glob"/>
-                       </propertyset>
-               </ant>
-       </target>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+*** GENERATED FROM project.xml - DO NOT EDIT  ***\r
+***         EDIT ../build.xml INSTEAD         ***\r
+\r
+For the purpose of easier reading the script\r
+is divided into following sections:\r
+\r
+  - initialization\r
+  - compilation\r
+  - jar\r
+  - execution\r
+  - debugging\r
+  - javadoc\r
+  - test compilation\r
+  - test execution\r
+  - test debugging\r
+  - applet\r
+  - cleanup\r
+\r
+        -->\r
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="juser-activity-core-impl">\r
+    <fail message="Please build using Ant 1.8.0 or higher.">\r
+        <condition>\r
+            <not>\r
+                <antversion atleast="1.8.0"/>\r
+            </not>\r
+        </condition>\r
+    </fail>\r
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>\r
+    <!-- \r
+                ======================\r
+                INITIALIZATION SECTION \r
+                ======================\r
+            -->\r
+    <target name="-pre-init">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target depends="-pre-init" name="-init-private">\r
+        <property file="nbproject/private/config.properties"/>\r
+        <property file="nbproject/private/configs/${config}.properties"/>\r
+        <property file="nbproject/private/private.properties"/>\r
+    </target>\r
+    <target name="-pre-init-libraries">\r
+        <property location="./lib/nblibraries.properties" name="libraries.path"/>\r
+        <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>\r
+        <pathconvert dirsep="/" property="libraries.dir">\r
+            <path path="${libraries.dir.nativedirsep}"/>\r
+        </pathconvert>\r
+        <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>\r
+        <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>\r
+    </target>\r
+    <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">\r
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">\r
+            <filterchain>\r
+                <replacestring from="$${base}" to="${libraries.dir}"/>\r
+                <escapeunicode/>\r
+            </filterchain>\r
+        </loadproperties>\r
+    </target>\r
+    <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">\r
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">\r
+            <filterchain>\r
+                <replacestring from="$${base}" to="${libraries.dir}"/>\r
+                <escapeunicode/>\r
+            </filterchain>\r
+        </loadproperties>\r
+    </target>\r
+    <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">\r
+        <property file="${user.properties.file}"/>\r
+        <!-- The two properties below are usually overridden -->\r
+        <!-- by the active platform. Just a fallback. -->\r
+        <property name="default.javac.source" value="1.4"/>\r
+        <property name="default.javac.target" value="1.4"/>\r
+    </target>\r
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">\r
+        <property file="nbproject/configs/${config}.properties"/>\r
+        <property file="nbproject/project.properties"/>\r
+    </target>\r
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">\r
+        <property name="platform.java" value="${java.home}/bin/java"/>\r
+        <available file="${manifest.file}" property="manifest.available"/>\r
+        <condition property="splashscreen.available">\r
+            <and>\r
+                <not>\r
+                    <equals arg1="${application.splash}" arg2="" trim="true"/>\r
+                </not>\r
+                <available file="${application.splash}"/>\r
+            </and>\r
+        </condition>\r
+        <condition property="main.class.available">\r
+            <and>\r
+                <isset property="main.class"/>\r
+                <not>\r
+                    <equals arg1="${main.class}" arg2="" trim="true"/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
+        <condition property="profile.available">\r
+            <and>\r
+                <isset property="javac.profile"/>\r
+                <length length="0" string="${javac.profile}" when="greater"/>\r
+                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>\r
+            </and>\r
+        </condition>\r
+        <condition property="do.archive">\r
+            <or>\r
+                <not>\r
+                    <istrue value="${jar.archive.disabled}"/>\r
+                </not>\r
+                <istrue value="${not.archive.disabled}"/>\r
+            </or>\r
+        </condition>\r
+        <condition property="do.mkdist">\r
+            <and>\r
+                <isset property="do.archive"/>\r
+                <isset property="libs.CopyLibs.classpath"/>\r
+                <not>\r
+                    <istrue value="${mkdist.disabled}"/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
+        <condition property="do.archive+manifest.available">\r
+            <and>\r
+                <isset property="manifest.available"/>\r
+                <istrue value="${do.archive}"/>\r
+            </and>\r
+        </condition>\r
+        <condition property="do.archive+main.class.available">\r
+            <and>\r
+                <isset property="main.class.available"/>\r
+                <istrue value="${do.archive}"/>\r
+            </and>\r
+        </condition>\r
+        <condition property="do.archive+splashscreen.available">\r
+            <and>\r
+                <isset property="splashscreen.available"/>\r
+                <istrue value="${do.archive}"/>\r
+            </and>\r
+        </condition>\r
+        <condition property="do.archive+profile.available">\r
+            <and>\r
+                <isset property="profile.available"/>\r
+                <istrue value="${do.archive}"/>\r
+            </and>\r
+        </condition>\r
+        <condition property="have.tests">\r
+            <or>\r
+                <available file="${test.src.dir}"/>\r
+            </or>\r
+        </condition>\r
+        <condition property="have.sources">\r
+            <or>\r
+                <available file="${src.dir}"/>\r
+            </or>\r
+        </condition>\r
+        <condition property="netbeans.home+have.tests">\r
+            <and>\r
+                <isset property="netbeans.home"/>\r
+                <isset property="have.tests"/>\r
+            </and>\r
+        </condition>\r
+        <condition property="no.javadoc.preview">\r
+            <and>\r
+                <isset property="javadoc.preview"/>\r
+                <isfalse value="${javadoc.preview}"/>\r
+            </and>\r
+        </condition>\r
+        <property name="run.jvmargs" value=""/>\r
+        <property name="run.jvmargs.ide" value=""/>\r
+        <property name="javac.compilerargs" value=""/>\r
+        <property name="work.dir" value="${basedir}"/>\r
+        <condition property="no.deps">\r
+            <and>\r
+                <istrue value="${no.dependencies}"/>\r
+            </and>\r
+        </condition>\r
+        <property name="javac.debug" value="true"/>\r
+        <property name="javadoc.preview" value="true"/>\r
+        <property name="application.args" value=""/>\r
+        <property name="source.encoding" value="${file.encoding}"/>\r
+        <property name="runtime.encoding" value="${source.encoding}"/>\r
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">\r
+            <and>\r
+                <isset property="javadoc.encoding"/>\r
+                <not>\r
+                    <equals arg1="${javadoc.encoding}" arg2=""/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>\r
+        <property name="includes" value="**"/>\r
+        <property name="excludes" value=""/>\r
+        <property name="do.depend" value="false"/>\r
+        <condition property="do.depend.true">\r
+            <istrue value="${do.depend}"/>\r
+        </condition>\r
+        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>\r
+        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">\r
+            <and>\r
+                <isset property="endorsed.classpath"/>\r
+                <not>\r
+                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
+        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">\r
+            <isset property="profile.available"/>\r
+        </condition>\r
+        <condition else="false" property="jdkBug6558476">\r
+            <and>\r
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>\r
+                <not>\r
+                    <os family="unix"/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
+        <condition else="false" property="javac.fork">\r
+            <or>\r
+                <istrue value="${jdkBug6558476}"/>\r
+                <istrue value="${javac.external.vm}"/>\r
+            </or>\r
+        </condition>\r
+        <property name="jar.index" value="false"/>\r
+        <property name="jar.index.metainf" value="${jar.index}"/>\r
+        <property name="copylibs.rebase" value="true"/>\r
+        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>\r
+        <condition property="junit.available">\r
+            <or>\r
+                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>\r
+                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>\r
+            </or>\r
+        </condition>\r
+        <condition property="testng.available">\r
+            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>\r
+        </condition>\r
+        <condition property="junit+testng.available">\r
+            <and>\r
+                <istrue value="${junit.available}"/>\r
+                <istrue value="${testng.available}"/>\r
+            </and>\r
+        </condition>\r
+        <condition else="testng" property="testng.mode" value="mixed">\r
+            <istrue value="${junit+testng.available}"/>\r
+        </condition>\r
+        <condition else="" property="testng.debug.mode" value="-mixed">\r
+            <istrue value="${junit+testng.available}"/>\r
+        </condition>\r
+        <property name="java.failonerror" value="true"/>\r
+    </target>\r
+    <target name="-post-init">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">\r
+        <fail unless="src.dir">Must set src.dir</fail>\r
+        <fail unless="test.src.dir">Must set test.src.dir</fail>\r
+        <fail unless="build.dir">Must set build.dir</fail>\r
+        <fail unless="dist.dir">Must set dist.dir</fail>\r
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>\r
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>\r
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>\r
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>\r
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>\r
+        <fail unless="dist.jar">Must set dist.jar</fail>\r
+    </target>\r
+    <target name="-init-macrodef-property">\r
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">\r
+            <attribute name="name"/>\r
+            <attribute name="value"/>\r
+            <sequential>\r
+                <property name="@{name}" value="${@{value}}"/>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">\r
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${src.dir}" name="srcdir"/>\r
+            <attribute default="${build.classes.dir}" name="destdir"/>\r
+            <attribute default="${javac.classpath}" name="classpath"/>\r
+            <attribute default="${javac.processorpath}" name="processorpath"/>\r
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="${javac.debug}" name="debug"/>\r
+            <attribute default="${empty.dir}" name="sourcepath"/>\r
+            <attribute default="${empty.dir}" name="gensrcdir"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <property location="${build.dir}/empty" name="empty.dir"/>\r
+                <mkdir dir="${empty.dir}"/>\r
+                <mkdir dir="@{apgeneratedsrcdir}"/>\r
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
+                    <src>\r
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
+                            <include name="*"/>\r
+                        </dirset>\r
+                    </src>\r
+                    <classpath>\r
+                        <path path="@{classpath}"/>\r
+                    </classpath>\r
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>\r
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>\r
+                    <compilerarg line="${javac.compilerargs}"/>\r
+                    <compilerarg value="-processorpath"/>\r
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>\r
+                    <compilerarg line="${ap.processors.internal}"/>\r
+                    <compilerarg line="${annotation.processing.processor.options}"/>\r
+                    <compilerarg value="-s"/>\r
+                    <compilerarg path="@{apgeneratedsrcdir}"/>\r
+                    <compilerarg line="${ap.proc.none.internal}"/>\r
+                    <customize/>\r
+                </javac>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">\r
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${src.dir}" name="srcdir"/>\r
+            <attribute default="${build.classes.dir}" name="destdir"/>\r
+            <attribute default="${javac.classpath}" name="classpath"/>\r
+            <attribute default="${javac.processorpath}" name="processorpath"/>\r
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="${javac.debug}" name="debug"/>\r
+            <attribute default="${empty.dir}" name="sourcepath"/>\r
+            <attribute default="${empty.dir}" name="gensrcdir"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <property location="${build.dir}/empty" name="empty.dir"/>\r
+                <mkdir dir="${empty.dir}"/>\r
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
+                    <src>\r
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
+                            <include name="*"/>\r
+                        </dirset>\r
+                    </src>\r
+                    <classpath>\r
+                        <path path="@{classpath}"/>\r
+                    </classpath>\r
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>\r
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>\r
+                    <compilerarg line="${javac.compilerargs}"/>\r
+                    <customize/>\r
+                </javac>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">\r
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${src.dir}" name="srcdir"/>\r
+            <attribute default="${build.classes.dir}" name="destdir"/>\r
+            <attribute default="${javac.classpath}" name="classpath"/>\r
+            <sequential>\r
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">\r
+                    <classpath>\r
+                        <path path="@{classpath}"/>\r
+                    </classpath>\r
+                </depend>\r
+            </sequential>\r
+        </macrodef>\r
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${build.classes.dir}" name="destdir"/>\r
+            <sequential>\r
+                <fail unless="javac.includes">Must set javac.includes</fail>\r
+                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">\r
+                    <path>\r
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>\r
+                    </path>\r
+                    <globmapper from="*.java" to="*.class"/>\r
+                </pathconvert>\r
+                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>\r
+                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>\r
+                <delete>\r
+                    <files includesfile="${javac.includesfile.binary}"/>\r
+                </delete>\r
+                <delete>\r
+                    <fileset file="${javac.includesfile.binary}"/>\r
+                </delete>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target if="${junit.available}" name="-init-macrodef-junit-init">\r
+        <condition else="false" property="nb.junit.batch" value="true">\r
+            <and>\r
+                <istrue value="${junit.available}"/>\r
+                <not>\r
+                    <isset property="test.method"/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
+        <condition else="false" property="nb.junit.single" value="true">\r
+            <and>\r
+                <istrue value="${junit.available}"/>\r
+                <isset property="test.method"/>\r
+            </and>\r
+        </condition>\r
+    </target>\r
+    <target name="-init-test-properties">\r
+        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>\r
+        <property name="test.binarytestincludes" value=""/>\r
+        <property name="test.binaryexcludes" value=""/>\r
+    </target>\r
+    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">\r
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <property name="junit.forkmode" value="perTest"/>\r
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>\r
+                    <syspropertyset>\r
+                        <propertyref prefix="test-sys-prop."/>\r
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
+                    </syspropertyset>\r
+                    <formatter type="brief" usefile="false"/>\r
+                    <formatter type="xml"/>\r
+                    <jvmarg value="-ea"/>\r
+                    <customize/>\r
+                </junit>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">\r
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <property name="junit.forkmode" value="perTest"/>\r
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
+                    <batchtest todir="${build.test.results.dir}">\r
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">\r
+                            <filename name="@{testincludes}"/>\r
+                        </fileset>\r
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">\r
+                            <filename name="${test.binarytestincludes}"/>\r
+                        </fileset>\r
+                    </batchtest>\r
+                    <syspropertyset>\r
+                        <propertyref prefix="test-sys-prop."/>\r
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
+                    </syspropertyset>\r
+                    <formatter type="brief" usefile="false"/>\r
+                    <formatter type="xml"/>\r
+                    <jvmarg value="-ea"/>\r
+                    <customize/>\r
+                </junit>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>\r
+    <target if="${testng.available}" name="-init-macrodef-testng">\r
+        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">\r
+                    <isset property="test.method"/>\r
+                </condition>\r
+                <union id="test.set">\r
+                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">\r
+                        <filename name="@{testincludes}"/>\r
+                    </fileset>\r
+                </union>\r
+                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>\r
+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="juser-activity-core" testname="TestNG tests" workingDir="${work.dir}">\r
+                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>\r
+                    <propertyset>\r
+                        <propertyref prefix="test-sys-prop."/>\r
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
+                    </propertyset>\r
+                    <customize/>\r
+                </testng>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target name="-init-macrodef-test-impl">\r
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <element implicit="true" name="customize" optional="true"/>\r
+            <sequential>\r
+                <echo>No tests executed.</echo>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">\r
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <element implicit="true" name="customize" optional="true"/>\r
+            <sequential>\r
+                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">\r
+                    <customize/>\r
+                </j2seproject3:junit>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">\r
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <element implicit="true" name="customize" optional="true"/>\r
+            <sequential>\r
+                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">\r
+                    <customize/>\r
+                </j2seproject3:testng>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">\r
+        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <sequential>\r
+                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">\r
+                    <customize>\r
+                        <classpath>\r
+                            <path path="${run.test.classpath}"/>\r
+                        </classpath>\r
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
+                        <jvmarg line="${run.jvmargs}"/>\r
+                        <jvmarg line="${run.jvmargs.ide}"/>\r
+                    </customize>\r
+                </j2seproject3:test-impl>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">\r
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <property name="junit.forkmode" value="perTest"/>\r
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>\r
+                    <syspropertyset>\r
+                        <propertyref prefix="test-sys-prop."/>\r
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
+                    </syspropertyset>\r
+                    <formatter type="brief" usefile="false"/>\r
+                    <formatter type="xml"/>\r
+                    <jvmarg value="-ea"/>\r
+                    <jvmarg line="${debug-args-line}"/>\r
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
+                    <customize/>\r
+                </junit>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">\r
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <property name="junit.forkmode" value="perTest"/>\r
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
+                    <batchtest todir="${build.test.results.dir}">\r
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">\r
+                            <filename name="@{testincludes}"/>\r
+                        </fileset>\r
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">\r
+                            <filename name="${test.binarytestincludes}"/>\r
+                        </fileset>\r
+                    </batchtest>\r
+                    <syspropertyset>\r
+                        <propertyref prefix="test-sys-prop."/>\r
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
+                    </syspropertyset>\r
+                    <formatter type="brief" usefile="false"/>\r
+                    <formatter type="xml"/>\r
+                    <jvmarg value="-ea"/>\r
+                    <jvmarg line="${debug-args-line}"/>\r
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
+                    <customize/>\r
+                </junit>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">\r
+        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <element implicit="true" name="customize" optional="true"/>\r
+            <sequential>\r
+                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">\r
+                    <customize/>\r
+                </j2seproject3:junit-debug>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target if="${testng.available}" name="-init-macrodef-testng-debug">\r
+        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${main.class}" name="testClass"/>\r
+            <attribute default="" name="testMethod"/>\r
+            <element name="customize2" optional="true"/>\r
+            <sequential>\r
+                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">\r
+                    <isset property="test.method"/>\r
+                </condition>\r
+                <condition else="-suitename juser-activity-core -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">\r
+                    <matches pattern=".*\.xml" string="@{testClass}"/>\r
+                </condition>\r
+                <delete dir="${build.test.results.dir}" quiet="true"/>\r
+                <mkdir dir="${build.test.results.dir}"/>\r
+                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">\r
+                    <customize>\r
+                        <customize2/>\r
+                        <jvmarg value="-ea"/>\r
+                        <arg line="${testng.debug.mode}"/>\r
+                        <arg line="-d ${build.test.results.dir}"/>\r
+                        <arg line="-listener org.testng.reporters.VerboseReporter"/>\r
+                        <arg line="${testng.cmd.args}"/>\r
+                    </customize>\r
+                </j2seproject3:debug>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">\r
+        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${main.class}" name="testClass"/>\r
+            <attribute default="" name="testMethod"/>\r
+            <element implicit="true" name="customize2" optional="true"/>\r
+            <sequential>\r
+                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">\r
+                    <customize2/>\r
+                </j2seproject3:testng-debug>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">\r
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <attribute default="${main.class}" name="testClass"/>\r
+            <attribute default="" name="testMethod"/>\r
+            <sequential>\r
+                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">\r
+                    <customize>\r
+                        <classpath>\r
+                            <path path="${run.test.classpath}"/>\r
+                        </classpath>\r
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
+                        <jvmarg line="${run.jvmargs}"/>\r
+                        <jvmarg line="${run.jvmargs.ide}"/>\r
+                    </customize>\r
+                </j2seproject3:test-debug-impl>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">\r
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${includes}" name="includes"/>\r
+            <attribute default="${excludes}" name="excludes"/>\r
+            <attribute default="**" name="testincludes"/>\r
+            <attribute default="" name="testmethods"/>\r
+            <attribute default="${main.class}" name="testClass"/>\r
+            <attribute default="" name="testMethod"/>\r
+            <sequential>\r
+                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">\r
+                    <customize2>\r
+                        <syspropertyset>\r
+                            <propertyref prefix="test-sys-prop."/>\r
+                            <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
+                        </syspropertyset>\r
+                    </customize2>\r
+                </j2seproject3:testng-debug-impl>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>\r
+    <!--\r
+                pre NB7.2 profiling section; consider it deprecated\r
+            -->\r
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>\r
+    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">\r
+        <macrodef name="resolve">\r
+            <attribute name="name"/>\r
+            <attribute name="value"/>\r
+            <sequential>\r
+                <property name="@{name}" value="${env.@{value}}"/>\r
+            </sequential>\r
+        </macrodef>\r
+        <macrodef name="profile">\r
+            <attribute default="${main.class}" name="classname"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <property environment="env"/>\r
+                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>\r
+                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">\r
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
+                    <jvmarg value="${profiler.info.jvmargs.agent}"/>\r
+                    <jvmarg line="${profiler.info.jvmargs}"/>\r
+                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>\r
+                    <arg line="${application.args}"/>\r
+                    <classpath>\r
+                        <path path="${run.classpath}"/>\r
+                    </classpath>\r
+                    <syspropertyset>\r
+                        <propertyref prefix="run-sys-prop."/>\r
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>\r
+                    </syspropertyset>\r
+                    <customize/>\r
+                </java>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">\r
+        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>\r
+        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>\r
+    </target>\r
+    <!--\r
+                end of pre NB7.2 profiling section\r
+            -->\r
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">\r
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">\r
+            <attribute default="${main.class}" name="name"/>\r
+            <attribute default="${debug.classpath}" name="classpath"/>\r
+            <attribute default="" name="stopclassname"/>\r
+            <sequential>\r
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">\r
+                    <classpath>\r
+                        <path path="@{classpath}"/>\r
+                    </classpath>\r
+                </nbjpdastart>\r
+            </sequential>\r
+        </macrodef>\r
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">\r
+            <attribute default="${build.classes.dir}" name="dir"/>\r
+            <sequential>\r
+                <nbjpdareload>\r
+                    <fileset dir="@{dir}" includes="${fix.classes}">\r
+                        <include name="${fix.includes}*.class"/>\r
+                    </fileset>\r
+                </nbjpdareload>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target name="-init-debug-args">\r
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>\r
+        <condition property="have-jdk-older-than-1.4">\r
+            <or>\r
+                <contains string="${version-output}" substring="java version &quot;1.0"/>\r
+                <contains string="${version-output}" substring="java version &quot;1.1"/>\r
+                <contains string="${version-output}" substring="java version &quot;1.2"/>\r
+                <contains string="${version-output}" substring="java version &quot;1.3"/>\r
+            </or>\r
+        </condition>\r
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">\r
+            <istrue value="${have-jdk-older-than-1.4}"/>\r
+        </condition>\r
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">\r
+            <os family="windows"/>\r
+        </condition>\r
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">\r
+            <isset property="debug.transport"/>\r
+        </condition>\r
+    </target>\r
+    <target depends="-init-debug-args" name="-init-macrodef-debug">\r
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${main.class}" name="classname"/>\r
+            <attribute default="${debug.classpath}" name="classpath"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">\r
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
+                    <jvmarg line="${debug-args-line}"/>\r
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>\r
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>\r
+                    <jvmarg line="${run.jvmargs}"/>\r
+                    <jvmarg line="${run.jvmargs.ide}"/>\r
+                    <classpath>\r
+                        <path path="@{classpath}"/>\r
+                    </classpath>\r
+                    <syspropertyset>\r
+                        <propertyref prefix="run-sys-prop."/>\r
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>\r
+                    </syspropertyset>\r
+                    <customize/>\r
+                </java>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target name="-init-macrodef-java">\r
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">\r
+            <attribute default="${main.class}" name="classname"/>\r
+            <attribute default="${run.classpath}" name="classpath"/>\r
+            <attribute default="jvm" name="jvm"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">\r
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>\r
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>\r
+                    <jvmarg line="${run.jvmargs}"/>\r
+                    <jvmarg line="${run.jvmargs.ide}"/>\r
+                    <classpath>\r
+                        <path path="@{classpath}"/>\r
+                    </classpath>\r
+                    <syspropertyset>\r
+                        <propertyref prefix="run-sys-prop."/>\r
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>\r
+                    </syspropertyset>\r
+                    <customize/>\r
+                </java>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target name="-init-macrodef-copylibs">\r
+        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">\r
+            <attribute default="${manifest.file}" name="manifest"/>\r
+            <element name="customize" optional="true"/>\r
+            <sequential>\r
+                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>\r
+                <pathconvert property="run.classpath.without.build.classes.dir">\r
+                    <path path="${run.classpath}"/>\r
+                    <map from="${build.classes.dir.resolved}" to=""/>\r
+                </pathconvert>\r
+                <pathconvert pathsep=" " property="jar.classpath">\r
+                    <path path="${run.classpath.without.build.classes.dir}"/>\r
+                    <chainedmapper>\r
+                        <flattenmapper/>\r
+                        <filtermapper>\r
+                            <replacestring from=" " to="%20"/>\r
+                        </filtermapper>\r
+                        <globmapper from="*" to="lib/*"/>\r
+                    </chainedmapper>\r
+                </pathconvert>\r
+                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>\r
+                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">\r
+                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>\r
+                    <manifest>\r
+                        <attribute name="Class-Path" value="${jar.classpath}"/>\r
+                        <customize/>\r
+                    </manifest>\r
+                </copylibs>\r
+            </sequential>\r
+        </macrodef>\r
+    </target>\r
+    <target name="-init-presetdef-jar">\r
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">\r
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">\r
+                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>\r
+            </jar>\r
+        </presetdef>\r
+    </target>\r
+    <target name="-init-ap-cmdline-properties">\r
+        <property name="annotation.processing.enabled" value="true"/>\r
+        <property name="annotation.processing.processors.list" value=""/>\r
+        <property name="annotation.processing.processor.options" value=""/>\r
+        <property name="annotation.processing.run.all.processors" value="true"/>\r
+        <property name="javac.processorpath" value="${javac.classpath}"/>\r
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>\r
+        <condition property="ap.supported.internal" value="true">\r
+            <not>\r
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>\r
+            </not>\r
+        </condition>\r
+    </target>\r
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">\r
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">\r
+            <isfalse value="${annotation.processing.run.all.processors}"/>\r
+        </condition>\r
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">\r
+            <isfalse value="${annotation.processing.enabled}"/>\r
+        </condition>\r
+    </target>\r
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">\r
+        <property name="ap.cmd.line.internal" value=""/>\r
+    </target>\r
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>\r
+    <!--\r
+                ===================\r
+                COMPILATION SECTION\r
+                ===================\r
+            -->\r
+    <target name="-deps-jar-init" unless="built-jar.properties">\r
+        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>\r
+        <delete file="${built-jar.properties}" quiet="true"/>\r
+    </target>\r
+    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">\r
+        <echo level="warn" message="Cycle detected: juser-activity-core was already built"/>\r
+    </target>\r
+    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">\r
+        <mkdir dir="${build.dir}"/>\r
+        <touch file="${built-jar.properties}" verbose="false"/>\r
+        <property file="${built-jar.properties}" prefix="already.built.jar."/>\r
+        <antcall target="-warn-already-built-jar"/>\r
+        <propertyfile file="${built-jar.properties}">\r
+            <entry key="${basedir}" value=""/>\r
+        </propertyfile>\r
+    </target>\r
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>\r
+    <target depends="init" name="-check-automatic-build">\r
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>\r
+    </target>\r
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">\r
+        <antcall target="clean"/>\r
+    </target>\r
+    <target depends="init,deps-jar" name="-pre-pre-compile">\r
+        <mkdir dir="${build.classes.dir}"/>\r
+    </target>\r
+    <target name="-pre-compile">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target if="do.depend.true" name="-compile-depend">\r
+        <pathconvert property="build.generated.subdirs">\r
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">\r
+                <include name="*"/>\r
+            </dirset>\r
+        </pathconvert>\r
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>\r
+    </target>\r
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">\r
+        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>\r
+        <copy todir="${build.classes.dir}">\r
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>\r
+        </copy>\r
+    </target>\r
+    <target if="has.persistence.xml" name="-copy-persistence-xml">\r
+        <mkdir dir="${build.classes.dir}/META-INF"/>\r
+        <copy todir="${build.classes.dir}/META-INF">\r
+            <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>\r
+        </copy>\r
+    </target>\r
+    <target name="-post-compile">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>\r
+    <target name="-pre-compile-single">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">\r
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>\r
+        <j2seproject3:force-recompile/>\r
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>\r
+    </target>\r
+    <target name="-post-compile-single">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>\r
+    <!--\r
+                ====================\r
+                JAR BUILDING SECTION\r
+                ====================\r
+            -->\r
+    <target depends="init" name="-pre-pre-jar">\r
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>\r
+        <mkdir dir="${dist.jar.dir}"/>\r
+    </target>\r
+    <target name="-pre-jar">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">\r
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>\r
+        <touch file="${tmp.manifest.file}" verbose="false"/>\r
+    </target>\r
+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">\r
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>\r
+        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>\r
+    </target>\r
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">\r
+        <manifest file="${tmp.manifest.file}" mode="update">\r
+            <attribute name="Main-Class" value="${main.class}"/>\r
+        </manifest>\r
+    </target>\r
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">\r
+        <manifest file="${tmp.manifest.file}" mode="update">\r
+            <attribute name="Profile" value="${javac.profile}"/>\r
+        </manifest>\r
+    </target>\r
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">\r
+        <basename file="${application.splash}" property="splashscreen.basename"/>\r
+        <mkdir dir="${build.classes.dir}/META-INF"/>\r
+        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>\r
+        <manifest file="${tmp.manifest.file}" mode="update">\r
+            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>\r
+        </manifest>\r
+    </target>\r
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">\r
+        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>\r
+        <echo level="info">To run this application from the command line without Ant, try:</echo>\r
+        <property location="${dist.jar}" name="dist.jar.resolved"/>\r
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>\r
+    </target>\r
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">\r
+        <j2seproject1:jar manifest="${tmp.manifest.file}"/>\r
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>\r
+        <property location="${dist.jar}" name="dist.jar.resolved"/>\r
+        <pathconvert property="run.classpath.with.dist.jar">\r
+            <path path="${run.classpath}"/>\r
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>\r
+        </pathconvert>\r
+        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">\r
+            <isset property="main.class.available"/>\r
+        </condition>\r
+        <condition else="debug" property="jar.usage.level" value="info">\r
+            <isset property="main.class.available"/>\r
+        </condition>\r
+        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>\r
+    </target>\r
+    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">\r
+        <delete>\r
+            <fileset file="${tmp.manifest.file}"/>\r
+        </delete>\r
+    </target>\r
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>\r
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>\r
+    <target name="-post-jar">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>\r
+    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>\r
+    <!--\r
+                =================\r
+                EXECUTION SECTION\r
+                =================\r
+            -->\r
+    <target depends="init,compile" description="Run a main class." name="run">\r
+        <j2seproject1:java>\r
+            <customize>\r
+                <arg line="${application.args}"/>\r
+            </customize>\r
+        </j2seproject1:java>\r
+    </target>\r
+    <target name="-do-not-recompile">\r
+        <property name="javac.includes.binary" value=""/>\r
+    </target>\r
+    <target depends="init,compile-single" name="run-single">\r
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>\r
+        <j2seproject1:java classname="${run.class}"/>\r
+    </target>\r
+    <target depends="init,compile-test-single" name="run-test-with-main">\r
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>\r
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>\r
+    </target>\r
+    <!--\r
+                =================\r
+                DEBUGGING SECTION\r
+                =================\r
+            -->\r
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">\r
+        <j2seproject1:nbjpdastart name="${debug.class}"/>\r
+    </target>\r
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">\r
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>\r
+    </target>\r
+    <target depends="init,compile" name="-debug-start-debuggee">\r
+        <j2seproject3:debug>\r
+            <customize>\r
+                <arg line="${application.args}"/>\r
+            </customize>\r
+        </j2seproject3:debug>\r
+    </target>\r
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>\r
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">\r
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>\r
+    </target>\r
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>\r
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">\r
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>\r
+        <j2seproject3:debug classname="${debug.class}"/>\r
+    </target>\r
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>\r
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">\r
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>\r
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>\r
+    </target>\r
+    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>\r
+    <target depends="init" name="-pre-debug-fix">\r
+        <fail unless="fix.includes">Must set fix.includes</fail>\r
+        <property name="javac.includes" value="${fix.includes}.java"/>\r
+    </target>\r
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">\r
+        <j2seproject1:nbjpdareload/>\r
+    </target>\r
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>\r
+    <!--\r
+                =================\r
+                PROFILING SECTION\r
+                =================\r
+            -->\r
+    <!--\r
+                pre NB7.2 profiler integration\r
+            -->\r
+    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">\r
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>\r
+        <nbprofiledirect>\r
+            <classpath>\r
+                <path path="${run.classpath}"/>\r
+            </classpath>\r
+        </nbprofiledirect>\r
+        <profile/>\r
+    </target>\r
+    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">\r
+        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>\r
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>\r
+        <nbprofiledirect>\r
+            <classpath>\r
+                <path path="${run.classpath}"/>\r
+            </classpath>\r
+        </nbprofiledirect>\r
+        <profile classname="${profile.class}"/>\r
+    </target>\r
+    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">\r
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>\r
+        <nbprofiledirect>\r
+            <classpath>\r
+                <path path="${run.classpath}"/>\r
+            </classpath>\r
+        </nbprofiledirect>\r
+        <profile classname="sun.applet.AppletViewer">\r
+            <customize>\r
+                <arg value="${applet.url}"/>\r
+            </customize>\r
+        </profile>\r
+    </target>\r
+    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">\r
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>\r
+        <nbprofiledirect>\r
+            <classpath>\r
+                <path path="${run.test.classpath}"/>\r
+            </classpath>\r
+        </nbprofiledirect>\r
+        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">\r
+            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>\r
+            <jvmarg value="${profiler.info.jvmargs.agent}"/>\r
+            <jvmarg line="${profiler.info.jvmargs}"/>\r
+            <test name="${profile.class}"/>\r
+            <classpath>\r
+                <path path="${run.test.classpath}"/>\r
+            </classpath>\r
+            <syspropertyset>\r
+                <propertyref prefix="test-sys-prop."/>\r
+                <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
+            </syspropertyset>\r
+            <formatter type="brief" usefile="false"/>\r
+            <formatter type="xml"/>\r
+        </junit>\r
+    </target>\r
+    <!--\r
+                end of pre NB72 profiling section\r
+            -->\r
+    <target if="netbeans.home" name="-profile-check">\r
+        <condition property="profiler.configured">\r
+            <or>\r
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>\r
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>\r
+            </or>\r
+        </condition>\r
+    </target>\r
+    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">\r
+        <startprofiler/>\r
+        <antcall target="run"/>\r
+    </target>\r
+    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">\r
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>\r
+        <startprofiler/>\r
+        <antcall target="run-single"/>\r
+    </target>\r
+    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>\r
+    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">\r
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>\r
+        <startprofiler/>\r
+        <antcall target="test-single"/>\r
+    </target>\r
+    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">\r
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>\r
+        <startprofiler/>\r
+        <antcal target="run-test-with-main"/>\r
+    </target>\r
+    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">\r
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>\r
+        <startprofiler/>\r
+        <antcall target="run-applet"/>\r
+    </target>\r
+    <!--\r
+                ===============\r
+                JAVADOC SECTION\r
+                ===============\r
+            -->\r
+    <target depends="init" if="have.sources" name="-javadoc-build">\r
+        <mkdir dir="${dist.javadoc.dir}"/>\r
+        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">\r
+            <and>\r
+                <isset property="endorsed.classpath.cmd.line.arg"/>\r
+                <not>\r
+                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
+        <condition else="" property="bug5101868workaround" value="*.java">\r
+            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>\r
+        </condition>\r
+        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">\r
+            <classpath>\r
+                <path path="${javac.classpath}"/>\r
+            </classpath>\r
+            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">\r
+                <filename name="**/*.java"/>\r
+            </fileset>\r
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">\r
+                <include name="**/*.java"/>\r
+                <exclude name="*.java"/>\r
+            </fileset>\r
+            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>\r
+        </javadoc>\r
+        <copy todir="${dist.javadoc.dir}">\r
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">\r
+                <filename name="**/doc-files/**"/>\r
+            </fileset>\r
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">\r
+                <include name="**/doc-files/**"/>\r
+            </fileset>\r
+        </copy>\r
+    </target>\r
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">\r
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>\r
+    </target>\r
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>\r
+    <!--\r
+                =========================\r
+                TEST COMPILATION SECTION\r
+                =========================\r
+            -->\r
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">\r
+        <mkdir dir="${build.test.classes.dir}"/>\r
+    </target>\r
+    <target name="-pre-compile-test">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target if="do.depend.true" name="-compile-test-depend">\r
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>\r
+    </target>\r
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">\r
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>\r
+        <copy todir="${build.test.classes.dir}">\r
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>\r
+        </copy>\r
+    </target>\r
+    <target name="-post-compile-test">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>\r
+    <target name="-pre-compile-test-single">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">\r
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>\r
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>\r
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>\r
+        <copy todir="${build.test.classes.dir}">\r
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>\r
+        </copy>\r
+    </target>\r
+    <target name="-post-compile-test-single">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>\r
+    <!--\r
+                =======================\r
+                TEST EXECUTION SECTION\r
+                =======================\r
+            -->\r
+    <target depends="init" if="have.tests" name="-pre-test-run">\r
+        <mkdir dir="${build.test.results.dir}"/>\r
+    </target>\r
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">\r
+        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>\r
+    </target>\r
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">\r
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>\r
+    </target>\r
+    <target depends="init" if="have.tests" name="test-report"/>\r
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>\r
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>\r
+    <target depends="init" if="have.tests" name="-pre-test-run-single">\r
+        <mkdir dir="${build.test.results.dir}"/>\r
+    </target>\r
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">\r
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>\r
+        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>\r
+    </target>\r
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">\r
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>\r
+    </target>\r
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>\r
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">\r
+        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>\r
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>\r
+        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>\r
+    </target>\r
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">\r
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>\r
+    </target>\r
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>\r
+    <!--\r
+                =======================\r
+                TEST DEBUGGING SECTION\r
+                =======================\r
+            -->\r
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">\r
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>\r
+        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>\r
+    </target>\r
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">\r
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>\r
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>\r
+        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>\r
+    </target>\r
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">\r
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>\r
+    </target>\r
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>\r
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>\r
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">\r
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>\r
+    </target>\r
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>\r
+    <!--\r
+                =========================\r
+                APPLET EXECUTION SECTION\r
+                =========================\r
+            -->\r
+    <target depends="init,compile-single" name="run-applet">\r
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>\r
+        <j2seproject1:java classname="sun.applet.AppletViewer">\r
+            <customize>\r
+                <arg value="${applet.url}"/>\r
+            </customize>\r
+        </j2seproject1:java>\r
+    </target>\r
+    <!--\r
+                =========================\r
+                APPLET DEBUGGING  SECTION\r
+                =========================\r
+            -->\r
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">\r
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>\r
+        <j2seproject3:debug classname="sun.applet.AppletViewer">\r
+            <customize>\r
+                <arg value="${applet.url}"/>\r
+            </customize>\r
+        </j2seproject3:debug>\r
+    </target>\r
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>\r
+    <!--\r
+                ===============\r
+                CLEANUP SECTION\r
+                ===============\r
+            -->\r
+    <target name="-deps-clean-init" unless="built-clean.properties">\r
+        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>\r
+        <delete file="${built-clean.properties}" quiet="true"/>\r
+    </target>\r
+    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">\r
+        <echo level="warn" message="Cycle detected: juser-activity-core was already built"/>\r
+    </target>\r
+    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">\r
+        <mkdir dir="${build.dir}"/>\r
+        <touch file="${built-clean.properties}" verbose="false"/>\r
+        <property file="${built-clean.properties}" prefix="already.built.clean."/>\r
+        <antcall target="-warn-already-built-clean"/>\r
+        <propertyfile file="${built-clean.properties}">\r
+            <entry key="${basedir}" value=""/>\r
+        </propertyfile>\r
+    </target>\r
+    <target depends="init" name="-do-clean">\r
+        <delete dir="${build.dir}"/>\r
+        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>\r
+    </target>\r
+    <target name="-post-clean">\r
+        <!-- Empty placeholder for easier customization. -->\r
+        <!-- You can override this target in the ../build.xml file. -->\r
+    </target>\r
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>\r
+    <target name="-check-call-dep">\r
+        <property file="${call.built.properties}" prefix="already.built."/>\r
+        <condition property="should.call.dep">\r
+            <and>\r
+                <not>\r
+                    <isset property="already.built.${call.subproject}"/>\r
+                </not>\r
+                <available file="${call.script}"/>\r
+            </and>\r
+        </condition>\r
+    </target>\r
+    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">\r
+        <ant antfile="${call.script}" inheritall="false" target="${call.target}">\r
+            <propertyset>\r
+                <propertyref prefix="transfer."/>\r
+                <mapper from="transfer.*" to="*" type="glob"/>\r
+            </propertyset>\r
+        </ant>\r
+    </target>\r
+</project>\r
index 8ebcafbd0b2a04e05bcc7b9de7a739c622e8afa7..a0aad230ce035c7180724aa27306e40b4aedbfb0 100644 (file)
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=true
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=juser-core
-application.vendor=Roland Haeder
-auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/juser-core.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.commons-codec-1.10.jar=lib/commons-codec-1.10.jar
-file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
-file.reference.jcoreee.jar=lib/jcoreee.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=false
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.jcoreee.jar}:\
-    ${file.reference.jcontacts-core.jar}:\
-    ${file.reference.commons-codec-1.10.jar}:\
-    ${libs.javaee-api-7.0.classpath}
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
-javac.deprecation=true
-javac.external.vm=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=true
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=true
-javadoc.reference.commons-codec-1.10.jar=https://commons.apache.org/proper/commons-codec/archives/1.10/apidocs/
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=true
-javadoc.windowtitle=User Library
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
-manifest.custom.codebase=
-# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
-manifest.custom.permissions=
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-project.license=gpl30
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-source.reference.jcontacts-core.jar=../jcontacts-core/src/
-source.reference.jcoreee.jar=../jcoreee/src/
-src.dir=src
-test.src.dir=test
+annotation.processing.enabled=true\r
+annotation.processing.enabled.in.editor=true\r
+annotation.processing.processors.list=\r
+annotation.processing.run.all.processors=true\r
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output\r
+application.title=juser-activity-core\r
+application.vendor=Roland Haeder\r
+auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml\r
+build.classes.dir=${build.dir}/classes\r
+build.classes.excludes=**/*.java,**/*.form\r
+# This directory is removed when the project is cleaned:\r
+build.dir=build\r
+build.generated.dir=${build.dir}/generated\r
+build.generated.sources.dir=${build.dir}/generated-sources\r
+# Only compile against the classpath explicitly listed here:\r
+build.sysclasspath=ignore\r
+build.test.classes.dir=${build.dir}/test/classes\r
+build.test.results.dir=${build.dir}/test/results\r
+# Uncomment to specify the preferred debugger connection transport:\r
+#debug.transport=dt_socket\r
+debug.classpath=\\r
+    ${run.classpath}\r
+debug.test.classpath=\\r
+    ${run.test.classpath}\r
+# Files in build.classes.dir which should be excluded from distribution jar\r
+dist.archive.excludes=\r
+# This directory is removed when the project is cleaned:\r
+dist.dir=dist\r
+dist.jar=${dist.dir}/juser-activity-core.jar\r
+dist.javadoc.dir=${dist.dir}/javadoc\r
+endorsed.classpath=\r
+excludes=\r
+file.reference.juser-core.jar=lib/juser-core.jar\r
+includes=**\r
+jar.archive.disabled=${jnlp.enabled}\r
+jar.compress=false\r
+jar.index=${jnlp.enabled}\r
+javac.classpath=\\r
+    ${file.reference.juser-core.jar}:\\r
+    ${libs.javaee-api-7.0.classpath}\r
+# Space-separated list of extra javac options\r
+javac.compilerargs=-Xlint:unchecked -Xlint:deprecation\r
+javac.deprecation=true\r
+javac.external.vm=false\r
+javac.processorpath=\\r
+    ${javac.classpath}\r
+javac.source=1.7\r
+javac.target=1.7\r
+javac.test.classpath=\\r
+    ${javac.classpath}:\\r
+    ${build.classes.dir}\r
+javac.test.processorpath=\\r
+    ${javac.test.classpath}\r
+javadoc.additionalparam=\r
+javadoc.author=true\r
+javadoc.encoding=${source.encoding}\r
+javadoc.noindex=false\r
+javadoc.nonavbar=false\r
+javadoc.notree=false\r
+javadoc.private=true\r
+javadoc.splitindex=true\r
+javadoc.use=true\r
+javadoc.version=true\r
+javadoc.windowtitle=User Activity Log Library\r
+jnlp.codebase.type=no.codebase\r
+jnlp.descriptor=application\r
+jnlp.enabled=false\r
+jnlp.mixed.code=default\r
+jnlp.offline-allowed=false\r
+jnlp.signed=false\r
+jnlp.signing=\r
+jnlp.signing.alias=\r
+jnlp.signing.keystore=\r
+# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.\r
+manifest.custom.application.library.allowable.codebase=\r
+# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts.\r
+manifest.custom.caller.allowable.codebase=\r
+# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed\r
+manifest.custom.codebase=\r
+# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)\r
+manifest.custom.permissions=\r
+meta.inf.dir=${src.dir}/META-INF\r
+mkdist.disabled=true\r
+platform.active=default_platform\r
+project.license=gpl30\r
+run.classpath=\\r
+    ${javac.classpath}:\\r
+    ${build.classes.dir}\r
+# Space-separated list of JVM arguments used when running the project.\r
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.\r
+# To set system properties for unit tests define test-sys-prop.name=value:\r
+run.jvmargs=\r
+run.test.classpath=\\r
+    ${javac.test.classpath}:\\r
+    ${build.test.classes.dir}\r
+source.encoding=UTF-8\r
+source.reference.juser-core.jar=../juser-core/src/\r
+src.dir=src\r
+test.src.dir=test\r
index 1643b785df329393052289b523b2cb0ed3db4802..6206458ef347244dd3d4c622091d4030b2fd5743 100644 (file)
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-       <type>org.netbeans.modules.java.j2seproject</type>
-       <configuration>
-               <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-                       <name>juser-core</name>
-                       <source-roots>
-                               <root id="src.dir"/>
-                       </source-roots>
-                       <test-roots>
-                               <root id="test.src.dir"/>
-                       </test-roots>
-               </data>
-               <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
-                       <definitions>./lib/nblibraries.properties</definitions>
-               </libraries>
-       </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://www.netbeans.org/ns/project/1">\r
+    <type>org.netbeans.modules.java.j2seproject</type>\r
+    <configuration>\r
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">\r
+            <name>juser-activity-core</name>\r
+            <source-roots>\r
+                <root id="src.dir"/>\r
+            </source-roots>\r
+            <test-roots>\r
+                <root id="test.src.dir"/>\r
+            </test-roots>\r
+        </data>\r
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">\r
+            <definitions>./lib/nblibraries.properties</definitions>\r
+        </libraries>\r
+    </configuration>\r
+</project>\r
diff --git a/src/org/mxchange/jusercore/container/login/LoginContainer.java b/src/org/mxchange/jusercore/container/login/LoginContainer.java
deleted file mode 100644 (file)
index 87014e9..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.container.login;
-
-import java.io.Serializable;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A container for login data
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface LoginContainer extends Serializable {
-
-       /**
-        * Getter for user instance
-        * <p>
-        * @return User instance
-        */
-       User getUser ();
-
-       /**
-        * Setter for user instance
-        * <p>
-        * @param user User instance
-        */
-       void setUser (final User user);
-
-       /**
-        * Getter for user password
-        * <p>
-        * @return User password
-        */
-       String getUserPassword ();
-
-       /**
-        * Setter for user password
-        * <p>
-        * @param userPassword User password
-        */
-       void setUserPassword (final String userPassword);
-
-}
diff --git a/src/org/mxchange/jusercore/container/login/UserLoginContainer.java b/src/org/mxchange/jusercore/container/login/UserLoginContainer.java
deleted file mode 100644 (file)
index f54a3ba..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.container.login;
-
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A user login container
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserLoginContainer implements LoginContainer {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 158_768_718_689_760_186L;
-
-       /**
-        * User instance
-        */
-       private User user;
-
-       /**
-        * Unencrypted password
-        */
-       private String userPassword;
-
-       /**
-        * Constructor with user instance and unencrypted password
-        * <p>
-        * @param user         User instance
-        * @param userPassword Unencrypted password
-        */
-       public UserLoginContainer (final User user, final String userPassword) {
-               // Is both set?
-               if (null == user) {
-                       // Throw NPE
-                       throw new NullPointerException("user is null"); //NOI18N
-               } else if (null == userPassword) {
-                       // Throw NPE again
-                       throw new NullPointerException("userPassword is null"); //NOI18N
-               } else if (userPassword.isEmpty()) {
-                       // Empty password
-                       throw new IllegalArgumentException("user password is empty."); //NOI18N
-               }
-
-               // Set both
-               this.user = user;
-               this.userPassword = userPassword;
-       }
-
-       @Override
-       public User getUser () {
-               return this.user;
-       }
-
-       @Override
-       public void setUser (final User user) {
-               this.user = user;
-       }
-
-       @Override
-       public String getUserPassword () {
-               return this.userPassword;
-       }
-
-       @Override
-       public void setUserPassword (final String userPassword) {
-               this.userPassword = userPassword;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/events/confirmation/ConfirmedUserAccountEvent.java b/src/org/mxchange/jusercore/events/confirmation/ConfirmedUserAccountEvent.java
deleted file mode 100644 (file)
index 0481159..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.confirmation;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An event, fireed if a new confirmedUser has confirmed
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class ConfirmedUserAccountEvent implements UserConfirmedAccountEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 575_412_375_267_190L;
-
-       /**
-        * Newly confirmed user
-        */
-       private final User confirmedUser;
-
-       /**
-        * Constructor with newly confirmed confirmedUser
-        * <p>
-        * @param confirmedUser Newly confirmed confirmedUser
-        */
-       public ConfirmedUserAccountEvent (final User confirmedUser) {
-               // Is the confirmed user instance valid?
-               if (null == confirmedUser) {
-                       // Throw NPE
-                       throw new NullPointerException("confirmedUser is null"); //NOI18N
-               } else if (confirmedUser.getUserId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("confirmedUser.userId is null"); //NOI18N
-               } else if (confirmedUser.getUserId() < 1) {
-                       // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("confirmedUser.userId={0} is invalid.", confirmedUser.getUserId())); //NOI18N
-               }
-
-               // Set it here
-               this.confirmedUser = confirmedUser;
-       }
-
-       /**
-        * Getter for confirmedUser instance
-        * <p>
-        * @return User instance
-        */
-       @Override
-       public User getConfirmedUser () {
-               return this.confirmedUser;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/events/confirmation/UserConfirmedAccountEvent.java b/src/org/mxchange/jusercore/events/confirmation/UserConfirmedAccountEvent.java
deleted file mode 100644 (file)
index 1bbea50..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.confirmation;
-
-import java.io.Serializable;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An event interface, fireed if a new user has registered
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface UserConfirmedAccountEvent extends Serializable {
-
-       /**
-        * Getter for user instance
-        * <p>
-        * @return User instance
-        */
-       User getConfirmedUser ();
-
-}
diff --git a/src/org/mxchange/jusercore/events/login/UserLoggedInEvent.java b/src/org/mxchange/jusercore/events/login/UserLoggedInEvent.java
deleted file mode 100644 (file)
index 1846490..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.login;
-
-import java.io.Serializable;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An interface for events after the user has logged in
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface UserLoggedInEvent extends Serializable {
-
-       /**
-        * Getter for user instance
-        * <p>
-        * @return User instance
-        */
-       User getLoggedInUser ();
-
-}
diff --git a/src/org/mxchange/jusercore/events/login/UserLoginEvent.java b/src/org/mxchange/jusercore/events/login/UserLoginEvent.java
deleted file mode 100644 (file)
index bfc25a6..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.login;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * This event is fired when the loggedInUser has logged in
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserLoginEvent implements UserLoggedInEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 163_294_958_817_560L;
-
-       /**
-        * User instance
-        */
-       private final User loggedInUser;
-
-       /**
-        * Constructor with updated user instance
-        * <p>
-        * @param loggedInUser Updated user instance
-        */
-       public UserLoginEvent (final User loggedInUser) {
-               // Is the logged-in user instance valid?
-               if (null == loggedInUser) {
-                       // Throw NPE
-                       throw new NullPointerException("loggedInUser is null"); //NOI18N
-               } else if (loggedInUser.getUserId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("loggedInUser.userId is null"); //NOI18N
-               } else if (loggedInUser.getUserId() < 1) {
-                       // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("loggedInUser.userId={0} is invalid.", loggedInUser.getUserId())); //NOI18N
-               }
-
-               // Set loggedInUser
-               this.loggedInUser = loggedInUser;
-       }
-
-       @Override
-       public User getLoggedInUser () {
-               return this.loggedInUser;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/events/logout/ObserveableUserLogoutEvent.java b/src/org/mxchange/jusercore/events/logout/ObserveableUserLogoutEvent.java
deleted file mode 100644 (file)
index e9d430b..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.logout;
-
-import java.io.Serializable;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An interface for events after the user has logged in
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface ObserveableUserLogoutEvent extends Serializable {
-
-       /**
-        * Getter for user instance
-        * <p>
-        * @return User instance
-        */
-       User getLoggedOutUser ();
-
-}
diff --git a/src/org/mxchange/jusercore/events/logout/UserLogoutEvent.java b/src/org/mxchange/jusercore/events/logout/UserLogoutEvent.java
deleted file mode 100644 (file)
index 3ee0555..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.logout;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * This event is fired when the loggedOutUser has logged in
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserLogoutEvent implements ObserveableUserLogoutEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 58_617_641_290_620L;
-
-       /**
-        * User instance
-        */
-       private final User loggedOutUser;
-
-       /**
-        * Constructor with updated loggedOutUser instance
-        * <p>
-        * @param loggedOutUser Updated loggedOutUser instance
-        */
-       public UserLogoutEvent (final User loggedOutUser) {
-               // Is the logged-in user instance valid?
-               if (null == loggedOutUser) {
-                       // Throw NPE
-                       throw new NullPointerException("loggedOutUser is null"); //NOI18N
-               } else if (loggedOutUser.getUserId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("loggedOutUser.userId is null"); //NOI18N
-               } else if (loggedOutUser.getUserId() < 1) {
-                       // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("loggedOutUser.userId={0} is invalid.", loggedOutUser.getUserId())); //NOI18N
-               }
-
-               // Set loggedOutUser
-               this.loggedOutUser = loggedOutUser;
-       }
-
-       @Override
-       public User getLoggedOutUser () {
-               return this.loggedOutUser;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/events/registration/RegisteredUserEvent.java b/src/org/mxchange/jusercore/events/registration/RegisteredUserEvent.java
deleted file mode 100644 (file)
index 85ae473..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.registration;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An event, fireed if a new registeredUser has registered
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class RegisteredUserEvent implements UserRegisteredEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 186_956_974_127_691L;
-
-       /**
-        * Newly registered registeredUser;
-        */
-       private final User registeredUser;
-
-       /**
-        * Constructor with newly registered registeredUser
-        * <p>
-        * @param registeredUser Newly registered registeredUser
-        */
-       public RegisteredUserEvent (final User registeredUser) {
-               // Is the registered user instance valid?
-               if (null == registeredUser) {
-                       // Throw NPE
-                       throw new NullPointerException("registeredUser is null"); //NOI18N
-               } else if (registeredUser.getUserId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("registeredUser.userId is null"); //NOI18N
-               } else if (registeredUser.getUserId() < 1) {
-                       // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("registeredUser.userId={0} is invalid.", registeredUser.getUserId())); //NOI18N
-               }
-
-               // Set it here
-               this.registeredUser = registeredUser;
-       }
-
-       /**
-        * Getter for registeredUser instance
-        * <p>
-        * @return User instance
-        */
-       @Override
-       public User getRegisteredUser () {
-               return this.registeredUser;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/events/registration/UserRegisteredEvent.java b/src/org/mxchange/jusercore/events/registration/UserRegisteredEvent.java
deleted file mode 100644 (file)
index ee1ecbe..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.registration;
-
-import java.io.Serializable;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An event interface, fireed if a new user has registered
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface UserRegisteredEvent extends Serializable {
-
-       /**
-        * Getter for user instance
-        * <p>
-        * @return User instance
-        */
-       User getRegisteredUser ();
-
-}
diff --git a/src/org/mxchange/jusercore/events/user/add/AdminAddedUserEvent.java b/src/org/mxchange/jusercore/events/user/add/AdminAddedUserEvent.java
deleted file mode 100644 (file)
index f1b8173..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*\r
- * Copyright (C) 2016 Roland Haeder\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation, either version 3 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jusercore.events.user.add;\r
-\r
-import java.io.Serializable;\r
-import org.mxchange.jusercore.model.user.User;\r
-\r
-/**\r
- * An interface for events being fired when an administrator added a new user\r
- * account.\r
- * <p>\r
- * @author Roland Haeder<roland@mxchange.org>\r
- */\r
-public interface AdminAddedUserEvent extends Serializable {\r
-\r
-       /**\r
-        * Getter for added user instance\r
-        * <p>\r
-        * @return Added user instance\r
-        */\r
-       User getAddedUser ();\r
-\r
-}\r
diff --git a/src/org/mxchange/jusercore/events/user/add/AdminUserAddedEvent.java b/src/org/mxchange/jusercore/events/user/add/AdminUserAddedEvent.java
deleted file mode 100644 (file)
index 8889084..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*\r
- * Copyright (C) 2016 Roland Haeder\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation, either version 3 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jusercore.events.user.add;\r
-\r
-import java.text.MessageFormat;\r
-import org.mxchange.jusercore.model.user.User;\r
-\r
-/**\r
- * An event being fired when the administrator has added a new user account\r
- * <p>\r
- * @author Roland Haeder<roland@mxchange.org>\r
- */\r
-public class AdminUserAddedEvent implements AdminAddedUserEvent {\r
-\r
-       /**\r
-        * Serial number\r
-        */\r
-       private static final long serialVersionUID = 14_785_787_174_676_290L;\r
-\r
-       /**\r
-        * Added user instance\r
-        */\r
-       private final User addedUser;\r
-\r
-       /**\r
-        * Constructor with added user instance\r
-        * <p>\r
-        * @param addedUser Added user instance\r
-        */\r
-       public AdminUserAddedEvent (final User addedUser) {\r
-               // Is the user instance valid?\r
-               if (null == addedUser) {\r
-                       // Throw NPE\r
-                       throw new NullPointerException("addedUser is null"); //NOI18N\r
-               } else if (addedUser.getUserId() == null) {\r
-                       // Throw NPE again\r
-                       throw new NullPointerException("addedUser.userId is null"); //NOI18N\r
-               } else if (addedUser.getUserId() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("addedUser.userId={0} is invalid.", addedUser.getUserId())); //NOI18N\r
-               }\r
-\r
-               // Set it here\r
-               this.addedUser = addedUser;\r
-       }\r
-\r
-       @Override\r
-       public User getAddedUser () {\r
-               return this.addedUser;\r
-       }\r
-\r
-}\r
diff --git a/src/org/mxchange/jusercore/events/user/linked/AdminLinkedUserEvent.java b/src/org/mxchange/jusercore/events/user/linked/AdminLinkedUserEvent.java
deleted file mode 100644 (file)
index c34ce80..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.user.linked;
-
-import java.io.Serializable;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An interface for events being fired when an administrator linked a new user
- * account with existing contact data.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface AdminLinkedUserEvent extends Serializable {
-
-       /**
-        * Getter for linked user instance
-        * <p>
-        * @return linked user instance
-        */
-       User getLinkedUser ();
-
-}
diff --git a/src/org/mxchange/jusercore/events/user/linked/AdminUserLinkedEvent.java b/src/org/mxchange/jusercore/events/user/linked/AdminUserLinkedEvent.java
deleted file mode 100644 (file)
index f35cc70..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.user.linked;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An event being fired when the administrator has linked a new user account
- * with existing contact data.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class AdminUserLinkedEvent implements AdminLinkedUserEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 14_785_787_174_676_290L;
-
-       /**
-        * Linked user instance
-        */
-       private final User linkedUser;
-
-       /**
-        * Constructor with linked user instance
-        * <p>
-        * @param linkedUser Linked user instance
-        */
-       public AdminUserLinkedEvent (final User linkedUser) {
-               // Is the user instance valid?
-               if (null == linkedUser) {
-                       // Throw NPE
-                       throw new NullPointerException("linkedUser is null"); //NOI18N
-               } else if (linkedUser.getUserId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("linkedUser.userId is null"); //NOI18N
-               } else if (linkedUser.getUserId() < 1) {
-                       // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("linkedUser.userId={0} is invalid.", linkedUser.getUserId())); //NOI18N
-               }
-
-               // Set it here
-               this.linkedUser = linkedUser;
-       }
-
-       @Override
-       public User getLinkedUser () {
-               return this.linkedUser;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/events/user/locked/AdminLockedUserEvent.java b/src/org/mxchange/jusercore/events/user/locked/AdminLockedUserEvent.java
deleted file mode 100644 (file)
index cd3196d..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.user.locked;
-
-import java.io.Serializable;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An interface for events being fired when an administrator locked a user
- * account.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface AdminLockedUserEvent extends Serializable {
-
-       /**
-        * Getter for locked user instance
-        * <p>
-        * @return locked user instance
-        */
-       User getLockedUser ();
-
-}
diff --git a/src/org/mxchange/jusercore/events/user/locked/AdminUserLockedEvent.java b/src/org/mxchange/jusercore/events/user/locked/AdminUserLockedEvent.java
deleted file mode 100644 (file)
index a2df3f9..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.user.locked;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An event being fired when the administrator has locked a user account.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class AdminUserLockedEvent implements AdminLockedUserEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 14_785_787_174_676_290L;
-
-       /**
-        * Locked user instance
-        */
-       private final User lockedUser;
-
-       /**
-        * Constructor with linked user instance
-        * <p>
-        * @param lockedUser Locked user instance
-        */
-       public AdminUserLockedEvent (final User lockedUser) {
-               // Is the user instance valid?
-               if (null == lockedUser) {
-                       // Throw NPE
-                       throw new NullPointerException("lockedUser is null"); //NOI18N
-               } else if (lockedUser.getUserId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("lockedUser.userId is null"); //NOI18N
-               } else if (lockedUser.getUserId() < 1) {
-                       // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("lockedUser.userId={0} is invalid.", lockedUser.getUserId())); //NOI18N
-               }
-
-               // Set it here
-               this.lockedUser = lockedUser;
-       }
-
-       @Override
-       public User getLockedUser () {
-               return this.lockedUser;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/events/user/password_change/UpdatedUserPasswordEvent.java b/src/org/mxchange/jusercore/events/user/password_change/UpdatedUserPasswordEvent.java
deleted file mode 100644 (file)
index 600e749..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.user.password_change;
-
-import org.mxchange.jusercore.model.user.password_history.PasswordHistory;
-
-/**
- * An interface for events being fired when a user updates personal data.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface UpdatedUserPasswordEvent {
-
-       /**
-        * Getter for password history entry
-        * <p>
-        * @return Password history entry
-        */
-       PasswordHistory getPasswordHistory ();
-
-}
diff --git a/src/org/mxchange/jusercore/events/user/password_change/UserUpdatedPasswordEvent.java b/src/org/mxchange/jusercore/events/user/password_change/UserUpdatedPasswordEvent.java
deleted file mode 100644 (file)
index 629f195..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.user.password_change;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.password_history.PasswordHistory;
-
-/**
- * An event being fired when the user has updated personal data
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserUpdatedPasswordEvent implements UpdatedUserPasswordEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 14_785_787_174_676_290L;
-
-       /**
-        * Updated user instance
-        */
-       private final PasswordHistory passwordHistory;
-
-       /**
-        * Constructor with updated user instance
-        * <p>
-        * @param passwordHistory Updated user instance
-        */
-       public UserUpdatedPasswordEvent (final PasswordHistory passwordHistory) {
-               // Is the user instance valid?
-               if (null == passwordHistory) {
-                       // Throw NPE
-                       throw new NullPointerException("passwordHistory is null"); //NOI18N
-               } else if (passwordHistory.getUserPasswordHistoryUser() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("passwordHistory.userPasswordHistoryUser is null"); //NOI18N
-               } else if (passwordHistory.getUserPasswordHistoryUser().getUserId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("passwordHistory.userPasswordHistoryUser.userId is null"); //NOI18N
-               } else if (passwordHistory.getUserPasswordHistoryUser().getUserId() < 1) {
-                       // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("passwordHistory.userPasswordHistoryUser.userId={0} is invalid.", passwordHistory.getUserPasswordHistoryUser().getUserId())); //NOI18N
-               }
-
-               // Set it here
-               this.passwordHistory = passwordHistory;
-       }
-
-       @Override
-       public PasswordHistory getPasswordHistory () {
-               return this.passwordHistory;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/events/user/unlocked/AdminUnlockedUserEvent.java b/src/org/mxchange/jusercore/events/user/unlocked/AdminUnlockedUserEvent.java
deleted file mode 100644 (file)
index bc0c422..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.user.unlocked;
-
-import java.io.Serializable;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An interface for events being fired when an administrator unlocked a user
- * account.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface AdminUnlockedUserEvent extends Serializable {
-
-       /**
-        * Getter for unlocked user instance
-        * <p>
-        * @return Unlocked user instance
-        */
-       User getUnlockedUser ();
-
-}
diff --git a/src/org/mxchange/jusercore/events/user/unlocked/AdminUserUnlockedEvent.java b/src/org/mxchange/jusercore/events/user/unlocked/AdminUserUnlockedEvent.java
deleted file mode 100644 (file)
index 145314b..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.events.user.unlocked;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An event being fired when the administrator has unlocked a user account.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class AdminUserUnlockedEvent implements AdminUnlockedUserEvent {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 14_785_787_174_676_290L;
-
-       /**
-        * Unlocked user instance
-        */
-       private final User unlockedUser;
-
-       /**
-        * Constructor with linked user instance
-        * <p>
-        * @param unlockedUser Unlocked user instance
-        */
-       public AdminUserUnlockedEvent (final User unlockedUser) {
-               // Is the user instance valid?
-               if (null == unlockedUser) {
-                       // Throw NPE
-                       throw new NullPointerException("unlockedUser is null"); //NOI18N
-               } else if (unlockedUser.getUserId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("unlockedUser.userId is null"); //NOI18N
-               } else if (unlockedUser.getUserId() < 1) {
-                       // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("unlockedUser.userId={0} is invalid.", unlockedUser.getUserId())); //NOI18N
-               }
-
-               // Set it here
-               this.unlockedUser = unlockedUser;
-       }
-
-       @Override
-       public User getUnlockedUser () {
-               return this.unlockedUser;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/events/user/update/AdminUpdatedUserDataEvent.java b/src/org/mxchange/jusercore/events/user/update/AdminUpdatedUserDataEvent.java
deleted file mode 100644 (file)
index 5b32266..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*\r
- * Copyright (C) 2016 Roland Haeder\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation, either version 3 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jusercore.events.user.update;\r
-\r
-import java.io.Serializable;\r
-import org.mxchange.jusercore.model.user.User;\r
-\r
-/**\r
- * An interface for events being fired when an administrator updated user data.\r
- * <p>\r
- * @author Roland Haeder<roland@mxchange.org>\r
- */\r
-public interface AdminUpdatedUserDataEvent extends Serializable {\r
-\r
-       /**\r
-        * Getter for updated user instance\r
-        * <p>\r
-        * @return Added user instance\r
-        */\r
-       User getUpdatedUser ();\r
-\r
-}\r
diff --git a/src/org/mxchange/jusercore/events/user/update/AdminUserDataUpdatedEvent.java b/src/org/mxchange/jusercore/events/user/update/AdminUserDataUpdatedEvent.java
deleted file mode 100644 (file)
index 4a9fda3..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*\r
- * Copyright (C) 2016 Roland Haeder\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation, either version 3 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jusercore.events.user.update;\r
-\r
-import java.text.MessageFormat;\r
-import org.mxchange.jusercore.model.user.User;\r
-\r
-/**\r
- * An event being fired when the administrator has updated user data\r
- * <p>\r
- * @author Roland Haeder<roland@mxchange.org>\r
- */\r
-public class AdminUserDataUpdatedEvent implements AdminUpdatedUserDataEvent {\r
-\r
-       /**\r
-        * Serial number\r
-        */\r
-       private static final long serialVersionUID = 14_785_787_174_676_290L;\r
-\r
-       /**\r
-        * Updated user instance\r
-        */\r
-       private final User updatedUser;\r
-\r
-       /**\r
-        * Constructor with updated user instance\r
-        * <p>\r
-        * @param updatedUser Updated user instance\r
-        */\r
-       public AdminUserDataUpdatedEvent (final User updatedUser) {\r
-               // Is the user instance valid?\r
-               if (null == updatedUser) {\r
-                       // Throw NPE\r
-                       throw new NullPointerException("updatedUser is null"); //NOI18N\r
-               } else if (updatedUser.getUserId() == null) {\r
-                       // Throw NPE again\r
-                       throw new NullPointerException("updatedUser.userId is null"); //NOI18N\r
-               } else if (updatedUser.getUserId() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("updatedUser.userId={0} is invalid.", updatedUser.getUserId())); //NOI18N\r
-               }\r
-\r
-               // Set it here\r
-               this.updatedUser = updatedUser;\r
-       }\r
-\r
-       @Override\r
-       public User getUpdatedUser () {\r
-               return this.updatedUser;\r
-       }\r
-\r
-}\r
diff --git a/src/org/mxchange/jusercore/events/user/update/UpdatedUserPersonalDataEvent.java b/src/org/mxchange/jusercore/events/user/update/UpdatedUserPersonalDataEvent.java
deleted file mode 100644 (file)
index 6499521..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*\r
- * Copyright (C) 2016 Roland Haeder\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation, either version 3 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jusercore.events.user.update;\r
-\r
-import org.mxchange.jusercore.model.user.User;\r
-\r
-/**\r
- * An interface for events being fired when a user updates personal data.\r
- * <p>\r
- * @author Roland Haeder<roland@mxchange.org>\r
- */\r
-public interface UpdatedUserPersonalDataEvent {\r
-\r
-       /**\r
-        * Getter for updated user instance\r
-        * <p>\r
-        * @return Added user instance\r
-        */\r
-       User getUpdatedUser ();\r
-\r
-}\r
diff --git a/src/org/mxchange/jusercore/events/user/update/UserUpdatedPersonalDataEvent.java b/src/org/mxchange/jusercore/events/user/update/UserUpdatedPersonalDataEvent.java
deleted file mode 100644 (file)
index 9e65dae..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*\r
- * Copyright (C) 2016 Roland Haeder\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation, either version 3 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jusercore.events.user.update;\r
-\r
-import java.text.MessageFormat;\r
-import org.mxchange.jusercore.model.user.User;\r
-\r
-/**\r
- * An event being fired when the user has updated personal data\r
- * <p>\r
- * @author Roland Haeder<roland@mxchange.org>\r
- */\r
-public class UserUpdatedPersonalDataEvent implements UpdatedUserPersonalDataEvent {\r
-\r
-       /**\r
-        * Serial number\r
-        */\r
-       private static final long serialVersionUID = 14_785_787_174_676_290L;\r
-\r
-       /**\r
-        * Updated user instance\r
-        */\r
-       private final User updatedUser;\r
-\r
-       /**\r
-        * Constructor with updated user instance\r
-        * <p>\r
-        * @param updatedUser Updated user instance\r
-        */\r
-       public UserUpdatedPersonalDataEvent (final User updatedUser) {\r
-               // Is the user instance valid?\r
-               if (null == updatedUser) {\r
-                       // Throw NPE\r
-                       throw new NullPointerException("updatedUser is null"); //NOI18N\r
-               } else if (updatedUser.getUserId() == null) {\r
-                       // Throw NPE again\r
-                       throw new NullPointerException("updatedUser.userId is null"); //NOI18N\r
-               } else if (updatedUser.getUserId() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("updatedUser.userId={0} is invalid.", updatedUser.getUserId())); //NOI18N\r
-               }\r
-\r
-               // Set it here\r
-               this.updatedUser = updatedUser;\r
-       }\r
-\r
-       @Override\r
-       public User getUpdatedUser () {\r
-               return this.updatedUser;\r
-       }\r
-\r
-}\r
diff --git a/src/org/mxchange/jusercore/exceptions/DataRepeatMismatchException.java b/src/org/mxchange/jusercore/exceptions/DataRepeatMismatchException.java
deleted file mode 100644 (file)
index 7606d6e..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.exceptions;
-
-/**
- * An exception thrown when the user has not entered same email addresses
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class DataRepeatMismatchException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 12_857_813_986_248_156L;
-
-       /**
-        * Constructor with message
-        * <p>
-        * @param message Message to show
-        */
-       public DataRepeatMismatchException (final String message) {
-               super(message);
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/exceptions/EmailAddressAlreadyRegisteredException.java b/src/org/mxchange/jusercore/exceptions/EmailAddressAlreadyRegisteredException.java
deleted file mode 100644 (file)
index c0e1ddf..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.exceptions;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An exception thrown when the user's email address is already registered.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class EmailAddressAlreadyRegisteredException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 16_435_892_878_271L;
-
-       /**
-        * Constructor with already registered user instance
-        * <p>
-        * @param user User instance
-        */
-       public EmailAddressAlreadyRegisteredException (final User user) {
-               // Call super contructor
-               super(MessageFormat.format("Email address {0} already registered.", user.getUserContact().getContactEmailAddress())); //NOI18N
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/exceptions/UserEmailAddressNotFoundException.java b/src/org/mxchange/jusercore/exceptions/UserEmailAddressNotFoundException.java
deleted file mode 100644 (file)
index 8a1591f..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.exceptions;
-
-import java.text.MessageFormat;
-
-/**
- * An exception thrown when an user email address was not found.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserEmailAddressNotFoundException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 50_375_271_856_714_906L;
-
-       /**
-        * Constructor with email address
-        * <p>
-        * @param emailAddress Email address
-        */
-       public UserEmailAddressNotFoundException (final String emailAddress) {
-               super(MessageFormat.format("User email address {0} not found.", emailAddress)); //NOI18N
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/exceptions/UserNameAlreadyRegisteredException.java b/src/org/mxchange/jusercore/exceptions/UserNameAlreadyRegisteredException.java
deleted file mode 100644 (file)
index f32fbb1..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.exceptions;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An exception thrown when the user name is already registered
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserNameAlreadyRegisteredException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 16_435_892_878_271L;
-
-       /**
-        * Constructor with already registered user instance
-        * <p>
-        * @param user User instance
-        */
-       public UserNameAlreadyRegisteredException (final User user) {
-               // Call super contructor
-               super(MessageFormat.format("User name {0} already registered at record id {1}. Maybe forgot to call isRegistered(user) ?", user.getUserName(), user.getUserId()));
-       }
-
-       /**
-        * Constructor with already registered user name
-        * <p>
-        * @param userName User name
-        */
-       public UserNameAlreadyRegisteredException (final String userName) {
-               // Call super contructor
-               super(MessageFormat.format("User name {0} already used. Maybe forgot to call isRegistered(user) ?", userName));
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/exceptions/UserNotFoundException.java b/src/org/mxchange/jusercore/exceptions/UserNotFoundException.java
deleted file mode 100644 (file)
index c8710f7..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.exceptions;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An exception thrown when the user's account was not found
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserNotFoundException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 42_895_928_956_718_956L;
-
-       /**
-        * Constructor with already registered user instance
-        * <p>
-        * @param user User instance
-        */
-       public UserNotFoundException (final User user) {
-               // Call super contructor
-               super(MessageFormat.format("User name {0} not found.", user.getUserName())); //NOI18N
-       }
-
-       /**
-        * Constructor with user id
-        * <p>
-        * @param userId User id
-        */
-       public UserNotFoundException (final Long userId) {
-               super(MessageFormat.format("User id {0} not found.", userId)); //NOI18N
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/exceptions/UserPasswordMismatchException.java b/src/org/mxchange/jusercore/exceptions/UserPasswordMismatchException.java
deleted file mode 100644 (file)
index 55db22b..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.exceptions;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An exception thrown when the entered password did not match the stored
- * password.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserPasswordMismatchException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 97_283_567_871_569_401L;
-
-       /**
-        * Creates an exception with given user instance
-        * <p>
-        * @param user User instance
-        */
-       public UserPasswordMismatchException (final User user) {
-               super(MessageFormat.format("Password for user {0} does not match stored password.", user));
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/exceptions/UserPasswordRepeatMismatchException.java b/src/org/mxchange/jusercore/exceptions/UserPasswordRepeatMismatchException.java
deleted file mode 100644 (file)
index 8a28369..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.exceptions;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An exception thrown when the entered password did not match the stored
- * password.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserPasswordRepeatMismatchException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 51_782_450_671_256_594L;
-
-       /**
-        * Creates an exception with given user instance
-        * <p>
-        * @param user User instance
-        */
-       public UserPasswordRepeatMismatchException (final User user) {
-               super(MessageFormat.format("Passwords don't match, userId={0}", user.getUserId()));
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/exceptions/UserStatusConfirmedException.java b/src/org/mxchange/jusercore/exceptions/UserStatusConfirmedException.java
deleted file mode 100644 (file)
index 28cfdb7..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.exceptions;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An exception thrown when the user account is unconfirmed
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserStatusConfirmedException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 541_378_578_296_710L;
-
-       /**
-        * Constructor with already registered user instance
-        * <p>
-        * @param user User instance
-        */
-       public UserStatusConfirmedException (final User user) {
-               // Call super contructor
-               super(MessageFormat.format("User account with user name {0} is confirmed.", user.getUserName()));
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/exceptions/UserStatusLockedException.java b/src/org/mxchange/jusercore/exceptions/UserStatusLockedException.java
deleted file mode 100644 (file)
index bb96e7f..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.exceptions;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An exception thrown when the user account is locked
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserStatusLockedException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 438_395_891_288_681L;
-
-       /**
-        * Constructor with already registered user instance
-        * <p>
-        * @param user User instance
-        */
-       public UserStatusLockedException (final User user) {
-               // Call super contructor
-               super(MessageFormat.format("User account with user name {0} is locked.", user.getUserName()));
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/exceptions/UserStatusUnconfirmedException.java b/src/org/mxchange/jusercore/exceptions/UserStatusUnconfirmedException.java
deleted file mode 100644 (file)
index 543cb80..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.exceptions;
-
-import java.text.MessageFormat;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * An exception thrown when the user account is unconfirmed
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserStatusUnconfirmedException extends Exception {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 438_395_891_288_681L;
-
-       /**
-        * Constructor with already registered user instance
-        * <p>
-        * @param user User instance
-        */
-       public UserStatusUnconfirmedException (final User user) {
-               // Call super contructor
-               super(MessageFormat.format("User account with user name {0} is unconfirmed.", user.getUserName()));
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/model/email_address/ChangeableEmailAddress.java b/src/org/mxchange/jusercore/model/email_address/ChangeableEmailAddress.java
deleted file mode 100644 (file)
index 5d2d726..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.model.email_address;
-
-import java.io.Serializable;
-import java.util.Calendar;
-import org.mxchange.jusercore.model.email_address.status.EmailChangeStatus;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A POJI for email address changes. This is required to have the user confirm
- * the change (avoids abuse a bit).
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface ChangeableEmailAddress extends Serializable {
-
-       /**
-        * Getter for email change id
-        * <p>
-        * @return Email change id
-        */
-       Long getEmailChangeId ();
-
-       /**
-        * Setter for email change id
-        * <p>
-        * @param emailChangeId Email change id
-        */
-       void setEmailChangeId (final Long emailChangeId);
-
-       /**
-        * Getter for email address to change to
-        * <p>
-        * @return Email address to change to
-        */
-       String getEmailAddress ();
-
-       /**
-        * Setter for email address to change to
-        * <p>
-        * @param emailAddress Email address to change to
-        */
-       void setEmailAddress (final String emailAddress);
-
-       /**
-        * Getter for created "email change" timestamp
-        * <p>
-        * @return Created "email change" timestamp
-        */
-       Calendar getEmailChangeCreated ();
-
-       /**
-        * Setter for created "email change" timestamp
-        * <p>
-        * @param emailChangeCreated Created "email change" timestamp
-        */
-       void setEmailChangeCreated (final Calendar emailChangeCreated);
-
-       /**
-        * Getter for user initiating the email change
-        * <p>
-        * @return User initiating the email change
-        */
-       User getEmailChangeUser ();
-
-       /**
-        * Setter for user initiating the email change
-        * <p>
-        * @param emailChangeUser User initiating the email change
-        */
-       void setEmailChangeUser (final User emailChangeUser);
-
-       /**
-        * Getter for email change done/undone
-        * <p>
-        * @return Email change done/undone
-        */
-       Calendar getEmailChangeDone ();
-
-       /**
-        * Setter for email change done/undone
-        * <p>
-        * @param emailChangeDone Email change done/undone
-        */
-       void setEmailChangeDone (final Calendar emailChangeDone);
-
-       /**
-        * Getter for email change status
-        * <p>
-        * @return Email change status
-        */
-       EmailChangeStatus getEmailChangeStatus ();
-
-       /**
-        * Setter for email change status
-        * <p>
-        * @param emailChangeStatus Email change status
-        */
-       void setEmailChangeStatus (final EmailChangeStatus emailChangeStatus);
-
-       /**
-        * Getter for email change hash
-        * <p>
-        * @return Email change hash
-        */
-       String getEmailChangeHash ();
-
-       /**
-        * Getter for email change hash
-        * <p>
-        * @param emailChangeHash Email change hash
-        */
-       void setEmailChangeHash (final String emailChangeHash);
-
-       @Override
-       boolean equals (final Object object);
-
-       @Override
-       int hashCode ();
-}
diff --git a/src/org/mxchange/jusercore/model/email_address/EmailAddressChange.java b/src/org/mxchange/jusercore/model/email_address/EmailAddressChange.java
deleted file mode 100644 (file)
index 718c4c5..0000000
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.model.email_address;
-
-import java.util.Calendar;
-import java.util.Objects;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-import org.mxchange.jusercore.model.email_address.status.EmailChangeStatus;
-import org.mxchange.jusercore.model.user.LoginUser;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A POJO for changing email addresses.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-@Entity (name = "email_changes")
-@Table (name = "email_changes")
-@NamedQueries (
-               value = {
-                       @NamedQuery (name = "SearchEmailChangeByEmail", query = "SELECT e FROM email_changes AS e WHERE LOWER(e.emailAddress) LIKE LOWER(:email)"),
-                       @NamedQuery (name = "AllEmailAddressChanges", query = "SELECT e.emailAddress FROM email_changes AS e ORDER BY e.emailChangeId ASC"),
-                       @NamedQuery (name = "SearchEmailChangeByHash", query = "SELECT e FROM email_changes AS e WHERE e.emailChangeHash = :hash")
-               }
-)
-@SuppressWarnings ("PersistenceUnitPresent")
-public class EmailAddressChange implements ChangeableEmailAddress {
-
-       /**
-        * Serial number
-        */
-       @Transient
-       private static final long serialVersionUID = 398_459_287_176_139L;
-
-       /**
-        * Email address to change to
-        */
-       @Basic (optional = false)
-       @Column (name = "email_address", length = 100, nullable = false, updatable = false)
-       private String emailAddress;
-
-       /**
-        * Timestamp when this change has been added
-        */
-       @Basic (optional = false)
-       @Temporal (TemporalType.TIMESTAMP)
-       @Column (name = "email_change_created", nullable = false, updatable = false)
-       private Calendar emailChangeCreated;
-
-       /**
-        * Timestamp when this change has been done or undone
-        */
-       @Basic (optional = false)
-       @Temporal (TemporalType.TIMESTAMP)
-       @Column (name = "email_change_done", nullable = false, updatable = false)
-       private Calendar emailChangeDone;
-
-       /**
-        * Email change hash the user has to click
-        */
-       @Basic (optional = false)
-       @Column (name = "email_change_hash", unique = true)
-       private String emailChangeHash;
-
-       /**
-        * Email change id
-        */
-       @Id
-       @GeneratedValue (strategy = GenerationType.IDENTITY)
-       @Column (name = "email_change_id", nullable = false, updatable = false)
-       private Long emailChangeId;
-
-       /**
-        * Email change status
-        */
-       @Basic (optional = false)
-       @Column (name = "email_change_status", nullable = false, updatable = false)
-       @Enumerated (EnumType.STRING)
-       private EmailChangeStatus emailChangeStatus;
-
-       /**
-        * User initiating the email change
-        */
-       @JoinColumn (name = "email_change_user_id", nullable = false, updatable = false)
-       @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false)
-       private User emailChangeUser;
-
-       /**
-        * Default constructor
-        */
-       public EmailAddressChange () {
-               // Set default email change status
-               this.emailChangeStatus = EmailChangeStatus.NEW;
-       }
-
-       /**
-        * Constructor with all fields to set
-        * <p>
-        * @param emailChangeId Email change id
-        * @param user User instance
-        * @param emailAddress Email address
-        * @param emailChangeCreated Timestamp for creation
-        * @param emailChangeStatus Email change status
-        * @param emailChangeDone When this entry has been done
-        * @param emailChangeHash Email change hash
-        */
-       public EmailAddressChange (final Long emailChangeId, final User user, final String emailAddress, final Calendar emailChangeCreated, final EmailChangeStatus emailChangeStatus, final Calendar emailChangeDone, final String emailChangeHash) {
-               // Call other constructor
-               this(user, emailAddress);
-
-               // Set remaining
-               this.emailChangeId = emailChangeId;
-               this.emailChangeCreated = emailChangeCreated;
-               this.emailChangeStatus = emailChangeStatus;
-               this.emailChangeDone = emailChangeDone;
-               this.emailChangeHash = emailChangeHash;
-       }
-
-       /**
-        * Constructor with user and email address
-        * <p>
-        * @param user User instance
-        * @param emailAddress Email address
-        */
-       public EmailAddressChange (final User user, final String emailAddress) {
-               // Call other constructor
-               this();
-
-               // Set all
-               this.emailChangeUser = user;
-               this.emailAddress = emailAddress;
-       }
-
-       @Override
-       public boolean equals (final Object object) {
-               if (this == object) {
-                       return true;
-               } else if (null == object) {
-                       return false;
-               } else if (this.getClass() != object.getClass()) {
-                       return false;
-               }
-
-               final ChangeableEmailAddress otherEmail = (ChangeableEmailAddress) object;
-
-               if (!Objects.equals(this.getEmailChangeId(), otherEmail.getEmailChangeId())) {
-                       return false;
-               } else if (!Objects.equals(this.getEmailAddress(), otherEmail.getEmailAddress())) {
-                       return false;
-               } else if (!Objects.equals(this.getEmailChangeUser(), otherEmail.getEmailChangeUser())) {
-                       return false;
-               }
-
-               return true;
-       }
-
-       @Override
-       public String getEmailAddress () {
-               return this.emailAddress;
-       }
-
-       @Override
-       public void setEmailAddress (final String emailAddress) {
-               this.emailAddress = emailAddress;
-       }
-
-       @Override
-       @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getEmailChangeCreated () {
-               return this.emailChangeCreated;
-       }
-
-       @Override
-       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setEmailChangeCreated (final Calendar emailChangeCreated) {
-               this.emailChangeCreated = emailChangeCreated;
-       }
-
-       @Override
-       @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getEmailChangeDone () {
-               return this.emailChangeDone;
-       }
-
-       @Override
-       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setEmailChangeDone (final Calendar emailChangeDone) {
-               this.emailChangeDone = emailChangeDone;
-       }
-
-       @Override
-       public String getEmailChangeHash () {
-               return this.emailChangeHash;
-       }
-
-       @Override
-       public void setEmailChangeHash (final String emailChangeHash) {
-               this.emailChangeHash = emailChangeHash;
-       }
-
-       @Override
-       public Long getEmailChangeId () {
-               return this.emailChangeId;
-       }
-
-       @Override
-       public void setEmailChangeId (final Long emailChangeId) {
-               this.emailChangeId = emailChangeId;
-       }
-
-       @Override
-       public EmailChangeStatus getEmailChangeStatus () {
-               return this.emailChangeStatus;
-       }
-
-       @Override
-       public void setEmailChangeStatus (final EmailChangeStatus emailChangeStatus) {
-               this.emailChangeStatus = emailChangeStatus;
-       }
-
-       @Override
-       public User getEmailChangeUser () {
-               return this.emailChangeUser;
-       }
-
-       @Override
-       public void setEmailChangeUser (final User emailChangeUser) {
-               this.emailChangeUser = emailChangeUser;
-       }
-
-       @Override
-       public int hashCode () {
-               int hash = 5;
-
-               hash = 71 * hash + Objects.hashCode(this.getEmailChangeId());
-               hash = 71 * hash + Objects.hashCode(this.getEmailAddress());
-               hash = 71 * hash + Objects.hashCode(this.getEmailChangeUser());
-
-               return hash;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/model/email_address/status/EmailChangeStatus.java b/src/org/mxchange/jusercore/model/email_address/status/EmailChangeStatus.java
deleted file mode 100644 (file)
index c472e80..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.model.email_address.status;
-
-import java.io.Serializable;
-
-/**
- * An enumeration for email changing
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public enum EmailChangeStatus implements Serializable {
-
-       /**
-        * Newly added email address (default)
-        */
-       NEW("EMAIL_CHANGE_STATUS_NEW"), //NOI18N
-
-       /**
-        * User changed to this address
-        */
-       CHANGED("EMAIL_CHANGE_STATUS_CHANGED"), //NOI18N
-
-       /**
-        * Has withdrawn the action
-        */
-       WITHDRAWN("EMAIL_CHANGE_STATUS_WITHDRAWN"), //NOI18N
-
-       /**
-        * User has "deleted" the entry. This is not done to keep a history of email changes.
-        */
-       DELETED("EMAIL_CHANGE_STATUS_DELETED"); //NOI18N
-
-       /**
-        * Message key
-        */
-       private final String messageKey;
-
-       /**
-        * Constructor with i18n translation key
-        * <p>
-        * @param messageKey Message key (i18n)
-        */
-       private EmailChangeStatus (final String messageKey) {
-               // Set it here
-               this.messageKey = messageKey;
-       }
-
-       /**
-        * Output value (for messages)
-        * <p>
-        * @return the messageKey
-        */
-       public String getMessageKey () {
-               return this.messageKey;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java
deleted file mode 100644 (file)
index 7de804a..0000000
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.model.user;
-
-import java.util.Calendar;
-import java.util.Locale;
-import java.util.Objects;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.contact.UserContact;
-import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
-import org.mxchange.jusercore.model.user.status.UserAccountStatus;
-
-/**
- * A generic user entity class
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-@Entity (name = "users")
-@Table (
-               name = "users"
-)
-@NamedQueries (
-               {
-                       @NamedQuery (name = "AllUserNames", query = "SELECT DISTINCT u.userName FROM users AS u ORDER BY u.userId ASC"),
-                       @NamedQuery (name = "AllEmailAddresses", query = "SELECT DISTINCT c.contactEmailAddress FROM contacts AS c INNER JOIN users AS u ON u.userContact = c ORDER BY c.contactId ASC"),
-                       @NamedQuery (name = "SearchUserByName", query = "SELECT u FROM users AS u WHERE LOWER(u.userName) LIKE LOWER(:userName)"),
-                       @NamedQuery (name = "SearchUserById", query = "SELECT u FROM users AS u WHERE u.userId = :id"),
-                       @NamedQuery (name = "SearchUserByEmailAddress", query = "SELECT u FROM users AS u INNER JOIN contacts AS c ON u.userContact = c WHERE LOWER(c.contactEmailAddress) LIKE LOWER(:emailAddress)"),
-                       @NamedQuery (name = "SearchUserByConfirmKey", query = "SELECT u FROM users AS u WHERE u.userConfirmKey = :confirmKey"),
-                       @NamedQuery (name = "SearchAllUsersExcept", query = "SELECT u FROM users AS u WHERE u != :user ORDER BY u.userId ASC"),
-                       @NamedQuery (name = "AllUsers", query = "SELECT u FROM users AS u ORDER BY u.userId ASC"),
-                       @NamedQuery (name = "AllPublicUsers", query = "SELECT u FROM users AS u WHERE u.userAccountStatus = :status AND u.userProfileMode = :mode ORDER BY u.userId ASC"),
-                       @NamedQuery (name = "AllMemberPublicUsers", query = "SELECT u FROM users AS u WHERE u.userAccountStatus = :status AND u.userProfileMode IN (:public, :members) ORDER BY u.userId ASC")
-               }
-)
-@SuppressWarnings ("PersistenceUnitPresent")
-public class LoginUser implements User {
-
-       /**
-        * Serial number
-        */
-       @Transient
-       private static final long serialVersionUID = 4_328_454_581_751L;
-
-       /**
-        * Account status
-        */
-       @Basic (optional = false)
-       @Column (name = "user_account_status", nullable = false)
-       @Enumerated (value = EnumType.STRING)
-       private UserAccountStatus userAccountStatus;
-
-       /**
-        * Confirmation key
-        */
-       @Column (name = "user_confirm_key", unique = true)
-       private String userConfirmKey;
-
-       /**
-        * Id number from "contacts" table
-        */
-       @JoinColumn (name = "user_contact_id", referencedColumnName = "contact_id", nullable = false, updatable = false, unique = true)
-       @OneToOne (targetEntity = UserContact.class, cascade = CascadeType.ALL, optional = false)
-       private Contact userContact;
-
-       /**
-        * "created" timestamp
-        */
-       @Basic (optional = false)
-       @Temporal (TemporalType.TIMESTAMP)
-       @Column (name = "user_created", nullable = false)
-       private Calendar userCreated;
-
-       /**
-        * Encrypted password
-        */
-       @Basic (optional = false)
-       @Column (name = "user_encrypted_password", nullable = false)
-       private String userEncryptedPassword;
-
-       /**
-        * User id
-        */
-       @Id
-       @Column (name = "user_id", nullable = false, length = 20, updatable = false)
-       @GeneratedValue (strategy = GenerationType.IDENTITY)
-       private Long userId;
-
-       /**
-        * Last "locked" timestamp
-        */
-       @Temporal (TemporalType.TIMESTAMP)
-       @Column (name = "user_last_locked_timestamp")
-       private Calendar userLastLocked;
-
-       /**
-        * Last locked reason
-        */
-       @Lob
-       @Column (name = "user_last_locked_reason")
-       private String userLastLockedReason;
-
-       /**
-        * User locale
-        */
-       @Column (name = "user_locale")
-       private Locale userLocale;
-
-       /**
-        * Whether the user must change password after login
-        */
-       @Column (name = "user_must_change_password")
-       private Boolean userMustChangePassword;
-
-       /**
-        * User name
-        */
-       @Basic (optional = false)
-       @Column (name = "user_name", nullable = false, length = 30, unique = true)
-       private String userName;
-
-       /**
-        * Profile mode of this user
-        */
-       @Basic (optional = false)
-       @Enumerated (EnumType.STRING)
-       @Column (name = "user_profile_mode", nullable = false)
-       private ProfileMode userProfileMode;
-
-       /**
-        * When this user has been updated
-        */
-       @Temporal (TemporalType.TIMESTAMP)
-       @Column (name = "user_updated")
-       private Calendar userUpdated;
-
-       /**
-        * Default constructor
-        */
-       public LoginUser () {
-               // Default is invisible
-               this.userProfileMode = ProfileMode.INVISIBLE;
-       }
-
-       @Override
-       public void copyAll (final User user) {
-               // Is contact set?
-               if (user.getUserContact() instanceof Contact) {
-                       // Copy also contact data
-                       this.getUserContact().copyAll(user.getUserContact());
-               }
-
-               // Copy other data
-               this.setUserConfirmKey(user.getUserConfirmKey());
-               this.setUserName(user.getUserName());
-               this.setUserEncryptedPassword(user.getUserEncryptedPassword());
-               this.setUserAccountStatus(user.getUserAccountStatus());
-               this.setUserCreated(user.getUserCreated());
-               this.setUserLastLocked(user.getUserLastLocked());
-               this.setUserLastLockedReason(user.getUserLastLockedReason());
-               this.setUserUpdated(user.getUserUpdated());
-               this.setUserProfileMode(user.getUserProfileMode());
-               this.setUserLocale(user.getUserLocale());
-       }
-
-       @Override
-       public boolean equals (final Object object) {
-               if (null == object) {
-                       return false;
-               } else if (this.getClass() != object.getClass()) {
-                       return false;
-               }
-
-               final User other = (User) object;
-
-               return ((Objects.equals(this.getUserName(), other.getUserName())) &&
-                               (Objects.equals(this.getUserId(), other.getUserId())));
-       }
-
-       @Override
-       public UserAccountStatus getUserAccountStatus () {
-               return this.userAccountStatus;
-       }
-
-       @Override
-       public void setUserAccountStatus (final UserAccountStatus userAccountStatus) {
-               this.userAccountStatus = userAccountStatus;
-       }
-
-       @Override
-       public String getUserConfirmKey () {
-               return this.userConfirmKey;
-       }
-
-       @Override
-       public void setUserConfirmKey (final String userConfirmKey) {
-               this.userConfirmKey = userConfirmKey;
-       }
-
-       @Override
-       public Contact getUserContact () {
-               return this.userContact;
-       }
-
-       @Override
-       public void setUserContact (final Contact userContact) {
-               this.userContact = userContact;
-       }
-
-       @Override
-       @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getUserCreated () {
-               return this.userCreated;
-       }
-
-       @Override
-       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setUserCreated (final Calendar userCreated) {
-               this.userCreated = userCreated;
-       }
-
-       @Override
-       public String getUserEncryptedPassword () {
-               return this.userEncryptedPassword;
-       }
-
-       @Override
-       public void setUserEncryptedPassword (final String userEncryptedPassword) {
-               this.userEncryptedPassword = userEncryptedPassword;
-       }
-
-       @Override
-       public Long getUserId () {
-               return this.userId;
-       }
-
-       @Override
-       public void setUserId (final Long userId) {
-               this.userId = userId;
-       }
-
-       @Override
-       @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getUserLastLocked () {
-               return this.userLastLocked;
-       }
-
-       @Override
-       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setUserLastLocked (final Calendar userLastLocked) {
-               this.userLastLocked = userLastLocked;
-       }
-
-       @Override
-       public String getUserLastLockedReason () {
-               return this.userLastLockedReason;
-       }
-
-       @Override
-       public void setUserLastLockedReason (final String userLastLockedReason) {
-               this.userLastLockedReason = userLastLockedReason;
-       }
-
-       @Override
-       public Locale getUserLocale () {
-               return this.userLocale;
-       }
-
-       @Override
-       public void setUserLocale (final Locale userLocale) {
-               this.userLocale = userLocale;
-       }
-
-       @Override
-       public Boolean getUserMustChangePassword () {
-               return this.userMustChangePassword;
-       }
-
-       @Override
-       public void setUserMustChangePassword (final Boolean userMustChangePassword) {
-               this.userMustChangePassword = userMustChangePassword;
-       }
-
-       @Override
-       public String getUserName () {
-               return this.userName;
-       }
-
-       @Override
-       public void setUserName (final String userName) {
-               this.userName = userName;
-       }
-
-       @Override
-       public ProfileMode getUserProfileMode () {
-               return this.userProfileMode;
-       }
-
-       @Override
-       public void setUserProfileMode (final ProfileMode userProfileMode) {
-               this.userProfileMode = userProfileMode;
-       }
-
-       @Override
-       @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getUserUpdated () {
-               return this.userUpdated;
-       }
-
-       @Override
-       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setUserUpdated (final Calendar userUpdated) {
-               this.userUpdated = userUpdated;
-       }
-
-       @Override
-       public int hashCode () {
-               int hash = 5;
-               hash = 83 * hash + Objects.hashCode(this.getUserName());
-               hash = 83 * hash + Objects.hashCode(this.getUserId());
-               return hash;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/model/user/User.java b/src/org/mxchange/jusercore/model/user/User.java
deleted file mode 100644 (file)
index 4bb0f05..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.model.user;
-
-import java.io.Serializable;
-import java.util.Calendar;
-import java.util.Locale;
-import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
-import org.mxchange.jusercore.model.user.status.UserAccountStatus;
-
-/**
- * A user POPJI
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface User extends Serializable {
-
-       /**
-        * Copies all attributes from other user object to this
-        * <p>
-        * @param userSource Source instance
-        */
-       void copyAll (final User userSource);
-
-       /**
-        * Getter for account status
-        * <p>
-        * @return Account status
-        */
-       UserAccountStatus getUserAccountStatus ();
-
-       /**
-        * Setter for account status
-        * <p>
-        * @param userStatus Account status
-        */
-       void setUserAccountStatus (final UserAccountStatus userStatus);
-
-       /**
-        * Getter for confirmation key
-        * <p>
-        * @return Confirmation key
-        */
-       String getUserConfirmKey ();
-
-       /**
-        * Setter for confirmation key
-        * <p>
-        * @param userConfirmKey Confirmation key
-        */
-       void setUserConfirmKey (final String userConfirmKey);
-
-       /**
-        * Getter for contact instance
-        * <p>
-        * @return Contact id number
-        */
-       Contact getUserContact ();
-
-       /**
-        * Setter for contact instance
-        * <p>
-        * @param contact Contact instance
-        */
-       void setUserContact (final Contact contact);
-
-       /**
-        * Getter for "created" timestamp
-        * <p>
-        * @return "created" timestamp
-        */
-       Calendar getUserCreated ();
-
-       /**
-        * Setter for "created" timestamp
-        * <p>
-        * @param userCreated "created" timestamp
-        */
-       void setUserCreated (final Calendar userCreated);
-
-       /**
-        * Getter for encrypted password
-        * <p>
-        * @return Encrypted password
-        */
-       String getUserEncryptedPassword ();
-
-       /**
-        * Setter for password hash
-        * <p>
-        * @param userEncryptedPassword Encrypted password
-        */
-       void setUserEncryptedPassword (final String userEncryptedPassword);
-
-       /**
-        * Getter for customer id number
-        * <p>
-        * @return User id number
-        */
-       Long getUserId ();
-
-       /**
-        * Settte for customer id number
-        * <p>
-        * @param customerId User id number
-        */
-       void setUserId (final Long customerId);
-
-       /**
-        * Getter for "locked" timestamp
-        * <p>
-        * @return "locked" timestamp
-        */
-       Calendar getUserLastLocked ();
-
-       /**
-        * Getter for "locked" timestamp
-        * <p>
-        * @param userLocked "locked" timestamp
-        */
-       void setUserLastLocked (final Calendar userLocked);
-
-       /**
-        * Getter for reason of last locked
-        * <p>
-        * @return Reason of last locked
-        */
-       String getUserLastLockedReason ();
-
-       /**
-        * Setter for reason of last locked
-        * <p>
-        * @param lastLockedReason Reason of last locked
-        */
-       void setUserLastLockedReason (final String lastLockedReason);
-
-       /**
-        * Getter for user name
-        * <p>
-        * @return User name
-        */
-       String getUserName ();
-
-       /**
-        * Setter for user name
-        * <p>
-        * @param userName User name
-        */
-       void setUserName (final String userName);
-
-       /**
-        * Getter for public user profile flag
-        * <p>
-        * @return Whether the user has a public profile
-        */
-       ProfileMode getUserProfileMode ();
-
-       /**
-        * Setter for public user profile flag
-        * <p>
-        * @param userPublicProfile Whether the user has a public profile
-        */
-       void setUserProfileMode (final ProfileMode userPublicProfile);
-
-       /**
-        * Getter for updated timestamp
-        * <p>
-        * @return Updated timestamp
-        */
-       Calendar getUserUpdated ();
-
-       /**
-        * Setter for updated timestamp
-        * <p>
-        * @param userUpdated Updated timestamp
-        */
-       void setUserUpdated (final Calendar userUpdated);
-
-       /**
-        * Getter for user's locale
-        * <p>
-        * @return User's locale
-        */
-       Locale getUserLocale ();
-
-       /**
-        * Setteror user's locale
-        * <p>
-        * @param userLocale User's locale
-        */
-       void setUserLocale (final Locale userLocale);
-
-       /**
-        * Getter for flag if user needs to change password
-        * <p>
-        * @return Flag if user needs to change password
-        */
-       Boolean getUserMustChangePassword ();
-
-       /**
-        * Setter for flag if user needs to change password
-        * <p>
-        * @param userMustChangePassword Flag if user needs to change password
-        */
-       void setUserMustChangePassword (final Boolean userMustChangePassword);
-
-       @Override
-       boolean equals (final Object object);
-
-       @Override
-       int hashCode ();
-
-}
diff --git a/src/org/mxchange/jusercore/model/user/UserUtils.java b/src/org/mxchange/jusercore/model/user/UserUtils.java
deleted file mode 100644 (file)
index ebd64ef..0000000
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.model.user;
-
-import java.io.Serializable;
-import java.security.SecureRandom;
-import java.text.MessageFormat;
-import java.util.Properties;
-import java.util.Random;
-import org.apache.commons.codec.digest.Crypt;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jusercore.container.login.LoginContainer;
-
-/**
- * An utilities class for users
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public class UserUtils implements Serializable {
-
-       /**
-        * Password alphabet
-        */
-       private static final String PASSWORD_ALPHABET = "abcdefghijklmnopqrstuvwxzyABCDEFGHIJKLMNOPQRSTUVWXZY0123456789-/?!_+#@"; //NOI18N
-
-       /**
-        * Minimum password length
-        */
-       private static final Integer PASSWORD_MINIMUM_LENGTH = 5;
-
-       /**
-        * Random number generator
-        */
-       private static final Random RANDOM_NUMBER_GENERATOR;
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 18_356_847_120_972L;
-
-       /**
-        * Static initializer
-        */
-       static {
-               // Init RNG
-               RANDOM_NUMBER_GENERATOR = new SecureRandom();
-       }
-
-       /**
-        * Creates a pseudo-random password with given length
-        * <p>
-        * @param length Length of the password
-        * <p>
-        * @return Pseudo-random password
-        */
-       public static String createRandomPassword (final Integer length) {
-               // Parameter should be valid
-               if (null == length) {
-                       // Throw NPE
-                       throw new NullPointerException("length is null"); //NOI18N
-               } else if (length < PASSWORD_MINIMUM_LENGTH) {
-                       // To weak passwords
-                       throw new IllegalArgumentException(MessageFormat.format("Password length {0} is to short, minimum: {1}", length, PASSWORD_MINIMUM_LENGTH)); //NOI18N
-               }
-
-               // Init variable
-               StringBuilder password = new StringBuilder(length);
-
-               // Start creating it
-               for (int i = 0; i < length; i++) {
-                       // Generate random number
-                       int pos = RANDOM_NUMBER_GENERATOR.nextInt(PASSWORD_ALPHABET.length());
-
-                       // Get char at this position and add it to the final password
-                       password.append(String.valueOf(PASSWORD_ALPHABET.charAt(pos)));
-               }
-
-               // Should have the wanted length
-               assert (password.length() == length) : MessageFormat.format("Password length {0} doesn't match requested: {1}", password.length(), length); //NOI18N
-
-               // Return it
-               return password.toString();
-       }
-
-       /**
-        * Hashes given user password and adds a salt to it
-        * <p>
-        * @param userPassword User password to be hashed
-        * <p>
-        * @return Hashed user password
-        */
-       public static String encryptPassword (final String userPassword) {
-               // Is it null or empty?
-               if (null == userPassword) {
-                       // Throw NPE
-                       throw new NullPointerException("userPassword is null"); //NOI18N
-               } else if (userPassword.isEmpty()) {
-                       // Empty passwords are hardcoded not allowed due to security risks
-                       throw new IllegalArgumentException("userPassword is empty"); //NOI18N
-               }
-
-               // Generate large number
-               String number = Long.toString(RANDOM_NUMBER_GENERATOR.nextLong() * 10_000_000_000L);
-
-               // Generate salt
-               String salt = Crypt.crypt(number);
-
-               // First encrypt password
-               String encryptedPassword = Crypt.crypt(userPassword, salt);
-
-               // Return it
-               return encryptedPassword;
-       }
-
-       /**
-        * Generates a pseudo-random user name
-        * <p>
-        * @return User name
-        */
-       public static String generateRandomUserName () {
-               // User name's format is normally "user" + random number (10 digits)
-               String userName = String.format("user%d", RANDOM_NUMBER_GENERATOR.nextInt(10000000)); //NOI18N
-
-               // Return it
-               return userName;
-       }
-
-       /**
-        * Generate a key suitable for confirmation. This is basicly a large and
-        * strong hash with a lop entropy.
-        * <p>
-        * @param user User instance to use as additional entropy source
-        * <p>
-        * @return Generated key
-        */
-       public static String generatedConfirmationKey (final User user) {
-               // Generates random string by creating a random, encrypted password
-               StringBuilder key = new StringBuilder(encryptPassword(generateRandomUserName()));
-
-               // Is user set?
-               if (user instanceof User) {
-                       // Add it's name, too
-                       key.append(":").append(user); //NOI18N
-
-                       // Is user name set?
-                       if (user.getUserName() instanceof String) {
-                               // Add it
-                               key.append(":").append(user.getUserName()); //NOI18N
-                       }
-
-                       // Is password set?
-                       if (user.getUserEncryptedPassword() instanceof String) {
-                               // Add it, too
-                               key.append(":").append(user.getUserEncryptedPassword()); //NOI18N
-                       }
-
-                       // Get contact instance
-                       Contact contact = user.getUserContact();
-
-                       // Is contact set?
-                       if (contact instanceof Contact) {
-                               // Add it, too
-                               key.append(":").append(contact); //NOI18N
-
-                               // Is email address set?
-                               if (contact.getContactEmailAddress() instanceof String) {
-                                       // Add it, too
-                                       key.append(":").append(contact.getContactEmailAddress()); //NOI18N
-                               }
-                       }
-               }
-
-               // Hash key
-               String hash = DigestUtils.sha256Hex(key.toString());
-
-               // Return it
-               return hash;
-       }
-
-       /**
-        * Returns a Properties object from given user instance.
-        * <p>
-        * @param user User instance to get all fields from
-        * <p>
-        * @return All properties from given user
-        */
-       public static Properties getAllUserFields (final User user) {
-               // Parameter should be valid
-               if (null == user) {
-                       // Throw NPE
-                       throw new NullPointerException("user is null"); //NOI18N
-               } else if (user.getUserId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("user.userId is null"); //NOI18N
-               } else if (user.getUserId() < 1) {
-                       // Not valid number
-                       throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid.", user.getUserId())); //NOI18N
-               } else if (user.getUserName() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("user.userName is null"); //NOI18N
-               } else if (user.getUserName().isEmpty()) {
-                       // Empty string
-                       throw new IllegalArgumentException("user.userName is empty"); //NOI18N
-               } else if (user.getUserAccountStatus() == null) {
-                       // Throw NPE
-                       throw new NullPointerException("user.userAccountStatus is null"); //NOI18N
-               }
-
-               // Init properties list
-               Properties properties = new Properties();
-
-               // Init some vbalues with empty strings
-               properties.setProperty("userConfirmKey", ""); //NOI18N
-               properties.setProperty("userUpdated", ""); //NOI18N
-               properties.setProperty("userLastLockedReason", ""); //NOI18N
-               properties.setProperty("contactTitle", ""); //NOI18N
-               properties.setProperty("contactStreet", ""); //NOI18N
-               properties.setProperty("contactHouseNumber", ""); //NOI18N
-               properties.setProperty("contacCity", ""); //NOI18N
-               properties.setProperty("contacCity", ""); //NOI18N
-               properties.setProperty("contactZipCode", ""); //NOI18N
-               properties.setProperty("contactBirthday", ""); //NOI18N
-               properties.setProperty("contactEmailAddress", ""); //NOI18N
-               properties.setProperty("contactUpdated", ""); //NOI18N
-
-               // Set all:
-               // - User data
-               properties.setProperty("userId", Long.toString(user.getUserId())); //NOI18N
-               properties.setProperty("userName", user.getUserName()); //NOI18N
-               properties.setProperty("userCreated", user.getUserCreated().toString()); //NOI18N
-               if (user.getUserUpdated() != null) {
-                       properties.setProperty("contactUpdated", user.getUserUpdated().toString()); //NOI18N
-               }
-               if (user.getUserConfirmKey() != null) {
-                       properties.setProperty("userConfirmKey", user.getUserConfirmKey()); //NOI18N
-               }
-               if (user.getUserLastLockedReason() != null) {
-                       properties.setProperty("userLastLockedReason", user.getUserLastLockedReason()); //NOI18N
-               }
-               properties.setProperty("userAccountStatus", user.getUserAccountStatus().toString()); //NOI18N
-
-               // - Contact data
-               properties.setProperty("contactGender", user.getUserContact().getContactGender().toString()); //NOI18N
-               if (user.getUserContact().getContactTitle() != null) {
-                       properties.setProperty("contactTitle", user.getUserContact().getContactTitle()); //NOI18N
-               }
-               properties.setProperty("contactFirstName", user.getUserContact().getContactFirstName()); //NOI18N
-               properties.setProperty("contactFamilyName", user.getUserContact().getContactFamilyName()); //NOI18N
-               if (user.getUserContact().getContactStreet() != null) {
-                       properties.setProperty("contactStreet", user.getUserContact().getContactStreet()); //NOI18N
-               }
-               if (user.getUserContact().getContactHouseNumber() != null) {
-                       properties.setProperty("contactHouseNumber", Short.toString(user.getUserContact().getContactHouseNumber())); //NOI18N
-               }
-               if (user.getUserContact().getContactCity() != null) {
-                       properties.setProperty("contacCity", user.getUserContact().getContactCity()); //NOI18N
-               }
-               if (user.getUserContact().getContactZipCode() != null) {
-                       properties.setProperty("contactZipCode", Integer.toString(user.getUserContact().getContactZipCode())); //NOI18N
-               }
-               if (user.getUserContact().getContactBirthday() != null) {
-                       properties.setProperty("contactBirthday", user.getUserContact().getContactBirthday().toString()); //NOI18N
-               }
-               if (user.getUserContact().getContactEmailAddress() != null) {
-                       properties.setProperty("contactEmailAddress", user.getUserContact().getContactEmailAddress()); //NOI18N
-               }
-               properties.setProperty("contactCreated", user.getUserContact().getContactCreated().toString()); //NOI18N
-               if (user.getUserContact().getContactUpdated() != null) {
-                       properties.setProperty("contactUpdated", user.getUserContact().getContactUpdated().toString()); //NOI18N
-               }
-
-               // Return it
-               return properties;
-       }
-
-       /**
-        * Checks if password from container matches the updatedUser's password
-        * <p>
-        * @param container Container holding user instance and unencrypted password
-        * @param updatedUser Updated user instance from database
-        * <p>
-        * @return Whether the password matches
-        */
-       public static boolean ifPasswordMatches (final LoginContainer container, final User updatedUser) {
-               // Validate parameters
-               if (null == container) {
-                       // Throw NPE
-                       throw new NullPointerException("container is null"); //NOI18N
-               } else if (null == updatedUser) {
-                       // And again NPE ...
-                       throw new NullPointerException("updatedUser is null"); //NOI18N
-               } else if (container.getUser() == null) {
-                       // NPE for user in container
-                       throw new NullPointerException("container.user is null"); //NOI18N
-               } else if (container.getUserPassword() == null) {
-                       // NPE for user password in container
-                       throw new NullPointerException("container.userPassword is null"); //NOI18N
-               } else if (container.getUserPassword().isEmpty()) {
-                       // Empty password in container
-                       throw new IllegalArgumentException("container.userPassword is empty"); //NOI18N
-               }
-
-               // Call below method
-               return ifPasswordMatches(container.getUserPassword(), updatedUser);
-       }
-
-       /**
-        * Checks if direct password the updatedUser's password
-        * <p>
-        * @param unencryptedPassword Unencrypted (direct) password
-        * @param updatedUser Updated user instance from database
-        * <p>
-        * @return Whether the password matches
-        */
-       public static boolean ifPasswordMatches (final String unencryptedPassword, final User updatedUser) {
-               // Validate parameters
-               if (null == unencryptedPassword) {
-                       // Throw NPE
-                       throw new NullPointerException("unencryptedPassword is null"); //NOI18N
-               } else if (unencryptedPassword.isEmpty()) {
-                       // NPE for user in container
-                       throw new NullPointerException("unencryptedPassword is empty."); //NOI18N
-               } else if (null == updatedUser) {
-                       // And again NPE ...
-                       throw new NullPointerException("updatedUser is null"); //NOI18N
-               }
-
-               // First encrypt password
-               String encryptedPassword = Crypt.crypt(unencryptedPassword, updatedUser.getUserEncryptedPassword());
-
-               // Is it matching?
-               return encryptedPassword.equals(updatedUser.getUserEncryptedPassword());
-       }
-
-       /**
-        * Checks if password from container matches with from user instance.
-        * <p>
-        * @param container Container holding user instance and unencrypted password
-        * <p>
-        * @return Whether it maches
-        */
-       public static boolean ifPasswordMatches (final LoginContainer container) {
-               // Validate parameters
-               if (null == container) {
-                       // Throw NPE
-                       throw new NullPointerException("container is null"); //NOI18N
-               } else if (container.getUser() == null) {
-                       // NPE for user in container
-                       throw new NullPointerException("container.user is null"); //NOI18N
-               } else if (container.getUserPassword() == null) {
-                       // NPE for user password in container
-                       throw new NullPointerException("container.userPassword is null"); //NOI18N
-               } else if (container.getUserPassword().isEmpty()) {
-                       // Empty password in container
-                       throw new IllegalArgumentException("container.userPassword is empty"); //NOI18N
-               }
-
-               // Call other method
-               return ifPasswordMatches(container.getUserPassword(), container.getUser());
-       }
-
-       /**
-        * No instance from this class
-        */
-       private UserUtils () {
-       }
-}
diff --git a/src/org/mxchange/jusercore/model/user/activity/LogableUserActivity.java b/src/org/mxchange/jusercore/model/user/activity/LogableUserActivity.java
new file mode 100644 (file)
index 0000000..d62ab2f
--- /dev/null
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2016 Cho-Time GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jusercore.model.user.activity;
+
+import java.io.Serializable;
+import java.util.Calendar;
+import org.mxchange.jusercore.model.user.User;
+
+/**
+ * POJI for logable user activity
+ * <p>
+ * @author Roland Haeder<rhaeder@cho-time.de>
+ */
+public interface LogableUserActivity extends Serializable {
+
+       /**
+        * Getter for activity id
+        * <p>
+        * @return Activity id
+        */
+       Long getActivityId ();
+
+       /**
+        * Getter for activity id
+        * <p>
+        * @param activityId Activity id
+        */
+       void setActivityId (final Long activityId);
+
+       /**
+        * Getter for activity message (optional)
+        * <p>
+        * @return Activity message
+        */
+       String getActivityMessage ();
+
+       /**
+        * Setter for activity message (optional)
+        * <p>
+        * @param activityMessage Activity message
+        */
+       void setActivityMessage (final String activityMessage);
+
+       /**
+        * Getter for activity timestamp
+        * <p>
+        * @return Activity timestamp
+        */
+       Calendar getActivityTimestamp ();
+
+       /**
+        * Setter for activity timestamp
+        * <p>
+        * @param activityTimestamp Activity timestamp
+        */
+       void setActivityTimestamp (final Calendar activityTimestamp);
+
+       /**
+        * Getter for activity type
+        * <p>
+        * @return Activity type
+        */
+       String getActivityType ();
+
+       /**
+        * Setter for activity type
+        * <p>
+        * @param activityType Activity type
+        */
+       void setActivityType (final String activityType);
+
+       /**
+        * Getter for activity user (who did it)
+        * <p>
+        * @return User who did activity
+        */
+       User getActivityUser ();
+
+       /**
+        * Setter for activity user (who did it)
+        * <p>
+        * @param activityUser User who did activity
+        */
+       void setActivityUser (final User activityUser);
+
+       @Override
+       boolean equals (final Object object);
+
+       @Override
+       int hashCode ();
+
+}
diff --git a/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java b/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java
new file mode 100644 (file)
index 0000000..790c5aa
--- /dev/null
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2016 Cho-Time GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jusercore.model.user.activity;
+
+import java.util.Calendar;
+import java.util.Objects;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+import org.mxchange.jusercore.model.user.LoginUser;
+import org.mxchange.jusercore.model.user.User;
+
+/**
+ * A POJO for user acitivity log
+ * <p>
+ * @author Roland Haeder<rhaeder@cho-time.de>
+ */
+@Entity (name = "user_activity_log")
+@Table (
+               name = "user_activity_log"
+)
+@NamedQueries (
+               {
+                       @NamedQuery (name = "FindAllUsersActivity", query = "SELECT a FROM user_activity_log AS a WHERE a.activityUser = :activityUser ORDER BY a.activityId DESC"),
+                       @NamedQuery (name = "FindUsersActivityByType", query = "SELECT a FROM user_activity_log AS a WHERE a.activityUser = :activityUser AND a.activityType LIKE :activityType ORDER BY a.activityId DESC")
+               }
+)
+@SuppressWarnings ("PersistenceUnitPresent")
+public class UserActivityLog implements LogableUserActivity {
+
+       /**
+        * Serial number
+        */
+       @Transient
+       private static final long serialVersionUID = 12_945_967_867_290_601L;
+
+       /**
+        * Primary key
+        */
+       @Id
+       @GeneratedValue (strategy = GenerationType.IDENTITY)
+       @Column (name = "activity_id", nullable = false, updatable = false)
+       private Long activityId;
+
+       /**
+        * Message
+        */
+       @Column (name = "activity_message", updatable = false)
+       @Lob
+       private String activityMessage;
+
+       /**
+        * Timestamp
+        */
+       @Basic (optional = false)
+       @Temporal (TemporalType.TIMESTAMP)
+       @Column (name = "activity_timestamp", nullable = false, updatable = false)
+       private Calendar activityTimestamp;
+
+       /**
+        * Type
+        */
+       @Basic (optional = false)
+       @Column (name = "activity_type", nullable = false, updatable = false)
+       private String activityType;
+
+       /**
+        * User instance
+        */
+       @JoinColumn (name = "activity_user_id", referencedColumnName = "user_id", nullable = false, updatable = false)
+       @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.ALL, optional = false)
+       private User activityUser;
+
+       /**
+        * Default constructor
+        */
+       public UserActivityLog () {
+       }
+
+       /**
+        * Constructor with message, type and user
+        * <p>
+        * @param activityMessage Message
+        * @param activityType Type
+        * @param activityUser User instance
+        */
+       public UserActivityLog (final String activityMessage, final String activityType, final User activityUser) {
+               this.activityMessage = activityMessage;
+               this.activityType = activityType;
+               this.activityUser = activityUser;
+       }
+
+       @Override
+       public boolean equals (final Object object) {
+               if (this == object) {
+                       return true;
+               } else if (null == object) {
+                       return false;
+               } else if (this.getClass() != object.getClass()) {
+                       return false;
+               }
+
+               final LogableUserActivity other = (LogableUserActivity) object;
+
+               if (!Objects.equals(this.getActivityMessage(), other.getActivityMessage())) {
+                       return false;
+               } else if (!Objects.equals(this.getActivityType(), other.getActivityType())) {
+                       return false;
+               } else if (!Objects.equals(this.getActivityId(), other.getActivityId())) {
+                       return false;
+               } else if (!Objects.equals(this.getActivityTimestamp(), other.getActivityTimestamp())) {
+                       return false;
+               } else if (!Objects.equals(this.getActivityUser(), other.getActivityUser())) {
+                       return false;
+               }
+
+               return true;
+       }
+
+       @Override
+       public Long getActivityId () {
+               return this.activityId;
+       }
+
+       @Override
+       public void setActivityId (final Long activityId) {
+               this.activityId = activityId;
+       }
+
+       @Override
+       public String getActivityMessage () {
+               return this.activityMessage;
+       }
+
+       @Override
+       public void setActivityMessage (final String activityMessage) {
+               this.activityMessage = activityMessage;
+       }
+
+       @Override
+       @SuppressWarnings ("ReturnOfDateField")
+       public Calendar getActivityTimestamp () {
+               return this.activityTimestamp;
+       }
+
+       @Override
+       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
+       public void setActivityTimestamp (final Calendar activityTimestamp) {
+               this.activityTimestamp = activityTimestamp;
+       }
+
+       @Override
+       public String getActivityType () {
+               return this.activityType;
+       }
+
+       @Override
+       public void setActivityType (final String activityType) {
+               this.activityType = activityType;
+       }
+
+       @Override
+       public User getActivityUser () {
+               return this.activityUser;
+       }
+
+       @Override
+       public void setActivityUser (final User activityUser) {
+               this.activityUser = activityUser;
+       }
+
+       @Override
+       public int hashCode () {
+               int hash = 7;
+
+               hash = 83 * hash + Objects.hashCode(this.getActivityId());
+               hash = 83 * hash + Objects.hashCode(this.getActivityMessage());
+               hash = 83 * hash + Objects.hashCode(this.getActivityTimestamp());
+               hash = 83 * hash + Objects.hashCode(this.getActivityType());
+               hash = 83 * hash + Objects.hashCode(this.getActivityUser());
+
+               return hash;
+       }
+
+}
diff --git a/src/org/mxchange/jusercore/model/user/password_history/PasswordHistory.java b/src/org/mxchange/jusercore/model/user/password_history/PasswordHistory.java
deleted file mode 100644 (file)
index 8a1c35e..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.model.user.password_history;
-
-import java.io.Serializable;
-import java.util.Calendar;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A POJI for user password history
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public interface PasswordHistory extends Serializable {
-
-       /**
-        * Getter for timestamp this history entry has been created (usually in
-        * EJB).
-        * <p>
-        * @return Timestamp when this history entry has been created
-        */
-       Calendar getUserPasswordHistoryCreated ();
-
-       /**
-        * Setter for timestamp this history entry has been created (usually in
-        * EJB).
-        * <p>
-        * @param userPasswordHistoryCreated Timestamp when this history entry has
-        * been created
-        */
-       void setUserPasswordHistoryCreated (final Calendar userPasswordHistoryCreated);
-
-       /**
-        * Getter for history entry id (primary key)
-        * <p>
-        * @return History entry id (primary key)
-        */
-       Long getUserPasswordHistoryId ();
-
-       /**
-        * Setter for history entry id (primary key)
-        * <p>
-        * @param userPasswordHistoryId History entry id (primary key)
-        */
-       void setUserPasswordHistoryId (final Long userPasswordHistoryId);
-
-       /**
-        * Getter for user's password hash
-        * <p>
-        * @return User's password hash
-        */
-       String getUserPasswordHistoryPasswordHash ();
-
-       /**
-        * Setter for user's password hash
-        * <p>
-        * @param userPasswordHistoryPasswordHash User's password hash
-        */
-       void setUserPasswordHistoryPasswordHash (final String userPasswordHistoryPasswordHash);
-
-       /**
-        * Getter for user instance
-        * <p>
-        * @return User instance
-        */
-       User getUserPasswordHistoryUser ();
-
-       /**
-        * Setter for user instance
-        * <p>
-        * @param userPasswordHistoryUser User instance
-        */
-       void setUserPasswordHistoryUser (final User userPasswordHistoryUser);
-
-       @Override
-       boolean equals (final Object object);
-
-       @Override
-       int hashCode ();
-
-}
diff --git a/src/org/mxchange/jusercore/model/user/password_history/UserPasswordHistory.java b/src/org/mxchange/jusercore/model/user/password_history/UserPasswordHistory.java
deleted file mode 100644 (file)
index 1cbdef1..0000000
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.model.user.password_history;
-
-import java.util.Calendar;
-import java.util.Objects;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-import org.mxchange.jusercore.model.user.LoginUser;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A POJO for user password history
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-@Entity (name = "user_password_history")
-@Table (
-               name = "user_password_history"
-)
-@NamedQueries (
-               {
-                       @NamedQuery (name = "AllUsersHistoryEntries", query = "SELECT h FROM user_password_history AS h WHERE h.userPasswordHistoryUser = :user ORDER BY h.userPasswordHistoryId DESC")
-               }
-)
-@SuppressWarnings ("PersistenceUnitPresent")
-public class UserPasswordHistory implements PasswordHistory {
-
-       /**
-        * Serial number
-        */
-       @Transient
-       private static final long serialVersionUID = 1L;
-
-       /**
-        * Timestamp when this entry has been created
-        */
-       @Basic (optional = false)
-       @Column (name = "history_created", nullable = false, updatable = false)
-       @Temporal (TemporalType.TIMESTAMP)
-       private Calendar userPasswordHistoryCreated;
-
-       /**
-        * Id number (primary key)
-        */
-       @Id
-       @Column (name = "history_id", updatable = false)
-       @GeneratedValue (strategy = GenerationType.IDENTITY)
-       private Long userPasswordHistoryId;
-
-       /**
-        * Password hash being used
-        */
-       @Basic (optional = false)
-       @Column (name = "history_password_hash", nullable = false, updatable = false)
-       private String userPasswordHistoryPasswordHash;
-
-       /**
-        * User instance for this history entry
-        */
-       @JoinColumn (name = "history_user_id", nullable = true, updatable = false)
-       @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH)
-       private User userPasswordHistoryUser;
-
-       /**
-        * Default constructor
-        */
-       public UserPasswordHistory () {
-       }
-
-       /**
-        * Constructor with password hash and user instance
-        * <p>
-        * @param userPasswordHistoryPasswordHash Password hash
-        * @param userPasswordHistoryUser User instance
-        */
-       public UserPasswordHistory (final String userPasswordHistoryPasswordHash, final User userPasswordHistoryUser) {
-               // Set all
-               this.userPasswordHistoryPasswordHash = userPasswordHistoryPasswordHash;
-               this.userPasswordHistoryUser = userPasswordHistoryUser;
-       }
-
-       @Override
-       public boolean equals (final Object object) {
-               if (this == object) {
-                       return true;
-               } else if (object == null) {
-                       return false;
-               } else if (this.getClass() != object.getClass()) {
-                       return false;
-               }
-
-               final PasswordHistory other = (PasswordHistory) object;
-
-               if (!Objects.equals(this.getUserPasswordHistoryId(), other.getUserPasswordHistoryId())) {
-                       return false;
-               } else if (!Objects.equals(this.getUserPasswordHistoryPasswordHash(), other.getUserPasswordHistoryPasswordHash())) {
-                       return false;
-               } else if (!Objects.equals(this.getUserPasswordHistoryUser(), other.getUserPasswordHistoryUser())) {
-                       return false;
-               }
-
-               return true;
-       }
-
-       @Override
-       @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getUserPasswordHistoryCreated () {
-               return this.userPasswordHistoryCreated;
-       }
-
-       @Override
-       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setUserPasswordHistoryCreated (final Calendar userPasswordHistoryCreated) {
-               this.userPasswordHistoryCreated = userPasswordHistoryCreated;
-       }
-
-       @Override
-       public Long getUserPasswordHistoryId () {
-               return this.userPasswordHistoryId;
-       }
-
-       @Override
-       public void setUserPasswordHistoryId (final Long userPasswordHistoryId) {
-               this.userPasswordHistoryId = userPasswordHistoryId;
-       }
-
-       @Override
-       public String getUserPasswordHistoryPasswordHash () {
-               return this.userPasswordHistoryPasswordHash;
-       }
-
-       @Override
-       public void setUserPasswordHistoryPasswordHash (final String userPasswordHistoryPasswordHash) {
-               this.userPasswordHistoryPasswordHash = userPasswordHistoryPasswordHash;
-       }
-
-       @Override
-       public User getUserPasswordHistoryUser () {
-               return this.userPasswordHistoryUser;
-       }
-
-       @Override
-       public void setUserPasswordHistoryUser (final User userPasswordHistoryUser) {
-               this.userPasswordHistoryUser = userPasswordHistoryUser;
-       }
-
-       @Override
-       public int hashCode () {
-               int hash = 7;
-
-               hash = 79 * hash + Objects.hashCode(this.getUserPasswordHistoryId());
-               hash = 79 * hash + Objects.hashCode(this.getUserPasswordHistoryPasswordHash());
-               hash = 79 * hash + Objects.hashCode(this.getUserPasswordHistoryUser());
-
-               return hash;
-       }
-
-}
diff --git a/src/org/mxchange/jusercore/model/user/profilemodes/ProfileMode.java b/src/org/mxchange/jusercore/model/user/profilemodes/ProfileMode.java
deleted file mode 100644 (file)
index c71bae7..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.model.user.profilemodes;
-
-import java.io.Serializable;
-
-/**
- * User profile modes
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public enum ProfileMode implements Serializable {
-
-       /**
-        * Invisible to guests and members (not administrators)
-        */
-       INVISIBLE("PROFILE_MODE_INVISIBLE"), //NOI18N
-
-       /**
-        * Only visible to members (and administrators)
-        */
-       MEMBERS("PROFILE_MODE_MEMBERS"), //NOI18N
-
-       /**
-        * Visible to all (public in Internet)
-        */
-       PUBLIC("PROFILE_MODE_PUBLIC"); //NOI18N
-
-       /**
-        * Message key (i18n)
-        */
-       private final String messageKey;
-
-       /**
-        * Constructor with message key
-        * <p>
-        * @param messageKey Message key
-        */
-       private ProfileMode (final String messageKey) {
-               this.messageKey = messageKey;
-       }
-
-       /**
-        * Getter for message key (i18n)
-        * <p>
-        * @return Message key
-        */
-       public String getMessageKey () {
-               return this.messageKey;
-       }
-}
diff --git a/src/org/mxchange/jusercore/model/user/status/UserAccountStatus.java b/src/org/mxchange/jusercore/model/user/status/UserAccountStatus.java
deleted file mode 100644 (file)
index f1eb67c..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2016 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jusercore.model.user.status;
-
-import java.io.Serializable;
-
-/**
- * An enumeration for user's account status like confirmed, locked, etc.
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-public enum UserAccountStatus implements Serializable {
-
-       /**
-        * Unconfirmed (default)
-        */
-       UNCONFIRMED("USER_ACCOUNT_STATUS_UNCONFIRMED", "user_status_unconfirmed"), //NOI18N
-
-       /**
-        * Confirmed (email address validated)
-        */
-       CONFIRMED("USER_ACCOUNT_STATUS_CONFIRMED", "user_status_confirmed"), //NOI18N
-
-       /**
-        * Locked (maybe violated T&C)
-        */
-       LOCKED("USER_ACCOUNT_STATUS_LOCKED", "user_status_locked"); //NOI18N
-
-       /**
-        * Message key
-        */
-       private final String messageKey;
-
-       /**
-        * CSS style class
-        */
-       private final String styleClass;
-
-       /**
-        * Constructor with i18n translation key
-        * <p>
-        * @param messageKey  Message key (i18n)
-        * @param styleClass CSS style class
-        */
-       private UserAccountStatus (final String messageKey, final String styleClass) {
-               // Set it here
-               this.messageKey = messageKey;
-               this.styleClass = styleClass;
-       }
-
-       /**
-        * Getter for message key
-        * <p>
-        * @return Message key (i18n)
-        */
-       public String getMessageKey () {
-               return this.messageKey;
-       }
-
-       /**
-        * Getter for CSS style class
-        * <p>
-        * @return CSS style class
-        */
-       public String getStyleClass () {
-               return this.styleClass;
-       }
-
-}