From 1813edb03516f12ec463096605b9c65a086695e9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Sat, 15 Apr 2017 21:10:57 +0200 Subject: [PATCH] Continued: - pizzaservice-core/mailer are now referenced as projects as they are application-specific projects and not libraries (like e.g. juser-core is) - updated jar(s) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- lib/jshop-core.jar | Bin 47889 -> 47875 bytes lib/jshop-ee-lib.jar | Bin 6340 -> 6329 bytes lib/pizzaservice-core.jar | Bin 25593 -> 0 bytes lib/pizzaservice-mailer.jar | Bin 9926 -> 0 bytes nbproject/build-impl.xml | 69 +++++++++++++++++++++++------------ nbproject/project.properties | 6 +-- nbproject/project.xml | 18 +++++++-- 7 files changed, 64 insertions(+), 29 deletions(-) delete mode 100644 lib/pizzaservice-core.jar delete mode 100644 lib/pizzaservice-mailer.jar diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar index b158fae1130460aecd0ea87662133557b48ea800..f0d098039e0b91f493ada31b419e080b0e17c867 100644 GIT binary patch delta 978 zcmbREjj8z?6K{YwGYc030|x^`%*_6Yyc*2WGy6AMBr`Dsxs&HH*@NiK519BE!Hkd0 zO3J)I5wET9Vxs$)7#R9CE2zsbO6qH9`s5d->*rP^XC&sOr|M@F6y>LsCYMY$te2de zuOTR5pn*fdLVoGZTQoc%=Kt617Ulz)pSCb5)t{At!Jl>Vh8pF`2HT`JU$c#764S<R zOQ4s;<OBy5{O;Ji-JyyJ?D|!cs(LE985k-z+c`gG6xYS!G{btU$;GbL;wCucKlaH^ zep_!jS;p-@UjI$@cUO>bz#RbMljpma;CDMH3^#{+JZ8iZ0-FQ90*%0aQ)iOOui;@} zsM)-}CW{G=-`er{YxCRs?UY38X2zxi8sIc^WR(RdO>O?asu7Z?n%DY+)6&(oevn94 zTkpV%ny4lhZ;4R=C4)_!GesJKo&jMK1_W5r_(5~>Lo?0E3OekQ<+mCz9-bVqHI^yI z3Mi;Hd4rXJc7Qh{lL#|BWg{gh1_ld+K@3Y8>n00qa|hc7PZq$WVTGbb*?F?yHvP%V zwwW`1@tf?pU1M?qJI7@H?FNhsCOd4;V7d|u6jYd8kSsd+K2XqdvcQgbM%&2+I~?Uf z-hjsm&>N_h_f5XABb6zk6X<UF$pYQNlQVZ3Fs<(ca~EiEOzIbzd~K%|<KoGTyW$xG hCMWJnWMW(al$D(PZz;!QpA}-0fA11tTfPe9S^(8HSCjw% delta 751 zcmZWlT}YEr7(VBGIaWFMiB4%rTYq!gMQzS%DAU<k6NSj`!W7oeg_R#}bQME4?PkbI zdxYvHA{2DFM9(&VKnf!0sucv@L=@cxhIQdpv%c^1GZ`ItIp=wJ-uHRWGqTCXH<{r= zr?6)qA$me?%%sK*cA;-3HSfL3@QI3e&Ki`PuQN)K5k$Tvn2s903#pFW+O?ZwjF2&I zt*@iFBzhp(EAbkQe8JvM1zE$3j?t=0Mcnkq740e`L@6&K%!-W>6MyFmGeoW&f_1`( zZof?#!nywrQ+pi#ldD7f2~ny^>k+vWn4{pw+-My-3@O-5Pa$Hk@j~z%mAzYVF;qj_ z;67uKhl+R@y1la*Ki~e1?zr)uj^+l{<#%!RN4%U6rM5R4i0XJD=4YCVwC#XGFvQLA z!P1{r3{TkwIX2|eUL`mFGo4^KF)Ly?a~3b>ME)_;Miqh|pYxQJ28Zj}%N8Y_h2-Pv zgzT?WBiTKZiC_4V4YN0=@iptft(=ESc$y1X|BH0DhfF5oK3Q(VD_=Ey`EpfUl4Xgw zKA?&BLJAmAn-h`Co9Pzb=ff=Bg%5c<x))p7=N|cKh1h!#Yl}`6=#$$l7>F9-UUIQe zzXo*}>^CY?>Pmtwv3wN!CoaTHC@wjflvF8cv<fehI(3W4vYD;kQ)%mjUXH)w!F?Ux qE<4%$6OA?E$cl^gK9k`AY)sYSt_+RS8q}j@x(4ejqAr(K{Qm+}mlA&f diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar index 1e83d3ce6bbaae734e674f9e0f12d07c5ed0c341..30f6d13515c63e60f42ad55d79b79b6b0236a349 100644 GIT binary patch delta 691 zcmX?NxYLj~z?+$ci-CcIf#JfE{)xOA%;%T%Z?wo_V&1r<fAdnNP9{Mh!z;Mrrk5TQ z0|N+qO)g+kn7n~aee!!Tw#hxLS`rBwKKVuI`neU!8Hsu6srp$3MfoYE$t9E6BqzUM z6<~*QH?c7@PX5Ks593dkV%MK+&x7D6uxEg6`><c4t%s3;0fb$lwsB4tVB?r<&nXDC zm2<K#FVAE%4iiS_$uV4tFf)NxZeGj5%_szN_3Sm4S*w6924N3|$%^7$K<9E!mgTZz zbVSxPdA+#U<k?)35-~VD0#@*tOAuxYm@mZrLd+4Xzb6aw=!scjmr7t4ot({+1a@EJ z%`(AmpdUfl8R$Myjmi7PWx;OL<#oYy<K~ULoQ&Xz*~=%z3})OCWM^as#@ys5LKdK? z+bl2K0gk)Lt3-2nQKD|LvRJkPNCYK#84zGe<1Y5eg-r6mxJ3?aA$iQOMAo!&vVwRx z*kDxuAgkHQ1NEII$kmfyi%T;t<pbKKK3QKv8EpQyTXW?$0JVUy6+$b+lEy=m3nhHn IP6>eo0cyk8B>(^b delta 531 zcmdmKc*Kx5z?+$ci-CcIf#EH4??he=<~Pi}8!fV!K=kINOr1=EK!z8y(QIxbCI$u& z_L^M4q%b+2HJmv~!)NkDHnqv~IXEXjXBC({pG^YH7H50K=nRw*pDe+y$7lm)#j>aK zf=rt4p8dX;k%6Ii@<sNkj4qQicojkVHqYk}VFW8MSDlcy9%#+_$p<*6F*-pN@K5$- z;+(vImwWOoE)nK9u*I@aG4{!Kxj>e~)UZ$H=6*i8nOkBqCy(xAH+FuY9Oq<To-(lc z%!Q(_dw>q;nS6m~I;#1b7x3~kf<3;8Pl_4LI4{V~$P5gb$v1^8zycz|9pJE;JYO^i zVje7LCQFEAE1-B0Xp1WY0xW6V$3D4`Ngfz>oWOA6m~6!<IQg`=5Lgr3+d!{-AoMUS zX<Ww%*5u2?G1*pJAFLSe2cQkkD2fmBKoxUNHsBKnnGSOG<Okx?OdI$nALO%}oFL8v Y7V?siW;!bfRINU_PePULsu0K=01>K|-v9sr diff --git a/lib/pizzaservice-core.jar b/lib/pizzaservice-core.jar deleted file mode 100644 index 5fd2b25323c4221d036f95df34d14db7a0184b51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25593 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 R1!Ech+l;96@^j?w{{g+7<G=s_ diff --git a/lib/pizzaservice-mailer.jar b/lib/pizzaservice-mailer.jar deleted file mode 100644 index 48e0bca4777a3c29038907fd3c8f26aba2b9ef79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9926 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 S^E)KS$>sDHc;&?&zWWcl#Zzqn diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 61ed7c6..4c1f755 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -806,6 +806,9 @@ exists or setup the property manually. For example like this: COMPILATION SECTION --> <target depends="init" if="no.dist.ear.dir" name="-deps-module-jar" unless="no.deps"> + <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="jar"> + <property name="deploy.on.save" value="false"/> + </ant> <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="jar"> <property name="deploy.on.save" value="false"/> </ant> @@ -817,6 +820,9 @@ exists or setup the property manually. For example like this: </ant> </target> <target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps"> + <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="jar"> + <property name="deploy.on.save" value="false"/> + </ant> <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="jar"> <property name="deploy.on.save" value="false"/> </ant> @@ -842,16 +848,20 @@ exists or setup the property manually. For example like this: <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${build.classes.dir}"/> <copyfiles files="${file.reference.jcountry-core.jar}" todir="${build.classes.dir}"/> <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${build.classes.dir}"/> - <copyfiles files="${file.reference.jphone-core.jar}" todir="${build.classes.dir}"/> - <copyfiles files="${file.reference.jphone-lib.jar}" todir="${build.classes.dir}"/> <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.classes.dir}"/> <copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${build.classes.dir}"/> <copyfiles files="${file.reference.juser-core.jar}" todir="${build.classes.dir}"/> <copyfiles files="${file.reference.juser-lib.jar}" todir="${build.classes.dir}"/> <copyfiles files="${file.reference.juser-activity-core.jar}" todir="${build.classes.dir}"/> <copyfiles files="${file.reference.juser-activity-lib.jar}" todir="${build.classes.dir}"/> + <copyfiles files="${file.reference.jcustomer-core.jar}" todir="${build.classes.dir}"/> + <copyfiles files="${file.reference.jcustomer-lib.jar}" todir="${build.classes.dir}"/> + <copyfiles files="${file.reference.jphone-core.jar}" todir="${build.classes.dir}"/> + <copyfiles files="${file.reference.jphone-lib.jar}" todir="${build.classes.dir}"/> + <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.classes.dir}"/> + <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${build.classes.dir}"/> <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${build.classes.dir}"/> - <copyfiles files="${file.reference.pizzaservice-core.jar}" todir="${build.classes.dir}"/> + <copyfiles files="${reference.pizzaservice-core.jar}" todir="${build.classes.dir}"/> <copyfiles files="${reference.pizzaservice-lib.jar}" todir="${build.classes.dir}"/> <copyfiles files="${reference.pizzaservice-mailer.jar}" todir="${build.classes.dir}"/> <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/> @@ -861,38 +871,46 @@ exists or setup the property manually. For example like this: <basename file="${file.reference.jcore-logger-lib.jar}" property="manifest.file.reference.jcore-logger-lib.jar"/> <basename file="${file.reference.jcountry-core.jar}" property="manifest.file.reference.jcountry-core.jar"/> <basename file="${file.reference.jcountry-lib.jar}" property="manifest.file.reference.jcountry-lib.jar"/> - <basename file="${file.reference.jphone-core.jar}" property="manifest.file.reference.jphone-core.jar"/> - <basename file="${file.reference.jphone-lib.jar}" property="manifest.file.reference.jphone-lib.jar"/> <basename file="${file.reference.jcontacts-core.jar}" property="manifest.file.reference.jcontacts-core.jar"/> <basename file="${file.reference.jcontacts-lib.jar}" property="manifest.file.reference.jcontacts-lib.jar"/> <basename file="${file.reference.juser-core.jar}" property="manifest.file.reference.juser-core.jar"/> <basename file="${file.reference.juser-lib.jar}" property="manifest.file.reference.juser-lib.jar"/> <basename file="${file.reference.juser-activity-core.jar}" property="manifest.file.reference.juser-activity-core.jar"/> <basename file="${file.reference.juser-activity-lib.jar}" property="manifest.file.reference.juser-activity-lib.jar"/> + <basename file="${file.reference.jcustomer-core.jar}" property="manifest.file.reference.jcustomer-core.jar"/> + <basename file="${file.reference.jcustomer-lib.jar}" property="manifest.file.reference.jcustomer-lib.jar"/> + <basename file="${file.reference.jphone-core.jar}" property="manifest.file.reference.jphone-core.jar"/> + <basename file="${file.reference.jphone-lib.jar}" property="manifest.file.reference.jphone-lib.jar"/> + <basename file="${file.reference.jshop-core.jar}" property="manifest.file.reference.jshop-core.jar"/> + <basename file="${file.reference.jshop-ee-lib.jar}" property="manifest.file.reference.jshop-ee-lib.jar"/> <basename file="${file.reference.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.jar"/> - <basename file="${file.reference.pizzaservice-core.jar}" property="manifest.file.reference.pizzaservice-core.jar"/> + <basename file="${reference.pizzaservice-core.jar}" property="manifest.reference.pizzaservice-core.jar"/> <basename file="${reference.pizzaservice-lib.jar}" property="manifest.reference.pizzaservice-lib.jar"/> <basename file="${reference.pizzaservice-mailer.jar}" property="manifest.reference.pizzaservice-mailer.jar"/> <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/> <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"> - <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 "/> + <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 jar-18 jar-19 jar-20 jar-21 "/> <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/> <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/> <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/> <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jcountry-lib.jar}"/> - <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/> - <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/> - <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/> - <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.jcontacts-lib.jar}"/> - <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/> - <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/> - <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.juser-activity-core.jar}"/> - <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.juser-activity-lib.jar}"/> - <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/> - <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.pizzaservice-core.jar}"/> - <attribute name="jar-15-Extension-Name" value="${manifest.reference.pizzaservice-lib.jar}"/> - <attribute name="jar-16-Extension-Name" value="${manifest.reference.pizzaservice-mailer.jar}"/> - <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/> + <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/> + <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jcontacts-lib.jar}"/> + <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/> + <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/> + <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.juser-activity-core.jar}"/> + <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.juser-activity-lib.jar}"/> + <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.jcustomer-core.jar}"/> + <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.jcustomer-lib.jar}"/> + <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/> + <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/> + <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/> + <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/> + <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/> + <attribute name="jar-18-Extension-Name" value="${manifest.reference.pizzaservice-core.jar}"/> + <attribute name="jar-19-Extension-Name" value="${manifest.reference.pizzaservice-lib.jar}"/> + <attribute name="jar-20-Extension-Name" value="${manifest.reference.pizzaservice-mailer.jar}"/> + <attribute name="jar-21-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/> </manifest> </target> <target depends="compile" name="library-inclusion-in-manifest"> @@ -900,16 +918,20 @@ exists or setup the property manually. For example like this: <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.jcountry-core.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${dist.ear.dir}/lib"/> - <copyfiles files="${file.reference.jphone-core.jar}" todir="${dist.ear.dir}/lib"/> - <copyfiles files="${file.reference.jphone-lib.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.juser-core.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.juser-lib.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.juser-activity-core.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.juser-activity-lib.jar}" todir="${dist.ear.dir}/lib"/> + <copyfiles files="${file.reference.jcustomer-core.jar}" todir="${dist.ear.dir}/lib"/> + <copyfiles files="${file.reference.jcustomer-lib.jar}" todir="${dist.ear.dir}/lib"/> + <copyfiles files="${file.reference.jphone-core.jar}" todir="${dist.ear.dir}/lib"/> + <copyfiles files="${file.reference.jphone-lib.jar}" todir="${dist.ear.dir}/lib"/> + <copyfiles files="${file.reference.jshop-core.jar}" todir="${dist.ear.dir}/lib"/> + <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${dist.ear.dir}/lib"/> - <copyfiles files="${file.reference.pizzaservice-core.jar}" todir="${dist.ear.dir}/lib"/> + <copyfiles files="${reference.pizzaservice-core.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${reference.pizzaservice-lib.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${reference.pizzaservice-mailer.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/> @@ -1296,6 +1318,7 @@ exists or setup the property manually. For example like this: CLEANUP SECTION --> <target depends="init" name="deps-clean" unless="no.deps"> + <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="clean"/> <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="clean"/> <ant antfile="${project.pizzaservice-mailer}/build.xml" inheritall="false" target="clean"/> <ant antfile="${project.juser-core}/build.xml" inheritall="false" target="clean"/> diff --git a/nbproject/project.properties b/nbproject/project.properties index 769ed07..9cdbf0b 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -39,7 +39,6 @@ file.reference.juser-core.jar=lib/juser-core.jar file.reference.juser-lib.jar=lib/juser-lib.jar file.reference.juser-activity-core.jar=lib/juser-activity-core.jar file.reference.juser-activity-lib.jar=lib/juser-activity-lib.jar -file.reference.pizzaservice-core.jar=lib/pizzaservice-core.jar file.reference.pizzaservice-mailer.jar=lib/pizzaservice-mailer.jar includes=** j2ee.compile.on.save=true @@ -73,7 +72,7 @@ javac.classpath=\ ${file.reference.jshop-core.jar}:\ ${file.reference.jshop-ee-lib.jar}:\ ${file.reference.jmailer-ee.jar}:\ - ${file.reference.pizzaservice-core.jar}:\ + ${reference.pizzaservice-core.jar}:\ ${reference.pizzaservice-lib.jar}:\ ${reference.pizzaservice-mailer.jar}:\ ${file.reference.cdi-api.jar} @@ -105,10 +104,12 @@ meta.inf=${source.root}/conf meta.inf.excludes=sun-cmp-mappings.xml platform.active=default_platform project.license=agpl30 +project.pizzaservice-core=../../NetBeansProjects/pizzaservice-core project.pizzaservice-lib=../pizzaservice-lib project.pizzaservice-mailer=../../NetBeansProjects/pizzaservice-mailer project.serviceLocator.class=org.mxchange.pizzaapplication.mailer.model.delivery.PizzaMailer project.juser-core=../juser-core +reference.pizzaservice-core.jar=${project.pizzaservice-core}/dist/pizzaservice-core.jar reference.pizzaservice-lib.jar=${project.pizzaservice-lib}/dist/pizzaservice-lib.jar reference.pizzaservice-mailer.jar=${project.pizzaservice-mailer}/dist/pizzaservice-mailer.jar resource.dir=setup @@ -136,7 +137,6 @@ source.reference.juser-core.jar=../juser-core/src/ source.reference.juser-lib.jar=../juser-lib/src/ source.reference.juser-activity-core.jar=../juser-activity-core/src/ source.reference.juser-activity-lib.jar=../juser-activity-lib/src/ -source.reference.pizzaservice-core.jar=../pizzaservice-core/src/ source.reference.pizzaservice-mailer.jar=../pizzaservice-mailer/src/ source.root=src src.dir=${source.root}/java diff --git a/nbproject/project.xml b/nbproject/project.xml index d451355..3282b42 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -9,16 +9,20 @@ <included-library dirs="200">file.reference.jcore-logger-lib.jar</included-library> <included-library dirs="200">file.reference.jcountry-core.jar</included-library> <included-library dirs="200">file.reference.jcountry-lib.jar</included-library> - <included-library dirs="200">file.reference.jphone-core.jar</included-library> - <included-library dirs="200">file.reference.jphone-lib.jar</included-library> <included-library dirs="200">file.reference.jcontacts-core.jar</included-library> <included-library dirs="200">file.reference.jcontacts-lib.jar</included-library> <included-library dirs="200">file.reference.juser-core.jar</included-library> <included-library dirs="200">file.reference.juser-lib.jar</included-library> <included-library dirs="200">file.reference.juser-activity-core.jar</included-library> <included-library dirs="200">file.reference.juser-activity-lib.jar</included-library> + <included-library dirs="200">file.reference.jcustomer-core.jar</included-library> + <included-library dirs="200">file.reference.jcustomer-lib.jar</included-library> + <included-library dirs="200">file.reference.jphone-core.jar</included-library> + <included-library dirs="200">file.reference.jphone-lib.jar</included-library> + <included-library dirs="200">file.reference.jshop-core.jar</included-library> + <included-library dirs="200">file.reference.jshop-ee-lib.jar</included-library> <included-library dirs="200">file.reference.jmailer-ee.jar</included-library> - <included-library dirs="200">file.reference.pizzaservice-core.jar</included-library> + <included-library dirs="200">reference.pizzaservice-core.jar</included-library> <included-library dirs="200">reference.pizzaservice-lib.jar</included-library> <included-library dirs="200">reference.pizzaservice-mailer.jar</included-library> <included-library dirs="200">file.reference.cdi-api.jar</included-library> @@ -33,6 +37,14 @@ <definitions>./lib/nblibraries.properties</definitions> </libraries> <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> + <reference> + <foreign-project>pizzaservice-core</foreign-project> + <artifact-type>jar</artifact-type> + <script>build.xml</script> + <target>jar</target> + <clean-target>clean</clean-target> + <id>jar</id> + </reference> <reference> <foreign-project>pizzaservice-lib</foreign-project> <artifact-type>jar</artifact-type> -- 2.39.5