]> git.mxchange.org Git - jproduct-lib.git/commitdiff
project initialized and cleaned from jshop-ee-lib, no need for jshop-core here
authorRoland Häder <roland@mxchange.org>
Sun, 6 Aug 2017 21:27:17 +0000 (23:27 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 6 Aug 2017 21:27:17 +0000 (23:27 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
build.xml
lib/jproduct-core.jar [deleted file]
nbproject/build-impl.xml
nbproject/project.properties
nbproject/project.xml
src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java [deleted file]
src/org/mxchange/jshopcore/model/receipt/ReceiptBeanRemote.java [deleted file]
src/org/mxchange/jshopcore/model/receipt/WrapableReceipt.java [deleted file]

index e1b5260c3c2dbadcb67b207b2ec1acfd9ac03125..243297758b6910645822f1fbf1ecb6fd685e611f 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="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 (file)
index 084bb0a..0000000
Binary files a/lib/jproduct-core.jar and /dev/null differ
index c0c76e76ccc7cafe83b1a63596eb25d6330f6017..0eab2ebf57f976b83c544b4105fa79023f311b37 100644 (file)
@@ -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"/>
index eccff81e5734665a15c8981e9c7823902386dc19..e25b91cad399887053fac50c4bac53a6ce92a1ec 100644 (file)
@@ -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
index 4a49af54fdaf8169846942aa36b9862ff50adcc2..dca01e6d84689dddca90dc790cf992a04be79af9 100644 (file)
@@ -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 (file)
index 05efbbd..0000000
+++ /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 (file)
index e5dd352..0000000
+++ /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 (file)
index 487d1f8..0000000
+++ /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 {
-
-}