From e6569e9e12999fe8db3488356ef1aa015c998806 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 5 Oct 2015 11:02:59 +0200
Subject: [PATCH] =?utf8?q?tried=20to=20fix=20project=20references,=20direc?=
=?utf8?q?tory=20names=20should=20be=20lower-case=20Signed-off-by:Roland?=
=?utf8?q?=20H=C3=A4der=20<roland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
PizzaService-ejb/nbproject/build-impl.xml | 18 +++++++++---------
PizzaService-ejb/nbproject/genfiles.properties | 4 ++--
PizzaService-ejb/nbproject/project.properties | 5 +++--
PizzaService-ejb/nbproject/project.xml | 6 +++---
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml
index eb6ed92..7e58e51 100644
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@ -806,12 +806,12 @@ exists or setup the property manually. For example like this:
COMPILATION SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="-deps-module-jar" unless="no.deps">
- <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="jar">
+ <ant antfile="${build.script.reference.PizzaService-lib}" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
</target>
<target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps">
- <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="jar">
+ <ant antfile="${build.script.reference.PizzaService-lib}" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
</target>
@@ -828,34 +828,34 @@ exists or setup the property manually. For example like this:
<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="${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="${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 "/>
<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.reference.PizzaService-lib.jar}"/>
- <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
- <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
+ <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
+ <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
+ <attribute name="jar-5-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
<attribute name="jar-6-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="${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>
@@ -1240,7 +1240,7 @@ exists or setup the property manually. For example like this:
CLEANUP SECTION
-->
<target depends="init" name="deps-clean" unless="no.deps">
- <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="clean"/>
+ <ant antfile="${build.script.reference.PizzaService-lib}" inheritall="false" target="clean"/>
</target>
<target depends="init" name="-do-clean">
<delete dir="${build.dir}"/>
diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties
index 71bdd51..97abcb6 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=ef7b2a36
-nbproject/build-impl.xml.script.CRC32=753c7f50
+nbproject/build-impl.xml.data.CRC32=a633ae49
+nbproject/build-impl.xml.script.CRC32=e18251c1
nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.51.1
diff --git a/PizzaService-ejb/nbproject/project.properties b/PizzaService-ejb/nbproject/project.properties
index ab5a29d..d0f659b 100644
--- a/PizzaService-ejb/nbproject/project.properties
+++ b/PizzaService-ejb/nbproject/project.properties
@@ -9,6 +9,7 @@ build.dir=build
build.ear.classes.dir=${build.dir}/classes
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
+build.script.reference.PizzaService-lib=../pizzaservice-lib/build.xml
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
debug.classpath=${javac.classpath}:${build.classes.dir}
@@ -42,9 +43,9 @@ jars.in.ejbjar=true
javac.classpath=\
${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
@@ -73,7 +74,7 @@ meta.inf.excludes=sun-cmp-mappings.xml
platform.active=default_platform
project.license=gpl30
project.pizzaservice-lib=../../pizzaservice-lib
-project.PizzaService-lib=../../../public_html/pizzaservice-lib
+project.PizzaService-lib=../../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 8174b24..53d11fb 100644
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -7,9 +7,9 @@
<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">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"/>
@@ -21,11 +21,11 @@
<libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
<definitions>lib/nblibraries.properties</definitions>
</libraries>
- <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+ <references xmlns="http://www.netbeans.org/ns/ant-project-references/2">
<reference>
<foreign-project>PizzaService-lib</foreign-project>
<artifact-type>jar</artifact-type>
- <script>build.xml</script>
+ <script>${build.script.reference.PizzaService-lib}</script>
<target>jar</target>
<clean-target>clean</clean-target>
<id>jar</id>
--
2.39.5