From e63eecc2d76ca192a269844ef246b1ac7a696361 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 17 Aug 2015 18:45:59 +0200 Subject: [PATCH] =?utf8?q?Added=20div=20for=20header=20Signed-off-by:Rolan?= =?utf8?q?d=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nbproject/build-impl.xml | 7 +- nbproject/build-impl.xml~ | 1472 +++++++++++++++++++++++++++++++++ nbproject/genfiles.properties | 6 +- web/admin/category.jsp | 6 +- web/admin/index.jsp | 6 +- web/admin/product.jsp | 6 +- web/bye.jsp | 6 +- web/customer/login.jsp | 6 +- web/customer/lost_passwd.jsp | 6 +- web/customer/register.jsp | 6 +- web/errorHandler.jsp | 6 +- web/finished.jsp | 6 +- web/index.jsp | 6 +- web/preview.jsp | 6 +- web/privacy.jsp | 6 +- web/terms.jsp | 6 +- 16 files changed, 1532 insertions(+), 31 deletions(-) create mode 100644 nbproject/build-impl.xml~ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 3c7d63ea..f6e8b2bb 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -877,7 +877,9 @@ exists or setup the property manually. For example like this: - + + + @@ -1444,6 +1446,7 @@ exists or setup the property manually. For example like this: CLEANUP SECTION --> + @@ -1467,6 +1470,6 @@ exists or setup the property manually. For example like this: - + diff --git a/nbproject/build-impl.xml~ b/nbproject/build-impl.xml~ new file mode 100644 index 00000000..3c7d63ea --- /dev/null +++ b/nbproject/build-impl.xml~ @@ -0,0 +1,1472 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set test.src.dir + Must set build.dir + Must set build.web.dir + Must set build.generated.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.war + + + + + + + + + +The Java EE server classpath is not correctly set up - server home directory is missing. +Either open the project in the IDE and assign the server or setup the server classpath manually. +For example like this: + ant -Dj2ee.server.home=<app_server_installation_directory> + + +The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. +Either open the project in the IDE and assign the server or setup the server classpath manually. +For example like this: + ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) +or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +The libs.CopyLibs.classpath property is not set up. +This property must point to +org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part +of NetBeans IDE installation and is usually located at +<netbeans_installation>/java<version>/ant/extra folder. +Either open the project in the IDE and make sure CopyLibs library +exists or setup the property manually. For example like this: + ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.jsp.includes + + + + + + + + + + + + + + + + + + + + + + + + + + Must select a file in the IDE or set jsp.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. + + + Launching ${browse.url} + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 83606fbe..4420a8f4 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=ec514056 +build.xml.data.CRC32=948b49d3 build.xml.script.CRC32=a6f5a733 build.xml.stylesheet.CRC32=651128d4@1.68.1.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=ec514056 -nbproject/build-impl.xml.script.CRC32=ea019def +nbproject/build-impl.xml.data.CRC32=948b49d3 +nbproject/build-impl.xml.script.CRC32=4bfe912f nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1 diff --git a/web/admin/category.jsp b/web/admin/category.jsp index ab96eedf..1419c92a 100644 --- a/web/admin/category.jsp +++ b/web/admin/category.jsp @@ -26,8 +26,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Kategorien

+ diff --git a/web/admin/index.jsp b/web/admin/index.jsp index b027fcb0..d1dafc5a 100644 --- a/web/admin/index.jsp +++ b/web/admin/index.jsp @@ -25,8 +25,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Administration

+ diff --git a/web/admin/product.jsp b/web/admin/product.jsp index 78182e99..92b7dd56 100644 --- a/web/admin/product.jsp +++ b/web/admin/product.jsp @@ -28,8 +28,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Produkte

+ diff --git a/web/bye.jsp b/web/bye.jsp index 1ee657b7..dc9df94f 100644 --- a/web/bye.jsp +++ b/web/bye.jsp @@ -16,8 +16,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Sitzung beenden

+ diff --git a/web/customer/login.jsp b/web/customer/login.jsp index df9e43ad..8a3ecb05 100644 --- a/web/customer/login.jsp +++ b/web/customer/login.jsp @@ -16,8 +16,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Einloggen

+ diff --git a/web/customer/lost_passwd.jsp b/web/customer/lost_passwd.jsp index e72ca385..d726dc07 100644 --- a/web/customer/lost_passwd.jsp +++ b/web/customer/lost_passwd.jsp @@ -16,8 +16,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Passwort vergessen

+ diff --git a/web/customer/register.jsp b/web/customer/register.jsp index 84c841dc..6f2cb057 100644 --- a/web/customer/register.jsp +++ b/web/customer/register.jsp @@ -17,8 +17,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Neukunde

+ diff --git a/web/errorHandler.jsp b/web/errorHandler.jsp index b193277b..5cb88450 100644 --- a/web/errorHandler.jsp +++ b/web/errorHandler.jsp @@ -20,8 +20,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Fehler

+ diff --git a/web/finished.jsp b/web/finished.jsp index 42715efb..26d3b050 100644 --- a/web/finished.jsp +++ b/web/finished.jsp @@ -31,8 +31,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Vielen Dank!

+ diff --git a/web/index.jsp b/web/index.jsp index ee2e596f..0da8453c 100644 --- a/web/index.jsp +++ b/web/index.jsp @@ -25,8 +25,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Eingangsseite

+ diff --git a/web/preview.jsp b/web/preview.jsp index 495e14d5..bd670ba3 100644 --- a/web/preview.jsp +++ b/web/preview.jsp @@ -31,8 +31,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Bestellung anzeigen

+ diff --git a/web/privacy.jsp b/web/privacy.jsp index 2471b06c..fa5d2d61 100644 --- a/web/privacy.jsp +++ b/web/privacy.jsp @@ -17,8 +17,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Datenschutzbestimmungen

+ diff --git a/web/terms.jsp b/web/terms.jsp index f3025a19..fb66a003 100644 --- a/web/terms.jsp +++ b/web/terms.jsp @@ -17,8 +17,10 @@ -
-

<%=PizzaServiceApplication.MAIN_TITLE%> - Allgemeine Geschäftsbedingungen

+ -- 2.39.5