From 09aa5c4298f168a73d2330ad7bc08875cecc1b40 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 13 Apr 2017 13:57:28 +0200 Subject: [PATCH] this project was based on addressbook-ejb and doesn't need jaddressbook and jcontacts-business-core MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- build.xml | 4 +-- lib/jaddressbook-core.jar | Bin 34220 -> 0 bytes lib/jaddressbook-lib.jar | Bin 4337 -> 0 bytes lib/jcontacts-business-core.jar | Bin 78466 -> 0 bytes nbproject/build-impl.xml | 54 +++++++++++++------------------- nbproject/project.properties | 37 +++++++++------------- nbproject/project.xml | 15 ++++----- src/conf/persistence.xml | 7 ++--- 8 files changed, 45 insertions(+), 72 deletions(-) delete mode 100644 lib/jaddressbook-core.jar delete mode 100644 lib/jaddressbook-lib.jar delete mode 100644 lib/jcontacts-business-core.jar diff --git a/build.xml b/build.xml index cb14d30..89ed7d3 100644 --- a/build.xml +++ b/build.xml @@ -7,8 +7,8 @@ - - Builds, tests, and runs the project addressbook-ejb. + + Builds, tests, and runs the project jfinancials-ejb. - + @@ -433,7 +433,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f - + @@ -585,7 +585,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f - + @@ -806,10 +806,10 @@ exists or setup the property manually. For example like this: COMPILATION SECTION --> - + - + @@ -817,10 +817,10 @@ exists or setup the property manually. For example like this: - + - + @@ -846,15 +846,12 @@ exists or setup the property manually. For example like this: - - - - - - + + + @@ -866,15 +863,12 @@ exists or setup the property manually. For example like this: - - - - - - + + + @@ -886,15 +880,12 @@ exists or setup the property manually. For example like this: - - - - - - + + + @@ -907,15 +898,12 @@ exists or setup the property manually. For example like this: - - - - - - + + + @@ -1300,8 +1288,8 @@ exists or setup the property manually. For example like this: CLEANUP SECTION --> - - + + diff --git a/nbproject/project.properties b/nbproject/project.properties index eb872f2..1d64f63 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -21,12 +21,9 @@ dist.jar=${dist.dir}/${jar.name} dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.addressbook-core.jar=lib/addressbook-core.jar -file.reference.addressbook-mailer.jar=lib/addressbook-mailer.jar +file.reference.jfinancials-core.jar=lib/jfinancials-core.jar +file.reference.jfinancials-mailer.jar=lib/jfinancials-mailer.jar file.reference.cdi-api.jar=lib/cdi-api.jar -file.reference.jaddressbook-core.jar=lib/jaddressbook-core.jar -file.reference.jaddressbook-lib.jar=lib/jaddressbook-lib.jar -file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.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 @@ -50,7 +47,7 @@ j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.ja j2ee.platform.wsit.classpath= j2ee.server.type=gfv3ee6 jar.compress=false -jar.name=addressbook-ejb.jar +jar.name=jfinancials-ejb.jar jars.in.ejbjar=false javac.classpath=\ ${file.reference.jcoreee.jar}:\ @@ -61,15 +58,12 @@ javac.classpath=\ ${file.reference.jphone-lib.jar}:\ ${file.reference.jcontacts-core.jar}:\ ${file.reference.jcontacts-lib.jar}:\ - ${file.reference.jcontacts-business-core.jar}:\ ${file.reference.juser-core.jar}:\ ${file.reference.juser-lib.jar}:\ - ${file.reference.jaddressbook-core.jar}:\ - ${file.reference.jaddressbook-lib.jar}:\ ${file.reference.jmailer-ee.jar}:\ - ${file.reference.addressbook-core.jar}:\ - ${reference.addressbook-lib.jar}:\ - ${reference.addressbook-mailer.jar}:\ + ${file.reference.jfinancials-core.jar}:\ + ${reference.jfinancials-lib.jar}:\ + ${reference.jfinancials-mailer.jar}:\ ${file.reference.cdi-api.jar} javac.compilerargs=-Xlint:unchecked -Xlint:deprecation javac.debug=true @@ -93,17 +87,17 @@ javadoc.private=true javadoc.splitindex=true javadoc.use=true javadoc.version=true -javadoc.windowtitle=Addressbook EJBs +javadoc.windowtitle=jfinancials EJBs meta.inf=${source.root}/conf meta.inf.excludes=sun-cmp-mappings.xml platform.active=default_platform project.juser-core=../juser-core project.license=agpl30 -project.addressbook-lib=../addressbook-lib -project.addressbook-mailer=../../NetBeansProjects/addressbook-mailer -project.serviceLocator.class=org.mxchange.addressbook.mailer.model.delivery.AddressbookMailer -reference.addressbook-lib.jar=${project.addressbook-lib}/dist/addressbook-lib.jar -reference.addressbook-mailer.jar=${project.addressbook-mailer}/dist/addressbook-mailer.jar +project.jfinancials-lib=../jfinancials-lib +project.jfinancials-mailer=../../NetBeansProjects/jfinancials-mailer +project.serviceLocator.class=org.mxchange.jfinancials.mailer.model.delivery.jfinancialsMailer +reference.jfinancials-lib.jar=${project.jfinancials-lib}/dist/jfinancials-lib.jar +reference.jfinancials-mailer.jar=${project.jfinancials-mailer}/dist/jfinancials-mailer.jar resource.dir=setup run.test.classpath=\ ${javac.test.classpath}:\ @@ -112,11 +106,8 @@ run.test.classpath=\ # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): runmain.jvmargs= source.encoding=UTF-8 -source.reference.addressbook-core.jar=../addressbook-core/src/ -source.reference.addressbook-mailer.jar=../addressbook-mailer/src/ -source.reference.jaddressbook-core.jar=../jaddressbook-core/src/ -source.reference.jaddressbook-lib.jar=../jaddressbook-lib/src/ -source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/ +source.reference.jfinancials-core.jar=../jfinancials-core/src/ +source.reference.jfinancials-mailer.jar=../jfinancials-mailer/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 adca205..cfc8d31 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -3,7 +3,7 @@ org.netbeans.modules.j2ee.ejbjarproject - addressbook-ejb + jfinancials-ejb 1.6.5 file.reference.jcoreee.jar file.reference.jcore-logger-lib.jar @@ -13,15 +13,12 @@ file.reference.jphone-lib.jar file.reference.jcontacts-core.jar file.reference.jcontacts-lib.jar - file.reference.jcontacts-business-core.jar file.reference.juser-core.jar file.reference.juser-lib.jar - file.reference.jaddressbook-core.jar - file.reference.jaddressbook-lib.jar file.reference.jmailer-ee.jar - file.reference.addressbook-core.jar - reference.addressbook-lib.jar - reference.addressbook-mailer.jar + file.reference.jfinancials-core.jar + reference.jfinancials-lib.jar + reference.jfinancials-mailer.jar file.reference.cdi-api.jar @@ -35,7 +32,7 @@ - addressbook-lib + jfinancials-lib jar jar @@ -43,7 +40,7 @@ jar - addressbook-mailer + jfinancials-mailer jar jar diff --git a/src/conf/persistence.xml b/src/conf/persistence.xml index 2fa63d1..082405f 100644 --- a/src/conf/persistence.xml +++ b/src/conf/persistence.xml @@ -1,10 +1,7 @@ - - jdbc/addressbook - org.mxchange.addressbook.model.addressbook.UserAddressbook - org.mxchange.addressbook.model.addressbook.entry.UserAddressbookEntry - org.mxchange.addressbook.model.addressbook.shared.AddressbookShare + + jdbc/jfinancials org.mxchange.jcontacts.contact.UserContact org.mxchange.jcontactsbusiness.CompanyContact org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData -- 2.39.5