From 529e402df37a88e56f587a22081a9c978c65af9d Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 5 Sep 2015 16:33:10 +0200 Subject: [PATCH] =?utf8?q?updated=20jcore.jar=20+=20jshop-core.jar=20+=20s?= =?utf8?q?ome=20other=20updates,=20e.g.=20commons=20removed=20Signed-off-b?= =?utf8?q?y:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- PizzaService-ejb/lib/jcore.jar | Bin 29196 -> 29196 bytes PizzaService-ejb/lib/jshop-core.jar | Bin 28048 -> 28048 bytes PizzaService-ejb/lib/jshop-ee-lib.jar | Bin 0 -> 7101 bytes .../nbproject/genfiles.properties | 2 +- PizzaService-ejb/nbproject/project.properties | 17 ++++++++--------- PizzaService-ejb/nbproject/project.xml | 11 +++++------ nbproject/build-impl.xml | 10 ++++++++++ nbproject/genfiles.properties | 6 +++--- nbproject/project.properties | 5 ++++- nbproject/project.xml | 12 ++++++++++++ 10 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 PizzaService-ejb/lib/jshop-ee-lib.jar diff --git a/PizzaService-ejb/lib/jcore.jar b/PizzaService-ejb/lib/jcore.jar index 512369dc27f7a8c58957c276db1d90814d7fc208..ad765c651eedef6a31b4c2d1ed677896302df52a 100644 GIT binary patch delta 434 zcmeBq!r1eKkte{LnT3mifrEizGUr4dO{Phl6V0bH0ofN6K;$P)AURoMG&LFCm$rMCwVX_5LpP5{M)MiWOWML3JPiz+xh>nt+#0a9_ zNj(A6S7f%ZfcRaCQDFIJ$`J80ssdpCJ@w;Yb;~tlz%;A&bvBUtdxp+nzOr$eG>G5r z#{w3g7&3z!#Me&HPh-%IB22qzX-9VI7 zmKTUh%W?-%>$8GE6ic=%i1N<%1yQrILqODr>S>za~%3Z~*bHXBdDe&P+=X<&tR+qFOV(LDZ#8HxMP2 z_jzD_p7~&Xi}JIHO&)wG?`X6Pc)y-1Y}=O0Fj?Gf#hUaMq?1A#jH8` z11}FZl9tJn7%f3kXBizp6hD(IhzetJ0#UP=yg<}52v3XI4x&VVa)CYTWP==b6w4=X zWOf9}e_{3nQk(5r1erl}5PKUVh`z;f1I*vTa~4cD3tZy`iAT#dvViD&O1@xmUA668 zApSE0b1+}t*0HP9r5*L%fN_kR(z#=J8AZibUCy?p~Q5FiKwx+=@jKJHrR%xJA z>7mPmMruoy{X3i zHR?CQ-yS>S8{IP*zVR}63!m#iar}Ue|Aky6p&q zO7YS?ww_o9T|K%o%7>IUMBE0IncsBamF9!J$ATxbl$PZc6~a`4b>C`>r=I^QZ_^2b z44S}u4BK@4xPeIU3O)=vK?V7Lk|yPUk*2_5&@_H0sFV&AmH#dN@DCvHy8(vu=xkF- z&9yITM^f9mBLWV5tkOg2su}xvqd->*^lE_?prY;CnB%b}xrFNn4bkBc7Zm6<7>3ns zD&rd4Fbed#K~uol^^|fzwS)C`Cp?s+ekf^JrDz&7?kE5`2lLy)ysehl34Pmb)qSsh zPhgO%OPjqtReiUXk2YbK08w=ugXUnpQluN&j=5!ZV4jmZcFVQGt`Fn-eYXF00&dfD zTersYqW9Ppp~I#XU`NJx=NXN0zuSK3Jq_eCZ@|Hl{&A_Fr6_kf|FG+Zc3V8M0~^tz z>bhPik3OJPBv=NMAhC0Zvu0~a^uKZkvOv& zo*POOQ^~M9;3Y9BKl^@54>(5;I@0bbd}W7$*^J&!=<=RB^8xS z(P8|d-KpW+S0`&saDb`V9DMoIS6@nLc)Wk8B$U#LhFM6hw=LU2p!N}E4Vr~?x`k1; z_dPeB0HdTDEq~&KNDqET2yaaqDoxRLx zdREhAP0wk%qUlo{x*&H3fs6moX?kAM=QaNY&3{qTmo$A@(^oY8s-_n-{hFp<*Yq2j z{+Xs1HGNgnKiBkJtQJHUWKo3Xrm+P~qVWIh)$*sGT=2&UldN zFQn7kdah8`Mp)g1g=TMLY$0b^ImbDw*1YPdAya61zAX|Oe=yGA4Fz;)YQ)1^JpAdr zwLzki8sU!kV^@H=cC>Yj8S@#Km@%v|J5z(!UwEYa=~bFuwb`~^9LdqNIgDgnIkQbi zp_U)XtKM7>P4AaMFMbP`x4l$gxR7trW5$N}M~V$R=X_84DdAzjts(dRBb`IU7wXtH zckK{2DhKt(=HYJx(TqLOptYmZ%cAJb=?juN?N90;*1KL5qA-S@BF@MBo~hiPX~>jl zCP!u#J>|YVbGbbg$Z*D>u2Ls}TF6{_RNFjyqD#+3#8STQ;M%i&&zLxU43W4`5gD9# z%JknV|HpM=RZ{MW<`tD$fS>2jI8%s46D8*4;EW*I^$%Bn)x(2-jZfaxK@waIRu4=3 z3!f=77$nNoVfC=+9P*WvXsTA6o^&L~|6DCr52M^2fTD_CgEU%CW^)FrV&$Xs3SA(tomFQ1yYRyMvT55neLvxoiBsMxyp+<&vuxX(w$l`%1^ zZ?+m8Y5e@ze}>|6T<0`b)fThJ*&=2Sc@{ZQKO;@8vfjUbg(_JR&kma{d-R6gMdfv* zVdKs1e;LdjI(up84gJ@d5r^)R)8?;mHplFZ_g#6!@%o>W(U7ljSqh$9rY5$nhI<{+ F{{b~)Y&ie` literal 0 HcmV?d00001 diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties index 177434f..cefb34d 100644 --- a/PizzaService-ejb/nbproject/genfiles.properties +++ b/PizzaService-ejb/nbproject/genfiles.properties @@ -1,4 +1,4 @@ -build.xml.data.CRC32=d7151c79 +build.xml.data.CRC32=b3168396 build.xml.script.CRC32=cabe2e92 build.xml.stylesheet.CRC32=5910fda3@1.51.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. diff --git a/PizzaService-ejb/nbproject/project.properties b/PizzaService-ejb/nbproject/project.properties index f1abe2e..56852b8 100644 --- a/PizzaService-ejb/nbproject/project.properties +++ b/PizzaService-ejb/nbproject/project.properties @@ -22,11 +22,10 @@ endorsed.classpath=\ ${libs.javaee-endorsed-api-6.0.classpath} excludes= file.reference.cdi-api.jar=lib/cdi-api.jar -file.reference.commons-codec-1.10.jar=lib/commons-codec-1.10.jar -file.reference.commons-lang3-3.4.jar=lib/commons-lang3-3.4.jar file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcore.jar=lib/jcore.jar file.reference.jshop-core.jar=lib/jshop-core.jar +file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar file.reference.jshop-ejb.jar=lib/jshop-ejb.jar file.reference.log4j-api-2.3.jar=lib/log4j-api-2.3.jar file.reference.log4j-core-2.3.jar=lib/log4j-core-2.3.jar @@ -47,16 +46,15 @@ jar.name=PizzaService-ejb.jar jars.in.ejbjar=false javac.classpath=\ ${reference.PizzaService-lib.jar}:\ - ${file.reference.cdi-api.jar}:\ - ${file.reference.commons-codec-1.10.jar}:\ - ${file.reference.commons-lang3-3.4.jar}:\ ${file.reference.jcore.jar}:\ + ${file.reference.jcoreee.jar}:\ + ${file.reference.jshop-core.jar}:\ + ${file.reference.jshop-ee-lib.jar}:\ + ${file.reference.jshop-ejb.jar}:\ + ${file.reference.cdi-api.jar}:\ ${file.reference.log4j-api-2.3.jar}:\ ${file.reference.log4j-core-2.3.jar}:\ - ${file.reference.log4j-web-2.3.jar}:\ - ${file.reference.jshop-core.jar}:\ - ${file.reference.jcoreee.jar}:\ - ${file.reference.jshop-ejb.jar} + ${file.reference.log4j-web-2.3.jar} javac.debug=true javac.deprecation=true javac.processorpath=\ @@ -96,6 +94,7 @@ source.encoding=UTF-8 source.reference.jcore.jar=../../jcore/src source.reference.jcoreee.jar=../../jcoreee/src/ source.reference.jshop-core.jar=../../jshop-core/src/ +source.reference.jshop-ee-lib.jar=../../jshop-ee-lib/src/ source.reference.jshop-ejb.jar=../../jshop-ejb/src/ source.root=src src.dir=${source.root}/java diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml index acb8f8b..549512d 100644 --- a/PizzaService-ejb/nbproject/project.xml +++ b/PizzaService-ejb/nbproject/project.xml @@ -6,16 +6,15 @@ PizzaService-ejb 1.6.5 reference.PizzaService-lib.jar - file.reference.cdi-api.jar - file.reference.commons-codec-1.10.jar - file.reference.commons-lang3-3.4.jar file.reference.jcore.jar + file.reference.jcoreee.jar + file.reference.jshop-core.jar + file.reference.jshop-ee-lib.jar + file.reference.jshop-ejb.jar + file.reference.cdi-api.jar file.reference.log4j-api-2.3.jar file.reference.log4j-core-2.3.jar file.reference.log4j-web-2.3.jar - file.reference.jshop-core.jar - file.reference.jcoreee.jar - file.reference.jshop-ejb.jar diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 277898f..f15258b 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -205,6 +205,10 @@ exists or setup the property manually. For example like this: + + + + @@ -218,6 +222,7 @@ exists or setup the property manually. For example like this: + @@ -295,6 +300,7 @@ exists or setup the property manually. For example like this: + @@ -623,6 +629,10 @@ exists or setup the property manually. For example like this: + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 949b84d..16a6e78 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=d066c1f0 +build.xml.data.CRC32=df8eee8a build.xml.script.CRC32=8e3e9528 build.xml.stylesheet.CRC32=a5d15b16@1.49.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=d066c1f0 -nbproject/build-impl.xml.script.CRC32=ec434f5f +nbproject/build-impl.xml.data.CRC32=df8eee8a +nbproject/build-impl.xml.script.CRC32=249f8ab6 nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.49.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index 96106b4..3811594 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -21,7 +21,8 @@ j2ee.platform.wsit.classpath= j2ee.server.type=gfv3ee6 jar.compress=false jar.content.additional=\ - ${reference.PizzaService-ejb.dist-ear} + ${reference.PizzaService-ejb.dist-ear}:\ + ${reference.jshop-ejb.dist-ear} jar.name=PizzaService.ear javac.debug=true javac.deprecation=false @@ -30,7 +31,9 @@ javac.target=1.6 meta.inf=src/conf no.dependencies=false platform.active=default_platform +project.jshop-ejb=../../MyProjects/jshop-ejb project.PizzaService-ejb=PizzaService-ejb +reference.jshop-ejb.dist-ear=${project.jshop-ejb}/dist/jshop-ejb.jar reference.PizzaService-ejb.dist-ear=${project.PizzaService-ejb}/dist/PizzaService-ejb.jar resource.dir=setup run.classpath= diff --git a/nbproject/project.xml b/nbproject/project.xml index b552f0e..6639f51 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -11,6 +11,10 @@ ${reference.PizzaService-ejb.dist-ear} / + + ${reference.jshop-ejb.dist-ear} + / + @@ -22,6 +26,14 @@ clean-ear dist-ear + + jshop-ejb + j2ee_ear_archive + + dist-ear + clean-ear + dist-ear + -- 2.39.5