From 91f47e0c1efb762046937a9f09d179f58ae18fc5 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 13 Apr 2017 14:16:37 +0200
Subject: [PATCH] Cleanups: - moved Apache PIO to own sub-folder - removed
 double-reference of addressbook-lib
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 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
 nbproject/build-impl.xml                  |   7 -------
 nbproject/project.properties              |   6 ++----
 nbproject/project.xml                     |   8 --------
 6 files changed, 2 insertions(+), 19 deletions(-)
 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/lib/poi-3.14-20160307.jar b/lib/poi/poi-3.14-20160307.jar
similarity index 100%
rename from lib/poi-3.14-20160307.jar
rename to lib/poi/poi-3.14-20160307.jar
diff --git a/lib/poi-3.14-all-LICENSE.txt b/lib/poi/poi-3.14-all-LICENSE.txt
similarity index 100%
rename from lib/poi-3.14-all-LICENSE.txt
rename to lib/poi/poi-3.14-all-LICENSE.txt
diff --git a/lib/poi-ooxml-3.14-20160307.jar b/lib/poi/poi-ooxml-3.14-20160307.jar
similarity index 100%
rename from lib/poi-ooxml-3.14-20160307.jar
rename to lib/poi/poi-ooxml-3.14-20160307.jar
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index a6c16bf1..2f9622e5 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -881,9 +881,6 @@ exists or setup the property manually. For example like this:
         <ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
-        <ant antfile="${project.addressbook-lib-1}/build.xml" inheritall="false" target="jar">
-            <property name="deploy.on.save" value="false"/>
-        </ant>
         <ant antfile="${project.addressbook-mailer}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
@@ -892,9 +889,6 @@ exists or setup the property manually. For example like this:
         <ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
-        <ant antfile="${project.addressbook-lib-1}/build.xml" inheritall="false" target="jar">
-            <property name="deploy.on.save" value="false"/>
-        </ant>
         <ant antfile="${project.addressbook-mailer}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
@@ -1459,7 +1453,6 @@ exists or setup the property manually. For example like this:
             -->
     <target depends="init" name="deps-clean" unless="no.deps">
         <ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="clean"/>
-        <ant antfile="${project.addressbook-lib-1}/build.xml" inheritall="false" target="clean"/>
         <ant antfile="${project.addressbook-mailer}/build.xml" inheritall="false" target="clean"/>
     </target>
     <target depends="init" name="do-clean">
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 5b198aa0..83f5d30c 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -51,8 +51,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
@@ -119,10 +119,8 @@ 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.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
 resource.dir=setup
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 6e4a110f..a19c4f59 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -102,14 +102,6 @@
                 <clean-target>clean</clean-target>
                 <id>jar</id>
             </reference>
-            <reference>
-                <foreign-project>addressbook-lib-1</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>addressbook-mailer</foreign-project>
                 <artifact-type>jar</artifact-type>
-- 
2.39.5