From a43b396386c91f3b90c66731fa032f5b1574334a Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 19 Feb 2016 17:12:45 +0100
Subject: [PATCH] Fixed dependencies (huh?)
---
PizzaService-ejb/nbproject/build-impl.xml | 32 +++++++++----------
.../nbproject/genfiles.properties | 6 ++--
PizzaService-ejb/nbproject/project.properties | 12 +++----
PizzaService-ejb/nbproject/project.xml | 6 ++--
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml
index 79e5a28..b6fa76c 100644
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@ -826,44 +826,44 @@ exists or setup the property manually. For example like this:
</target>
<target depends="compile,-library-inclusion-in-archive-weblogic,-library-inclusion-in-archive-by-user" name="library-inclusion-in-archive"/>
<target if="is.jars.in.ejbjar" name="-library-inclusion-in-archive-by-user">
- <copyfiles files="${file.reference.jcoreee.jar}" todir="${build.classes.dir}"/>
- <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.jcoreee.jar}" todir="${build.classes.dir}"/>
+ <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${build.classes.dir}"/>
+ <copyfiles files="${reference.PizzaService-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="${reference.PizzaService-lib.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
</target>
<target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
- <basename file="${file.reference.jcoreee.jar}" property="manifest.file.reference.jcoreee.jar"/>
- <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.jcoreee.jar}" property="manifest.file.reference.jcoreee.jar"/>
+ <basename file="${file.reference.jcore-logger-lib.jar}" property="manifest.file.reference.jcore-logger-lib.jar"/>
+ <basename file="${reference.PizzaService-lib.jar}" property="manifest.reference.PizzaService-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="${reference.PizzaService-lib.jar}" property="manifest.reference.PizzaService-lib.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 "/>
- <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.jshop-core.jar}"/>
- <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
- <attribute name="jar-7-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
+ <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
+ <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcountry-lib.jar}"/>
+ <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
+ <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
+ <attribute name="jar-5-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
+ <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
+ <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
<attribute name="jar-8-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
</manifest>
</target>
<target depends="compile" name="library-inclusion-in-manifest">
- <copyfiles files="${file.reference.jcoreee.jar}" todir="${dist.ear.dir}/lib"/>
- <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.jcoreee.jar}" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${reference.PizzaService-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="${reference.PizzaService-lib.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
<manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
</target>
diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties
index 084f710..b0a3d1a 100644
--- a/PizzaService-ejb/nbproject/genfiles.properties
+++ b/PizzaService-ejb/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ 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.
# 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=b7f399f9
-nbproject/build-impl.xml.script.CRC32=dcb101ec
-nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.51.1
+nbproject/build-impl.xml.data.CRC32=3f3880db
+nbproject/build-impl.xml.script.CRC32=53812a0a
+nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1
diff --git a/PizzaService-ejb/nbproject/project.properties b/PizzaService-ejb/nbproject/project.properties
index 7da2801..d37b176 100644
--- a/PizzaService-ejb/nbproject/project.properties
+++ b/PizzaService-ejb/nbproject/project.properties
@@ -43,20 +43,20 @@ jar.compress=false
jar.name=PizzaService-ejb.jar
jars.in.ejbjar=true
javac.classpath=\
- ${file.reference.jcoreee.jar}:\
- ${file.reference.jcore-logger-lib.jar}:\
${file.reference.jcountry-core.jar}:\
${file.reference.jcountry-lib.jar}:\
+ ${file.reference.jcoreee.jar}:\
+ ${file.reference.jcore-logger-lib.jar}:\
+ ${reference.PizzaService-lib.jar}:\
${file.reference.jshop-core.jar}:\
${file.reference.jshop-ee-lib.jar}:\
- ${reference.PizzaService-lib.jar}:\
${file.reference.cdi-api.jar}
javac.debug=true
javac.deprecation=true
javac.processorpath=\
${javac.classpath}
-javac.source=1.7
-javac.target=1.7
+javac.source=1.8
+javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
@@ -78,7 +78,7 @@ meta.inf.excludes=sun-cmp-mappings.xml
platform.active=default_platform
project.license=gpl30
project.pizzaservice-lib=../../pizzaservice-lib
-project.PizzaService-lib=../../pizzaservice-lib
+project.PizzaService-lib=../../../public_html/pizzaservice-lib
reference.PizzaService-lib.jar=${project.PizzaService-lib}/dist/PizzaService-lib.jar
resource.dir=setup
run.test.classpath=\
diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml
index aec4efa..ea2fe4e 100644
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -5,13 +5,13 @@
<data xmlns="http://www.netbeans.org/ns/j2ee-ejbjarproject/3">
<name>PizzaService-ejb</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
- <included-library dirs="200">file.reference.jcoreee.jar</included-library>
- <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.jcoreee.jar</included-library>
+ <included-library dirs="200">file.reference.jcore-logger-lib.jar</included-library>
+ <included-library dirs="200">reference.PizzaService-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">reference.PizzaService-lib.jar</included-library>
<included-library dirs="200">file.reference.cdi-api.jar</included-library>
<source-roots>
<root id="src.dir"/>
--
2.39.5