From a70a804cf0658ee75130685dbc69452288662f44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 29 Apr 2016 15:20:35 +0200 Subject: [PATCH] Removed dependency on jcore.jar as this is not for JavaEE applications --- lib/jcore.jar | Bin 13647 -> 0 bytes nbproject/project.properties | 203 +++++++++--------- .../jusercore/model/user/UserUtils.java | 13 +- 3 files changed, 109 insertions(+), 107 deletions(-) delete mode 100644 lib/jcore.jar diff --git a/lib/jcore.jar b/lib/jcore.jar deleted file mode 100644 index c50cd351b83398151594c3a383385faebc7ec753..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13647 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 diff --git a/nbproject/project.properties b/nbproject/project.properties index 53bf939..0ebb67d 100644 --- 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 +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.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 diff --git a/src/org/mxchange/jusercore/model/user/UserUtils.java b/src/org/mxchange/jusercore/model/user/UserUtils.java index 82a041b..1cbb94d 100644 --- 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; *

* @author Roland Haeder */ -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 *

- * @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 *

* @return Whether the password matches @@ -157,7 +162,7 @@ public class UserUtils extends BaseFrameworkSystem { /** * Checks if password from container matches with from user instance. *

- * @param container Container holding user instance and unencrypted password + * @param container Container holding user instance and unencrypted password *

* @return Whether it maches */ -- 2.39.5