From a43b396386c91f3b90c66731fa032f5b1574334a Mon Sep 17 00:00:00 2001 From: Roland Haeder 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: - - + + + - - - + + + - - - - - - - - + + + + + + + - - + + + - 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 @@ PizzaService-ejb 1.6.5 - 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 -- 2.39.5