From b5c0ff105f7d8383ff01b5667d774d2fc97a9113 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 13 Apr 2017 14:13:24 +0200 Subject: [PATCH] Prepared jfinancials-war: - no need for jaddressbook / jcontacts-business-core - moved Apache POI to own sub-folder - removed addressbook navigation rules (still files are left) - renamed all addressbook references to jfinancials 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 lib/{ => poi}/poi-3.14-20160307.jar | Bin lib/{ => poi}/poi-3.14-all-LICENSE.txt | 0 lib/{ => poi}/poi-ooxml-3.14-20160307.jar | Bin monitor/README.txt | 6 ++-- nbproject/build-impl.xml | 24 ++++++------- nbproject/faces-config.NavData | 8 ----- nbproject/project.properties | 39 ++++++++------------- nbproject/project.xml | 23 ++++--------- web/WEB-INF/faces-config.xml | 40 ---------------------- web/WEB-INF/glassfish-web.xml | 2 +- 14 files changed, 40 insertions(+), 106 deletions(-) delete mode 100644 lib/jaddressbook-core.jar delete mode 100644 lib/jaddressbook-lib.jar delete mode 100644 lib/jcontacts-business-core.jar rename lib/{ => poi}/poi-3.14-20160307.jar (100%) rename lib/{ => poi}/poi-3.14-all-LICENSE.txt (100%) rename lib/{ => poi}/poi-ooxml-3.14-20160307.jar (100%) diff --git a/build.xml b/build.xml index c1e4ecde..80c8d64a 100644 --- a/build.xml +++ b/build.xml @@ -7,8 +7,8 @@ - - Builds, tests, and runs the project addressbook-war. + + Builds, tests, and runs the project jfinancials-war. - + @@ -495,7 +495,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f - + @@ -645,7 +645,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f - + @@ -878,24 +878,24 @@ exists or setup the property manually. For example like this: COMPILATION SECTION --> - + - + - + - + - + - + @@ -1458,9 +1458,9 @@ exists or setup the property manually. For example like this: CLEANUP SECTION --> - - - + + + diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 5e41b4bd..e6f7350b 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -8,19 +8,15 @@ - - - - @@ -30,7 +26,6 @@ - @@ -46,7 +41,6 @@ - @@ -60,13 +54,11 @@ - - diff --git a/nbproject/project.properties b/nbproject/project.properties index 5b198aa0..8435e486 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -35,12 +35,9 @@ dist.javadoc.dir=${dist.dir}/javadoc dist.war=${dist.dir}/${war.name} endorsed.classpath= excludes= -file.reference.addressbook-core.jar=lib/addressbook-core.jar +file.reference.jfinancials-core.jar=lib/jfinancials-core.jar file.reference.cdi-api.jar=lib/cdi-api.jar file.reference.gf-client.jar=lib/gf-client.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 @@ -51,8 +48,8 @@ file.reference.jphone-core.jar=lib/jphone-core.jar file.reference.jphone-lib.jar=lib/jphone-lib.jar file.reference.juser-core.jar=lib/juser-core.jar file.reference.juser-lib.jar=lib/juser-lib.jar -file.reference.poi-3.14-20160307.jar=lib/poi-3.14-20160307.jar -file.reference.poi-ooxml-3.14-20160307.jar=lib/poi-ooxml-3.14-20160307.jar +file.reference.poi-3.14-20160307.jar=lib/poi/poi-3.14-20160307.jar +file.reference.poi-ooxml-3.14-20160307.jar=lib/poi/poi-ooxml-3.14-20160307.jar includes=** j2ee.compile.on.save=true j2ee.copy.static.files.on.save=true @@ -72,17 +69,14 @@ javac.classpath=\ ${file.reference.jcountry-core.jar}:\ ${file.reference.jcountry-lib.jar}:\ ${file.reference.jcontacts-core.jar}:\ - ${file.reference.jcontacts-business-core.jar}:\ ${file.reference.jcontacts-lib.jar}:\ ${file.reference.jphone-core.jar}:\ ${file.reference.jphone-lib.jar}:\ ${file.reference.juser-core.jar}:\ ${file.reference.juser-lib.jar}:\ - ${file.reference.jaddressbook-core.jar}:\ - ${file.reference.jaddressbook-lib.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}:\ ${file.reference.gf-client.jar}:\ ${file.reference.poi-3.14-20160307.jar}:\ @@ -114,17 +108,17 @@ javadoc.reference.poi-ooxml-3.14-20160307.jar=https://poi.apache.org/apidocs/ javadoc.splitindex=true javadoc.use=true javadoc.version=true -javadoc.windowtitle=Addressbook Web Application +javadoc.windowtitle=jfinancials Web Application lib.dir=${web.docbase.dir}/WEB-INF/lib persistence.xml.dir=${conf.dir} platform.active=default_platform -project.addressbook-lib=../addressbook-lib -project.addressbook-lib-1=../../NetBeansProjects/addressbook-lib -project.addressbook-mailer=../../NetBeansProjects/addressbook-mailer +project.jfinancials-lib=../jfinancials-lib +project.jfinancials-lib-1=../../NetBeansProjects/jfinancials-lib +project.jfinancials-mailer=../../NetBeansProjects/jfinancials-mailer project.license=agpl30 -reference.addressbook-lib-1.jar=${project.addressbook-lib-1}/dist/addressbook-lib.jar -reference.addressbook-lib.jar=${project.addressbook-lib}/dist/addressbook-lib.jar -reference.addressbook-mailer.jar=${project.addressbook-mailer}/dist/addressbook-mailer.jar +reference.jfinancials-lib-1.jar=${project.jfinancials-lib-1}/dist/jfinancials-lib.jar +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}:\ @@ -133,10 +127,7 @@ 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.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.jcontacts-core.jar=../jcontacts-core/src/ source.reference.jcontacts-lib.jar=../jcontacts-lib/src/ source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/ @@ -152,6 +143,6 @@ src.dir=${source.root}/java test.src.dir=test war.content.additional= war.ear.name=${war.name} -war.name=addressbook-war.war +war.name=jfinancials-war.war web.docbase.dir=web webinf.dir=web/WEB-INF diff --git a/nbproject/project.xml b/nbproject/project.xml index 6e4a110f..8e7bad0a 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -3,7 +3,7 @@ org.netbeans.modules.web.project - addressbook-war + jfinancials-war 1.6.5 @@ -21,9 +21,6 @@ ${file.reference.jphone-core.jar} - - ${file.reference.jcontacts-business-core.jar} - ${file.reference.jphone-lib.jar} @@ -52,19 +49,13 @@ ${file.reference.jshop-ee-lib.jar} - ${file.reference.jaddressbook-core.jar} - - - ${file.reference.jaddressbook-lib.jar} - - - ${file.reference.addressbook-core.jar} + ${file.reference.jfinancials-core.jar} - ${reference.addressbook-lib.jar} + ${reference.jfinancials-lib.jar} - ${reference.addressbook-mailer.jar} + ${reference.jfinancials-mailer.jar} ${file.reference.cdi-api.jar} @@ -95,7 +86,7 @@ - addressbook-lib + jfinancials-lib jar jar @@ -103,7 +94,7 @@ jar - addressbook-lib-1 + jfinancials-lib-1 jar jar @@ -111,7 +102,7 @@ jar - addressbook-mailer + jfinancials-mailer jar jar diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index f5aaab2f..90f02c23 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -55,10 +55,6 @@ user_resend_link /guest/user/resend_link.xhtml - - login_own_addressbooks - /user/login_own_addressbooks.xhtml - login_edit_user_data /login/login_edit_user_data.xhtml @@ -155,42 +151,6 @@ /index.xhtml - - /user/login_own_addressbooks.xhtml - - user_add_addressbook - /user/login_add_addressbook.xhtml - - - user_show_addressbook - /guest/user/show_addressbook.xhtml - - - show_addressbook_entries - /guest/user/show_addressbook_entries.xhtml - - - - /guest/user/user_list.xhtml - - login_list_sharing_addressbooks - /user/login_list_sharing_addressbooks.xhtml - - - - /guest/user/show_addressbook.xhtml - - login_start_sharing_addressbook - /user/login_start_sharing_addressbook.xhtml - - - - /user/login_shared_addressbooks.xhtml - - user_show_addressbook - /guest/user/show_addressbook.xhtml - - /user/login_edit_user_data.xhtml diff --git a/web/WEB-INF/glassfish-web.xml b/web/WEB-INF/glassfish-web.xml index b56fd7b2..6497cc1a 100644 --- a/web/WEB-INF/glassfish-web.xml +++ b/web/WEB-INF/glassfish-web.xml @@ -1,7 +1,7 @@ - /addressbook-war + /jfinancials-war admin admin -- 2.39.5