Removed dependency on jcore.jar as this is not for JavaEE applications

diff --git a/lib/jcore.jar b/lib/jcore.jar
deleted file mode 100644 (file)
index c50cd35..0000000
Binary files a/lib/jcore.jar and /dev/null differ

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 53bf939d5fdaf46529bd7c24f2f63f20fcc774cf..0ebb67d19fc7cb7395ed455852f7489226a6c831 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,103 +1,100 @@
-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.jcore.jar=lib/jcore.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.jcore.jar}:\
-    ${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.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.jcore.jar=../jcore/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-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-core.jar\r
+dist.javadoc.dir=${dist.dir}/javadoc\r
+endorsed.classpath=\r
+excludes=\r
+file.reference.commons-codec-1.10.jar=lib/commons-codec-1.10.jar\r
+file.reference.jcontacts-core.jar=lib/jcontacts-core.jar\r
+file.reference.jcoreee.jar=lib/jcoreee.jar\r
+includes=**\r
+jar.archive.disabled=${jnlp.enabled}\r
+jar.compress=false\r
+jar.index=${jnlp.enabled}\r
+javac.classpath=\\r
+    ${file.reference.jcoreee.jar}:\\r
+    ${file.reference.jcontacts-core.jar}:\\r
+    ${file.reference.commons-codec-1.10.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 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 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.jcontacts-core.jar=../jcontacts-core/src/\r
+source.reference.jcoreee.jar=../jcoreee/src/\r
+src.dir=src\r
+test.src.dir=test\r

diff --git a/src/org/mxchange/jusercore/model/user/UserUtils.java b/src/org/mxchange/jusercore/model/user/UserUtils.java
index 82a041b74892f175f4d72d71af48cde69e9f9871..1cbb94df09fea2ce6c0fa94a80a9ceaf1c53b35b 100644 (file)
--- a/src/org/mxchange/jusercore/model/user/UserUtils.java
+++ b/src/org/mxchange/jusercore/model/user/UserUtils.java
@@ -16,11 +16,11 @@
  */
 package org.mxchange.jusercore.model.user;
 
+import java.io.Serializable;
 import java.security.SecureRandom;
 import java.text.MessageFormat;
 import java.util.Random;
 import org.apache.commons.codec.digest.Crypt;
-import org.mxchange.jcore.BaseFrameworkSystem;
 import org.mxchange.jusercore.container.login.LoginContainer;
 import org.mxchange.jusercore.container.login.UserLoginContainer;
 
@@ -29,7 +29,7 @@ import org.mxchange.jusercore.container.login.UserLoginContainer;
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */
-public class UserUtils extends BaseFrameworkSystem {
+public class UserUtils implements Serializable {
 
        /**
         * Password alphabet
@@ -46,6 +46,11 @@ public class UserUtils extends BaseFrameworkSystem {
         */
        private static final Random RANDOM_NUMBER_GENERATOR;
 
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 18_356_847_120_972L;
+
        /**
         * Static initializer
         */
@@ -123,7 +128,7 @@ public class UserUtils extends BaseFrameworkSystem {
        /**
         * Checks if password from container matches the updatedUser's password
         * <p>
-        * @param container   Container holding user instance and unencrypted password
+        * @param container Container holding user instance and unencrypted password
         * @param updatedUser Updated user instance from database
         * <p>
         * @return Whether the password matches
@@ -157,7 +162,7 @@ public class UserUtils extends BaseFrameworkSystem {
        /**
         * Checks if password from container matches with from user instance.
         * <p>
-        * @param container   Container holding user instance and unencrypted password
+        * @param container Container holding user instance and unencrypted password
         * <p>
         * @return Whether it maches
         */