From 92bf37bbbe93088e5451d7f6a1611a84b5684366 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Fri, 9 Jun 2017 22:46:22 +0200 Subject: [PATCH] Don't cherry-pick: - added missing jars for business contacts - no Financials here, Addressbook is the right class prefix MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- lib/jcontacts-business-lib.jar | Bin 0 -> 1505 bytes nbproject/genfiles.properties | 2 +- nbproject/project.properties | 3 +++ nbproject/project.xml | 3 +++ ...AddressbookBusinessContactWebSessionBean.java | 8 ++++---- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 lib/jcontacts-business-lib.jar diff --git a/lib/jcontacts-business-lib.jar b/lib/jcontacts-business-lib.jar new file mode 100644 index 0000000000000000000000000000000000000000..929e5694cb8938ec4f50a7ccc2eded9d3922235c GIT binary patch literal 1505 zcmb7E-EI;=6g~qK%IYemB*w%<yfA?n*pfD}wf-#?lD5z`rD@`gW>}_l$TCZIXHDy! z@1hs_2wv!=rZ+x=58#C_(0FEP7P?SLCz=26JAX6h>}|&r8o)e2@$=6u7;9-rK(lsW zmNs|l#`zh*UI;B9bmi0UmoCCp&tVUtO><|nUTYncoAo9Y{D^t7bjVzfJK{;cQeM(E zQ;eOM18N<!Jf7j@TKTcAZMcj|)+tp_6@In6^meUMTJ>>gS5`{PYRngQU254Zzu~w8 z$E6a57j;e7Mm8>d|8dEk1ls7hUE^wmeu3zpSjSX!*%(wgjJILCk1HiCg!U{)NNP#1 z?R#7>&x?@XJj<Fa2B3OvHo1BsWn(C{g#yvTDx+eb^&QE|mQ6kH?ELFDl(h`G6l7Ac zkb*3MJ4ak}BK+#<W`{tv(CE>3)UeSxqv43|da*IXiHMwa0$T0FVgnU#F9nMP7O8DV zP#%G7p*Ym#OKuwt?n$JkTf8f%^j${a)db+_b!~aBtZ6yEYq2`FQRc&l9g|U0?i0AX z?+eNM?2voBZ8K8{M+QGg86KE@Vz6G@7={|PytrPJCiD`>i~_&g?lDUe$OT8-F<Q*! z)aLIg+CpG!hAtL{--x)o<H)+>i%$4JNdg37*yH#~VhMuzJcqj^?h-hs@MIp+xYE=; z+`xV_Sm|&J=Oo_TR#{JCxi~_uC=rOnmVrN}n!_qEEEpr|w349+s(t+M2*;2*RzSv; zPfO^49w`5XOBK5RF;s#Nn=<z=E-wXpoH{MxN7Q>HLY<cWmwk^GfD1#=_t&$9MP7R1 XgAL2U-u9e&TYR`Ad_kcPRLO&X%5a89 literal 0 HcmV?d00001 diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index f1e9f3a6..d13cdb5d 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=be5f34f7 build.xml.stylesheet.CRC32=651128d4@1.68.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=25847443 +nbproject/build-impl.xml.data.CRC32=1292f65c nbproject/build-impl.xml.script.CRC32=b9d55450 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index f0a373be..fb9b71c9 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -42,6 +42,7 @@ file.reference.jaddressbook-lib.jar=lib/jaddressbook-lib.jar file.reference.jaddressbook-share-core.jar=lib/jaddressbook-share-core.jar file.reference.jaddressbook-share-lib.jar=lib/jaddressbook-share-lib.jar file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar +file.reference.jcontacts-business-lib.jar=lib/jcontacts-business-lib.jar file.reference.jcontacts-core.jar=lib/jcontacts-core.jar file.reference.jcontacts-lib.jar=lib/jcontacts-lib.jar file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar @@ -74,6 +75,7 @@ javac.classpath=\ ${file.reference.jcountry-lib.jar}:\ ${file.reference.jcontacts-core.jar}:\ ${file.reference.jcontacts-business-core.jar}:\ + ${file.reference.jcontacts-business-lib.jar}:\ ${file.reference.jcontacts-lib.jar}:\ ${file.reference.jphone-core.jar}:\ ${file.reference.jphone-lib.jar}:\ @@ -141,6 +143,7 @@ source.reference.jaddressbook-lib.jar=../jaddressbook-lib/src/ source.reference.jaddressbook-share-core.jar=../jaddressbook-share-core/src source.reference.jaddressbook-share-lib.jar=../jaddressbook-share-lib/src source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/ +source.reference.jcontacts-business-lib.jar=../jcontacts-business-lib/src source.reference.jcontacts-core.jar=../jcontacts-core/src/ source.reference.jcontacts-lib.jar=../jcontacts-lib/src/ source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/ diff --git a/nbproject/project.xml b/nbproject/project.xml index 4d9d8bb4..6f564f36 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -24,6 +24,9 @@ <library dirs="200"> <file>${file.reference.jcontacts-business-core.jar}</file> </library> + <library dirs="200"> + <file>${file.reference.jcontacts-business-lib.jar}</file> + </library> <library dirs="200"> <file>${file.reference.jcontacts-lib.jar}</file> </library> diff --git a/src/java/org/mxchange/addressbook/beans/businesscontact/AddressbookBusinessContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/businesscontact/AddressbookBusinessContactWebSessionBean.java index aeb8d454..334d73cd 100644 --- a/src/java/org/mxchange/addressbook/beans/businesscontact/AddressbookBusinessContactWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/businesscontact/AddressbookBusinessContactWebSessionBean.java @@ -26,10 +26,10 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; +import org.mxchange.addressbook.beans.BaseAddressbookController; +import org.mxchange.addressbook.beans.login.user.AddressbookUserLoginWebSessionController; import org.mxchange.jcontactsbusiness.BusinessContact; import org.mxchange.jcontactsbusiness.BusinessContactSessionBeanRemote; -import org.mxchange.jfinancials.beans.BaseFinancialsController; -import org.mxchange.jfinancials.beans.login.user.FinancialsUserLoginWebSessionController; /** * A business contact bean (controller) @@ -38,7 +38,7 @@ import org.mxchange.jfinancials.beans.login.user.FinancialsUserLoginWebSessionCo */ @Named ("businessContactController") @SessionScoped -public class AddressbookBusinessContactWebSessionBean extends BaseFinancialsController implements AddressbookBusinessContactWebSessionController { +public class AddressbookBusinessContactWebSessionBean extends BaseAddressbookController implements AddressbookBusinessContactWebSessionController { /** * Serial number @@ -59,7 +59,7 @@ public class AddressbookBusinessContactWebSessionBean extends BaseFinancialsCont * User instance */ @Inject - private FinancialsUserLoginWebSessionController userLoginController; + private AddressbookUserLoginWebSessionController userLoginController; /** * Constructor -- 2.39.5