(no commit message)

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 11df13d..984c257 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -647,28 +647,28 @@ exists or setup the property manually. For example like this:
         <dirname file="${dist.war}" property="dist.jar.dir"/>\r
         <mkdir dir="${dist.jar.dir}"/>\r
         <jar compress="${jar.compress}" jarfile="${dist.war}">\r
-            <fileset dir="${build.web.dir}"/>\r
+            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>\r
         </jar>\r
     </target>\r
     <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">\r
         <dirname file="${dist.war}" property="dist.jar.dir"/>\r
         <mkdir dir="${dist.jar.dir}"/>\r
         <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">\r
-            <fileset dir="${build.web.dir}"/>\r
+            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>\r
         </jar>\r
     </target>\r
     <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">\r
         <dirname file="${dist.war}" property="dist.jar.dir"/>\r
         <mkdir dir="${dist.jar.dir}"/>\r
         <jar compress="${jar.compress}" jarfile="${dist.war}">\r
-            <fileset dir="${build.web.dir}"/>\r
+            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>\r
         </jar>\r
     </target>\r
     <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">\r
         <dirname file="${dist.war}" property="dist.jar.dir"/>\r
         <mkdir dir="${dist.jar.dir}"/>\r
         <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">\r
-            <fileset dir="${build.web.dir}"/>\r
+            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>\r
         </jar>\r
     </target>\r
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>\r
@@ -723,7 +723,7 @@ exists or setup the property manually. For example like this:
         <dirname file="${dist.ear.war}" property="dist.jar.dir"/>\r
         <mkdir dir="${dist.jar.dir}"/>\r
         <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">\r
-            <fileset dir="${build.web.dir}"/>\r
+            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>\r
         </jar>\r
     </target>\r
     <target name="-post-dist">\r

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index ed3d7f9..193e69b 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=651128d4@1.33.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.\r
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.\r
 nbproject/build-impl.xml.data.CRC32=e3f82181\r
-nbproject/build-impl.xml.script.CRC32=93e81836\r
-nbproject/build-impl.xml.stylesheet.CRC32=0cbf5bb7@1.33.1.1\r
+nbproject/build-impl.xml.script.CRC32=54bc9623\r
+nbproject/build-impl.xml.stylesheet.CRC32=b7883b1f@1.36.1.1\r

diff --git a/nbproject/project.properties b/nbproject/project.properties
index f62ee35..a6f1d34 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -47,7 +47,7 @@ includes=**
 j2ee.compile.on.save=true\r
 j2ee.deploy.on.save=true\r
 j2ee.platform=1.5\r
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/jaxr-api-osgi.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jaxrpc-api-osgi.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.servlet.jar\r
+j2ee.platform.classpath=${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jar\r
 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar\r
 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar\r
 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar\r

diff --git a/src/java/newpackage/NewServlet.java b/src/java/newpackage/NewServlet.java
new file mode 100644 (file)
index 0000000..aadb756
--- /dev/null
+++ b/src/java/newpackage/NewServlet.java
@@ -0,0 +1,91 @@
+/*\r
+ * To change this template, choose Tools | Templates\r
+ * and open the template in the editor.\r
+ */\r
+package newpackage;\r
+\r
+import java.io.IOException;\r
+import java.io.PrintWriter;\r
+import javax.servlet.ServletException;\r
+import javax.servlet.http.HttpServlet;\r
+import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
+\r
+/**\r
+ *\r
+ * @author pbarros\r
+ */\r
+public class NewServlet extends HttpServlet {\r
+\r
+    /**\r
+     * Processes requests for both HTTP\r
+     * <code>GET</code> and\r
+     * <code>POST</code> methods.\r
+     *\r
+     * @param request servlet request\r
+     * @param response servlet response\r
+     * @throws ServletException if a servlet-specific error occurs\r
+     * @throws IOException if an I/O error occurs\r
+     */\r
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)\r
+            throws ServletException, IOException {\r
+        response.setContentType("text/html;charset=UTF-8");\r
+        PrintWriter out = response.getWriter();\r
+        try {\r
+            /*\r
+             * TODO output your page here. You may use following sample code.\r
+             */\r
+            out.println("<html>");\r
+            out.println("<head>");\r
+            out.println("<title>Servlet NewServlet</title>");            \r
+            out.println("</head>");\r
+            out.println("<body>");\r
+            out.println("<h1>Servlet NewServlet at " + request.getContextPath() + "</h1>");\r
+            out.println("</body>");\r
+            out.println("</html>");\r
+        } finally {            \r
+            out.close();\r
+        }\r
+    }\r
+\r
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">\r
+    /**\r
+     * Handles the HTTP\r
+     * <code>GET</code> method.\r
+     *\r
+     * @param request servlet request\r
+     * @param response servlet response\r
+     * @throws ServletException if a servlet-specific error occurs\r
+     * @throws IOException if an I/O error occurs\r
+     */\r
+    @Override\r
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)\r
+            throws ServletException, IOException {\r
+        processRequest(request, response);\r
+    }\r
+\r
+    /**\r
+     * Handles the HTTP\r
+     * <code>POST</code> method.\r
+     *\r
+     * @param request servlet request\r
+     * @param response servlet response\r
+     * @throws ServletException if a servlet-specific error occurs\r
+     * @throws IOException if an I/O error occurs\r
+     */\r
+    @Override\r
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)\r
+            throws ServletException, IOException {\r
+        processRequest(request, response);\r
+    }\r
+\r
+    /**\r
+     * Returns a short description of the servlet.\r
+     *\r
+     * @return a String containing servlet description\r
+     */\r
+    @Override\r
+    public String getServletInfo() {\r
+        return "Short description";\r
+    }// </editor-fold>\r
+}\r

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
old mode 100755 (executable)
new mode 100644 (file)
index e2c86a7..a1167fb
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -9,10 +9,18 @@
         <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
+    <servlet>
+        <servlet-name>NewServlet</servlet-name>
+        <servlet-class>newpackage.NewServlet</servlet-class>
+    </servlet>
     <servlet-mapping>
         <servlet-name>Faces Servlet</servlet-name>
         <url-pattern>*.jsf</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>NewServlet</servlet-name>
+        <url-pattern>/NewServlet</url-pattern>
+    </servlet-mapping>
     <session-config>
         <session-timeout>
             30