From beac12aa3562e23382a1bff3f550d8fa3b597ed0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Sun, 6 Aug 2017 23:27:17 +0200 Subject: [PATCH] project initialized and cleaned from jshop-ee-lib, no need for jshop-core here MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- build.xml | 6 +- lib/jproduct-core.jar | Bin 21554 -> 0 bytes nbproject/build-impl.xml | 18 ++-- nbproject/project.properties | 13 ++- nbproject/project.xml | 4 +- .../model/basket/BasketSessionBeanRemote.java | 55 ------------ .../model/receipt/ReceiptBeanRemote.java | 78 ------------------ .../model/receipt/WrapableReceipt.java | 28 ------- 8 files changed, 19 insertions(+), 183 deletions(-) delete mode 100644 lib/jproduct-core.jar delete mode 100644 src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java delete mode 100644 src/org/mxchange/jshopcore/model/receipt/ReceiptBeanRemote.java delete mode 100644 src/org/mxchange/jshopcore/model/receipt/WrapableReceipt.java diff --git a/build.xml b/build.xml index e1b5260..2432977 100644 --- 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="jshop-ee-lib" default="default" basedir="."> - <description>Builds, tests, and runs the project jshop-ee-lib.</description> +<project name="jproduct-lib" default="default" basedir="."> + <description>Builds, tests, and runs the project jproduct-lib.</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="jshop-ee-lib-impl.jar"> + <target name="run" depends="jproduct-lib-impl.jar"> <exec dir="bin" executable="launcher.exe"> <arg file="${dist.jar}"/> </exec> diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar deleted file mode 100644 index 084bb0a15f1b45d0b44f82c72880f74a14135260..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21554 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 Iev<G07c`4%SpWb4 diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index c0c76e7..0eab2eb 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -19,7 +19,7 @@ is divided into following sections: - 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="jshop-ee-lib-impl"> +<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="jproduct-lib-impl"> <fail message="Please build using Ant 1.8.0 or higher."> <condition> <not> @@ -474,7 +474,7 @@ is divided into following sections: </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="jshop-ee-lib" testname="TestNG tests" workingDir="${work.dir}"> + <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="jproduct-lib" testname="TestNG tests" workingDir="${work.dir}"> <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> <propertyset> <propertyref prefix="test-sys-prop."/> @@ -625,7 +625,7 @@ is divided into following sections: <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}"> <isset property="test.method"/> </condition> - <condition else="-suitename jshop-ee-lib -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}"> + <condition else="-suitename jproduct-lib -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"/> @@ -917,7 +917,7 @@ is divided into following sections: <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: jshop-ee-lib was already built"/> + <echo level="warn" message="Cycle detected: jproduct-lib was already built"/> </target> <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> <mkdir dir="${build.dir}"/> @@ -929,8 +929,8 @@ is divided into following sections: </propertyfile> <antcall target="-maybe-call-dep"> <param name="call.built.properties" value="${built-jar.properties}"/> - <param location="${project.jshop-core}" name="call.subproject"/> - <param location="${project.jshop-core}/build.xml" name="call.script"/> + <param location="${project.jproduct-core}" name="call.subproject"/> + <param location="${project.jproduct-core}/build.xml" name="call.script"/> <param name="call.target" value="jar"/> <param name="transfer.built-jar.properties" value="${built-jar.properties}"/> <param name="transfer.not.archive.disabled" value="true"/> @@ -1410,7 +1410,7 @@ is divided into following sections: <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: jshop-ee-lib was already built"/> + <echo level="warn" message="Cycle detected: jproduct-lib was already built"/> </target> <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> <mkdir dir="${build.dir}"/> @@ -1422,8 +1422,8 @@ is divided into following sections: </propertyfile> <antcall target="-maybe-call-dep"> <param name="call.built.properties" value="${built-clean.properties}"/> - <param location="${project.jshop-core}" name="call.subproject"/> - <param location="${project.jshop-core}/build.xml" name="call.script"/> + <param location="${project.jproduct-core}" name="call.subproject"/> + <param location="${project.jproduct-core}/build.xml" name="call.script"/> <param name="call.target" value="clean"/> <param name="transfer.built-clean.properties" value="${built-clean.properties}"/> <param name="transfer.not.archive.disabled" value="true"/> diff --git a/nbproject/project.properties b/nbproject/project.properties index eccff81..e25b91c 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -3,7 +3,7 @@ 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=jshop-ee-lib +application.title=jproduct-lib application.vendor=Roland H\u00e4der auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml build.classes.dir=${build.dir}/classes @@ -26,13 +26,12 @@ debug.test.classpath=\ dist.archive.excludes= # This directory is removed when the project is cleaned: dist.dir=dist -dist.jar=${dist.dir}/jshop-ee-lib.jar +dist.jar=${dist.dir}/jproduct-lib.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcustomer-core.jar=lib/jcustomer-core.jar -file.reference.jproduct-core.jar=lib/jproduct-core.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=false @@ -40,8 +39,7 @@ jar.index=${jnlp.enabled} javac.classpath=\ ${file.reference.jcoreee.jar}:\ ${file.reference.jcustomer-core.jar}:\ - ${file.reference.jproduct-core.jar}:\ - ${reference.jshop-core.jar}:\ + ${reference.jproduct-core.jar}:\ ${libs.javaee-api-7.0.classpath} # Space-separated list of extra javac options javac.compilerargs= @@ -83,9 +81,9 @@ manifest.custom.permissions= meta.inf.dir=${src.dir}/META-INF mkdist.disabled=true platform.active=default_platform -project.jshop-core=../jshop-core +project.jproduct-core=../jproduct-core project.license=gpl30 -reference.jshop-core.jar=${project.jshop-core}/dist/jshop-core.jar +reference.jproduct-core.jar=${project.jproduct-core}/dist/jproduct-core.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} @@ -99,6 +97,5 @@ run.test.classpath=\ source.encoding=UTF-8 source.reference.jcoreee.jar=../jcoreee/src/ source.reference.jcustomer-core.jar=../jcustomer-core/src/ -source.reference.jproduct-core.jar=../jproduct-core/src/ src.dir=src test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml index 4a49af5..dca01e6 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -3,7 +3,7 @@ <type>org.netbeans.modules.java.j2seproject</type> <configuration> <data xmlns="http://www.netbeans.org/ns/j2se-project/3"> - <name>jshop-ee-lib</name> + <name>jproduct-lib</name> <source-roots> <root id="src.dir"/> </source-roots> @@ -16,7 +16,7 @@ </libraries> <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> <reference> - <foreign-project>jshop-core</foreign-project> + <foreign-project>jproduct-core</foreign-project> <artifact-type>jar</artifact-type> <script>build.xml</script> <target>jar</target> diff --git a/src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java b/src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java deleted file mode 100644 index 05efbbd..0000000 --- a/src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2016, 2017 Roland Häder - * - * 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.jshopcore.model.basket; - -import java.io.Serializable; -import java.util.List; -import javax.ejb.Remote; -import org.mxchange.jcustomercore.model.customer.Customer; - -/** - * An interface for a basket bean - * <p> - * @author Roland Häder<roland@mxchange.org> - */ -@Remote -public interface BasketSessionBeanRemote extends Serializable { - - /** - * Returns user's current basket, or creates an empty initial if none is - * found. - * <p> - * @return User's current basked - */ - Basket<AddableBasketItem> getCurrentBasket (); - - /** - * Clears this bean from previous usage - */ - void clear (); - - /** - * Registers the order list of tems with the customer - * <p> - * @param customer Customer instance - * @param orderedItems Ordered items list - * <p> - * @return Access key - */ - String registerItems (final Customer customer, final List<AddableBasketItem> orderedItems); - -} diff --git a/src/org/mxchange/jshopcore/model/receipt/ReceiptBeanRemote.java b/src/org/mxchange/jshopcore/model/receipt/ReceiptBeanRemote.java deleted file mode 100644 index e5dd352..0000000 --- a/src/org/mxchange/jshopcore/model/receipt/ReceiptBeanRemote.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2016, 2017 Roland Häder - * - * 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.jshopcore.model.receipt; - -import java.io.Serializable; -import javax.ejb.Remote; -import org.mxchange.jcustomercore.model.customer.Customer; - -/** - * A remote interface for official recipt creation - * <p> - * @author Roland Häder<roland@mxchange.org> - */ -@Remote -public interface ReceiptBeanRemote extends Serializable { - - /** - * Returns a wrapped PDF byte stream for given access key or null if not - * found. - * <p> - * @param accessKey Access key on the online PDF - * <p> - * @return Wrapped byte stream - */ - WrapableReceipt createReceiptFromAccessKey (final String accessKey); - - /** - * Fetches access key, if customer instance matches, else null is returned - * <p> - * @param customer Customer instance - * <p> - * @return Access key or null - */ - String fetchAccessKey (final Customer customer); - - /** - * Getter for access key - * <p> - * @return Access key - */ - String getAccessKey (); - - /** - * Setter for access key - * <p> - * @param accessKey Access key - */ - void setAccessKey (final String accessKey); - - /** - * Getter for customer instance - * <p> - * @return Customer instance - */ - Customer getCustomer (); - - /** - * Setter for customer instance - * <p> - * @param customer Customer instance - */ - void setCustomer (final Customer customer); - -} diff --git a/src/org/mxchange/jshopcore/model/receipt/WrapableReceipt.java b/src/org/mxchange/jshopcore/model/receipt/WrapableReceipt.java deleted file mode 100644 index 487d1f8..0000000 --- a/src/org/mxchange/jshopcore/model/receipt/WrapableReceipt.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2016, 2017 Roland Häder - * - * 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.jshopcore.model.receipt; - -import java.io.Serializable; - -/** - * A receipt wrapper interface. - * <p> - * @author Roland Häder<roland@mxchange.org> - */ -public interface WrapableReceipt extends Serializable { - -} -- 2.39.5