Initial changes

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 2ac99945602b5738975db58eca9b3f3198b9a670..8b76c5361ba146fafb622b97979db4afdfa167e4 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -42,18 +42,43 @@ is divided into following sections:
         <property file="nbproject/private/configs/${config}.properties"/>
         <property file="nbproject/private/private.properties"/>
     </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
+    <target name="-pre-init-libraries">
+        <property location=".\lib\nblibraries.properties" name="libraries.path"/>
+        <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
+        <pathconvert dirsep="/" property="libraries.dir">
+            <path path="${libraries.dir.nativedirsep}"/>
+        </pathconvert>
+        <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>
+        <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>
+    </target>
+    <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">
+            <filterchain>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
+                <escapeunicode/>
+            </filterchain>
+        </loadproperties>
+    </target>
+    <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">
+            <filterchain>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
+                <escapeunicode/>
+            </filterchain>
+        </loadproperties>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
         <property name="default.javac.source" value="1.4"/>
         <property name="default.javac.target" value="1.4"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
         <property file="nbproject/project.properties"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
         <property name="platform.java" value="${java.home}/bin/java"/>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
@@ -222,7 +247,7 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
         <fail unless="src.dir">Must set src.dir</fail>
         <fail unless="test.src.dir">Must set test.src.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
@@ -875,7 +900,7 @@ is divided into following sections:
     <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
         <property name="ap.cmd.line.internal" value=""/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
     <!--
                 ===================
                 COMPILATION SECTION

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index a1eeaabfbd0d39b2893a7793326466fd89a91ddd..46dc8cf295279e9d309f90906333b7453accb3f4 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=99b67310
+build.xml.data.CRC32=f0670d99
 build.xml.script.CRC32=c005ff3b
 build.xml.stylesheet.CRC32=8064a381@1.75.2.48
 # 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=99b67310
-nbproject/build-impl.xml.script.CRC32=6ad262f1
+nbproject/build-impl.xml.data.CRC32=f0670d99
+nbproject/build-impl.xml.script.CRC32=ba48679e
 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

diff --git a/nbproject/project.properties b/nbproject/project.properties
index ddf607c42ec475e9bb5e817e88c24d6a7ecce4c8..b86092208ab963170b650ad6a4d8e628efcd7ab1 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,9 +1,11 @@
 annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processor.options=
+annotation.processing.enabled.in.editor=true
 annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=PizzaService-lib
+application.vendor=Roland Haeder
+auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -26,13 +28,27 @@ dist.archive.excludes=
 dist.dir=dist
 dist.jar=${dist.dir}/PizzaService-lib.jar
 dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
 excludes=
+file.reference.cdi-api.jar=lib\\cdi-api.jar
+file.reference.jcore.jar=lib\\jcore.jar
+file.reference.jsfcore.jar=lib\\jsfcore.jar
+file.reference.jshop.jar=lib\\jshop.jar
+file.reference.log4j-api-2.3.jar=lib\\log4j-api-2.3.jar
+file.reference.log4j-core-2.3.jar=lib\\log4j-core-2.3.jar
 includes=**
 jar.compress=false
-javac.classpath=
+javac.classpath=\
+    ${file.reference.jcore.jar}:\
+    ${file.reference.jsfcore.jar}:\
+    ${file.reference.jshop.jar}:\
+    ${libs.javaee-api-7.0.classpath}:\
+    ${file.reference.log4j-api-2.3.jar}:\
+    ${file.reference.log4j-core-2.3.jar}:\
+    ${file.reference.cdi-api.jar}
 # Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
+javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
+javac.deprecation=true
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.7
@@ -43,19 +59,20 @@ javac.test.classpath=\
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
-javadoc.author=false
+javadoc.author=true
 javadoc.encoding=${source.encoding}
 javadoc.noindex=false
 javadoc.nonavbar=false
 javadoc.notree=false
-javadoc.private=false
+javadoc.private=true
 javadoc.splitindex=true
 javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
+javadoc.version=true
+javadoc.windowtitle=Pizza-Service Library
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform
+project.license=gpl30
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -67,5 +84,8 @@ run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 source.encoding=UTF-8
+source.reference.jcore.jar=../jcore/src/
+source.reference.jsfcore.jar=../jsfcore/src/
+source.reference.jshop.jar=../jshop/src/
 src.dir=src
 test.src.dir=test

diff --git a/nbproject/project.xml b/nbproject/project.xml
index e6edbad8fd5034a562fe24d1e9599beea2ef1656..c0e59c77d35d0436551b9d838c95cb5e7e81dc72 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -11,5 +11,8 @@
                 <root id="test.src.dir"/>
             </test-roots>
         </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>.\lib\nblibraries.properties</definitions>
+        </libraries>
     </configuration>
 </project>

diff --git a/src/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java b/src/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java
index 21c0e8f3dd3a02188d7e7c5dc7fa629687dfd3ba..76cedd683624a4a01e89958df7cafb2dc8fb2b8d 100644 (file)
--- a/src/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java
+++ b/src/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java
@@ -28,7 +28,6 @@ import javax.faces.FacesException;
 import javax.inject.Named;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpSession;
 import org.mxchange.jcore.exceptions.BadTokenException;
 import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException;
 import org.mxchange.jcore.exceptions.UnsupportedDatabaseBackendException;
@@ -75,18 +74,6 @@ public class PizzaServiceBean extends BaseFrameworkBean implements PizzaBean {
                this.getLogger().trace("CALLED!"); //NOI18N
        }
 
-       @Override
-       @Deprecated
-       public String getCheckedHtmlFromProduct (final Product product, final ServletRequest request, final HttpSession session) {
-               throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-       }
-
-       @Override
-       @Deprecated
-       public String getDisabledHtmlFromSession (final ServletRequest request, final HttpSession session) throws ServletException {
-               throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-       }
-
        @Override
        @PostConstruct
        public void init () throws FacesException {
@@ -242,9 +229,4 @@ public class PizzaServiceBean extends BaseFrameworkBean implements PizzaBean {
                // Deligate to app
                return this.app.generateLinkForParent(category);
        }
-
-       @Override
-       public void setValueInSession (HttpSession session, String key, Object value) {
-               throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-       }
 }