]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Auto-formatted whole project
authorRoland Haeder <roland@mxchange.org>
Fri, 9 Oct 2015 19:40:49 +0000 (21:40 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 9 Oct 2015 19:40:49 +0000 (21:40 +0200)
16 files changed:
nbproject/ant-deploy.xml
nbproject/build-impl.xml
nbproject/faces-config.NavData
nbproject/project.xml
src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java
src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java
src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java
src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java
src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java
web/WEB-INF/templates/basket/total_sum.tpl
web/WEB-INF/templates/guest/guest_base.tpl
web/WEB-INF/templates/guest/guest_footer.tpl
web/WEB-INF/templates/guest/guest_menu.tpl
web/errorHandler.xhtml
web/resources/css/default.css

index 2d5f8778d18757ea5ded4eea4da13ca1adc51093..3c01560598dfb6e9553a981b2c724a341cd8a592 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="-deploy-ant" basedir=".">
-    <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
-        <property file="${deploy.ant.properties.file}" />
-        <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
-        <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
-        <available file="${deploy.ant.resource.dir}" property="has.setup"/>
-        <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
-    </target>
-    
-    <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
-        <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
-        <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
-        <!-- The doctype triggers resolution which can fail -->
-        <replace file="${temp.sun.web}">
-            <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
-            <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
-        </replace>
-        <replace file="${temp.sun.web}">
-            <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
-            <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
-        </replace>
-        <xmlproperty file="${temp.sun.web}" validate="false">
-        </xmlproperty>    
-        <delete file="${temp.sun.web}"/>
-        <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
-            <isset property="sun-web-app.context-root"/>
-        </condition>
-        <condition property="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
-            <isset property="sun-web-app.context-root"/>
-        </condition>
-    </target>
-    <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
-        <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
-        <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
-        <!-- The doctype triggers resolution which can fail -->
-        <replace file="${temp.gf.web}">
-            <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
-            <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
-        </replace>
-        <replace file="${temp.gf.web}">
-            <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
-            <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
-        </replace>
-        <xmlproperty file="${temp.gf.web}" validate="false">
-        </xmlproperty>
-        <delete file="${temp.gf.web}"/>
-        <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
-            <isset property="glassfish-web-app.context-root"/>
-        </condition>
-        <condition property="deploy.context.root.argument" value="&amp;contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
-            <isset property="glassfish-web-app.context-root"/>
-        </condition>
-    </target>
-    <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
-        <property name="deploy.context.root.argument" value=""/>
-    </target>
-    <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
-        <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
-        <mkdir dir="${gfv3.resources.dir}"/>
-        <mkdir dir="${gfv3.resources.dir}/META-INF"/>
-        <copy todir="${gfv3.resources.dir}/META-INF">
-            <fileset dir="${deploy.ant.resource.dir}"/>
-        </copy>
-        <jar destfile="${deploy.ant.archive}" update="true">
-            <fileset dir="${gfv3.resources.dir}"/>
-        </jar>
-        <delete dir="${gfv3.resources.dir}"/>
-    </target>
-    <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
-        <antcall target="-deploy-without-pw"/>
-        <antcall target="-deploy-with-pw"/>
-    </target>
+       <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
+               <property file="${deploy.ant.properties.file}" />
+               <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
+               <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
+               <available file="${deploy.ant.resource.dir}" property="has.setup"/>
+               <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+               <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
+       </target>
 
-    <target name="-deploy-without-pw" unless="gfv3.password">
-        <echo message="Deploying ${deploy.ant.archive}"/>
-        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
-            dest="${gfv3.results.file}"/>
-        <delete file="${gfv3.results.file}"/>    
-    </target>
-    <target name="-deploy-with-pw" if="gfv3.password">
-        <echo message="Deploying ${deploy.ant.archive}"/>
-        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
-            dest="${gfv3.results.file}"/>
-        <delete file="${gfv3.results.file}"/>
-    </target>
-    <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
-        <antcall target="-undeploy-without-pw"/>
-        <antcall target="-undeploy-with-pw"/>
-    </target>
+       <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
+               <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
+               <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
+               <!-- The doctype triggers resolution which can fail -->
+               <replace file="${temp.sun.web}">
+                       <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
+                       <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
+               </replace>
+               <replace file="${temp.sun.web}">
+                       <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
+                       <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
+               </replace>
+               <xmlproperty file="${temp.sun.web}" validate="false">
+               </xmlproperty>
+               <delete file="${temp.sun.web}"/>
+               <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
+                       <isset property="sun-web-app.context-root"/>
+               </condition>
+               <condition property="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
+                       <isset property="sun-web-app.context-root"/>
+               </condition>
+       </target>
+       <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
+               <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
+               <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
+               <!-- The doctype triggers resolution which can fail -->
+               <replace file="${temp.gf.web}">
+                       <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
+                       <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
+               </replace>
+               <replace file="${temp.gf.web}">
+                       <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
+                       <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
+               </replace>
+               <xmlproperty file="${temp.gf.web}" validate="false">
+               </xmlproperty>
+               <delete file="${temp.gf.web}"/>
+               <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
+                       <isset property="glassfish-web-app.context-root"/>
+               </condition>
+               <condition property="deploy.context.root.argument" value="&amp;contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
+                       <isset property="glassfish-web-app.context-root"/>
+               </condition>
+       </target>
+       <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
+               <property name="deploy.context.root.argument" value=""/>
+       </target>
+       <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
+               <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
+               <mkdir dir="${gfv3.resources.dir}"/>
+               <mkdir dir="${gfv3.resources.dir}/META-INF"/>
+               <copy todir="${gfv3.resources.dir}/META-INF">
+                       <fileset dir="${deploy.ant.resource.dir}"/>
+               </copy>
+               <jar destfile="${deploy.ant.archive}" update="true">
+                       <fileset dir="${gfv3.resources.dir}"/>
+               </jar>
+               <delete dir="${gfv3.resources.dir}"/>
+       </target>
+       <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
+               <antcall target="-deploy-without-pw"/>
+               <antcall target="-deploy-with-pw"/>
+       </target>
 
-    <target name="-undeploy-without-pw" unless="gfv3.password">
-        <echo message="Undeploying ${deploy.ant.archive}"/>
-        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
-            dest="${gfv3.results.file}"/>
-        <delete file="${gfv3.results.file}"/>    
-    </target>
-    <target name="-undeploy-with-pw" if="gfv3.password">
-        <echo message="Undeploying ${deploy.ant.archive}"/>
-        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
-            dest="${gfv3.results.file}"/>
-        <delete file="${gfv3.results.file}"/>
-    </target>
+       <target name="-deploy-without-pw" unless="gfv3.password">
+               <echo message="Deploying ${deploy.ant.archive}"/>
+               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+               <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+               <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+                        dest="${gfv3.results.file}"/>
+               <delete file="${gfv3.results.file}"/>
+       </target>
+       <target name="-deploy-with-pw" if="gfv3.password">
+               <echo message="Deploying ${deploy.ant.archive}"/>
+               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+               <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+               <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+                        dest="${gfv3.results.file}"/>
+               <delete file="${gfv3.results.file}"/>
+       </target>
+       <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
+               <antcall target="-undeploy-without-pw"/>
+               <antcall target="-undeploy-with-pw"/>
+       </target>
+
+       <target name="-undeploy-without-pw" unless="gfv3.password">
+               <echo message="Undeploying ${deploy.ant.archive}"/>
+               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+               <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+                        dest="${gfv3.results.file}"/>
+               <delete file="${gfv3.results.file}"/>
+       </target>
+       <target name="-undeploy-with-pw" if="gfv3.password">
+               <echo message="Undeploying ${deploy.ant.archive}"/>
+               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+               <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+                        dest="${gfv3.results.file}"/>
+               <delete file="${gfv3.results.file}"/>
+       </target>
 </project>
index 8672aa8106655f06d773b0c9ba1e4ad963ee6055..c98c1438b6dcfcfa5f78edba357706d835adbd34 100644 (file)
@@ -821,9 +821,9 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     <target name="-init-taskdefs">
         <fail unless="libs.CopyLibs.classpath">
 The libs.CopyLibs.classpath property is not set up.
-This property must point to 
+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 
+of NetBeans IDE installation and is usually located at
 &lt;netbeans_installation&gt;/java&lt;version&gt;/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:
@@ -1364,7 +1364,7 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
     <!--
-                
+
                 TEST COMPILATION SECTION
             -->
     <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -1403,7 +1403,7 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
     <!--
-                
+
                 TEST EXECUTION SECTION
             -->
     <target depends="init" if="have.tests" name="-pre-test-run">
@@ -1439,7 +1439,7 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
     <!--
-                
+
                 TEST DEBUGGING SECTION
             -->
     <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
@@ -1461,35 +1461,35 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
     <!--
-                
-                CLEANUP SECTION
-            -->
-    <target depends="init" name="deps-clean" unless="no.deps">
-        <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="clean"/>
-    </target>
-    <target depends="init" name="do-clean">
-        <condition property="build.dir.to.clean" value="${build.web.dir}">
-            <isset property="dist.ear.dir"/>
-        </condition>
-        <property name="build.dir.to.clean" value="${build.web.dir}"/>
-        <delete includeEmptyDirs="true" quiet="true">
-            <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
-        </delete>
-        <delete dir="${build.dir}"/>
-        <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
-        <delete dir="${dist.dir}"/>
-    </target>
-    <target depends="do-clean" if="status.clean-failed" name="check-clean">
-        <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
-        <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
-    </target>
-    <target depends="init" if="netbeans.home" name="undeploy-clean">
-        <nbundeploy failOnError="false" startServer="false"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
-    <target depends="clean" description="Clean build products." name="clean-ear"/>
+
+               CLEANUP SECTION
+       -->
+       <target depends="init" name="deps-clean" unless="no.deps">
+               <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="clean"/>
+       </target>
+       <target depends="init" name="do-clean">
+               <condition property="build.dir.to.clean" value="${build.web.dir}">
+                       <isset property="dist.ear.dir"/>
+               </condition>
+               <property name="build.dir.to.clean" value="${build.web.dir}"/>
+               <delete includeEmptyDirs="true" quiet="true">
+                       <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
+               </delete>
+               <delete dir="${build.dir}"/>
+               <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
+               <delete dir="${dist.dir}"/>
+       </target>
+       <target depends="do-clean" if="status.clean-failed" name="check-clean">
+               <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
+               <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
+       </target>
+       <target depends="init" if="netbeans.home" name="undeploy-clean">
+               <nbundeploy failOnError="false" startServer="false"/>
+       </target>
+       <target name="-post-clean">
+               <!-- Empty placeholder for easier customization. -->
+               <!-- You can override this target in the ../build.xml file. -->
+       </target>
+       <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
+       <target depends="clean" description="Clean build products." name="clean-ear"/>
 </project>
index c2d4339f607d27b493b0708a103f93f8a6d9a1d6..2296f9097835b61e1bd21bb36699b44dd7cfe98c 100644 (file)
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scene Scope="Project" version="2">
-    <Scope Scope="Faces Configuration Only"/>
-    <Scope Scope="Project">
-        <Node id="admin/admin_logout.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="item_added.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="*" x="150" y="300" zoom="true"/>
-        <Node id="customer/register.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="errorHandler.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="terms.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="bye.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="privacy.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="index.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="imprint.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="admin/category.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="admin/product.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="basket.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="customer/login.xhtml" x="900" y="300" zoom="true"/>
-    </Scope>
-    <Scope Scope="All Faces Configurations"/>
+       <Scope Scope="Faces Configuration Only"/>
+       <Scope Scope="Project">
+               <Node id="admin/admin_logout.xhtml" x="400" y="600" zoom="true"/>
+               <Node id="item_added.xhtml" x="1150" y="150" zoom="true"/>
+               <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
+               <Node id="*" x="150" y="300" zoom="true"/>
+               <Node id="customer/register.xhtml" x="650" y="150" zoom="true"/>
+               <Node id="errorHandler.xhtml" x="900" y="450" zoom="true"/>
+               <Node id="terms.xhtml" x="650" y="300" zoom="true"/>
+               <Node id="customer/checkout.xhtml" x="400" y="150" zoom="true"/>
+               <Node id="bye.xhtml" x="650" y="450" zoom="true"/>
+               <Node id="privacy.xhtml" x="150" y="150" zoom="true"/>
+               <Node id="customer/checkout2.xhtml" x="150" y="750" zoom="true"/>
+               <Node id="index.xhtml" x="1400" y="150" zoom="true"/>
+               <Node id="imprint.xhtml" x="1150" y="300" zoom="true"/>
+               <Node id="admin/category.xhtml" x="150" y="600" zoom="true"/>
+               <Node id="customer/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
+               <Node id="admin/product.xhtml" x="150" y="450" zoom="true"/>
+               <Node id="basket.xhtml" x="900" y="150" zoom="true"/>
+               <Node id="customer/login.xhtml" x="900" y="300" zoom="true"/>
+       </Scope>
+       <Scope Scope="All Faces Configurations"/>
 </Scene>
index d8749ee168ee02cabb2072bd0899da29594445ed..9c6aa1fc823220accc899fff07fb7f12c3993d53 100644 (file)
@@ -1,68 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.web.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/web-project/3">
-            <name>PizzaService-war</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <web-module-libraries>
-                <library dirs="200">
-                    <file>${file.reference.jcore.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcore-logger-lib.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcoreee.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcontacts-core.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jshop-core.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jshop-ee-lib.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
-                    <file>${reference.PizzaService-lib.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.cdi-api.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.gf-client.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-            </web-module-libraries>
-            <web-module-additional-libraries/>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <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>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
-                <foreign-project>PizzaService-lib</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>jar</target>
-                <clean-target>clean</clean-target>
-                <id>jar</id>
-            </reference>
-        </references>
-    </configuration>
+       <type>org.netbeans.modules.web.project</type>
+       <configuration>
+               <data xmlns="http://www.netbeans.org/ns/web-project/3">
+                       <name>PizzaService-war</name>
+                       <minimum-ant-version>1.6.5</minimum-ant-version>
+                       <web-module-libraries>
+                               <library dirs="200">
+                                       <file>${file.reference.jcore.jar}</file>
+                                       <path-in-war>WEB-INF/lib</path-in-war>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jcore-logger-lib.jar}</file>
+                                       <path-in-war>WEB-INF/lib</path-in-war>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jcoreee.jar}</file>
+                                       <path-in-war>WEB-INF/lib</path-in-war>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jcontacts-core.jar}</file>
+                                       <path-in-war>WEB-INF/lib</path-in-war>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jshop-core.jar}</file>
+                                       <path-in-war>WEB-INF/lib</path-in-war>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jshop-ee-lib.jar}</file>
+                                       <path-in-war>WEB-INF/lib</path-in-war>
+                               </library>
+                               <library dirs="200">
+                                       <file>${reference.PizzaService-lib.jar}</file>
+                                       <path-in-war>WEB-INF/lib</path-in-war>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.cdi-api.jar}</file>
+                                       <path-in-war>WEB-INF/lib</path-in-war>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.gf-client.jar}</file>
+                                       <path-in-war>WEB-INF/lib</path-in-war>
+                               </library>
+                       </web-module-libraries>
+                       <web-module-additional-libraries/>
+                       <source-roots>
+                               <root id="src.dir"/>
+                       </source-roots>
+                       <test-roots>
+                               <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>
+               <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+                       <reference>
+                               <foreign-project>PizzaService-lib</foreign-project>
+                               <artifact-type>jar</artifact-type>
+                               <script>build.xml</script>
+                               <target>jar</target>
+                               <clean-target>clean</clean-target>
+                               <id>jar</id>
+                       </reference>
+               </references>
+       </configuration>
 </project>
index ad78dd8898bdfb5a38d2a6399d880bcc3372f037..1e632c5863a29f3ab3a4c0b4858a2572bf0af073 100644 (file)
@@ -58,6 +58,7 @@ public abstract class AbstractWebBean implements Serializable {
         * Getter for message from given key
         * <p>
         * @param key Key to get message from
+        * <p>
         * @return Message
         */
        protected String getMessageStringFromKey (final String key) {
index 6a77a62c2f45088566be47c20b2cba4a8c24962c..467033c469104cc872f0f6e6df3d56a100768cec 100644 (file)
@@ -425,6 +425,7 @@ public class BasketWebBean implements BasketWebController {
         * found by checking it's id and itemType=product
         * <p>
         * @param product Product instance
+        * <p>
         * @return Item instance or null if not found
         */
        private AddableBasketItem getItemFromProduct (final Product product) {
index e5a8419761facbe80ce1a02500a1dfd5dd8f34cb..f976aba215993fc60db930717d4e106327fd4750 100644 (file)
@@ -33,6 +33,7 @@ public interface BasketWebController extends Serializable {
         * it.
         * <p>
         * @param product Product instance to add
+        * <p>
         * @return Redirect target or null
         */
        public String addItem (final Product product);
@@ -56,6 +57,7 @@ public interface BasketWebController extends Serializable {
         * Calculates total price (no tax added) for given item.
         * <p>
         * @param item Item instance to calculate total price for
+        * <p>
         * @return Total price
         */
        public Float calculateItemPrice (final AddableBasketItem item);
@@ -72,6 +74,7 @@ public interface BasketWebController extends Serializable {
         * page. If the item is not found, another "error" page is called.
         * <p>
         * @param item Item instance to change
+        * <p>
         * @return Page redirection
         */
        public String changeItem (final AddableBasketItem item);
@@ -115,6 +118,7 @@ public interface BasketWebController extends Serializable {
         * instance.
         * <p>
         * @param product Product instance
+        * <p>
         * @return Item amount of given product
         */
        public Long getItemAmount (final Product product);
@@ -152,6 +156,7 @@ public interface BasketWebController extends Serializable {
         * Checks whether the currently set product is added in basked
         * <p>
         * @param product Product instance
+        * <p>
         * @return Whether the product is added
         */
        public boolean isProductAdded (final Product product);
index 22fed4fa89d6b0990a581c61dfb6550551ae9635..f61d35203afe94e67e56ea501d9a404587e15f9d 100644 (file)
@@ -63,6 +63,7 @@ public class CustomerWebBean implements CustomerWebController {
         * Country code
         */
        private String countryCode;
+
        /**
         * Remote customer bean
         */
index 11dae64da3df7d7e3f8833e9605593edbf79ccb1..2da2b11abe5eaa22d40d79fa8eb397a08871242c 100644 (file)
@@ -40,6 +40,7 @@ public interface AdminProductWebController {
         * Some "getter" for a linked list of all products
         * <p>
         * @return All products
+        * <p>
         * @throws javax.faces.view.facelets.FaceletException If anything went wrong
         */
        public List<Product> getAllProducts () throws FaceletException;
index 705a66ada086145b608bdca13b6e33844420a186..cfc888ddca4823509064c1d49a31916d778f2e01 100644 (file)
@@ -47,6 +47,7 @@ public interface ShopWebController extends Serializable {
         * Some "getter" for a linked list of all categories
         * <p>
         * @return All categories
+        * <p>
         * @throws javax.faces.view.facelets.FaceletException If anything went wrong
         */
        public List<Category> getAllCategories () throws FaceletException;
@@ -56,6 +57,7 @@ public interface ShopWebController extends Serializable {
         * parent" fake category.
         * <p>
         * @return All categories
+        * <p>
         * @throws javax.faces.view.facelets.FaceletException If anything went wrong
         */
        public List<Category> getAllCategoriesParent () throws FaceletException;
@@ -64,6 +66,7 @@ public interface ShopWebController extends Serializable {
         * Some "getter" for a linked list of only available products
         * <p>
         * @return Only available products
+        * <p>
         * @throws javax.faces.view.facelets.FaceletException If anything went wrong
         */
        public List<Product> getAvailableProducts () throws FaceletException;
index 274f9a496608de75156fe7d3042eac1b90b3e85d..a105a3f983828a68c6b9860dbdd79bdf59c7441d 100644 (file)
@@ -5,7 +5,7 @@
        xmlns:ui="http://java.sun.com/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       >
+>
 
        <ui:fragment rendered="#{basketController.hasItems()}">
                <div class="totals_container">
index 53d3de54157b7494ef2de0fcb803b85b0df5604a..a25966d93f01c18084f9236d5f6a315e17252f2c 100644 (file)
@@ -4,7 +4,9 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:ui="http://java.sun.com/jsf/facelets">
 
-       <ui:define name="title"><ui:insert name="guest_title" class="guest_title" /></ui:define>
+       <ui:define name="title">
+               <ui:insert name="guest_title" class="guest_title" />
+       </ui:define>
 
        <ui:define name="menu">
                <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
index e327def56a801c208dbf956c2d4b2fce5be5eb8e..2449e844d4e3a56fb29fe7f682019e44c97963ab 100644 (file)
@@ -6,10 +6,18 @@
        xmlns:ui="http://java.sun.com/jsf/facelets">
        <div class="footer">
                <ul class="footer_nav">
-                       <li class="footer_link"><h:link outcome="index" title="#{msg.LINK_GUEST_HOME_TITLE}" value="#{msg.LINK_GUEST_HOME}" /></li>
-                       <li class="footer_link"><h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" /></li>
-                       <li class="footer_link"><h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" /></li>
-                       <li class="footer_link"><h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" /></li>
+                       <li class="footer_link">
+                               <h:link outcome="index" title="#{msg.LINK_GUEST_HOME_TITLE}" value="#{msg.LINK_GUEST_HOME}" />
+                       </li>
+                       <li class="footer_link">
+                               <h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
+                       </li>
+                       <li class="footer_link">
+                               <h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
+                       </li>
+                       <li class="footer_link">
+                               <h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
+                       </li>
                        <li class="footer_copyright">Copyright (c) 2015 by Roland Häder</li>
                </ul>
        </div>
index 467165b5c808d64b5f372af57520a346c38dd2f4..c85f5549d28408310362dd91dc3e1532197b0a4e 100644 (file)
                        </div>
 
                        <ul>
-                               <li><h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" /></li>
-                               <li><h:link title="#{msg.LINK_TO_BASKET_TITLE}" outcome="basket" value="#{msg.LINK_BASKET}" /></li>
-                               <li><h:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" /></li>
+                               <li>
+                                       <h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
+                               </li>
+                               <li>
+                                       <h:link title="#{msg.LINK_TO_BASKET_TITLE}" outcome="basket" value="#{msg.LINK_BASKET}" />
+                               </li>
+                               <li>
+                                       <h:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
+                               </li>
                        </ul>
 
                        <div class="menu_header">
                        </div>
 
                        <ul>
-                               <li><h:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="customer_login" value="#{msg.LINK_GUEST_LOGIN}" /></li>
-                               <li><h:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="customer_register" value="#{msg.LINK_GUEST_REGISTER}" /></li>
-                               <li><h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="customer_lost_passwd" value="#{msg.LINK_GUEST_PASSWORD}" /></li>
+                               <li>
+                                       <h:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="customer_login" value="#{msg.LINK_GUEST_LOGIN}" />
+                               </li>
+                               <li>
+                                       <h:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="customer_register" value="#{msg.LINK_GUEST_REGISTER}" />
+                               </li>
+                               <li>
+                                       <h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="customer_lost_passwd" value="#{msg.LINK_GUEST_PASSWORD}" />
+                               </li>
                        </ul>
                </div>
        </div>
index adb51696e2f4b1105ed30cd54c740805cedbdd61..e3178a93133c34f99a8e1c7f0800c5b76cb1aad2 100644 (file)
@@ -21,7 +21,7 @@ Author     : Roland Haeder
        </head>
 
        <body>
-               <div id="header"> 
+               <div id="header">
                        <div id="title">
                                <h1>Pizza-Service - Fehler</h1>
                        </div>
index 1df064aa1458424a9174c144060d69d34971fb82..2279b248cb987e2ea0413824fea6498936b793d3 100644 (file)
@@ -2,7 +2,7 @@ body {
        background-color: #ffffff;
        font-size: 12px;
        font-family: lucida;
-       color: #000000;  
+       color: #000000;
        margin: 10px;
 }