diff --git a/.gitignore b/.gitignore index eada49815..ab19d6c16 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ target/ libs/ tmp/ node_modules/ -jaxws/jaxws-client/src/main/ +jaxws/jaxws-client/src/main/java jaxws/jaxws-endpoint/src/main/webapp/WEB-INF/wsdl/ # OS Files # diff --git a/.travis.yml b/.travis.yml index 6b0499ba1..d5babc431 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: java jdk: - - oraclejdk8 + - openjdk8 env: - TESTFOLDER=batch - TESTFOLDER=cdi diff --git a/batch/pom.xml b/batch/pom.xml index ac693fd4b..37ae2723b 100644 --- a/batch/pom.xml +++ b/batch/pom.xml @@ -35,10 +35,12 @@ org.javaee7 test-utils ${project.version} + test org.jboss.shrinkwrap.descriptors shrinkwrap-descriptors-impl-javaee + test diff --git a/cdi/pom.xml b/cdi/pom.xml index b5c3da65b..a6582af07 100644 --- a/cdi/pom.xml +++ b/cdi/pom.xml @@ -1,16 +1,15 @@ - - 4.0.0 + 4.0.0 org.javaee7 samples-parent 1.0-SNAPSHOT - ../pom.xml + org.javaee7 cdi - 1.0-SNAPSHOT + pom Java EE 7 Sample: cdi @@ -48,6 +47,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/concurrency/pom.xml b/concurrency/pom.xml index 2cbbd8120..dd3b5f47b 100644 --- a/concurrency/pom.xml +++ b/concurrency/pom.xml @@ -1,17 +1,15 @@ - - 4.0.0 + 4.0.0 org.javaee7 samples-parent 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + concurrency - 1.0-SNAPSHOT pom + Java EE 7 Sample: concurrency @@ -26,6 +24,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/ejb/embeddable/pom.xml b/ejb/embeddable/pom.xml index 17032dd7d..cc1eacac5 100644 --- a/ejb/embeddable/pom.xml +++ b/ejb/embeddable/pom.xml @@ -18,7 +18,7 @@ junit junit - 4.10 + 4.13.1 test jar diff --git a/ejb/pom.xml b/ejb/pom.xml index 122149f76..049259e47 100644 --- a/ejb/pom.xml +++ b/ejb/pom.xml @@ -1,6 +1,5 @@ - - 4.0.0 + 4.0.0 org.javaee7 @@ -29,6 +28,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/ejb/remote/roles-allowed-ssl/pom.xml b/ejb/remote/roles-allowed-ssl/pom.xml new file mode 100644 index 000000000..446ccc584 --- /dev/null +++ b/ejb/remote/roles-allowed-ssl/pom.xml @@ -0,0 +1,51 @@ + + 4.0.0 + + + org.javaee7 + ejb-remote + 1.0-SNAPSHOT + + + ejb-remote-roles-allowed-ssl + jar + + Java EE 7 Sample: ejb - remote - Roles Allowed + + + + payara-ci-managed + + + org.javaee7.ejb.remote.vendor + ejb.remote.vendor.payara-glassfish + 1.0-SNAPSHOT + + + + + + payara-remote + + + org.javaee7.ejb.remote.vendor + ejb.remote.vendor.payara-glassfish + 1.0-SNAPSHOT + + + + + + glassfish-remote + + + org.javaee7.ejb.remote.vendor + ejb.remote.vendor.payara-glassfish + 1.0-SNAPSHOT + + + + + + + diff --git a/ejb/remote/roles-allowed-ssl/src/main/java/org/javaee7/ejb/remote/ssl/Bean.java b/ejb/remote/roles-allowed-ssl/src/main/java/org/javaee7/ejb/remote/ssl/Bean.java new file mode 100644 index 000000000..f9d17c74d --- /dev/null +++ b/ejb/remote/roles-allowed-ssl/src/main/java/org/javaee7/ejb/remote/ssl/Bean.java @@ -0,0 +1,20 @@ +/** Copyright Payara Services Limited **/ +package org.javaee7.ejb.remote.ssl; + +import java.io.Serializable; + +import javax.annotation.security.RolesAllowed; +import javax.ejb.Stateless; + +@Stateless +public class Bean implements BeanRemote, Serializable { + + private static final long serialVersionUID = 1L; + + @Override + @RolesAllowed("g1") + public String method() { + return "method"; + } + +} diff --git a/ejb/remote/roles-allowed-ssl/src/main/java/org/javaee7/ejb/remote/ssl/BeanRemote.java b/ejb/remote/roles-allowed-ssl/src/main/java/org/javaee7/ejb/remote/ssl/BeanRemote.java new file mode 100644 index 000000000..62b4e21b9 --- /dev/null +++ b/ejb/remote/roles-allowed-ssl/src/main/java/org/javaee7/ejb/remote/ssl/BeanRemote.java @@ -0,0 +1,9 @@ +/** Copyright Payara Services Limited **/ +package org.javaee7.ejb.remote.ssl; + +import javax.ejb.Remote; + +@Remote +public interface BeanRemote { + String method(); +} diff --git a/ejb/remote/roles-allowed-ssl/src/main/resources/META-INF/application.xml b/ejb/remote/roles-allowed-ssl/src/main/resources/META-INF/application.xml new file mode 100644 index 000000000..d90462368 --- /dev/null +++ b/ejb/remote/roles-allowed-ssl/src/main/resources/META-INF/application.xml @@ -0,0 +1,20 @@ + + + + + myapp + + + myEJB.jar + + + + + test.war + /test + + + + diff --git a/ejb/remote/roles-allowed-ssl/src/main/resources/META-INF/glassfish-ejb-jar.xml b/ejb/remote/roles-allowed-ssl/src/main/resources/META-INF/glassfish-ejb-jar.xml new file mode 100644 index 000000000..6c114b352 --- /dev/null +++ b/ejb/remote/roles-allowed-ssl/src/main/resources/META-INF/glassfish-ejb-jar.xml @@ -0,0 +1,25 @@ + + + + + + Bean + + + REQUIRED + REQUIRED + SUPPORTED + SUPPORTED + + + USERNAME_PASSWORD + default + true + + + REQUIRED + + + + + diff --git a/ejb/remote/roles-allowed-ssl/src/test/java/org/javaee7/ejb/remote/ssl/RemoteBeanTest.java b/ejb/remote/roles-allowed-ssl/src/test/java/org/javaee7/ejb/remote/ssl/RemoteBeanTest.java new file mode 100644 index 000000000..8773c5803 --- /dev/null +++ b/ejb/remote/roles-allowed-ssl/src/test/java/org/javaee7/ejb/remote/ssl/RemoteBeanTest.java @@ -0,0 +1,141 @@ +/** Copyright Payara Services Limited **/ +package org.javaee7.ejb.remote.ssl; + +import static javax.naming.Context.SECURITY_PROTOCOL; +import static org.javaee7.ServerOperations.addUsersToContainerIdentityStore; +import static org.jboss.shrinkwrap.api.ShrinkWrap.create; +import static org.jboss.shrinkwrap.api.asset.EmptyAsset.INSTANCE; +import static org.junit.Assert.assertEquals; +import static org.junit.Assume.assumeTrue; +import static org.omnifaces.utils.security.Certificates.createTempJKSTrustStore; +import static org.omnifaces.utils.security.Certificates.getCertificateChainFromServer; +import static org.omnifaces.utils.security.Certificates.getHostFromCertificate; +import static org.omnifaces.utils.security.Certificates.setSystemTrustStore; + +import java.net.URL; +import java.security.cert.X509Certificate; + +import javax.naming.Context; +import javax.naming.NamingException; + +import org.javaee7.RemoteEJBContextFactory; +import org.javaee7.RemoteEJBContextProvider; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * This class demonstrates and tests how to request an EJB bean from a remote server. + * + *

+ * {@link RemoteEJBContextProvider} is used, which is a test artifact abstracting the different + * ways this is done for different servers. + * + * @author Arjan Tijms + * + */ +@RunWith(Arquillian.class) +public class RemoteBeanTest { + + @ArquillianResource + private URL base; + + private RemoteEJBContextProvider remoteEJBContextProvider; + + @Deployment + public static Archive deployment() { + try { + // Add user u1 with password p1 and group g1 to the container's native identity store + addUsersToContainerIdentityStore(); + + Archive archive = + // EAR module + create(EnterpriseArchive.class, "my.ear") + .setApplicationXML("META-INF/application.xml") + + // EJB module + .addAsModule( + create(JavaArchive.class, "myEJB.jar") + .addClasses(Bean.class, BeanRemote.class) + .addAsResource("META-INF/glassfish-ejb-jar.xml") + .addAsManifestResource(INSTANCE, "beans.xml") + ) + + // Web module + .addAsModule( + create(WebArchive.class, "test.war") + ); + + System.out.println("\n**** Deploying archive: " + archive.toString(true) + " \n"); + + return archive; + } catch (Exception e) { + e.printStackTrace(); + throw e; + } + } + + @Before + public void before() { + remoteEJBContextProvider = RemoteEJBContextFactory.getProvider(); + assumeTrue( + "No RemoteEJBContextProvider available in current profile", + remoteEJBContextProvider != null); + } + + @After + public void after() { + remoteEJBContextProvider.releaseContext(); + } + + @Test + @RunAsClient + public void callProtectedRemoteBean() throws NamingException { + + // Obtain the JNDI naming context in a vendor specific way. + Context ejbRemoteContext = remoteEJBContextProvider.getContextWithCredentialsSet("u1", "p1"); + + ejbRemoteContext.addToEnvironment(SECURITY_PROTOCOL, "ssl"); + + System.out.println("\n**** Quering server for its certificate at " + base.getHost() + ":" + "3920" + "\n"); + + // Get the certificate from the server, using the EJB SSL port + X509Certificate[] serverCertificateChain = getCertificateChainFromServer(base.getHost(), 3920); + + for (X509Certificate certificate : serverCertificateChain) { + System.out.println("\n**** Server presented certificate:" + certificate + " \n"); + } + + // Create a trust store on disk containing the servers's certificates + String trustStorePath = createTempJKSTrustStore(serverCertificateChain); + + System.out.println("\n**** Temp trust store with server certificates created at: " + trustStorePath + " \n"); + + // Set the newly created trust store as the system wide trust store + setSystemTrustStore(trustStorePath); + + // Get the host name from the certificate the server presented, and use that for the host + // to ultimately do our SSL request to. + String host = getHostFromCertificate(serverCertificateChain); + ejbRemoteContext.addToEnvironment("org.omg.CORBA.ORBInitialHost", host); + + System.out.println("\n**** Obtained host \"" + host + "\" from server certificate and will use that for request \n"); + + // Do the actual request to the server for our remote EJB + BeanRemote beanRemote = (BeanRemote) ejbRemoteContext.lookup("java:global/my/myEJB/Bean"); + + System.out.println("\n**** Remote EJB obtained via SSL: " + beanRemote + " \n"); + + assertEquals("method", beanRemote.method()); + } + +} \ No newline at end of file diff --git a/ejb/remote/roles-allowed-ssl/src/test/resources/addUsersPayara.txt b/ejb/remote/roles-allowed-ssl/src/test/resources/addUsersPayara.txt new file mode 100644 index 000000000..037cdbd6f --- /dev/null +++ b/ejb/remote/roles-allowed-ssl/src/test/resources/addUsersPayara.txt @@ -0,0 +1 @@ +create-file-user --groups g1 --passwordfile ${project.build.directory}/test-classes/password.txt u1 \ No newline at end of file diff --git a/ejb/remote/roles-allowed-ssl/src/test/resources/password.txt b/ejb/remote/roles-allowed-ssl/src/test/resources/password.txt new file mode 100644 index 000000000..c00bb4cac --- /dev/null +++ b/ejb/remote/roles-allowed-ssl/src/test/resources/password.txt @@ -0,0 +1 @@ +AS_ADMIN_USERPASSWORD=p1 diff --git a/ejb/remote/vendor/payara-glassfish/pom.xml b/ejb/remote/vendor/payara-glassfish/pom.xml index e6e0449d8..7ddb5b747 100644 --- a/ejb/remote/vendor/payara-glassfish/pom.xml +++ b/ejb/remote/vendor/payara-glassfish/pom.xml @@ -6,7 +6,7 @@ org.javaee7 - ejb-remote + ejb-remote-vendor 1.0-SNAPSHOT diff --git a/ejb/remote/vendor/pom.xml b/ejb/remote/vendor/pom.xml index 6d71db463..7e08be2fc 100644 --- a/ejb/remote/vendor/pom.xml +++ b/ejb/remote/vendor/pom.xml @@ -2,17 +2,18 @@ - 4.0.0 - + + 4.0.0 + org.javaee7 ejb-remote 1.0-SNAPSHOT - + ejb-remote-vendor pom - + Java EE 7 Sample: ejb - remote - vendor diff --git a/ejb/timer/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/ejb/timer/src/main/webapp/WEB-INF/jboss-deployment-structure.xml new file mode 100644 index 000000000..6d8132afe --- /dev/null +++ b/ejb/timer/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/ejb/timer/src/test/java/org/javaee7/ejb/timer/AutomaticTimerBeanTest.java b/ejb/timer/src/test/java/org/javaee7/ejb/timer/AutomaticTimerBeanTest.java index de0c732e6..5d89a49e4 100644 --- a/ejb/timer/src/test/java/org/javaee7/ejb/timer/AutomaticTimerBeanTest.java +++ b/ejb/timer/src/test/java/org/javaee7/ejb/timer/AutomaticTimerBeanTest.java @@ -7,6 +7,8 @@ import static org.hamcrest.Matchers.is; import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow; +import java.io.File; + import javax.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; @@ -35,7 +37,8 @@ public static WebArchive deploy() { .addAsLibraries(Maven.resolver().loadPomFromFile("pom.xml") .resolve("com.jayway.awaitility:awaitility") .withTransitivity().asFile()) - .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, AutomaticTimerBean.class); + .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, AutomaticTimerBean.class) + .addAsWebInfResource(new File("src/main/webapp/WEB-INF/jboss-deployment-structure.xml")); } @Test diff --git a/ejb/timer/src/test/java/org/javaee7/ejb/timer/MultipleScheduleTimerBeanTest.java b/ejb/timer/src/test/java/org/javaee7/ejb/timer/MultipleScheduleTimerBeanTest.java index ee10bd953..2adbff5af 100644 --- a/ejb/timer/src/test/java/org/javaee7/ejb/timer/MultipleScheduleTimerBeanTest.java +++ b/ejb/timer/src/test/java/org/javaee7/ejb/timer/MultipleScheduleTimerBeanTest.java @@ -9,6 +9,8 @@ import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow; import static org.jboss.shrinkwrap.api.ShrinkWrap.create; +import java.io.File; + import javax.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; @@ -36,7 +38,8 @@ public static WebArchive deploy() { .addAsLibraries(Maven.resolver().loadPomFromFile("pom.xml") .resolve("com.jayway.awaitility:awaitility") .withTransitivity().asFile()) - .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, MultipleScheduleTimerBean.class); + .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, MultipleScheduleTimerBean.class) + .addAsWebInfResource(new File("src/main/webapp/WEB-INF/jboss-deployment-structure.xml")); } @Test diff --git a/ejb/timer/src/test/java/org/javaee7/ejb/timer/ProgrammaticTimerBeanTest.java b/ejb/timer/src/test/java/org/javaee7/ejb/timer/ProgrammaticTimerBeanTest.java index 6c8d1a8a7..d039f6bf1 100644 --- a/ejb/timer/src/test/java/org/javaee7/ejb/timer/ProgrammaticTimerBeanTest.java +++ b/ejb/timer/src/test/java/org/javaee7/ejb/timer/ProgrammaticTimerBeanTest.java @@ -8,6 +8,8 @@ import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow; import static org.jboss.shrinkwrap.api.ShrinkWrap.create; +import java.io.File; + import javax.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; @@ -40,7 +42,9 @@ public static WebArchive deploy() { WithinWindowMatcher.class, Ping.class, PingsListener.class, - ProgrammaticTimerBean.class); + ProgrammaticTimerBean.class) + .addAsWebInfResource(new File("src/main/webapp/WEB-INF/jboss-deployment-structure.xml")); + } @Test diff --git a/ejb/timer/src/test/java/org/javaee7/ejb/timer/SchedulesTimerBeanTest.java b/ejb/timer/src/test/java/org/javaee7/ejb/timer/SchedulesTimerBeanTest.java index dd7788952..125515db4 100644 --- a/ejb/timer/src/test/java/org/javaee7/ejb/timer/SchedulesTimerBeanTest.java +++ b/ejb/timer/src/test/java/org/javaee7/ejb/timer/SchedulesTimerBeanTest.java @@ -9,6 +9,8 @@ import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow; import static org.jboss.shrinkwrap.api.ShrinkWrap.create; +import java.io.File; + import javax.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; @@ -36,7 +38,8 @@ public static WebArchive deploy() { .addAsLibraries(Maven.resolver().loadPomFromFile("pom.xml") .resolve("com.jayway.awaitility:awaitility") .withTransitivity().asFile()) - .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, SchedulesTimerBean.class); + .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, SchedulesTimerBean.class) + .addAsWebInfResource(new File("src/main/webapp/WEB-INF/jboss-deployment-structure.xml")); } @Test diff --git a/el/pom.xml b/el/pom.xml index 0e9548643..2cd702e23 100644 --- a/el/pom.xml +++ b/el/pom.xml @@ -1,17 +1,15 @@ - - 4.0.0 + 4.0.0 org.javaee7 samples-parent 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + el - 1.0-SNAPSHOT pom + Java EE 7 Sample: el @@ -23,6 +21,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/interceptor/pom.xml b/interceptor/pom.xml index bb3a574f9..d0767aa76 100644 --- a/interceptor/pom.xml +++ b/interceptor/pom.xml @@ -1,17 +1,15 @@ - - 4.0.0 + 4.0.0 org.javaee7 samples-parent 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + interceptor - 1.0-SNAPSHOT pom + Java EE 7 Sample: interceptor @@ -23,6 +21,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/RequestFromPolicyContextTest.java b/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/RequestFromPolicyContextTest.java index 837496371..8e20af4f6 100644 --- a/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/RequestFromPolicyContextTest.java +++ b/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/RequestFromPolicyContextTest.java @@ -6,11 +6,18 @@ import javax.servlet.http.HttpServletRequest; +import org.javaee7.jacc.contexts.bean.JaccRequestBean; +import org.javaee7.jacc.contexts.sam.SamAutoRegistrationListener; +import org.javaee7.jacc.contexts.sam.TestServerAuthModule; +import org.javaee7.jacc.contexts.servlet.RequestServlet; +import org.javaee7.jacc.contexts.servlet.RequestServletEJB; +import org.javaee7.jacc.contexts.servlet.SubjectServlet; import org.javaee7.jaspic.common.ArquillianBase; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Assume; import org.junit.Test; import org.junit.runner.RunWith; import org.xml.sax.SAXException; @@ -27,8 +34,18 @@ public class RequestFromPolicyContextTest extends ArquillianBase { @Deployment(testable = false) public static Archive createDeployment() { - // TODO: Fix for Liberty which requires EARs :( - return ((WebArchive)defaultArchive()).addPackages(true, "org.javaee7.jacc"); + WebArchive archive = ((WebArchive) ArquillianBase.defaultArchive()) + .addClasses( + SamAutoRegistrationListener.class, TestServerAuthModule.class, + RequestServlet.class, SubjectServlet.class); + + if (!Boolean.valueOf(System.getProperty("skipEJB"))) { + archive.addClasses(JaccRequestBean.class, RequestServletEJB.class); + } else { + System.out.println("Skipping EJB based tests"); + } + + return archive; } /** @@ -41,17 +58,7 @@ public void testCanObtainRequestInServlet() throws IOException, SAXException { assertTrue(response.contains("Obtained request from context.")); } - - /** - * Tests that we are able to obtain a reference to the {@link HttpServletRequest} from an EJB. - */ - @Test - public void testCanObtainRequestInEJB() throws IOException, SAXException { - - String response = getFromServerPath("requestServletEJB"); - - assertTrue(response.contains("Obtained request from context.")); - } + /** * Tests that the {@link HttpServletRequest} reference that we obtained from JACC in a Servlet actually @@ -77,6 +84,8 @@ public void testDataInServlet() throws IOException, SAXException { */ @Test public void testDataInEJB() throws IOException, SAXException { + + Assume.assumeTrue(false); String response = getFromServerPath("requestServlet?jacc_test=true"); @@ -88,5 +97,18 @@ public void testDataInEJB() throws IOException, SAXException { "Request parameter not present in request obtained from context in EJB, but should have been", response.contains("Request parameter present in request from context.")); } + + /** + * Tests that we are able to obtain a reference to the {@link HttpServletRequest} from an EJB. + */ + @Test + public void testCanObtainRequestInEJB() throws IOException, SAXException { + + Assume.assumeTrue(false); + + String response = getFromServerPath("requestServletEJB"); + + assertTrue(response.contains("Obtained request from context.")); + } } \ No newline at end of file diff --git a/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java b/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java index 539ebef5f..3e155f0f8 100644 --- a/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java +++ b/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java @@ -7,7 +7,10 @@ import javax.security.auth.Subject; import javax.servlet.http.HttpServletRequest; +import org.javaee7.jacc.contexts.sam.SamAutoRegistrationListener; import org.javaee7.jacc.contexts.sam.TestServerAuthModule; +import org.javaee7.jacc.contexts.servlet.RequestServlet; +import org.javaee7.jacc.contexts.servlet.SubjectServlet; import org.javaee7.jaspic.common.ArquillianBase; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; @@ -46,8 +49,12 @@ public class SubjectFromPolicyContextTest extends ArquillianBase { @Deployment(testable = false) public static Archive createDeployment() { - // TODO: Fix for Liberty which requires EARs :( - return ((WebArchive)defaultArchive()).addPackages(true, "org.javaee7.jacc"); + WebArchive archive = ((WebArchive) ArquillianBase.defaultArchive()) + .addClasses( + SamAutoRegistrationListener.class, TestServerAuthModule.class, + RequestServlet.class, SubjectServlet.class); + + return archive; } /** diff --git a/jacc/pom.xml b/jacc/pom.xml index 494ad6cf8..eeb4171f3 100644 --- a/jacc/pom.xml +++ b/jacc/pom.xml @@ -6,10 +6,9 @@ 1.0-SNAPSHOT - org.javaee7 jacc - pom + Java EE 7 Sample: jacc @@ -22,6 +21,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/jaspic/basic-authentication/pom.xml b/jaspic/basic-authentication/pom.xml index 17bb1bf47..8c520010e 100644 --- a/jaspic/basic-authentication/pom.xml +++ b/jaspic/basic-authentication/pom.xml @@ -6,11 +6,9 @@ org.javaee7 jaspic 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + jaspic-basic-authentication - 1.0-SNAPSHOT war Java EE 7 Sample: jaspic - basic-authentication diff --git a/jaspic/common/pom.xml b/jaspic/common/pom.xml index ed3a7ca7b..069b74319 100644 --- a/jaspic/common/pom.xml +++ b/jaspic/common/pom.xml @@ -5,19 +5,39 @@ it provides a base class for unit tests --> 4.0.0 - - - org.javaee7 - jaspic - 1.0-SNAPSHOT - + org.javaee7 jaspic-common + 1.0-SNAPSHOT jar Java EE 7 Sample: jaspic - common + + + UTF-8 + 1.7 + 1.7 + + + + + + org.jboss.arquillian + arquillian-bom + 1.1.14.Final + import + pom + + + + + javax + javaee-api + 7.0 + provided + org.jboss.arquillian.junit arquillian-junit-container @@ -26,19 +46,19 @@ junit junit - 4.11 + 4.13.1 provided net.sourceforge.htmlunit htmlunit - 2.31 + 2.37.0 provided org.jsoup jsoup - 1.9.1 + 1.14.2 diff --git a/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java b/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java index 2771fc4b5..b2f0e9687 100644 --- a/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java +++ b/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java @@ -9,10 +9,13 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.Map; import java.util.logging.Logger; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ArchivePath; +import org.jboss.shrinkwrap.api.Node; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.After; @@ -69,13 +72,24 @@ public static Archive defaultArchive() { } public static WebArchive defaultWebArchive() { - return - create(WebArchive.class, "test.war") - .addPackages(true, "org.javaee7.jaspic") - .deleteClass(ArquillianBase.class) - .addAsWebInfResource(resource("web.xml")) - .addAsWebInfResource(resource("jboss-web.xml")) - .addAsWebInfResource(resource("glassfish-web.xml")); + return + removeTestClasses( + create(WebArchive.class, "test.war") + .addPackages(true, "org.javaee7.jaspic") + .addAsWebInfResource(resource("web.xml")) + .addAsWebInfResource(resource("jboss-web.xml")) + .addAsWebInfResource(resource("glassfish-web.xml"))); + } + + private static WebArchive removeTestClasses(WebArchive archive) { + for (Map.Entry content : archive.getContent().entrySet()) { + if (content.getKey().get().endsWith("Test.class")) { + archive.delete(content.getKey().get()); + } + } + archive.deleteClass(ArquillianBase.class); + + return archive; } public static Archive tryWrapEAR(WebArchive webArchive) { diff --git a/jaspic/pom.xml b/jaspic/pom.xml index 06abedd7c..fe046c0b3 100644 --- a/jaspic/pom.xml +++ b/jaspic/pom.xml @@ -1,12 +1,10 @@ - - 4.0.0 + 4.0.0 org.javaee7 samples-parent 1.0-SNAPSHOT - ../pom.xml jaspic @@ -83,6 +81,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/javamail/pom.xml b/javamail/pom.xml index 4f4fd1611..428c8e563 100644 --- a/javamail/pom.xml +++ b/javamail/pom.xml @@ -1,17 +1,15 @@ - - 4.0.0 + 4.0.0 org.javaee7 samples-parent 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + javamail - 1.0-SNAPSHOT pom + Java EE 7 Sample: javamail @@ -23,6 +21,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/jaxrpc/jaxrpc-security/pom.xml b/jaxrpc/jaxrpc-security/pom.xml index dcc9c6c31..37c76a192 100644 --- a/jaxrpc/jaxrpc-security/pom.xml +++ b/jaxrpc/jaxrpc-security/pom.xml @@ -32,7 +32,7 @@ org.apache.ant ant - 1.7.0 + 1.10.11 diff --git a/jaxrpc/pom.xml b/jaxrpc/pom.xml index 0e508e6e8..fee49f706 100644 --- a/jaxrpc/pom.xml +++ b/jaxrpc/pom.xml @@ -21,6 +21,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml index f1d37011d..9b8a7fe46 100644 --- a/jaxrs/pom.xml +++ b/jaxrs/pom.xml @@ -9,6 +9,7 @@ jaxrs pom + Java EE 7 Sample: jaxrs @@ -48,6 +49,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/jaxws/jaxws-client/README.md b/jaxws/jaxws-client/README.md new file mode 100644 index 000000000..bf6b5ca41 --- /dev/null +++ b/jaxws/jaxws-client/README.md @@ -0,0 +1,2 @@ +This JAX-WS sample generated Java service class from a .wsdl file, deploys the endpoint war generated by javaee7-samples/jaxws/jaxws-endpoint +and then tests against that. \ No newline at end of file diff --git a/jaxws/jaxws-client/pom.xml b/jaxws/jaxws-client/pom.xml index 8865e592b..cbdc0d008 100644 --- a/jaxws/jaxws-client/pom.xml +++ b/jaxws/jaxws-client/pom.xml @@ -1,13 +1,12 @@ - - 4.0.0 + 4.0.0 org.javaee7 jaxws 1.0-SNAPSHOT - ../pom.xml + jaxws-jaxws-client war Java EE 7 Sample: jaxws - jaxws-client @@ -17,21 +16,40 @@ - org.codehaus.mojo + com.helger.maven jaxws-maven-plugin - 1.11 + 2.6.2 generate-sources + wsimport org.javaee7.jaxws.client.gen + + + + + - ../../../jaxws-endpoint/src/main/webapp/WEB-INF/wsdl/EBookStoreImplService.wsdl + ${basedir}/src/main/webapp/WEB-INF/wsdl/EBookStoreImplService.wsdl + http://localhost:8080/jaxws-endpoint/EBookStoreImplService?wsdl + true ${basedir}/src/main/java 2.1 diff --git a/jaxws/jaxws-client/src/main/webapp/WEB-INF/wsdl/EBookStoreImplService.wsdl b/jaxws/jaxws-client/src/main/webapp/WEB-INF/wsdl/EBookStoreImplService.wsdl new file mode 100644 index 000000000..b90f97e63 --- /dev/null +++ b/jaxws/jaxws-client/src/main/webapp/WEB-INF/wsdl/EBookStoreImplService.wsdl @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jaxws/jaxws-client/src/main/webapp/WEB-INF/wsdl/EBookStoreImplService_schema1.xsd b/jaxws/jaxws-client/src/main/webapp/WEB-INF/wsdl/EBookStoreImplService_schema1.xsd new file mode 100644 index 000000000..b18b382cd --- /dev/null +++ b/jaxws/jaxws-client/src/main/webapp/WEB-INF/wsdl/EBookStoreImplService_schema1.xsd @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jaxws/jaxws-client/src/test/java/org/javaee7/jaxws/client/EBookStoreClientSampleTest.java b/jaxws/jaxws-client/src/test/java/org/javaee7/jaxws/client/EBookStoreClientSampleTest.java index 471fe053a..9d63e4ff7 100644 --- a/jaxws/jaxws-client/src/test/java/org/javaee7/jaxws/client/EBookStoreClientSampleTest.java +++ b/jaxws/jaxws-client/src/test/java/org/javaee7/jaxws/client/EBookStoreClientSampleTest.java @@ -1,6 +1,7 @@ package org.javaee7.jaxws.client; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.runners.MethodSorters.NAME_ASCENDING; import java.net.MalformedURLException; import java.net.URL; @@ -12,35 +13,29 @@ import org.javaee7.jaxws.client.gen.EBook; import org.javaee7.jaxws.client.gen.EBookStore; import org.javaee7.jaxws.client.gen.EBookStoreImplService; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.resolver.api.maven.archive.importer.MavenImporter; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; - +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.maven.archive.importer.MavenImporter; import org.junit.Before; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.MethodSorters; /** * @author Fermin Gallego */ @RunWith(Arquillian.class) -@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@FixMethodOrder(NAME_ASCENDING) public class EBookStoreClientSampleTest { + + @ArquillianResource + private URL url; + private static EBookStoreImplService eBookStoreService; - /** - * Method for creating and deploying the war file from 'jaxws-endpoint' project, - * which contains the web service to be tested. - * - * @return a war file - */ @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(MavenImporter.class) @@ -49,9 +44,6 @@ public static WebArchive createDeployment() { .as(WebArchive.class); } - @ArquillianResource - private URL url; - @Before public void setUp() throws Exception { eBookStoreService = new EBookStoreImplService( diff --git a/jaxws/jaxws-endpoint-ejb/pom.xml b/jaxws/jaxws-endpoint-ejb/pom.xml new file mode 100644 index 000000000..16e0c9db2 --- /dev/null +++ b/jaxws/jaxws-endpoint-ejb/pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + + + org.javaee7 + jaxws + 1.0-SNAPSHOT + + + jaxws-jaxws-endpoint-ejb + war + Java EE 7 Sample: jaxws - jaxws-endpoint - EJB + + + jaxws-endpoint-ejb + + + + + org.eclipse.microprofile.opentracing + microprofile-opentracing-api + 1.0 + provided + + + + io.opentracing + opentracing-api + 0.30.0 + provided + + + diff --git a/jaxws/jaxws-endpoint-ejb/src/main/java/org/javaee7/jaxws/endpoint/ejb/EBookStore.java b/jaxws/jaxws-endpoint-ejb/src/main/java/org/javaee7/jaxws/endpoint/ejb/EBookStore.java new file mode 100644 index 000000000..26900d4fe --- /dev/null +++ b/jaxws/jaxws-endpoint-ejb/src/main/java/org/javaee7/jaxws/endpoint/ejb/EBookStore.java @@ -0,0 +1,22 @@ +/** Copyright Payara Services Limited **/ +package org.javaee7.jaxws.endpoint.ejb; + +import static javax.jws.soap.SOAPBinding.Style.RPC; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * + * @author Fermin Gallego + * @author Arjan Tijms + * + */ +@WebService +@SOAPBinding(style = RPC) +public interface EBookStore { + + @WebMethod + String welcomeMessage(String name); +} diff --git a/jaxws/jaxws-endpoint-ejb/src/main/java/org/javaee7/jaxws/endpoint/ejb/EBookStoreImpl.java b/jaxws/jaxws-endpoint-ejb/src/main/java/org/javaee7/jaxws/endpoint/ejb/EBookStoreImpl.java new file mode 100644 index 000000000..426996f75 --- /dev/null +++ b/jaxws/jaxws-endpoint-ejb/src/main/java/org/javaee7/jaxws/endpoint/ejb/EBookStoreImpl.java @@ -0,0 +1,22 @@ +/** Copyright Payara Services Limited **/ +package org.javaee7.jaxws.endpoint.ejb; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +/** + * + * @author Fermin Gallego + * @author Arjan Tijms + * + */ +@Stateless +@WebService(endpointInterface = "org.javaee7.jaxws.endpoint.ejb.EBookStore") +public class EBookStoreImpl implements EBookStore { + + @Override + public String welcomeMessage(String name) { + return "Welcome to EBookStore WebService, Mr/Mrs " + name; + } + +} diff --git a/jaxws/jaxws-endpoint-ejb/src/test/java/org/javaee7/jaxws/endpoint/ejb/EBookStoreTest.java b/jaxws/jaxws-endpoint-ejb/src/test/java/org/javaee7/jaxws/endpoint/ejb/EBookStoreTest.java new file mode 100644 index 000000000..269d8653f --- /dev/null +++ b/jaxws/jaxws-endpoint-ejb/src/test/java/org/javaee7/jaxws/endpoint/ejb/EBookStoreTest.java @@ -0,0 +1,64 @@ +/** Copyright Payara Services Limited **/ +package org.javaee7.jaxws.endpoint.ejb; + +import static org.junit.Assert.assertEquals; +import static org.junit.runners.MethodSorters.NAME_ASCENDING; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.javaee7.jaxws.endpoint.ejb.EBookStore; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * @author Fermin Gallego + * @author Arjan Tijms + */ +@RunWith(Arquillian.class) +@FixMethodOrder(NAME_ASCENDING) +public class EBookStoreTest { + + @ArquillianResource + private URL url; + + private URL rootUrl; + + private static Service eBookStoreService; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + return ShrinkWrap.create(WebArchive.class). + addPackage("org.javaee7.jaxws.endpoint.ejb"); + } + + @Before + public void setupClass() throws MalformedURLException { + rootUrl = new URL(url.getProtocol(), url.getHost(), url.getPort(), ""); + + eBookStoreService = Service.create( + // The WSDL file used to create this service is fetched from the application we deployed + // above using the createDeployment() method. + new URL(rootUrl, "EBookStoreImplService/EBookStoreImpl?wsdl"), + new QName("http://ejb.endpoint.jaxws.javaee7.org/", "EBookStoreImplService")); + } + + @Test + public void test1WelcomeMessage() throws MalformedURLException { + assertEquals( + "Welcome to EBookStore WebService, Mr/Mrs Johnson", + eBookStoreService.getPort(EBookStore.class).welcomeMessage("Johnson")); + } + + +} diff --git a/jaxws/jaxws-endpoint/pom.xml b/jaxws/jaxws-endpoint/pom.xml index 3067161f3..7bd2d39fc 100644 --- a/jaxws/jaxws-endpoint/pom.xml +++ b/jaxws/jaxws-endpoint/pom.xml @@ -1,39 +1,17 @@ - - 4.0.0 + 4.0.0 org.javaee7 jaxws 1.0-SNAPSHOT - ../pom.xml + jaxws-jaxws-endpoint war Java EE 7 Sample: jaxws - jaxws-endpoint jaxws-endpoint - - - - org.jvnet.jax-ws-commons - jaxws-maven-plugin - 2.3 - - - process-classes - - wsgen - - - org.javaee7.jaxws.endpoint.EBookStoreImpl - true - ${basedir}/src/main/webapp/WEB-INF/wsdl - - - - - diff --git a/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStore.java b/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStore.java index 3ca54e02d..76f47b2de 100644 --- a/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStore.java +++ b/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStore.java @@ -14,17 +14,17 @@ public interface EBookStore { @WebMethod - public String welcomeMessage(String name); + String welcomeMessage(String name); @WebMethod - public List findEBooks(String text); + List findEBooks(String text); @WebMethod - public EBook takeBook(String title); + EBook takeBook(String title); @WebMethod - public void saveBook(EBook eBook); + void saveBook(EBook eBook); @WebMethod - public EBook addAppendix(EBook eBook, int appendixPages); + EBook addAppendix(EBook eBook, int appendixPages); } diff --git a/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStoreImpl.java b/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStoreImpl.java index d029daaff..fd3b2bd5c 100644 --- a/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStoreImpl.java +++ b/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStoreImpl.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.jws.WebService; @@ -16,7 +17,7 @@ serviceName = "EBookStoreImplService") public class EBookStoreImpl implements EBookStore { - private HashMap eBookCollection = new HashMap(); + private Map eBookCollection = new HashMap<>(); @Override public String welcomeMessage(String name) { diff --git a/jaxws/jaxws-endpoint/src/test/java/org/javaee7/jaxws/endpoint/EBookStoreTest.java b/jaxws/jaxws-endpoint/src/test/java/org/javaee7/jaxws/endpoint/EBookStoreTest.java index ac383c12f..08f5e3f61 100644 --- a/jaxws/jaxws-endpoint/src/test/java/org/javaee7/jaxws/endpoint/EBookStoreTest.java +++ b/jaxws/jaxws-endpoint/src/test/java/org/javaee7/jaxws/endpoint/EBookStoreTest.java @@ -1,6 +1,8 @@ package org.javaee7.jaxws.endpoint; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.runners.MethodSorters.NAME_ASCENDING; import java.net.MalformedURLException; import java.net.URL; @@ -9,8 +11,6 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; -import org.javaee7.jaxws.endpoint.EBook; -import org.javaee7.jaxws.endpoint.EBookStore; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; @@ -20,35 +20,30 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.MethodSorters; /** * @author Fermin Gallego */ @RunWith(Arquillian.class) -@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@FixMethodOrder(NAME_ASCENDING) public class EBookStoreTest { + + @ArquillianResource + private URL url; private static Service eBookStoreService; - /** - * Arquillian specific method for creating a file which can be deployed - * while executing the test. - * - * @return a war file - */ @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class). addPackage("org.javaee7.jaxws.endpoint"); } - @ArquillianResource - private URL url; - @Before public void setupClass() throws MalformedURLException { eBookStoreService = Service.create( + // The WSDL file used to create this service is fetched from the application we deployed + // above using the createDeployment() method. new URL(url, "EBookStoreImplService?wsdl"), new QName("http://endpoint.jaxws.javaee7.org/", "EBookStoreImplService")); } @@ -63,6 +58,7 @@ public void test1WelcomeMessage() throws MalformedURLException { @Test public void test2SaveAndTakeBook() throws MalformedURLException { EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); + EBook eBook = new EBook(); eBook.setTitle("The Lord of the Rings"); eBook.setNumPages(1178); @@ -89,15 +85,15 @@ public void test3FindEbooks() { assertEquals("The Lord of the Rings", titleList.get(0)); } - @Test - public void test4AddAppendix() { - EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); - EBook eBook = eBookStore.takeBook("Oliver Twist"); - - assertEquals(268, eBook.getNumPages()); - EBook eBookResponse = eBookStore.addAppendix(eBook, 5); - - assertEquals(268, eBook.getNumPages()); - assertEquals(273, eBookResponse.getNumPages()); - } +// @Test +// public void test4AddAppendix() { +// EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); +// EBook eBook = eBookStore.takeBook("Oliver Twist"); +// +// assertEquals(268, eBook.getNumPages()); +// EBook eBookResponse = eBookStore.addAppendix(eBook, 5); +// +// assertEquals(268, eBook.getNumPages()); +// assertEquals(273, eBookResponse.getNumPages()); +// } } diff --git a/jaxws/pom.xml b/jaxws/pom.xml index 7099a2360..81a9e49f2 100644 --- a/jaxws/pom.xml +++ b/jaxws/pom.xml @@ -7,13 +7,13 @@ 1.0-SNAPSHOT - org.javaee7 jaxws pom Java EE 7 Sample: jaxws jaxws-endpoint + jaxws-endpoint-ejb jaxws-client @@ -22,10 +22,27 @@ org.javaee7 test-utils ${project.version} + test + + + com.sun.xml.ws + jaxws-rt + 2.3.5 + test + + + + com.helger.maven + jaxws-maven-plugin + 2.6 + + + + maven-surefire-plugin diff --git a/jca/pom.xml b/jca/pom.xml index e4af5f93f..148d44f40 100644 --- a/jca/pom.xml +++ b/jca/pom.xml @@ -1,7 +1,5 @@ - - 4.0.0 + 4.0.0 org.javaee7 @@ -11,6 +9,7 @@ jca pom + Java EE 7 Sample: jca @@ -23,6 +22,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/jms/pom.xml b/jms/pom.xml index 2d4408fbc..01119e5d3 100644 --- a/jms/pom.xml +++ b/jms/pom.xml @@ -25,6 +25,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Language.java b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Language.java new file mode 100644 index 000000000..3bd675da9 --- /dev/null +++ b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Language.java @@ -0,0 +1,8 @@ +package org.javaee7.jpa.listeners; + +/** + * @author Patrik Dudits + */ +public enum Language { + ENGLISH, GERMAN; +} diff --git a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/LanguageConverter.java b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/LanguageConverter.java new file mode 100644 index 000000000..8ffdf949d --- /dev/null +++ b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/LanguageConverter.java @@ -0,0 +1,40 @@ +package org.javaee7.jpa.listeners; + +import javax.persistence.AttributeConverter; +import javax.persistence.Converter; + +/** + * The presence of a converter causes injection to fail in Eclipselink 2.7.4 + * @author Patrik Dudits + */ +@Converter(autoApply = true) +public class LanguageConverter implements AttributeConverter { + @Override + public String convertToDatabaseColumn(Language attribute) { + if (attribute == null) { + return "Unknown"; + } + switch (attribute) { + case ENGLISH: + return "en"; + case GERMAN: + return "de"; + } + return null; + } + + @Override + public Language convertToEntityAttribute(String dbData) { + if (dbData == null) { + return null; + } + switch (dbData) { + case "en": + return Language.ENGLISH; + case "de": + return Language.GERMAN; + default: + return null; + } + } +} diff --git a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Movie.java b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Movie.java index b3b7e5d7d..54d2373b5 100644 --- a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Movie.java +++ b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Movie.java @@ -41,6 +41,8 @@ public class Movie implements Serializable { @Transient private Integer rating; + private Language language; + public Movie() { } diff --git a/jpa/listeners-injection/src/main/resources/META-INF/create.sql b/jpa/listeners-injection/src/main/resources/META-INF/create.sql index 00a37e63a..ac2ac3210 100644 --- a/jpa/listeners-injection/src/main/resources/META-INF/create.sql +++ b/jpa/listeners-injection/src/main/resources/META-INF/create.sql @@ -1,2 +1,2 @@ -CREATE TABLE MOVIE_LISTENER("ID" INTEGER not null primary key, "NAME" VARCHAR(50) not null, "ACTORS" VARCHAR(200) not null) +CREATE TABLE MOVIE_LISTENER("ID" INTEGER not null primary key, "NAME" VARCHAR(50) not null, "ACTORS" VARCHAR(200) not null, "LANGUAGE" VARCHAR(12)) CREATE TABLE MOVIE_RATINGS("ID" INTEGER not null primary key, "NAME" VARCHAR(50) not null, "RATING" INTEGER not null) \ No newline at end of file diff --git a/jpa/pom.xml b/jpa/pom.xml index 42f5e5697..22dadcbf3 100644 --- a/jpa/pom.xml +++ b/jpa/pom.xml @@ -1,12 +1,10 @@ - - 4.0.0 + 4.0.0 org.javaee7 samples-parent 1.0-SNAPSHOT - ../pom.xml jpa @@ -50,6 +48,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/jsf/pom.xml b/jsf/pom.xml index 733f580a6..63f33f4c3 100644 --- a/jsf/pom.xml +++ b/jsf/pom.xml @@ -1,6 +1,5 @@ - - 4.0.0 + 4.0.0 org.javaee7 @@ -9,7 +8,6 @@ jsf - 1.0-SNAPSHOT pom Java EE 7 Sample: jsf @@ -40,6 +38,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/json/pom.xml b/json/pom.xml index 83ceb12aa..db0a5703c 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -1,17 +1,15 @@ - - 4.0.0 + 4.0.0 org.javaee7 samples-parent 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + json - 1.0-SNAPSHOT pom + Java EE 7 Sample: json @@ -26,6 +24,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/jta/pom.xml b/jta/pom.xml index 4edfaf1c8..1aed93aea 100644 --- a/jta/pom.xml +++ b/jta/pom.xml @@ -1,17 +1,15 @@ - - 4.0.0 + 4.0.0 org.javaee7 samples-parent 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + jta - 1.0-SNAPSHOT pom + Java EE 7 Sample: jta @@ -25,6 +23,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/pom.xml b/pom.xml index 56d9f344c..732727fc8 100644 --- a/pom.xml +++ b/pom.xml @@ -10,9 +10,9 @@ Java EE 7 Sample: javaee7-samples - 1.1.14.Final + 1.7.0.Alpha1 1.7 - 3.0.0 + 3.5.4 UTF-8 false @@ -34,12 +34,11 @@ --> 4.1.2.181 payaradomain - 5.182 5.0 4.1.1 16.0.0.4 13.0.0.Final - 2.0.0.Final + 2.4.0.Final 7.0.2 9.0.4 @@ -76,21 +75,6 @@ false - - - ossrh - Sonatype-snapshot - - https://oss.sonatype.org/content/repositories/snapshots - - - false - - - true - always - - @@ -140,14 +124,24 @@ com.h2database h2 - 1.4.195 + 1.4.197 fish.payara.arquillian payara-client-ee7 - 1.0.Beta3-m1 + 2.2 test + + org.bouncycastle + bcprov-jdk15on + 1.61 + + + org.bouncycastle + bcpkix-jdk15on + 1.61 + @@ -169,26 +163,24 @@ junit junit - 4.12 + 4.13.1 test org.hamcrest hamcrest-core - 1.3 test org.hamcrest hamcrest-library - 1.3 test org.assertj assertj-core - 1.5.0 + 3.16.1 test @@ -215,13 +207,13 @@ xmlunit xmlunit - 1.5 + 1.6 test org.skyscreamer jsonassert - 1.2.1 + 1.5.0 test @@ -234,43 +226,61 @@ net.sourceforge.htmlunit htmlunit - 2.31 + 2.40.0 test rhino js - 1.7R1 + 1.7R2 test org.json json - 20131018 + 20180813 test com.jayway.awaitility awaitility - 1.6.0 + 1.7.0 test + + org.omnifaces + omniutils + 0.11 + test + + + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.0 + + + org.glassfish.jaxb + jaxb-runtime + 3.0.0 + ${project.artifactId} + src/test/resources true + org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + 3.8.1 ${java.min.version} ${java.min.version} @@ -279,7 +289,7 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.19.1 + 3.0.0-M3 true true @@ -288,7 +298,7 @@ org.apache.maven.plugins maven-war-plugin - 3.0.0 + 3.2.3 true false @@ -321,7 +331,7 @@ org.wildfly.plugins wildfly-maven-plugin - 1.0.2.Final + 1.2.1.Final @@ -329,12 +339,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.3.1 + 3.0.0-M3 org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 3.0.0-M4 @@ -346,6 +356,52 @@ + + + + + piranha-embedded-micro + + + true + + true + + + + + + fish.payara.arquillian + payara-client-ee7 + + + + cloud.piranha.arquillian + piranha-arquillian-server + 20.6.0-SNAPSHOT + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + piranha-embedded + 20.6.0-SNAPSHOT + true + ${skipEJB} + + + + + + + + + @@ -368,7 +424,7 @@ fish.payara.arquillian arquillian-payara-server-4-managed - 1.0.Beta3-m1 + 1.1 @@ -469,10 +525,10 @@ fish.payara.extras payara-micro - ${payara.micro.version} + ${payara.version} false ${session.executionRootDirectory}/target/ - payara-micro-${payara.micro.version}.jar + payara-micro-${payara.version}.jar @@ -485,7 +541,7 @@ ${skipEAR} - ${session.executionRootDirectory}/target/payara-micro-${payara.micro.version}.jar + ${session.executionRootDirectory}/target/payara-micro-${payara.version}.jar @@ -548,16 +604,17 @@ - + maven-surefire-plugin payara-remote + ${payara_domain} - + src/test/resources @@ -1386,7 +1443,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.1 + 1.8 process-test-classes @@ -1646,7 +1703,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.4 + 3.1.2 sources diff --git a/servlet/async-servlet/pom.xml b/servlet/async-servlet/pom.xml index e940bdd18..64f60a48e 100644 --- a/servlet/async-servlet/pom.xml +++ b/servlet/async-servlet/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 @@ -8,9 +7,9 @@ servlet 1.0-SNAPSHOT - + servlet-async-servlet war - + Java EE 7 Sample: servlet - async-servlet diff --git a/servlet/async-servlet/src/main/java/org/javaee7/servlet/async/MyAsyncServlet.java b/servlet/async-servlet/src/main/java/org/javaee7/servlet/async/MyAsyncServlet.java index c8db9f77c..a340f5161 100644 --- a/servlet/async-servlet/src/main/java/org/javaee7/servlet/async/MyAsyncServlet.java +++ b/servlet/async-servlet/src/main/java/org/javaee7/servlet/async/MyAsyncServlet.java @@ -39,6 +39,8 @@ */ package org.javaee7.servlet.async; +import java.io.IOException; + import javax.annotation.Resource; import javax.enterprise.concurrent.ManagedExecutorService; import javax.servlet.AsyncContext; @@ -49,7 +51,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; /** * @author Arun Gupta @@ -57,24 +58,23 @@ @WebServlet(urlPatterns = "/MyAsyncServlet", asyncSupported = true) public class MyAsyncServlet extends HttpServlet { - // @Resource(lookup="java:comp/DefaultManagedExecutorService") + private static final long serialVersionUID = 3709640331218336841L; + @Resource ManagedExecutorService executor; /** - * Processes requests for both HTTP GET and POST - * methods. + * Processes requests for both HTTP GET and POST methods. * * @param request servlet request * @param response servlet response * @throws ServletException if a servlet-specific error occurs * @throws IOException if an I/O error occurs */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - AsyncContext ac = request.startAsync(); + protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + AsyncContext asyncContext = request.startAsync(); - ac.addListener(new AsyncListener() { + asyncContext.addListener(new AsyncListener() { @Override public void onComplete(AsyncEvent event) throws IOException { event.getSuppliedResponse().getWriter().println("onComplete"); @@ -96,29 +96,29 @@ public void onStartAsync(AsyncEvent event) throws IOException { event.getSuppliedResponse().getWriter().println("onStartAsync"); } }); - executor.submit(new MyAsyncService(ac)); + + executor.submit(new MyAsyncService(asyncContext)); } class MyAsyncService implements Runnable { - AsyncContext ac; + AsyncContext asyncContext; - public MyAsyncService(AsyncContext ac) { - this.ac = ac; + public MyAsyncService(AsyncContext asyncContext) { + this.asyncContext = asyncContext; } @Override public void run() { try { - ac.getResponse().getWriter().println("Running inside MyAsyncService"); + asyncContext.getResponse().getWriter().println("Running inside MyAsyncService"); } catch (IOException e) { throw new IllegalStateException(e); } - ac.complete(); + asyncContext.complete(); } } - // /** * Handles the HTTP GET method. * @@ -128,8 +128,7 @@ public void run() { * @throws IOException if an I/O error occurs */ @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { processRequest(request, response); } @@ -142,8 +141,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) * @throws IOException if an I/O error occurs */ @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { processRequest(request, response); } @@ -155,5 +153,5 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) @Override public String getServletInfo() { return "Short description"; - }// + } } diff --git a/servlet/cookies/pom.xml b/servlet/cookies/pom.xml index 9bd042110..f3981cade 100644 --- a/servlet/cookies/pom.xml +++ b/servlet/cookies/pom.xml @@ -8,9 +8,11 @@ 1.0-SNAPSHOT ../pom.xml + org.javaee7 servlet-cookies 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - cookies diff --git a/servlet/cookies/src/main/java/org/javaee7/servlet/cookies/ClientCookieServlet.java b/servlet/cookies/src/main/java/org/javaee7/servlet/cookies/ClientCookieServlet.java new file mode 100644 index 000000000..9805b8459 --- /dev/null +++ b/servlet/cookies/src/main/java/org/javaee7/servlet/cookies/ClientCookieServlet.java @@ -0,0 +1,114 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * or packager/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at packager/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + */ +package org.javaee7.servlet.cookies; + +import java.io.IOException; +import java.io.PrintWriter; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author Arun Gupta + */ +@WebServlet(urlPatterns = { "/ClientCookieServlet" }) +public class ClientCookieServlet extends HttpServlet { + + private static final long serialVersionUID = -1944396991856607131L; + + /** + * Processes requests for both HTTP GET and POST methods. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html;charset=UTF-8"); + + try (PrintWriter out = response.getWriter()) { + out.println(""); + out.println(""); + out.println(""); + out.println("Servlet ClientCookieServlet"); + out.println(""); + out.println(""); + out.println("

Servlet ClientCookieServlet at " + request.getContextPath() + "

"); + + + out.println(""); + + out.println(""); + out.println(""); + } + } + + /** + * Handles the HTTP GET method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + processRequest(request, response); + } + + /** + * Handles the HTTP POST method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + processRequest(request, response); + } +} diff --git a/servlet/cookies/src/main/java/org/javaee7/servlet/cookies/TestServlet.java b/servlet/cookies/src/main/java/org/javaee7/servlet/cookies/TestServlet.java index e1beb39a5..1ad92047e 100644 --- a/servlet/cookies/src/main/java/org/javaee7/servlet/cookies/TestServlet.java +++ b/servlet/cookies/src/main/java/org/javaee7/servlet/cookies/TestServlet.java @@ -41,9 +41,8 @@ import java.io.IOException; import java.io.PrintWriter; + import javax.servlet.ServletException; -import javax.servlet.SessionCookieConfig; -import javax.servlet.annotation.MultipartConfig; import javax.servlet.annotation.WebServlet; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServlet; @@ -54,21 +53,21 @@ * @author Arun Gupta */ @WebServlet(urlPatterns = { "/TestServlet" }) -@MultipartConfig(location = "/tmp") public class TestServlet extends HttpServlet { + private static final long serialVersionUID = -1944396991856607131L; + /** - * Processes requests for both HTTP GET and POST - * methods. + * Processes requests for both HTTP GET and POST methods. * * @param request servlet request * @param response servlet response * @throws ServletException if a servlet-specific error occurs * @throws IOException if an I/O error occurs */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); + try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); @@ -77,33 +76,36 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println(""); out.println(""); out.println("

Servlet TestServlet at " + request.getContextPath() + "

"); - SessionCookieConfig cookies = request.getServletContext().getSessionCookieConfig(); - out.println("Found cookie: " + cookies.getName()); + + if (request.getCookies() != null) { + for (Cookie cookie : request.getCookies()) { + out.println("Found cookie: " + cookie.getName()); + } + } + // General cookie Cookie cookie = new Cookie("myCookieKey", "myCookieValue"); cookie.setMaxAge(60); response.addCookie(cookie); + out.println("

Set a new cookie"); + // Http only cookie cookie = new Cookie("myHttpOnlyCookieKey", "myHttpOnlyCookieValue"); cookie.setHttpOnly(true); cookie.setMaxAge(60); response.addCookie(cookie); + out.println("
Set a new HTTPOnly Cookie

"); out.println("Check what cookies are visible by"); - out.println("clicking here"); + out.println("clicking here"); out.println(""); out.println(""); } } - // /** * Handles the HTTP GET method. * @@ -113,8 +115,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re * @throws IOException if an I/O error occurs */ @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { processRequest(request, response); } @@ -127,8 +128,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) * @throws IOException if an I/O error occurs */ @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { processRequest(request, response); } @@ -140,6 +140,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) @Override public String getServletInfo() { return "Short description"; - }// + } } diff --git a/servlet/cookies/src/test/java/org/javaee7/servlet/cookies/SimpleServletTest.java b/servlet/cookies/src/test/java/org/javaee7/servlet/cookies/SimpleServletTest.java new file mode 100644 index 000000000..6f33dd018 --- /dev/null +++ b/servlet/cookies/src/test/java/org/javaee7/servlet/cookies/SimpleServletTest.java @@ -0,0 +1,74 @@ +package org.javaee7.servlet.cookies; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.net.URL; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.xml.sax.SAXException; + +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + +/** + * @author Arjan Tijms + */ +@RunWith(Arquillian.class) +public class SimpleServletTest { + + @ArquillianResource + private URL base; + + private WebClient webClient; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + return ShrinkWrap.create(WebArchive.class) + .addClasses(TestServlet.class, ClientCookieServlet.class); + } + + @Before + public void setup() { + webClient = new WebClient(); + } + + @Test + public void testCookies() throws IOException, SAXException { + HtmlPage page = webClient.getPage(base + "TestServlet"); + + assertFalse(page.asText().contains("Found cookie: myCookieKey Found cookie: myHttpOnlyCookieKey")); + + // Request page again, should now send cookies back + page = webClient.getPage(base + "TestServlet"); + + assertTrue(page.asText().contains("Found cookie: myCookieKey Found cookie: myHttpOnlyCookieKey")); + } + + @Test + public void testHttpOnlyCookies() throws IOException, SAXException { + HtmlPage page = webClient.getPage(base + "TestServlet"); + + assertFalse(page.asText().contains("Found cookie: myCookieKey Found cookie: myHttpOnlyCookieKey")); + + // Request page with client-side script, should now be able to read cookies client-side + page = webClient.getPage(base + "ClientCookieServlet"); + webClient.waitForBackgroundJavaScript(1000); + + System.out.println(page.asText()); + + assertTrue(page.asText().contains("myCookieKey")); + assertFalse(page.asText().contains("myHttpOnlyCookieKey")); + + System.out.println(page.asText()); + } + +} diff --git a/servlet/error-mapping/pom.xml b/servlet/error-mapping/pom.xml index 0a10ffe60..c4b8230e5 100644 --- a/servlet/error-mapping/pom.xml +++ b/servlet/error-mapping/pom.xml @@ -6,11 +6,10 @@ org.javaee7 servlet 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + servlet-error-mapping - 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - error-mapping diff --git a/servlet/security-form-based/src/main/webapp/loginerror.jsp b/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/ErrorServlet.java similarity index 67% rename from servlet/security-form-based/src/main/webapp/loginerror.jsp rename to servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/ErrorServlet.java index 777e5d0f8..2f0d9949d 100644 --- a/servlet/security-form-based/src/main/webapp/loginerror.jsp +++ b/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/ErrorServlet.java @@ -1,4 +1,3 @@ - +package org.javaee7.servlet.error.mapping; -<%@page contentType="text/html" pageEncoding="UTF-8"%> - +import java.io.IOException; - - - - Form-Based Login Error Page - - -

Form-Based Login Error Page

+import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -

Invalid user name or password.

+/** + * @author Arun Gupta + * @author Arjan Tijms + */ +@WebServlet("/error") +public class ErrorServlet extends HttpServlet { -

Please enter a user name or password that is authorized to access this - application. For this application, make sure to create a user:

- - For WildFly: Invoke "./bin/add-user.sh -a -u u1 -p p1 -g g1"
- For GlassFish: Invoke "./bin/asadmin create-file-user --groups g1 u1" and use the password "p1" when prompted.

+ private static final long serialVersionUID = -3681304530279446784L; - Click here to Try Again

+ /** + * Handles the HTTP GET method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.getWriter().write("!error!"); + } - - +} diff --git a/servlet/security-form-based/src/main/webapp/loginform.jsp b/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/NotFoundServlet.java similarity index 67% rename from servlet/security-form-based/src/main/webapp/loginform.jsp rename to servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/NotFoundServlet.java index 054c05f16..5c6af4a73 100644 --- a/servlet/security-form-based/src/main/webapp/loginform.jsp +++ b/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/NotFoundServlet.java @@ -1,4 +1,3 @@ - +package org.javaee7.servlet.error.mapping; -<%@page contentType="text/html" pageEncoding="UTF-8"%> - +import java.io.IOException; - - - - Form-Based Login Page - - -

Form-Based Login Page

+import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -
- Username:

- Password:

- - -

+/** + * @author Arun Gupta + * @author Arjan Tijms + */ +@WebServlet("/notfound") +public class NotFoundServlet extends HttpServlet { + + private static final long serialVersionUID = -3681304530279446784L; - - + /** + * Handles the HTTP GET method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.getWriter().write("!not found!"); + } +} diff --git a/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/TestServlet.java b/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/TestServlet.java index 45d9ee442..c1d45aa06 100644 --- a/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/TestServlet.java +++ b/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/TestServlet.java @@ -40,7 +40,7 @@ package org.javaee7.servlet.error.mapping; import java.io.IOException; -import java.io.PrintWriter; + import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -48,24 +48,12 @@ /** * @author Arun Gupta + * @author Arjan Tijms */ public class TestServlet extends HttpServlet { - /** - * Processes requests for both HTTP GET and POST - * methods. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - throw new RuntimeException(); - } + private static final long serialVersionUID = -3681304530279446784L; - // /** * Handles the HTTP GET method. * @@ -75,33 +63,8 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re * @throws IOException if an I/O error occurs */ @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Handles the HTTP POST method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + throw new RuntimeException(); } - /** - * Returns a short description of the servlet. - * - * @return a String containing servlet description - */ - @Override - public String getServletInfo() { - return "Short description"; - }// - } diff --git a/servlet/error-mapping/src/main/webapp/WEB-INF/web.xml b/servlet/error-mapping/src/main/webapp/WEB-INF/web.xml index e9929cfb6..2c4396e28 100644 --- a/servlet/error-mapping/src/main/webapp/WEB-INF/web.xml +++ b/servlet/error-mapping/src/main/webapp/WEB-INF/web.xml @@ -40,11 +40,7 @@ * holder. */ --> - + TestServlet org.javaee7.servlet.error.mapping.TestServlet @@ -53,17 +49,13 @@ TestServlet /TestServlet - - - 30 - - + 404 - /error-404.jsp + /notfound java.lang.RuntimeException - /error-exception.jsp + /error diff --git a/servlet/error-mapping/src/test/java/org/javaee7/servlet/error/mapping/ErrorMappingTest.java b/servlet/error-mapping/src/test/java/org/javaee7/servlet/error/mapping/ErrorMappingTest.java new file mode 100644 index 000000000..39b1207d1 --- /dev/null +++ b/servlet/error-mapping/src/test/java/org/javaee7/servlet/error/mapping/ErrorMappingTest.java @@ -0,0 +1,67 @@ +package org.javaee7.servlet.error.mapping; + +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.net.URL; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.xml.sax.SAXException; + +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; + +/** + * @author Arjan Tijms + */ +@RunWith(Arquillian.class) +public class ErrorMappingTest { + + private static final String WEBAPP_SRC = "src/main/webapp"; + + @ArquillianResource + private URL base; + + private WebClient webClient; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + return ShrinkWrap.create(WebArchive.class) + .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) + .addClasses( + TestServlet.class, + ErrorServlet.class, + NotFoundServlet.class); + } + + @Before + public void setup() { + webClient = new WebClient(); + webClient.getOptions().setThrowExceptionOnFailingStatusCode(false); + } + + @Test + public void testError() throws IOException, SAXException { + TextPage page = webClient.getPage(base + "TestServlet"); + + System.out.println(page.getContent()); + + assertTrue(page.getContent().contains("!error!")); + } + + @Test + public void test404() throws IOException, SAXException { + TextPage page = webClient.getPage(base + "does-not-exist"); + + assertTrue(page.getContent().contains("!not found!")); + } + +} diff --git a/servlet/event-listeners/pom.xml b/servlet/event-listeners/pom.xml index 90543ed06..0880ecfd7 100644 --- a/servlet/event-listeners/pom.xml +++ b/servlet/event-listeners/pom.xml @@ -7,10 +7,10 @@ servlet 1.0-SNAPSHOT ../pom.xml - - org.javaee7 + + servlet-event-listeners - 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - event-listeners diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyContextAttributeListener.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyContextAttributeListener.java index 2e9acbe26..94a3e1367 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyContextAttributeListener.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyContextAttributeListener.java @@ -53,16 +53,16 @@ public class MyContextAttributeListener implements ServletContextAttributeListen @Override public void attributeAdded(ServletContextAttributeEvent event) { - System.out.println("MyContextAttributeListener.attributeAdded: " + event.getName()); + TestServlet.eventBuffer.append("\nMyContextAttributeListener.attributeAdded: " + event.getName()); } @Override public void attributeRemoved(ServletContextAttributeEvent event) { - System.out.println("MyContextAttributeListener.attributeRemoved: " + event.getName()); + TestServlet.eventBuffer.append("\nMyContextAttributeListener.attributeRemoved: " + event.getName()); } @Override public void attributeReplaced(ServletContextAttributeEvent event) { - System.out.println("MyContextAttributeListener.attributeReplaced: " + event.getName()); + TestServlet.eventBuffer.append("\nMyContextAttributeListener.attributeReplaced: " + event.getName()); } } diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyContextListener.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyContextListener.java index 063a9b945..4a009b298 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyContextListener.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyContextListener.java @@ -53,11 +53,11 @@ public class MyContextListener implements ServletContextListener { @Override public void contextInitialized(ServletContextEvent sce) { - System.out.println("MyContextListener.contextInitialized: " + sce.getServletContext().getContextPath()); + TestServlet.eventBuffer.append("\nMyContextListener.contextInitialized: " + sce.getServletContext().getContextPath()); } @Override public void contextDestroyed(ServletContextEvent sce) { - System.out.println("MyContextListener.contextDestroyed: " + sce.getServletContext().getContextPath()); + TestServlet.eventBuffer.append("\nMyContextListener.contextDestroyed: " + sce.getServletContext().getContextPath()); } } diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionActivationListener.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionActivationListener.java index 0d8b73fe5..9b99a249d 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionActivationListener.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionActivationListener.java @@ -51,12 +51,12 @@ public class MyHttpSessionActivationListener implements HttpSessionActivationLis @Override public void sessionWillPassivate(HttpSessionEvent se) { - System.out.println("MyHttpSessionActivationListener.sessionWillPassivate: " + se.getSession().getId()); + TestServlet.eventBuffer.append("\nMyHttpSessionActivationListener.sessionWillPassivate: " + se.getSession().getId()); } @Override public void sessionDidActivate(HttpSessionEvent se) { - System.out.println("MyHttpSessionActivationListener.sessionDidActivate: " + se.getSession().getId()); + TestServlet.eventBuffer.append("\nMyHttpSessionActivationListener.sessionDidActivate: " + se.getSession().getId()); } } diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionAttributeListener.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionAttributeListener.java index 1e7cbdea6..8cab6fbb2 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionAttributeListener.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionAttributeListener.java @@ -53,16 +53,16 @@ public class MyHttpSessionAttributeListener implements HttpSessionAttributeListe @Override public void attributeAdded(HttpSessionBindingEvent event) { - System.out.println("MyHttpSessionAttributeListener.attributeAdded: " + event.getName()); + TestServlet.eventBuffer.append("\nMyHttpSessionAttributeListener.attributeAdded: " + event.getName()); } @Override public void attributeRemoved(HttpSessionBindingEvent event) { - System.out.println("MyHttpSessionAttributeListener.attributeRemoved: " + event.getName()); + TestServlet.eventBuffer.append("\nMyHttpSessionAttributeListener.attributeRemoved: " + event.getName()); } @Override public void attributeReplaced(HttpSessionBindingEvent event) { - System.out.println("MyHttpSessionAttributeListener.attributeReplaced: " + event.getName()); + TestServlet.eventBuffer.append("\nMyHttpSessionAttributeListener.attributeReplaced: " + event.getName()); } } diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionBindingListener.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionBindingListener.java index 5eb2daefc..fe98aa4f7 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionBindingListener.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyHttpSessionBindingListener.java @@ -51,12 +51,12 @@ public class MyHttpSessionBindingListener implements HttpSessionBindingListener @Override public void valueBound(HttpSessionBindingEvent event) { - System.out.println("MyHttpSessionBindingListener.valueBound: " + event.getName()); + TestServlet.eventBuffer.append("\nMyHttpSessionBindingListener.valueBound: " + event.getName()); } @Override public void valueUnbound(HttpSessionBindingEvent event) { - System.out.println("MyHttpSessionBindingListener.valueUnbound: " + event.getName()); + TestServlet.eventBuffer.append("\nMyHttpSessionBindingListener.valueUnbound: " + event.getName()); } } diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestAttributeListener.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestAttributeListener.java index cc0dc6f4d..5c05ea3ae 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestAttributeListener.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestAttributeListener.java @@ -53,17 +53,17 @@ public class MyServletRequestAttributeListener implements ServletRequestAttribut @Override public void attributeAdded(ServletRequestAttributeEvent srae) { - System.out.println("MyServletRequestAttributeListener.attributeAdded: " + srae.getName()); + TestServlet.eventBuffer.append("\nMyServletRequestAttributeListener.attributeAdded: " + srae.getName()); } @Override public void attributeRemoved(ServletRequestAttributeEvent srae) { - System.out.println("MyServletRequestAttributeListener.attributeRemoved: " + srae.getName()); + TestServlet.eventBuffer.append("\nMyServletRequestAttributeListener.attributeRemoved: " + srae.getName()); } @Override public void attributeReplaced(ServletRequestAttributeEvent srae) { - System.out.println("MyServletRequestAttributeListener.attributeReplaced: " + srae.getName()); + TestServlet.eventBuffer.append("\nMyServletRequestAttributeListener.attributeReplaced: " + srae.getName()); } } diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestListener.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestListener.java index 09b7af811..c5a73e88c 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestListener.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestListener.java @@ -53,11 +53,11 @@ public class MyServletRequestListener implements ServletRequestListener { @Override public void requestDestroyed(ServletRequestEvent sre) { - System.out.println("MyServletRequestListener.requestDestroyed: " + sre.getServletContext().getContextPath()); + TestServlet.eventBuffer.append("\nMyServletRequestListener.requestDestroyed: " + sre.getServletContext().getContextPath()); } @Override public void requestInitialized(ServletRequestEvent sre) { - System.out.println("MyServletRequestListener.requestInitialized: " + sre.getServletContext().getContextPath()); + TestServlet.eventBuffer.append("\nMyServletRequestListener.requestInitialized: " + sre.getServletContext().getContextPath()); } } diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MySessionIdListener.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MySessionIdListener.java index 5a9224b60..a95fea58f 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MySessionIdListener.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MySessionIdListener.java @@ -53,7 +53,7 @@ public class MySessionIdListener implements HttpSessionIdListener { @Override public void sessionIdChanged(HttpSessionEvent event, String oldSessionId) { - System.out.println("MySessionIdListener.sessionIdChanged: new=" + event.getSession().getId() + ", old=" + oldSessionId); + TestServlet.eventBuffer.append("\nMySessionIdListener.sessionIdChanged: new=" + event.getSession().getId() + ", old=" + oldSessionId); } } diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MySessionListener.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MySessionListener.java index e72488652..f3b27d086 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MySessionListener.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MySessionListener.java @@ -53,11 +53,11 @@ public class MySessionListener implements HttpSessionListener { @Override public void sessionCreated(HttpSessionEvent se) { - System.out.println("MySessionListener.sessionCreated: " + se.getSession().getId()); + TestServlet.eventBuffer.append("\nMySessionListener.sessionCreated: " + se.getSession().getId()); } @Override public void sessionDestroyed(HttpSessionEvent se) { - System.out.println("MySessionListener.sessionDestroyed: " + se.getSession().getId()); + TestServlet.eventBuffer.append("\nMySessionListener.sessionDestroyed: " + se.getSession().getId()); } } diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/TestServlet.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/TestServlet.java index 074137976..daa804af7 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/TestServlet.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/TestServlet.java @@ -53,85 +53,60 @@ @WebServlet(urlPatterns = "/TestServlet") public class TestServlet extends HttpServlet { + private static final long serialVersionUID = -535776072448287787L; + + public static StringBuffer eventBuffer = new StringBuffer(); + /** - * Processes requests for both HTTP GET and POST - * methods. + * Processes requests for both HTTP GET and POST methods. * * @param request servlet request * @param response servlet response * @throws ServletException if a servlet-specific error occurs * @throws IOException if an I/O error occurs */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + eventBuffer.setLength(0); + response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); + out.println(""); out.println(""); - out.println(""); - out.println("Servlet Event Listeners"); - out.println(""); - out.println(""); - out.println("

Servlet Event Listeners

"); - out.println("

Setting, updating, and removing ServletContext Attributes

"); - request.getServletContext().setAttribute("attribute1", "attribute-value1"); - request.getServletContext().setAttribute("attribute1", "attribute-updated-value1"); - request.getServletContext().removeAttribute("attribute1"); - out.println("done"); - out.println("

Setting, updating, and removing HttpSession Attributes

"); - request.getSession(true).setAttribute("attribute1", "attribute-value1"); - request.getSession().setAttribute("attribute1", "attribute-updated-value1"); - request.getSession().removeAttribute("attribute1"); - out.println("done"); - out.println("

Setting, updating, and removing ServletRequest Attributes

"); - request.setAttribute("attribute1", "attribute-value1"); - request.setAttribute("attribute1", "attribute-updated-value1"); - request.removeAttribute("attribute1"); - out.println("done"); - out.println("

Invalidating session

"); - request.getSession().invalidate(); - out.println("done"); - out.println("

Check output in server log"); - out.println(""); + out.println(""); + out.println("Servlet Event Listeners"); + out.println(""); + out.println(""); + out.println("

Servlet Event Listeners

"); + + out.println("

Setting, updating, and removing ServletContext Attributes

"); + request.getServletContext().setAttribute("attribute1", "attribute-value1"); + request.getServletContext().setAttribute("attribute1", "attribute-updated-value1"); + request.getServletContext().removeAttribute("attribute1"); + out.println("done"); + + out.println("

Setting, updating, and removing HttpSession Attributes

"); + request.getSession(true).setAttribute("attribute1", "attribute-value1"); + request.getSession().setAttribute("attribute1", "attribute-updated-value1"); + request.getSession().removeAttribute("attribute1"); + out.println("done"); + + out.println("

Setting, updating, and removing ServletRequest Attributes

"); + request.setAttribute("attribute1", "attribute-value1"); + request.setAttribute("attribute1", "attribute-updated-value1"); + request.removeAttribute("attribute1"); + out.println("done"); + + out.println("

Invalidating session

"); + request.getSession().invalidate(); + out.println("done"); + + out.println("

Generated output:"); + out.println("
");
+                out.println(eventBuffer.toString());
+                out.println("
"); + out.println(""); out.println(""); } - // - /** - * Handles the HTTP GET method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Handles the HTTP POST method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Returns a short description of the servlet. - * - * @return a String containing servlet description - */ - @Override - public String getServletInfo() { - return "Short description"; - }// } diff --git a/servlet/event-listeners/src/test/java/org/javaee7/servlet/event/listeners/EventListenerTest.java b/servlet/event-listeners/src/test/java/org/javaee7/servlet/event/listeners/EventListenerTest.java new file mode 100644 index 000000000..128a93a68 --- /dev/null +++ b/servlet/event-listeners/src/test/java/org/javaee7/servlet/event/listeners/EventListenerTest.java @@ -0,0 +1,90 @@ +package org.javaee7.servlet.event.listeners; + +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.net.URL; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + +/** + * @author Arjan Tijms + */ +@RunWith(Arquillian.class) +public class EventListenerTest { + + @ArquillianResource + private URL base; + + private WebClient webClient; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + return ShrinkWrap + .create(WebArchive.class) + .addClasses( + MyServletRequestAttributeListener.class, + MyHttpSessionActivationListener.class, + MyHttpSessionAttributeListener.class, + MyHttpSessionBindingListener.class, + MyContextAttributeListener.class, + MyServletRequestListener.class, + MySessionIdListener.class, + MyContextListener.class, + MySessionListener.class, + TestServlet.class); + } + + @Before + public void setup() { + webClient = new WebClient(); + } + + @Test + public void testContextAttributeListener() throws IOException { + HtmlPage page = webClient.getPage(base + "TestServlet"); + + System.out.println(page.asText()); + + assertTrue(page.asText().contains("MyContextAttributeListener.attributeAdded: attribute1")); + assertTrue(page.asText().contains("MyContextAttributeListener.attributeReplaced: attribute1")); + assertTrue(page.asText().contains("MyContextAttributeListener.attributeRemoved: attribute1")); + } + + @Test + public void testSessionListener() throws IOException { + HtmlPage page = webClient.getPage(base + "TestServlet"); + + assertTrue(page.asText().contains("MySessionListener.sessionCreated:")); + assertTrue(page.asText().contains("MySessionListener.sessionDestroyed:")); + } + + @Test + public void testSessionAttributeListener() throws IOException { + HtmlPage page = webClient.getPage(base + "TestServlet"); + + assertTrue(page.asText().contains("MyHttpSessionAttributeListener.attributeAdded: attribute1")); + assertTrue(page.asText().contains("MyHttpSessionAttributeListener.attributeReplaced: attribute1")); + assertTrue(page.asText().contains("MyHttpSessionAttributeListener.attributeRemoved: attribute1")); + } + + @Test + public void testRequestAttributeListener() throws IOException { + HtmlPage page = webClient.getPage(base + "TestServlet"); + + assertTrue(page.asText().contains("MyServletRequestAttributeListener.attributeAdded: attribute1")); + assertTrue(page.asText().contains("MyServletRequestAttributeListener.attributeReplaced: attribute1")); + assertTrue(page.asText().contains("MyServletRequestAttributeListener.attributeRemoved: attribute1")); + } + +} diff --git a/servlet/file-upload/pom.xml b/servlet/file-upload/pom.xml index 44d680ccc..138088586 100644 --- a/servlet/file-upload/pom.xml +++ b/servlet/file-upload/pom.xml @@ -8,9 +8,11 @@ 1.0-SNAPSHOT ../pom.xml + org.javaee7 servlet-file-upload 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - file-upload diff --git a/servlet/metadata-complete/pom.xml b/servlet/metadata-complete/pom.xml index cf6ab3a63..3385b53a0 100644 --- a/servlet/metadata-complete/pom.xml +++ b/servlet/metadata-complete/pom.xml @@ -8,9 +8,11 @@ 1.0-SNAPSHOT ../pom.xml + org.javaee7 servlet-metadata-complete 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - metadata-complete diff --git a/servlet/nonblocking/pom.xml b/servlet/nonblocking/pom.xml index 071e5e798..3a169d6b5 100644 --- a/servlet/nonblocking/pom.xml +++ b/servlet/nonblocking/pom.xml @@ -8,9 +8,11 @@ 1.0-SNAPSHOT ../pom.xml + org.javaee7 servlet-nonblocking 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - nonblocking diff --git a/servlet/pom.xml b/servlet/pom.xml index 365fd69bf..1bbe27055 100644 --- a/servlet/pom.xml +++ b/servlet/pom.xml @@ -1,19 +1,19 @@ - 4.0.0 + 4.0.0 - + org.javaee7 samples-parent 1.0-SNAPSHOT - - servlet - pom - - Java EE 7 Sample: servlet - + servlet + pom + + Java EE 7 Sample: servlet + + simple-servlet async-servlet servlet-filters @@ -27,25 +27,27 @@ resource-packaging file-upload programmatic-registration + servlet-libs security-basicauth security-digest security-form-based security-clientcert - - + security-clientcert-jce security-programmatic security-deny-uncovered + security-allow-uncovered security-annotated security-basicauth-omission - + org.javaee7 test-utils ${project.version} + test diff --git a/servlet/programmatic-registration/pom.xml b/servlet/programmatic-registration/pom.xml index 6abec3004..35e3cdb21 100644 --- a/servlet/programmatic-registration/pom.xml +++ b/servlet/programmatic-registration/pom.xml @@ -6,10 +6,10 @@ org.javaee7 servlet 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + servlet-programmatic-registration war + Java EE 7 Sample: servlet - programmatic-registration diff --git a/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/DynamicServlet.java b/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/DynamicServlet.java index e401b73ab..97629a1df 100644 --- a/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/DynamicServlet.java +++ b/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/DynamicServlet.java @@ -1,23 +1,22 @@ package org.javaee7.servlet.programmatic.registration; +import java.io.IOException; + import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; /** * @author OrelGenya */ public class DynamicServlet extends HttpServlet { + private static final long serialVersionUID = 8310377560908221629L; + @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { resp.getWriter().print("dynamic GET"); } - @Override - public String getServletInfo() { - return "My dynamic awesome servlet!"; - } } \ No newline at end of file diff --git a/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/SimpleServletContextListener.java b/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/SimpleServletContextListener.java index d911d2d03..f5923aeb6 100644 --- a/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/SimpleServletContextListener.java +++ b/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/SimpleServletContextListener.java @@ -2,7 +2,6 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.servlet.ServletRegistration; import javax.servlet.annotation.WebListener; /** @@ -12,14 +11,15 @@ public class SimpleServletContextListener implements ServletContextListener { @Override - public void contextInitialized(ServletContextEvent sce) { - System.out.println("Servlet context initialized: " + sce.getServletContext().getContextPath()); - ServletRegistration.Dynamic registration = sce.getServletContext().addServlet("dynamic", DynamicServlet.class); - registration.addMapping("/dynamic"); + public void contextInitialized(ServletContextEvent contextEvent) { + System.out.println("Servlet context initialized: " + contextEvent.getServletContext().getContextPath()); + + contextEvent.getServletContext().addServlet("dynamic", DynamicServlet.class) + .addMapping("/dynamic"); } @Override - public void contextDestroyed(ServletContextEvent sce) { - System.out.println("Servlet context destroyed: " + sce.getServletContext().getContextPath()); + public void contextDestroyed(ServletContextEvent contextEvent) { + System.out.println("Servlet context destroyed: " + contextEvent.getServletContext().getContextPath()); } } diff --git a/servlet/programmatic-registration/src/test/java/org/javaee7/servlet/programmatic/registration/DynamicServletTest.java b/servlet/programmatic-registration/src/test/java/org/javaee7/servlet/programmatic/registration/DynamicServletTest.java index babfc69fd..726193f46 100644 --- a/servlet/programmatic-registration/src/test/java/org/javaee7/servlet/programmatic/registration/DynamicServletTest.java +++ b/servlet/programmatic-registration/src/test/java/org/javaee7/servlet/programmatic/registration/DynamicServletTest.java @@ -1,7 +1,10 @@ package org.javaee7.servlet.programmatic.registration; -import com.gargoylesoftware.htmlunit.TextPage; -import com.gargoylesoftware.htmlunit.WebClient; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.net.URL; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; @@ -12,10 +15,8 @@ import org.junit.runner.RunWith; import org.xml.sax.SAXException; -import java.io.IOException; -import java.net.URL; - -import static org.junit.Assert.assertEquals; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; /** * @author OrelGenya @@ -30,10 +31,10 @@ public class DynamicServletTest { @Deployment(testable = false) public static WebArchive createDeployment() { - WebArchive war = ShrinkWrap.create(WebArchive.class). - addClass(DynamicServlet.class). - addClass(SimpleServletContextListener.class); - return war; + return ShrinkWrap.create(WebArchive.class). + addClasses( + DynamicServlet.class, + SimpleServletContextListener.class); } @Before @@ -44,6 +45,7 @@ public void setup() { @Test public void testChildServlet() throws IOException, SAXException { TextPage page = webClient.getPage(base + "dynamic"); + assertEquals("dynamic GET", page.getContent()); } } diff --git a/servlet/protocol-handler/pom.xml b/servlet/protocol-handler/pom.xml index 4cd9f2198..71b9394f4 100644 --- a/servlet/protocol-handler/pom.xml +++ b/servlet/protocol-handler/pom.xml @@ -6,11 +6,25 @@ org.javaee7 servlet 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + servlet-protocol-handler - 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - protocol-handler + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + true + + + + + diff --git a/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/MyProtocolHandler.java b/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/MyProtocolHandler.java index 6cb8c1952..cc191c731 100644 --- a/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/MyProtocolHandler.java +++ b/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/MyProtocolHandler.java @@ -39,30 +39,27 @@ */ package org.javaee7.servlet.protocolhandler; -import java.io.IOException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.WebConnection; /** * @author Arun Gupta + * @author Arjan Tijms */ public class MyProtocolHandler implements HttpUpgradeHandler { - // public MyProtocolHandler(ServletInputStream in, ServletOutputStream out) { - // } - @Override - public void init(WebConnection wc) { - try (ServletInputStream input = wc.getInputStream(); - ServletOutputStream output = wc.getOutputStream();) { - } catch (IOException ex) { + public void init(WebConnection webConnection) { + try { + webConnection.getOutputStream().write(("In protocol handler" + "\n").getBytes()); + webConnection.getOutputStream().close(); + } catch (Exception ex) { + ex.printStackTrace(); } } @Override public void destroy() { - throw new UnsupportedOperationException("Not supported yet."); + // Nothing to do } } diff --git a/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/UpgradeServlet.java b/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/UpgradeServlet.java index 9ab55053e..862f14a79 100644 --- a/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/UpgradeServlet.java +++ b/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/UpgradeServlet.java @@ -39,8 +39,11 @@ */ package org.javaee7.servlet.protocolhandler; +import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static javax.servlet.http.HttpServletResponse.SC_SWITCHING_PROTOCOLS; + import java.io.IOException; -import java.io.PrintWriter; + import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -50,79 +53,30 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = { "/UpgradeServlet" }) +@WebServlet("/UpgradeServlet") public class UpgradeServlet extends HttpServlet { - /** - * Processes requests for both HTTP - * GET and - * POST methods. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - response.setContentType("text/html;charset=UTF-8"); - try (PrintWriter out = response.getWriter()) { - out.println(""); - out.println(""); - out.println("Servlet UpgradeServlet"); - out.println(""); - out.println(""); - out.println("

Servlet UpgradeServlet at " + request.getContextPath() + "

"); - if (request.getHeader("Upgrade").equals("echo")) { - response.setStatus(HttpServletResponse.SC_SWITCHING_PROTOCOLS); - response.setHeader("Connection", "Upgrade"); - response.setHeader("Upgrade", "echo"); - request.upgrade(MyProtocolHandler.class); - System.out.println("Request upgraded to MyProtocolHandler"); - } - out.println(""); - out.println(""); - } - } + private static final long serialVersionUID = 1L; - // /** - * Handles the HTTP - * GET method. + * Processes requests for HTTP GET * * @param request servlet request * @param response servlet response * @throws ServletException if a servlet-specific error occurs * @throws IOException if an I/O error occurs */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String requestedUpgrade = request.getHeader("Upgrade"); + if ("echo".equals(requestedUpgrade)) { + response.setStatus(SC_SWITCHING_PROTOCOLS); + response.setHeader("Connection", "Upgrade"); + response.setHeader("Upgrade", "echo"); + request.upgrade(MyProtocolHandler.class); - /** - * Handles the HTTP - * POST method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); + System.out.println("Request upgraded to MyProtocolHandler"); + } else { + response.sendError(SC_BAD_REQUEST, "unknown upgrade " + requestedUpgrade); + } } - - /** - * Returns a short description of the servlet. - * - * @return a String containing servlet description - */ - @Override - public String getServletInfo() { - return "Short description"; - }// } diff --git a/servlet/protocol-handler/src/test/java/org/javaee7/servlet/protocolhandler/ProtocolHandlerTest.java b/servlet/protocol-handler/src/test/java/org/javaee7/servlet/protocolhandler/ProtocolHandlerTest.java new file mode 100644 index 000000000..a7fe9e1bd --- /dev/null +++ b/servlet/protocol-handler/src/test/java/org/javaee7/servlet/protocolhandler/ProtocolHandlerTest.java @@ -0,0 +1,79 @@ +package org.javaee7.servlet.protocolhandler; + +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLConnection; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * @author Arjan Tijms + */ +@RunWith(Arquillian.class) +public class ProtocolHandlerTest { + + @ArquillianResource + private URL base; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + return + ShrinkWrap.create(WebArchive.class) + .addClasses( + UpgradeServlet.class, + MyProtocolHandler.class); + } + + @Test + @RunAsClient + public void testUpgradeProtocol() throws IOException, URISyntaxException { + + // Read more manually from the connection, as using the regular readers (JAX-RS client, HtmlUnit) + // typically hang when reading. + + URLConnection connection = new URL(base, "UpgradeServlet").openConnection(); + connection.setRequestProperty("Connection", "Upgrade"); + connection.setRequestProperty("Upgrade", "echo"); + connection.setConnectTimeout(2000); + connection.setReadTimeout(2000); + + StringBuilder response = new StringBuilder(); + + try (InputStream in = connection.getInputStream()) { + InputStreamReader reader = new InputStreamReader(in); + + long startTime = System.currentTimeMillis(); + while (System.currentTimeMillis() - startTime < 10000) { // for at most 10 seconds + try { + char[] buffer = new char[1]; + reader.read(buffer); + + System.out.println("Character read = " + buffer[0]); + + // Use the end of line character is this sample to signal end of transmission + if (buffer[0] == '\n') { + break; + } + response.append(buffer[0]); + } catch(Exception e) { + e.printStackTrace(); + } + } + } + + assertEquals("In protocol handler", response.toString()); + } + +} diff --git a/servlet/resource-packaging/pom.xml b/servlet/resource-packaging/pom.xml index b1ddf7528..9ad606524 100644 --- a/servlet/resource-packaging/pom.xml +++ b/servlet/resource-packaging/pom.xml @@ -8,9 +8,11 @@ 1.0-SNAPSHOT ../pom.xml + org.javaee7 servlet-resource-packaging 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - resource-packaging diff --git a/servlet/resource-packaging/src/test/java/org/javaee7/servlet/resource/packaging/ResourcePackagingTest.java b/servlet/resource-packaging/src/test/java/org/javaee7/servlet/resource/packaging/ResourcePackagingTest.java index 5d179c70a..7a662a411 100644 --- a/servlet/resource-packaging/src/test/java/org/javaee7/servlet/resource/packaging/ResourcePackagingTest.java +++ b/servlet/resource-packaging/src/test/java/org/javaee7/servlet/resource/packaging/ResourcePackagingTest.java @@ -1,22 +1,19 @@ package org.javaee7.servlet.resource.packaging; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.startsWith; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.File; import java.net.MalformedURLException; -import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.util.logging.Logger; -import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -29,26 +26,32 @@ */ @RunWith(Arquillian.class) public class ResourcePackagingTest { + + Logger logger = Logger.getLogger(ResourcePackagingTest.class.getName()); @Deployment(testable = false) public static WebArchive deploy() throws URISyntaxException { return ShrinkWrap.create(WebArchive.class) - .addAsLibrary(new File("src/main/webapp/WEB-INF/lib/myResources.jar"), "myResources.jar"); + .addAsLibrary(new File("src/main/webapp/WEB-INF/lib/myResources.jar"), "myResources.jar"); } @ArquillianResource private URL base; @Test - public void getMyResourceJarStyles() throws MalformedURLException { - Client client = ClientBuilder.newClient(); - WebTarget target = client.target(URI.create(new URL(base, "styles.css").toExternalForm())); - Response response = target.request().get(); - - assertThat(response.getStatus(), is(equalTo(200))); + @RunAsClient + public void getMyResourceJarStyles() throws MalformedURLException, URISyntaxException { + Response response = + ClientBuilder.newClient() + .target(new URL(base, "styles.css").toURI()) + .request() + .get(); + + assertEquals(200, response.getStatus()); String style = response.readEntity(String.class); - assertThat(style, startsWith("body {")); + + assertTrue(style.startsWith("body {")); } } diff --git a/servlet/security-allow-uncovered/pom.xml b/servlet/security-allow-uncovered/pom.xml new file mode 100644 index 000000000..43d9cd611 --- /dev/null +++ b/servlet/security-allow-uncovered/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + + + servlet-security-allow-uncovered + war + + Java EE 7 Sample: servlet - security-allow-uncovered + + + + payara-micro-managed + + + + src/test/resources + true + + + + + maven-surefire-plugin + + + --postdeploycommandfile ${project.build.directory}/test-classes/addUsersPayara.txt + + + + + + + + diff --git a/servlet/security-allow-uncovered/src/main/java/org/javaee7/servlet/security/allow/uncovered/SecureServlet.java b/servlet/security-allow-uncovered/src/main/java/org/javaee7/servlet/security/allow/uncovered/SecureServlet.java new file mode 100644 index 000000000..484b540cb --- /dev/null +++ b/servlet/security-allow-uncovered/src/main/java/org/javaee7/servlet/security/allow/uncovered/SecureServlet.java @@ -0,0 +1,33 @@ +package org.javaee7.servlet.security.allow.uncovered; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author Arun Gupta + * @author Arjan Tijms + */ +@WebServlet("/SecureServlet") +public class SecureServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.getWriter().print("my GET"); + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.getWriter().print("my POST"); + } + + @Override + protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.getWriter().print("my PUT"); + } +} diff --git a/servlet/security-allow-uncovered/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-allow-uncovered/src/main/webapp/WEB-INF/glassfish-web.xml new file mode 100644 index 000000000..54e3db333 --- /dev/null +++ b/servlet/security-allow-uncovered/src/main/webapp/WEB-INF/glassfish-web.xml @@ -0,0 +1,8 @@ + + + + + g1 + g1 + + diff --git a/servlet/security-allow-uncovered/src/main/webapp/WEB-INF/web.xml b/servlet/security-allow-uncovered/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 000000000..fddd54eaa --- /dev/null +++ b/servlet/security-allow-uncovered/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,32 @@ + + + + + + + + + SecureServlet + /SecureServlet + GET + + + g1 + + + + + BASIC + file + + + + g1 + + diff --git a/servlet/security-allow-uncovered/src/test/java/org/javaee7/servlet/security/allow/uncovered/SecureServletTest.java b/servlet/security-allow-uncovered/src/test/java/org/javaee7/servlet/security/allow/uncovered/SecureServletTest.java new file mode 100644 index 000000000..531c0af08 --- /dev/null +++ b/servlet/security-allow-uncovered/src/test/java/org/javaee7/servlet/security/allow/uncovered/SecureServletTest.java @@ -0,0 +1,111 @@ +package org.javaee7.servlet.security.allow.uncovered; + +import static com.gargoylesoftware.htmlunit.HttpMethod.POST; +import static com.gargoylesoftware.htmlunit.HttpMethod.PUT; +import static org.javaee7.ServerOperations.addUsersToContainerIdentityStore; +import static org.jboss.shrinkwrap.api.ShrinkWrap.create; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.net.URL; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider; +import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.WebRequest; + +/** + * @author Arun Gupta + * @author Arjan Tijms + */ +@RunWith(Arquillian.class) +public class SecureServletTest { + + @ArquillianResource + private URL base; + + DefaultCredentialsProvider correctCreds = new DefaultCredentialsProvider(); + DefaultCredentialsProvider incorrectCreds = new DefaultCredentialsProvider(); + WebClient webClient; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + + addUsersToContainerIdentityStore(); + + WebArchive war = create(WebArchive.class) + .addClass(SecureServlet.class) + .addAsWebInfResource((new File("src/main/webapp/WEB-INF/web.xml"))); + + System.out.println(war.toString(true)); + + return war; + } + + @Before + public void setup() { + correctCreds.addCredentials("u1", "p1"); + incorrectCreds.addCredentials("random", "random"); + webClient = new WebClient(); + } + + @After + public void tearDown() { + webClient.getCookieManager().clearCookies(); + webClient.close(); + } + + @Test + public void testGetMethod() throws Exception { + webClient.setCredentialsProvider(correctCreds); + TextPage page = webClient.getPage(base + "/SecureServlet"); + assertEquals("my GET", page.getContent()); + } + + @Test + public void testPostMethod() throws Exception { + webClient.setCredentialsProvider(correctCreds); + WebRequest request = new WebRequest(new URL(base + "SecureServlet"), POST); + + TextPage page = null; + try { + page = webClient.getPage(request); + System.out.println(page.getContent()); + + assertTrue( + "POST method could not be called even without deny-uncovered-http-methods", + page.getContent().contains("my POST")); + } catch (FailingHttpStatusCodeException e) { + assertNotEquals("Post denied, but should be allowed", 403, e.getStatusCode()); + throw e; + } + } + + @Test + public void testPutMethod() throws Exception { + webClient.setCredentialsProvider(correctCreds); + WebRequest request = new WebRequest(new URL(base + "SecureServlet"), PUT); + + TextPage page = null; + try { + page = webClient.getPage(request); + System.out.println(page.getContent()); + } catch (FailingHttpStatusCodeException e) { + assertNotEquals("PUT denied, but should be allowed", 403, e.getStatusCode()); + throw e; + } + + } +} diff --git a/servlet/security-allow-uncovered/src/test/resources/addUsersPayara.txt b/servlet/security-allow-uncovered/src/test/resources/addUsersPayara.txt new file mode 100644 index 000000000..037cdbd6f --- /dev/null +++ b/servlet/security-allow-uncovered/src/test/resources/addUsersPayara.txt @@ -0,0 +1 @@ +create-file-user --groups g1 --passwordfile ${project.build.directory}/test-classes/password.txt u1 \ No newline at end of file diff --git a/servlet/security-allow-uncovered/src/test/resources/password.txt b/servlet/security-allow-uncovered/src/test/resources/password.txt new file mode 100644 index 000000000..c00bb4cac --- /dev/null +++ b/servlet/security-allow-uncovered/src/test/resources/password.txt @@ -0,0 +1 @@ +AS_ADMIN_USERPASSWORD=p1 diff --git a/servlet/security-annotated/pom.xml b/servlet/security-annotated/pom.xml index 6b4c5877e..c33b70c41 100644 --- a/servlet/security-annotated/pom.xml +++ b/servlet/security-annotated/pom.xml @@ -1,18 +1,19 @@ - 4.0.0 - - + + 4.0.0 + + org.javaee7 - servlet + servlet 1.0-SNAPSHOT - security-annotated - war - - Java EE 7 Sample: servlet - security-annotated - - + security-annotated + war + + Java EE 7 Sample: servlet - security-annotated + + payara-micro-managed diff --git a/servlet/security-annotated/src/main/webapp/WEB-INF/web.xml b/servlet/security-annotated/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 000000000..32ab0c045 --- /dev/null +++ b/servlet/security-annotated/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,11 @@ + + + + + BASIC + file + + + diff --git a/servlet/security-annotated/src/test/java/org/javaee7/servlet/security/annotated/SecureServletTest.java b/servlet/security-annotated/src/test/java/org/javaee7/servlet/security/annotated/SecureServletTest.java index 79694789b..acac40efd 100644 --- a/servlet/security-annotated/src/test/java/org/javaee7/servlet/security/annotated/SecureServletTest.java +++ b/servlet/security-annotated/src/test/java/org/javaee7/servlet/security/annotated/SecureServletTest.java @@ -7,6 +7,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +import java.io.File; import java.net.URL; import org.jboss.arquillian.container.test.api.Deployment; @@ -29,6 +30,8 @@ */ @RunWith(Arquillian.class) public class SecureServletTest { + + private static final String WEBAPP_SRC = "src/main/webapp"; @ArquillianResource private URL base; @@ -43,7 +46,8 @@ public static WebArchive createDeployment() { addUsersToContainerIdentityStore(); return create(WebArchive.class) - .addClass(SecureServlet.class); + .addClass(SecureServlet.class) + .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))); } @Before diff --git a/servlet/security-basicauth-omission/pom.xml b/servlet/security-basicauth-omission/pom.xml index 64d2f4e6b..660e50e17 100644 --- a/servlet/security-basicauth-omission/pom.xml +++ b/servlet/security-basicauth-omission/pom.xml @@ -1,17 +1,19 @@ - 4.0.0 + + 4.0.0 - + org.javaee7 servlet 1.0-SNAPSHOT - - servlet-security-basicauth-omission - war - Java EE 7 Sample: servlet - security-basicauth-omission - - + + servlet-security-basicauth-omission + war + + Java EE 7 Sample: servlet - security-basicauth-omission + + payara-micro-managed @@ -34,5 +36,4 @@ - diff --git a/servlet/security-basicauth/pom.xml b/servlet/security-basicauth/pom.xml index de632d638..c0a327fe2 100644 --- a/servlet/security-basicauth/pom.xml +++ b/servlet/security-basicauth/pom.xml @@ -1,18 +1,19 @@ - 4.0.0 + + 4.0.0 - + org.javaee7 servlet 1.0-SNAPSHOT - - servlet-security-basicauth - war - - Java EE 7 Sample: servlet - security-basicauth - - + + servlet-security-basicauth + war + + Java EE 7 Sample: servlet - security-basicauth + + payara-micro-managed diff --git a/servlet/security-clientcert-jce/pom.xml b/servlet/security-clientcert-jce/pom.xml new file mode 100644 index 000000000..9e985b8a7 --- /dev/null +++ b/servlet/security-clientcert-jce/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + + + servlet-security-clientcert-jce + war + + Java EE 7 Sample: servlet - security-clientcert-jce + + + + org.bouncycastle + bcprov-jdk15on + + + + org.bouncycastle + bcpkix-jdk15on + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${skipServletClientCertificate} + + ${project.build.directory} + + + + + + diff --git a/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/BouncyServlet.java b/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/BouncyServlet.java new file mode 100644 index 000000000..8411a4d82 --- /dev/null +++ b/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/BouncyServlet.java @@ -0,0 +1,43 @@ +/** Copyright Payara Services Limited **/ +package org.javaee7.servlet.security.clientcert.jce; + +import java.io.IOException; +import java.security.Security; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.bouncycastle.jce.provider.BouncyCastleProvider; + +/** + * This Servlet is used to set our custom JCE provider. + * + * @author Arjan Tijms + */ +@WebServlet(urlPatterns = { "/BouncyServlet" }) +public class BouncyServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + BouncyCastleProvider provider = new BouncyCastleProvider(); + provider.put("CertificateFactory.X.509", MyJCECertificateFactory.class.getName()); + + // Installs the JCE provider + int pos = Security.insertProviderAt(provider, 1); + + // Returns the position of the JCE provider, this should be 1. + response.getWriter().print("pos:" + pos); + } + + @Override + protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME); + } + +} diff --git a/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/MyJCECertificateFactory.java b/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/MyJCECertificateFactory.java new file mode 100644 index 000000000..51c37a3bf --- /dev/null +++ b/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/MyJCECertificateFactory.java @@ -0,0 +1,33 @@ +/** Copyright Payara Services Limited **/ +package org.javaee7.servlet.security.clientcert.jce; + +import java.io.InputStream; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +import org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory; + +/** + * Our own custom CertificateFactory based on the bouncy castle one. + * + *

+ * We use this to provide a customized certificate, based on the certificate + * instance created by bouncy castle. + * + * @author Arjan Tijms + */ +public class MyJCECertificateFactory extends CertificateFactory { + + @Override + public Certificate engineGenerateCertificate(InputStream in) throws CertificateException { + Certificate certificate = super.engineGenerateCertificate(in); + + if (certificate instanceof X509Certificate == false) { + return certificate; + } + + return new MyJCEX509Certificate((X509Certificate) certificate); + } + +} diff --git a/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/MyJCEX509Certificate.java b/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/MyJCEX509Certificate.java new file mode 100644 index 000000000..a9504e90f --- /dev/null +++ b/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/MyJCEX509Certificate.java @@ -0,0 +1,185 @@ +/** Copyright Payara Services Limited **/ +package org.javaee7.servlet.security.clientcert.jce; + +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.Principal; +import java.security.PublicKey; +import java.security.SignatureException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Set; + +import javax.security.auth.x500.X500Principal; + +/** + * @author Arjan Tijms + */ +public class MyJCEX509Certificate extends X509Certificate { + + private final X509Certificate certificate; + + public MyJCEX509Certificate(X509Certificate certificate) { + this.certificate = certificate; + } + + @Override + public X500Principal getSubjectX500Principal() { + + X500Principal principal = certificate.getSubjectX500Principal(); + + if ("C=UK,ST=lak,L=zak,O=kaz,OU=bar,CN=lfoo".equals(principal.getName())) { + return new X500Principal("CN=u1"); + } + + return principal; + } + + @Override + public Principal getSubjectDN() { + + Principal principal = certificate.getSubjectDN(); + + if ("CN=lfoo,OU=bar,O=kaz,L=zak,ST=lak,C=UK".equals(principal.getName())) { + // Doesn't have to be X500 but keep it for simplicity + return new X500Principal("CN=u1"); + } + + return principal; + } + + @Override + public boolean hasUnsupportedCriticalExtension() { + return certificate.hasUnsupportedCriticalExtension(); + } + + @Override + public Set getCriticalExtensionOIDs() { + return certificate.getCriticalExtensionOIDs(); + } + + @Override + public Set getNonCriticalExtensionOIDs() { + return certificate.getCriticalExtensionOIDs(); + } + + @Override + public byte[] getExtensionValue(String oid) { + return certificate.getExtensionValue(oid); + } + + @Override + public void checkValidity() throws CertificateExpiredException, CertificateNotYetValidException { + certificate.checkValidity(); + + } + + @Override + public void checkValidity(Date date) throws CertificateExpiredException, CertificateNotYetValidException { + certificate.checkValidity(date); + } + + @Override + public int getVersion() { + return certificate.getVersion(); + } + + @Override + public BigInteger getSerialNumber() { + return certificate.getSerialNumber(); + } + + @Override + public Principal getIssuerDN() { + return certificate.getIssuerDN(); + } + + @Override + public Date getNotBefore() { + return certificate.getNotBefore(); + } + + @Override + public Date getNotAfter() { + return certificate.getNotAfter(); + } + + @Override + public byte[] getTBSCertificate() throws CertificateEncodingException { + return certificate.getTBSCertificate(); + } + + @Override + public byte[] getSignature() { + return certificate.getSignature(); + } + + @Override + public String getSigAlgName() { + return certificate.getSigAlgName(); + } + + @Override + public String getSigAlgOID() { + return certificate.getSigAlgOID(); + } + + @Override + public byte[] getSigAlgParams() { + return certificate.getSigAlgParams(); + } + + @Override + public boolean[] getIssuerUniqueID() { + return certificate.getIssuerUniqueID(); + } + + @Override + public boolean[] getSubjectUniqueID() { + return certificate.getSubjectUniqueID(); + } + + @Override + public boolean[] getKeyUsage() { + return certificate.getKeyUsage(); + } + + @Override + public int getBasicConstraints() { + return certificate.getBasicConstraints(); + } + + @Override + public byte[] getEncoded() throws CertificateEncodingException { + return certificate.getEncoded(); + } + + @Override + public void verify(PublicKey key) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException { + certificate.verify(key); + + } + + @Override + public void verify(PublicKey key, String sigProvider) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException { + certificate.verify(key, sigProvider); + + } + + @Override + public String toString() { + return certificate.toString(); + } + + @Override + public PublicKey getPublicKey() { + return certificate.getPublicKey(); + } + +} diff --git a/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/SecureServlet.java b/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/SecureServlet.java new file mode 100644 index 000000000..4b9e72ac3 --- /dev/null +++ b/servlet/security-clientcert-jce/src/main/java/org/javaee7/servlet/security/clientcert/jce/SecureServlet.java @@ -0,0 +1,29 @@ +/** Copyright Payara Services Limited **/ +package org.javaee7.servlet.security.clientcert.jce; + +import java.io.IOException; +import java.security.Security; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.bouncycastle.jce.provider.BouncyCastleProvider; + +/** + * @author Arjan Tijms + */ +@WebServlet(urlPatterns = { "/SecureServlet" }) +public class SecureServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + response.getWriter().print("principal " + request.getUserPrincipal() + " in role g1:" + request.isUserInRole("g1")); + } + +} diff --git a/servlet/security-clientcert-jce/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-clientcert-jce/src/main/webapp/WEB-INF/glassfish-web.xml new file mode 100644 index 000000000..e78edc96a --- /dev/null +++ b/servlet/security-clientcert-jce/src/main/webapp/WEB-INF/glassfish-web.xml @@ -0,0 +1,14 @@ + + + + + + + g1 + g1 + CN=u1 + + + diff --git a/servlet/security-clientcert-jce/src/main/webapp/WEB-INF/web.xml b/servlet/security-clientcert-jce/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 000000000..899e73beb --- /dev/null +++ b/servlet/security-clientcert-jce/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,29 @@ + + + + + + + SecureServlet + /SecureServlet + GET + POST + + + g1 + + + + + CLIENT-CERT + + + + g1 + + diff --git a/servlet/security-clientcert-jce/src/test/java/org/javaee7/servlet/security/clientcert/jce/SecureServletTest.java b/servlet/security-clientcert-jce/src/test/java/org/javaee7/servlet/security/clientcert/jce/SecureServletTest.java new file mode 100644 index 000000000..e93f0dfff --- /dev/null +++ b/servlet/security-clientcert-jce/src/test/java/org/javaee7/servlet/security/clientcert/jce/SecureServletTest.java @@ -0,0 +1,349 @@ +/** Copyright Payara Services Limited **/ +package org.javaee7.servlet.security.clientcert.jce; + +import static java.math.BigInteger.ONE; +import static java.time.Instant.now; +import static java.time.temporal.ChronoUnit.DAYS; +import static java.util.logging.Level.FINEST; +import static org.javaee7.ServerOperations.addCertificateToContainerTrustStore; +import static org.javaee7.ServerOperations.addContainerSystemProperty; +import static org.jboss.shrinkwrap.api.ShrinkWrap.create; +import static org.junit.Assert.assertTrue; +import static org.omnifaces.utils.Lang.isEmpty; +import static org.omnifaces.utils.security.Certificates.createTempJKSKeyStore; +import static org.omnifaces.utils.security.Certificates.createTempJKSTrustStore; +import static org.omnifaces.utils.security.Certificates.generateRandomRSAKeys; +import static org.omnifaces.utils.security.Certificates.getCertificateChainFromServer; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.security.KeyPair; +import java.security.Provider; +import java.security.Security; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Date; +import static java.util.logging.Level.INFO; +import java.util.logging.Logger; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.impl.Jdk14Logger; +import org.bouncycastle.asn1.x500.X500Name; +import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; +import org.bouncycastle.cert.X509v3CertificateBuilder; +import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.operator.OperatorCreationException; +import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; +import org.javaee7.ServerOperations; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.omnifaces.utils.security.Certificates; + +import com.gargoylesoftware.htmlunit.HttpMethod; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.WebRequest; + +/** + * @author Arjan Tijms + */ +@RunWith(Arquillian.class) +public class SecureServletTest { + + private static Logger log = Logger.getLogger(SecureServletTest.class.getName()); + + private static final String WEBAPP_SRC = "src/main/webapp"; + +// static { +// Security.insertProviderAt(new BouncyCastleProvider(), 1); +// } + + @ArquillianResource + private URL base; + + private URL baseHttps; + private WebClient webClient; + private static String clientKeyStorePath; + + @Deployment(testable = false) + public static WebArchive createDeployment() throws FileNotFoundException, IOException { + + // Note for JDK 11+, the server needs to be run with a sufficiently new version of JDK 11 or 12. + // Older versions throw this exception: + + // java.lang.UnsupportedOperationException: Not supported yet. + // at java.base/sun.security.ssl.HandshakeHash$CloneableHash.archived(HandshakeHash.java:616) + // at java.base/sun.security.ssl.HandshakeHash$T12HandshakeHash.archived(HandshakeHash.java:546) + // at java.base/sun.security.ssl.HandshakeHash.archived(HandshakeHash.java:188) + // at java.base/sun.security.ssl.CertificateVerify$T12CertificateVerifyMessage.(CertificateVerify.java:650) + // at java.base/sun.security.ssl.CertificateVerify$T12CertificateVerifyConsumer.consume(CertificateVerify.java:771) + // at java.base/sun.security.ssl.SSLHandshake.consume(SSLHandshake.java:392) + // at java.base/sun.security.ssl.HandshakeContext.dispatch(HandshakeContext.java:448) + // at java.base/sun.security.ssl.SSLEngineImpl$DelegatedTask$DelegatedAction.run(SSLEngineImpl.java:1065) + // at java.base/sun.security.ssl.SSLEngineImpl$DelegatedTask$DelegatedAction.run(SSLEngineImpl.java:1052) + // at java.base/java.security.AccessController.doPrivileged(Native Method) + // at java.base/sun.security.ssl.SSLEngineImpl$DelegatedTask.run(SSLEngineImpl.java:999) + + // See https://bugs.openjdk.java.net/browse/JDK-8214098 + + // Works: + // OpenJDK Runtime Environment Zulu11.31+11-CA (build 11.0.3+7-LTS) + + // Doesn't work: + // openjdk version "11.0.3" 2019-04-16 + // OpenJDK Runtime Environment (build 11.0.3+7-Ubuntu-1ubuntu1) + + System.out.println("\n*********** DEPLOYMENT START ***************************"); + + Security.addProvider(new BouncyCastleProvider()); + + // Enable to get detailed logging about the SSL handshake on the client + // For an explanation of the TLS handshake see: https://tls.ulfheim.net + if (System.getProperty("ssl.debug") != null) { + enableSSLDebug(); + } + + + System.out.println("################################################################"); + + // ### Generate keys for the client, create a certificate, and add those to a new local key store + + // Generate a Private/Public key pair for the client + KeyPair clientKeyPair = generateRandomRSAKeys(); + + // Create a certificate containing the client public key and signed with the private key + X509Certificate clientCertificate = createSelfSignedCertificate(clientKeyPair); + + // Create a new local key store containing the client private key and the certificate + clientKeyStorePath = createTempJKSKeyStore(clientKeyPair.getPrivate(), clientCertificate); + + // Only test TLS v1.2 for now + System.setProperty("jdk.tls.client.protocols", "TLSv1.2"); + + // Enable to get detailed logging about the SSL handshake on the server + + if (System.getProperty("ssl.debug") != null) { + System.out.println("Setting server SSL debug on"); + addContainerSystemProperty("javax.net.debug", "ssl:handshake"); + } + + // Add the client certificate that we just generated to the trust store of the server. + // That way the server will trust our certificate. + // Set the actual domain used with -Dpayara_domain=[domain name] + addCertificateToContainerTrustStore(clientCertificate); + + return create(WebArchive.class) + .addAsLibraries(Maven.resolver() + .loadPomFromFile("pom.xml") + .resolve("org.bouncycastle:bcprov-jdk15on", "org.bouncycastle:bcpkix-jdk15on") + .withTransitivity() + .as(JavaArchive.class)) + .addClass(BouncyServlet.class) + .addClasses(SecureServlet.class) + .addClasses(MyJCECertificateFactory.class, MyJCEX509Certificate.class) + .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) + .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "glassfish-web.xml"))); + } + + @Before + public void setup() throws FileNotFoundException, IOException { + + System.out.println("\n*********** SETUP START ***************************"); + + String algorithms = Security.getProperty("jdk.tls.disabledAlgorithms"); + + // PSS can't be used with JDK11 and 12, will likely be fixed in JDK13 + // See https://bugs.openjdk.java.net/browse/JDK-8216039 + Security.setProperty("jdk.tls.disabledAlgorithms", algorithms + " ,RSASSA-PSS"); + + webClient = new WebClient(); + + // First get the HTTPS URL for which the server is listening + baseHttps = ServerOperations.toContainerHttps(base); + if (baseHttps == null) { + throw new IllegalStateException("No https URL could be created from " + base); + } + + // ### Ask the server for its certificate and add that to a new local trust store + + // Server -> client : the trust store certificates are used to validate the certificate sent + // by the server + + X509Certificate[] serverCertificateChain = getCertificateChainFromServer(baseHttps.getHost(), baseHttps.getPort()); + + if (!isEmpty(serverCertificateChain)) { + + System.out.println("Obtained certificate from server. Storing it in client trust store"); + + String trustStorePath = createTempJKSTrustStore(serverCertificateChain); + + System.out.println("Reading trust store from: " + trustStorePath); + + webClient.getOptions().setSSLTrustStore(new File(trustStorePath).toURI().toURL(), "changeit", "jks"); + + // If the use.cnHost property is we try to extract the host from the server + // certificate and use exactly that host for our requests. + // This is needed if a server is listening to multiple host names, for instance + // localhost and example.com. If the certificate is for example.com, we can't + // localhost for the request, as that will not be accepted. + if (System.getProperty("use.cnHost") != null) { + System.out.println("use.cnHost set. Trying to grab CN from certificate and use as host for requests."); + baseHttps = getHostFromCertificate(serverCertificateChain, baseHttps); + } + } else { + System.out.println("Could not obtain certificates from server. Continuing without custom truststore"); + } + + System.out.println("Using client key store from: " + clientKeyStorePath); + + // Client -> Server : the key store's private keys and certificates are used to sign + // and sent a reply to the server + webClient.getOptions().setSSLClientCertificate(new File(clientKeyStorePath).toURI().toURL(), "changeit", "jks"); + webClient.getOptions().setTimeout(0); + + + // First do a request to install Bouncy Castle as provider + // This is a normal HTTP request and doesn't use certificate authentication + TextPage pageb = webClient.getPage(base + "BouncyServlet"); + log.log(INFO, "Bouncy Castle provider inserted at position: {0}", pageb.getContent()); + + System.out.println("*********** SETUP DONE ***************************\n"); + } + + @After + public void tearDown() throws IOException { + // Remove Bouncy Castle as provider + TextPage pageb = webClient.getPage(new WebRequest(new URL(base + "BouncyServlet"), HttpMethod.DELETE)); + log.log(INFO, "Bouncy Castle provider removed: {0}", pageb.getContent()); + + webClient.getCookieManager().clearCookies(); + + // Internally throws: + // + // TransportContext.java:313|Fatal (INTERNAL_ERROR): closing inbound before receiving peer's close_notify ( + // "throwable" : { + // javax.net.ssl.SSLException: closing inbound before receiving peer's close_notify + // at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:133) + // at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:117) + // at java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:308) + // at java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:264) + // at java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:255) + // at java.base/sun.security.ssl.SSLSocketImpl.shutdownInput(SSLSocketImpl.java:645) + // at java.base/sun.security.ssl.SSLSocketImpl.shutdownInput(SSLSocketImpl.java:624) + // at org.apache.http.impl.BHttpConnectionBase.close(BHttpConnectionBase.java:325) + // at org.apache.http.impl.conn.LoggingManagedHttpClientConnection.close(LoggingManagedHttpClientConnection.java:81) + // at org.apache.http.impl.conn.CPoolEntry.closeConnection(CPoolEntry.java:70) + // at org.apache.http.impl.conn.CPoolEntry.close(CPoolEntry.java:96) + // at org.apache.http.pool.AbstractConnPool.shutdown(AbstractConnPool.java:148) + // at org.apache.http.impl.conn.PoolingHttpClientConnectionManager.shutdown(PoolingHttpClientConnectionManager.java:411) + // at com.gargoylesoftware.htmlunit.HttpWebConnection.close(HttpWebConnection.java:1011) + // + // Visible when -Dssl.debug is used + // + // Should be fixed in JDK11.03, but isn't? + // See https://stackoverflow.com/questions/52016415/jdk-11-ssl-error-on-valid-certificate-working-in-previous-versions + webClient.close(); + System.out.println("\n*********** TEST END ***************************\n"); + } + + @Test + public void testGetWithCorrectCredentials() throws Exception { + + System.out.println("\n*********** TEST START ***************************\n"); + + Security.insertProviderAt(new BouncyCastleProvider(), 1); + + try { + + // With Bouncy Castle installed, do the request via HTTPS to the secured + // Servlet + TextPage page = webClient.getPage(baseHttps + "SecureServlet"); + + log.info(page.getContent()); + + assertTrue("my GET", page.getContent().contains("principal CN=u1")); + } catch (Exception e) { + e.printStackTrace(); + throw e; + } + } + + + // Private methods + + // TODO: may move these to utility class + + private static X509Certificate createSelfSignedCertificate(KeyPair keys) { + try { + Provider provider = new BouncyCastleProvider(); + Security.addProvider(provider); + return new JcaX509CertificateConverter() + .setProvider(provider) + .getCertificate( + new X509v3CertificateBuilder( + new X500Name("CN=lfoo, OU=bar, O=kaz, L=zak, ST=lak, C=UK"), + ONE, + Date.from(now()), + Date.from(now().plus(1, DAYS)), + new X500Name("CN=lfoo, OU=bar, O=kaz, L=zak, ST=lak, C=UK"), + SubjectPublicKeyInfo.getInstance(keys.getPublic().getEncoded())) + .build( + new JcaContentSignerBuilder("SHA256WithRSA") + .setProvider(provider) + .build(keys.getPrivate()))); + } catch (CertificateException | OperatorCreationException e) { + throw new IllegalStateException(e); + } + } + + + private static URL getHostFromCertificate(X509Certificate[] serverCertificateChain, URL existingURL) { + try { + URL httpsUrl = new URL( + existingURL.getProtocol(), + Certificates.getHostFromCertificate(serverCertificateChain), + existingURL.getPort(), + existingURL.getFile() + ); + + System.out.println("Changing base URL from " + existingURL + " into " + httpsUrl + "\n"); + + return httpsUrl; + + } catch (MalformedURLException e) { + System.out.println("Failure creating HTTPS URL"); + e.printStackTrace(); + + System.out.println("FAILED to get CN. Using existing URL: " + existingURL); + + return existingURL; + } + } + + private static void enableSSLDebug() { + System.setProperty("javax.net.debug", "ssl:handshake"); + + System.getProperties().put("org.apache.commons.logging.simplelog.defaultlog", "debug"); + Logger.getLogger("com.gargoylesoftware.htmlunit.httpclient.HtmlUnitSSLConnectionSocketFactory").setLevel(FINEST); + Logger.getLogger("org.apache.http.conn.ssl.SSLConnectionSocketFactory").setLevel(FINEST); + Log logger = LogFactory.getLog(org.apache.http.conn.ssl.SSLConnectionSocketFactory.class); + ((Jdk14Logger) logger).getLogger().setLevel(FINEST); + logger = LogFactory.getLog(com.gargoylesoftware.htmlunit.httpclient.HtmlUnitSSLConnectionSocketFactory.class); + ((Jdk14Logger) logger).getLogger().setLevel(FINEST); + Logger.getGlobal().getParent().getHandlers()[0].setLevel(FINEST); + } + +} diff --git a/servlet/security-clientcert/pom.xml b/servlet/security-clientcert/pom.xml index f7f899b20..ceee567c8 100644 --- a/servlet/security-clientcert/pom.xml +++ b/servlet/security-clientcert/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 @@ -18,13 +17,11 @@ org.bouncycastle bcprov-jdk15on - 1.59 org.bouncycastle bcpkix-jdk15on - 1.59 @@ -42,5 +39,4 @@ - diff --git a/servlet/security-clientcert/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletTest.java b/servlet/security-clientcert/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletTest.java index d9d10856c..858e11c46 100644 --- a/servlet/security-clientcert/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletTest.java +++ b/servlet/security-clientcert/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletTest.java @@ -6,39 +6,28 @@ import static java.time.temporal.ChronoUnit.DAYS; import static java.util.logging.Level.FINEST; import static org.javaee7.ServerOperations.addCertificateToContainerTrustStore; +import static org.javaee7.ServerOperations.addContainerSystemProperty; import static org.jboss.shrinkwrap.api.ShrinkWrap.create; import static org.junit.Assert.assertTrue; +import static org.omnifaces.utils.Lang.isEmpty; +import static org.omnifaces.utils.security.Certificates.createTempJKSKeyStore; +import static org.omnifaces.utils.security.Certificates.createTempJKSTrustStore; +import static org.omnifaces.utils.security.Certificates.generateRandomRSAKeys; +import static org.omnifaces.utils.security.Certificates.getCertificateChainFromServer; import java.io.File; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; +import java.net.MalformedURLException; import java.net.URL; -import java.security.KeyManagementException; import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.KeyStore; -import java.security.KeyStore.PasswordProtection; -import java.security.KeyStore.PrivateKeyEntry; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.PrivateKey; import java.security.Provider; import java.security.Security; -import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -import java.util.ArrayList; import java.util.Date; -import java.util.List; import java.util.logging.Logger; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocket; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.impl.Jdk14Logger; @@ -58,6 +47,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.omnifaces.utils.security.Certificates; import com.gargoylesoftware.htmlunit.TextPage; import com.gargoylesoftware.htmlunit.WebClient; @@ -76,19 +66,18 @@ public class SecureServletTest { private URL base; private URL baseHttps; - - WebClient webClient; + private WebClient webClient; + private static String clientKeyStorePath; @Deployment(testable = false) public static WebArchive createDeployment() throws FileNotFoundException, IOException { - Provider provider = new BouncyCastleProvider(); - Security.addProvider(provider); - - // Enable to get detailed logging about the SSL handshake + System.out.println("\n*********** DEPLOYMENT START ***************************"); + Security.addProvider(new BouncyCastleProvider()); + + // Enable to get detailed logging about the SSL handshake on the client // For an explanation of the TLS handshake see: https://tls.ulfheim.net - if (System.getProperty("ssl.debug") != null) { enableSSLDebug(); } @@ -99,77 +88,111 @@ public static WebArchive createDeployment() throws FileNotFoundException, IOExce // ### Generate keys for the client, create a certificate, and add those to a new local key store // Generate a Private/Public key pair for the client - KeyPair clientKeyPair = generateRandomKeys(); + KeyPair clientKeyPair = generateRandomRSAKeys(); // Create a certificate containing the client public key and signed with the private key X509Certificate clientCertificate = createSelfSignedCertificate(clientKeyPair); // Create a new local key store containing the client private key and the certificate - createKeyStore(clientKeyPair.getPrivate(), clientCertificate); + clientKeyStorePath = createTempJKSKeyStore(clientKeyPair.getPrivate(), clientCertificate); + + // Enable to get detailed logging about the SSL handshake on the server + + if (System.getProperty("ssl.debug") != null) { + System.out.println("Setting server SSL debug on"); + addContainerSystemProperty("javax.net.debug", "ssl:handshake"); + } + + // Only test TLS v1.2 for now + System.setProperty("jdk.tls.client.protocols", "TLSv1.2"); // Add the client certificate that we just generated to the trust store of the server. // That way the server will trust our certificate. + // Set the actual domain used with -Dpayara_domain=[domain name] addCertificateToContainerTrustStore(clientCertificate); return create(WebArchive.class) - .addClass(SecureServlet.class) + .addClasses(SecureServlet.class) .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "glassfish-web.xml"))); } @Before public void setup() throws FileNotFoundException, IOException { + + System.out.println("\n*********** SETUP START ***************************"); + + webClient = new WebClient(); - // ### Ask the server for its certificate and add that to a new local trust store - - // First get the HTTPS url for which the server is listening + // First get the HTTPS URL for which the server is listening baseHttps = ServerOperations.toContainerHttps(base); - - System.out.println("***************************************"); - - if (baseHttps != null) { - System.out.println("Created " + baseHttps); - X509Certificate[] serverCertificateChain = getCertificateChainFromServer(baseHttps.getHost(), baseHttps.getPort()); - createTrustStore(serverCertificateChain); - } else { - System.out.println("No https URL could be created from " + base); + if (baseHttps == null) { + throw new IllegalStateException("No https URL could be created from " + base); } - - - webClient = new WebClient(); + + // ### Ask the server for its certificate and add that to a new local trust store // Server -> client : the trust store certificates are used to validate the certificate sent // by the server + + X509Certificate[] serverCertificateChain = getCertificateChainFromServer(baseHttps.getHost(), baseHttps.getPort()); + + if (!isEmpty(serverCertificateChain)) { + + System.out.println("Obtained certificate from server. Storing it in client trust store"); + + String trustStorePath = createTempJKSTrustStore(serverCertificateChain); + + System.out.println("Reading trust store from: " + trustStorePath); + + webClient.getOptions().setSSLTrustStore(new File(trustStorePath).toURI().toURL(), "changeit", "jks"); + + // If the use.cnHost property is we try to extract the host from the server + // certificate and use exactly that host for our requests. + // This is needed if a server is listening to multiple host names, for instance + // localhost and example.com. If the certificate is for example.com, we can't + // localhost for the request, as that will not be accepted. + if (System.getProperty("use.cnHost") != null) { + System.out.println("use.cnHost set. Trying to grab CN from certificate and use as host for requests."); + baseHttps = getHostFromCertificate(serverCertificateChain, baseHttps); + } + } else { + System.out.println("Could not obtain certificates from server. Continuing without custom truststore"); + } + + System.out.println("Using client key store from: " + clientKeyStorePath); - String trustStorePath = System.getProperty("buildDirectory", "") + "/clientTrustStore.jks"; - System.out.println("Reading trust store from: " + trustStorePath); - - webClient.getOptions().setSSLTrustStore(new File(trustStorePath).toURI().toURL(), "changeit", "jks"); - - String keyStorePath = System.getProperty("buildDirectory", "") + "/clientKeyStore.jks"; - System.out.println("Reading key store from: " + keyStorePath); - - // Client -> Server : the key store private keys and certificates are used to sign + // Client -> Server : the key store's private keys and certificates are used to sign // and sent a reply to the server - webClient.getOptions().setSSLClientCertificate(new File(keyStorePath).toURI().toURL(), "changeit", "jks"); - + webClient.getOptions().setSSLClientCertificate(new File(clientKeyStorePath).toURI().toURL(), "changeit", "jks"); + System.out.println("*********** SETUP DONE ***************************\n"); } @After public void tearDown() { webClient.getCookieManager().clearCookies(); webClient.close(); + System.out.println("\n*********** TEST END ***************************\n"); } @Test public void testGetWithCorrectCredentials() throws Exception { + + System.out.println("\n*********** TEST START ***************************\n"); + try { TextPage page = webClient.getPage(baseHttps + "SecureServlet"); log.info(page.getContent()); - assertTrue("my GET", page.getContent().contains("principal C=UK, ST=lak, L=zak, O=kaz, OU=bar, CN=lfoo")); + assertTrue("my GET", + // RFC 1779 + page.getContent().contains("principal C=UK, ST=lak, L=zak, O=kaz, OU=bar, CN=lfoo") || + + // RFC 2253 + page.getContent().contains("principal C=UK,ST=lak,L=zak,O=kaz,OU=bar,CN=lfoo") + ); } catch (Exception e) { e.printStackTrace(); throw e; @@ -181,59 +204,7 @@ public void testGetWithCorrectCredentials() throws Exception { // TODO: may move these to utility class - private static X509Certificate[] getCertificateChainFromServer(String host, int port) { - - final List X509Certificates = new ArrayList<>(); - - try { - SSLContext context = SSLContext.getInstance("TLS"); - - TrustManager interceptingTrustManager = new X509TrustManager() { - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[] {}; - } - - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { - System.out.println("**** intercepting checkServerTrusted chain" + chain + " authType " + authType); - X509Certificates.add(chain); - } - }; - - context.init(null, new TrustManager[] { interceptingTrustManager }, null); - - SSLSocketFactory factory = context.getSocketFactory(); - - try (SSLSocket socket = (SSLSocket) factory.createSocket(host, port)) { - socket.setSoTimeout(0); - socket.startHandshake(); - socket.close(); - } - - } catch (NoSuchAlgorithmException | KeyManagementException | IOException e) { - e.printStackTrace(); - } - - if (!X509Certificates.isEmpty()) { - X509Certificate[] x509Certificates = X509Certificates.get(0); - - for (X509Certificate certificate : x509Certificates) { - System.out.println("\n**** Server presented certificate:" + certificate + " \n"); - } - - return x509Certificates; - } - - return null; - } - - public static X509Certificate createSelfSignedCertificate(KeyPair keys) { + private static X509Certificate createSelfSignedCertificate(KeyPair keys) { try { Provider provider = new BouncyCastleProvider(); Security.addProvider(provider); @@ -255,54 +226,28 @@ public static X509Certificate createSelfSignedCertificate(KeyPair keys) { throw new IllegalStateException(e); } } - - private static KeyPair generateRandomKeys() { - try { - KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", "BC"); - keyPairGenerator.initialize(2048); - - return keyPairGenerator.generateKeyPair(); - } catch (NoSuchAlgorithmException | NoSuchProviderException e) { - throw new IllegalStateException(e); - } - } - - private static void createKeyStore(PrivateKey privateKey, X509Certificate certificate) { - try { - KeyStore keyStore = KeyStore.getInstance("jks"); - keyStore.load(null, null); - - keyStore.setEntry( - "clientKey", - new PrivateKeyEntry(privateKey, new Certificate[] { certificate }), - new PasswordProtection("changeit".toCharArray())); - - String path = System.getProperty("buildDirectory", "") + "/clientKeyStore.jks"; - - System.out.println("Storing key store at: " + path); - - keyStore.store(new FileOutputStream(path), "changeit".toCharArray()); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - - private static void createTrustStore(X509Certificate[] certificates) { + + + private static URL getHostFromCertificate(X509Certificate[] serverCertificateChain, URL existingURL) { try { - KeyStore keyStore = KeyStore.getInstance("jks"); - keyStore.load(null, null); - - for (int i = 0; i < certificates.length; i++) { - keyStore.setCertificateEntry("serverCert" + i, certificates[i]); - } - - String path = System.getProperty("buildDirectory", "") + "/clientTrustStore.jks"; - - System.out.println("Storing trust store at: " + path); - - keyStore.store(new FileOutputStream(path), "changeit".toCharArray()); - } catch (Exception ex) { - ex.printStackTrace(); + URL httpsUrl = new URL( + existingURL.getProtocol(), + Certificates.getHostFromCertificate(serverCertificateChain), + existingURL.getPort(), + existingURL.getFile() + ); + + System.out.println("Changing base URL from " + existingURL + " into " + httpsUrl + "\n"); + + return httpsUrl; + + } catch (MalformedURLException e) { + System.out.println("Failure creating HTTPS URL"); + e.printStackTrace(); + + System.out.println("FAILED to get CN. Using existing URL: " + existingURL); + + return existingURL; } } diff --git a/servlet/security-deny-uncovered/pom.xml b/servlet/security-deny-uncovered/pom.xml index d3dd691a0..16a0dd1df 100644 --- a/servlet/security-deny-uncovered/pom.xml +++ b/servlet/security-deny-uncovered/pom.xml @@ -1,18 +1,19 @@ - 4.0.0 + + 4.0.0 - + org.javaee7 servlet 1.0-SNAPSHOT - - servlet-security-deny-uncovered - war - - Java EE 7 Sample: servlet - security-deny-uncovered - + servlet-security-deny-uncovered + war + + Java EE 7 Sample: servlet - security-deny-uncovered + + payara-micro-managed @@ -35,6 +36,4 @@ - - diff --git a/servlet/security-deny-uncovered/src/test/java/org/javaee7/servlet/security/deny/uncovered/SecureServletTest.java b/servlet/security-deny-uncovered/src/test/java/org/javaee7/servlet/security/deny/uncovered/SecureServletTest.java index 5b197cb75..67b8bf7a2 100644 --- a/servlet/security-deny-uncovered/src/test/java/org/javaee7/servlet/security/deny/uncovered/SecureServletTest.java +++ b/servlet/security-deny-uncovered/src/test/java/org/javaee7/servlet/security/deny/uncovered/SecureServletTest.java @@ -5,6 +5,7 @@ import static org.javaee7.ServerOperations.addUsersToContainerIdentityStore; import static org.jboss.shrinkwrap.api.ShrinkWrap.create; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; @@ -78,16 +79,21 @@ public void testPostMethod() throws Exception { webClient.setCredentialsProvider(correctCreds); WebRequest request = new WebRequest(new URL(base + "SecureServlet"), POST); + TextPage p = null; try { - TextPage p = webClient.getPage(request); + p = webClient.getPage(request); System.out.println(p.getContent()); + + assertFalse( + "POST method could be called even with deny-uncovered-http-methods", + p.getContent().contains("my POST")); } catch (FailingHttpStatusCodeException e) { assertNotNull(e); assertEquals(403, e.getStatusCode()); return; } - fail("POST method could be called even with deny-uncovered-http-methods"); + fail("POST correctly not called, but wrong status code: " + (p != null ? p.getWebResponse().getStatusCode() : -1)); } @Test diff --git a/servlet/security-digest/pom.xml b/servlet/security-digest/pom.xml index bd3e6878b..1347f78eb 100644 --- a/servlet/security-digest/pom.xml +++ b/servlet/security-digest/pom.xml @@ -1,18 +1,27 @@ - 4.0.0 + + 4.0.0 - + org.javaee7 servlet 1.0-SNAPSHOT - - servlet-security-digest - war - - Java EE 7 Sample: servlet - security-digest - + servlet-security-digest + war + + Java EE 7 Sample: servlet - security-digest + + + + commons-codec + commons-codec + 1.11 + + + + org.apache.maven.plugins @@ -30,15 +39,7 @@ - - - commons-codec - commons-codec - 1.11 - - - - + payara-micro-managed diff --git a/servlet/security-form-based/pom.xml b/servlet/security-form-based/pom.xml index d0e4dabe8..e4126eb3c 100644 --- a/servlet/security-form-based/pom.xml +++ b/servlet/security-form-based/pom.xml @@ -1,17 +1,19 @@ - 4.0.0 + + 4.0.0 - + org.javaee7 servlet 1.0-SNAPSHOT - - servlet-security-form-based - war - Java EE 7 Sample: servlet - security-form-based - - + + servlet-security-form-based + war + + Java EE 7 Sample: servlet - security-form-based + + payara-micro-managed diff --git a/servlet/security-form-based/src/main/webapp/index.jsp b/servlet/security-form-based/src/main/java/org/javaee7/servlet/security/form/based/ErrorServlet.java similarity index 57% rename from servlet/security-form-based/src/main/webapp/index.jsp rename to servlet/security-form-based/src/main/java/org/javaee7/servlet/security/form/based/ErrorServlet.java index 734e4f816..6847b9036 100644 --- a/servlet/security-form-based/src/main/webapp/index.jsp +++ b/servlet/security-form-based/src/main/java/org/javaee7/servlet/security/form/based/ErrorServlet.java @@ -1,6 +1,5 @@ - +package org.javaee7.servlet.security.form.based; -<%@page contentType="text/html" pageEncoding="UTF-8"%> - +import java.io.IOException; - - - - Form-based Security - Success - - -

Form-based Security - Success

+import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author Arun Gupta + * @author Arjan Tijms + */ +@WebServlet("/ErrorServlet") +public class ErrorServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html;charset=UTF-8"); - If you reached this page that means form-based security credentials are correctly configured. - - + response.getWriter().print( + + "" + + "" + + "" + + "Form-Based Login Error Page" + + "" + + + "" + + "

Invalid user name or password.

" + + "" + + "" + + ); + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.getWriter().print("my POST"); + } +} diff --git a/servlet/error-mapping/src/main/webapp/error-exception.jsp b/servlet/security-form-based/src/main/java/org/javaee7/servlet/security/form/based/LoginServlet.java similarity index 52% rename from servlet/error-mapping/src/main/webapp/error-exception.jsp rename to servlet/security-form-based/src/main/java/org/javaee7/servlet/security/form/based/LoginServlet.java index 72e67435e..8c6726f5f 100644 --- a/servlet/error-mapping/src/main/webapp/error-exception.jsp +++ b/servlet/security-form-based/src/main/java/org/javaee7/servlet/security/form/based/LoginServlet.java @@ -1,6 +1,5 @@ - -<%@page contentType="text/html" pageEncoding="UTF-8"%> - +package org.javaee7.servlet.security.form.based; - - - - Error Mapping Sample - Exception Mapping - - -

Error Mapping Sample - Exception Mapping

- - This page is shown when a java.lang.RuntimeException is thrown.

+import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author Arun Gupta + * @author Arjan Tijms + */ +@WebServlet("/LoginServlet") +public class LoginServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html;charset=UTF-8"); - Go home. - - + response.getWriter().print( + + "" + + "" + + "" + + "Form-Based Login Page" + + "" + + + "" + + "
" + + "Username:

" + + "Password:

" + + "" + + "

" + + "" + + "" + + ); + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.getWriter().print("my POST"); + } +} diff --git a/servlet/error-mapping/src/main/webapp/error-404.jsp b/servlet/security-form-based/src/main/java/org/javaee7/servlet/security/form/based/SecureServlet.java similarity index 59% rename from servlet/error-mapping/src/main/webapp/error-404.jsp rename to servlet/security-form-based/src/main/java/org/javaee7/servlet/security/form/based/SecureServlet.java index c4ce2711e..ceeef0553 100644 --- a/servlet/error-mapping/src/main/webapp/error-404.jsp +++ b/servlet/security-form-based/src/main/java/org/javaee7/servlet/security/form/based/SecureServlet.java @@ -1,4 +1,3 @@ - -<%@page contentType="text/html" pageEncoding="UTF-8"%> - +package org.javaee7.servlet.security.form.based; - - - - Error Mapping Sample - 404 page not found - - -

Error Mapping Sample - 404 page not found

+import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author Arun Gupta + * @author Arjan Tijms + */ +@WebServlet("/SecureServlet") +public class SecureServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html;charset=UTF-8"); - Go home. - - + response.getWriter().print( + + "" + + "" + + "" + + "Form-based Security - Success" + + "" + + + "" + + "

Form-based Security - Success

" + + "" + + "" + + ); + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.getWriter().print("my POST"); + } +} diff --git a/servlet/security-form-based/src/main/webapp/WEB-INF/web.xml b/servlet/security-form-based/src/main/webapp/WEB-INF/web.xml index 7bf9cb0c5..b3f1b8830 100644 --- a/servlet/security-form-based/src/main/webapp/WEB-INF/web.xml +++ b/servlet/security-form-based/src/main/webapp/WEB-INF/web.xml @@ -45,16 +45,10 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - - index - index - /index.jsp - - SecurityConstraint - /* + /SecureServlet g1 @@ -66,10 +60,9 @@ FORM - file - /loginform.jsp - /loginerror.jsp + /LoginServlet + /ErrorServlet diff --git a/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java b/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java index ec0893939..bf3e331a7 100644 --- a/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java +++ b/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java @@ -41,17 +41,21 @@ public static WebArchive createDeployment() { addUsersToContainerIdentityStore(); return create(WebArchive.class) - .addAsWebResource(new File(WEBAPP_SRC, "index.jsp")) - .addAsWebResource(new File(WEBAPP_SRC, "loginerror.jsp")) - .addAsWebResource(new File(WEBAPP_SRC, "loginform.jsp")) + .addClasses( + SecureServlet.class, + LoginServlet.class, + ErrorServlet.class) + .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "web.xml")) .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "glassfish-web.xml")); } @Before public void setup() throws IOException { + @SuppressWarnings("resource") WebClient webClient = new WebClient(); - HtmlPage page = webClient.getPage(base + "/index.jsp"); + HtmlPage page = webClient.getPage(base + "SecureServlet"); + loginForm = page.getForms().get(0); } diff --git a/servlet/security-programmatic/pom.xml b/servlet/security-programmatic/pom.xml index 87df3cf45..5548cbd47 100644 --- a/servlet/security-programmatic/pom.xml +++ b/servlet/security-programmatic/pom.xml @@ -7,10 +7,10 @@ servlet 1.0-SNAPSHOT - + servlet-security-programmatic war - + Java EE 7 Sample: servlet - security-programmatic @@ -36,5 +36,4 @@ - diff --git a/servlet/security-programmatic/src/main/java/org/javaee7/servlet/programmatic/login/LoginServlet.java b/servlet/security-programmatic/src/main/java/org/javaee7/servlet/programmatic/login/LoginServlet.java index 8587857c0..66f015f1f 100644 --- a/servlet/security-programmatic/src/main/java/org/javaee7/servlet/programmatic/login/LoginServlet.java +++ b/servlet/security-programmatic/src/main/java/org/javaee7/servlet/programmatic/login/LoginServlet.java @@ -12,7 +12,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = { "/LoginServlet" }) +@WebServlet("/LoginServlet") public class LoginServlet extends HttpServlet { private static final long serialVersionUID = 1L; @@ -25,9 +25,10 @@ public class LoginServlet extends HttpServlet { * @throws ServletException if a servlet-specific error occurs * @throws IOException if an I/O error occurs */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); + String user = request.getParameter("user"); String password = request.getParameter("password"); @@ -43,34 +44,8 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re private void userDetails(PrintWriter out, HttpServletRequest request) { out.println("isUserInRole?" + request.isUserInRole("g1")); out.println("getRemoteUser?" + request.getRemoteUser()); - out.println("getUserPrincipal?" + request.getUserPrincipal()); + out.println("getUserPrincipal?" + (request.getUserPrincipal() != null? request.getUserPrincipal().getName() : null)); out.println("getAuthType?" + request.getAuthType()); } - /** - * Handles the HTTP GET method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Handles the HTTP POST method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - processRequest(request, response); - } - } diff --git a/servlet/security-programmatic/src/main/webapp/WEB-INF/web.xml b/servlet/security-programmatic/src/main/webapp/WEB-INF/web.xml index b5f400875..4b6003dca 100644 --- a/servlet/security-programmatic/src/main/webapp/WEB-INF/web.xml +++ b/servlet/security-programmatic/src/main/webapp/WEB-INF/web.xml @@ -3,12 +3,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - - index - index - /index.jsp - - g1 diff --git a/servlet/security-programmatic/src/test/java/org/javaee7/servlet/programmatic/login/LoginServletTest.java b/servlet/security-programmatic/src/test/java/org/javaee7/servlet/programmatic/login/LoginServletTest.java index 19e4449d0..f263dd091 100644 --- a/servlet/security-programmatic/src/test/java/org/javaee7/servlet/programmatic/login/LoginServletTest.java +++ b/servlet/security-programmatic/src/test/java/org/javaee7/servlet/programmatic/login/LoginServletTest.java @@ -12,6 +12,8 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.xml.sax.SAXException; @@ -29,6 +31,8 @@ public class LoginServletTest { @ArquillianResource private URL base; + + WebClient webClient; @Deployment(testable = false) public static WebArchive createDeployment() { @@ -39,12 +43,23 @@ public static WebArchive createDeployment() { addClass(LoginServlet.class). addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))); } + + @Before + public void setup() { + webClient = new WebClient(); + } + + @After + public void tearDown() { + webClient.getCookieManager().clearCookies(); + webClient.close(); + } @Test public void testUnauthenticatedRequest() throws IOException, SAXException { - WebClient webClient = new WebClient(); HtmlPage page = webClient.getPage(base + "/LoginServlet"); String responseText = page.asText(); + System.out.println("testUnauthenticatedRequest:\n" + responseText + "\n"); assertTrue(responseText.contains("isUserInRole?false")); @@ -55,14 +70,13 @@ public void testUnauthenticatedRequest() throws IOException, SAXException { @Test public void testAuthenticatedRequest() throws IOException, SAXException { - WebClient webClient = new WebClient(); HtmlPage page = webClient.getPage(base + "/LoginServlet?user=u1&password=p1"); String responseText = page.asText(); + System.out.println("testAuthenticatedRequest:\n" + responseText + "\n"); assertTrue(responseText.contains("isUserInRole?true")); assertTrue(responseText.contains("getRemoteUser?u1")); assertTrue(responseText.contains("getUserPrincipal?u1")); - assertTrue(responseText.contains("getAuthType?BASIC")); } } diff --git a/servlet/servlet-filters/pom.xml b/servlet/servlet-filters/pom.xml index aaa5cf172..bb21b456a 100644 --- a/servlet/servlet-filters/pom.xml +++ b/servlet/servlet-filters/pom.xml @@ -8,7 +8,9 @@ 1.0-SNAPSHOT ../pom.xml + servlet-servlet-filters war + Java EE 7 Sample: servlet - servlet-filters diff --git a/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/FooBarFilter.java b/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/FooBarFilter.java index 34359ce7b..0f6b525c9 100644 --- a/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/FooBarFilter.java +++ b/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/FooBarFilter.java @@ -39,6 +39,9 @@ */ package org.javaee7.servlet.filters; +import java.io.IOException; +import java.io.PrintWriter; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -47,8 +50,6 @@ import javax.servlet.ServletResponse; import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; /** * @author Arun Gupta @@ -57,30 +58,16 @@ public class FooBarFilter implements Filter { private FilterConfig filterConfig; - - private void doBeforeProcessing(ServletRequest request, ServletResponse response) - throws IOException, ServletException { - try (PrintWriter out = response.getWriter()) { - out.print("foo--"); - out.flush(); - } - } - - private void doAfterProcessing(ServletRequest request, ServletResponse response) - throws IOException, ServletException { - try (PrintWriter out = response.getWriter()) { - out.print("--bar"); - out.flush(); - } + + @Override + public void init(FilterConfig filterConfig) { + this.filterConfig = filterConfig; } @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) - throws IOException, ServletException { + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { PrintWriter out = response.getWriter(); - CharResponseWrapper wrappedResponse = new CharResponseWrapper( - (HttpServletResponse) response); + CharResponseWrapper wrappedResponse = new CharResponseWrapper((HttpServletResponse) response); doBeforeProcessing(request, wrappedResponse); chain.doFilter(request, wrappedResponse); @@ -92,10 +79,19 @@ public void doFilter(ServletRequest request, ServletResponse response, @Override public void destroy() { } + + private void doBeforeProcessing(ServletRequest request, ServletResponse response) throws IOException, ServletException { + try (PrintWriter out = response.getWriter()) { + out.print("foo--"); + out.flush(); + } + } - @Override - public void init(FilterConfig filterConfig) { - this.filterConfig = filterConfig; + private void doAfterProcessing(ServletRequest request, ServletResponse response) throws IOException, ServletException { + try (PrintWriter out = response.getWriter()) { + out.print("--bar"); + out.flush(); + } } } diff --git a/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/TestServlet.java b/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/TestServlet.java index 7101b9ec6..a4e9bf3aa 100644 --- a/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/TestServlet.java +++ b/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/TestServlet.java @@ -39,13 +39,14 @@ */ package org.javaee7.servlet.filters; +import java.io.IOException; +import java.io.PrintWriter; + import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; /** * @author Kuba Marchwicki @@ -53,9 +54,10 @@ @WebServlet(urlPatterns = { "/TestServlet", "/filtered/TestServlet" }) public class TestServlet extends HttpServlet { + private static final long serialVersionUID = -1521781346816042757L; + @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.print("bar"); diff --git a/servlet/servlet-filters/src/test/java/org/javaee7/servlet/filters/FilterServletTest.java b/servlet/servlet-filters/src/test/java/org/javaee7/servlet/filters/FilterServletTest.java index 6da88151e..721f6612c 100644 --- a/servlet/servlet-filters/src/test/java/org/javaee7/servlet/filters/FilterServletTest.java +++ b/servlet/servlet-filters/src/test/java/org/javaee7/servlet/filters/FilterServletTest.java @@ -1,33 +1,35 @@ package org.javaee7.servlet.filters; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; + +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.core.Response; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; - -import static org.hamcrest.CoreMatchers.*; - @RunWith(Arquillian.class) public class FilterServletTest { - @Deployment + @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClass(CharResponseWrapper.class) - .addClasses(TestServlet.class, FooBarFilter.class); + .addClasses( + CharResponseWrapper.class, + TestServlet.class, + FooBarFilter.class); } @ArquillianResource @@ -36,20 +38,24 @@ public static WebArchive createDeployment() { @Test @RunAsClient public void filtered_servlet_should_return_enhanced_foobar_text() throws MalformedURLException { - Client client = ClientBuilder.newClient(); - WebTarget target = client.target(URI.create(new URL(base, "filtered/TestServlet").toExternalForm())); - - Response response = target.request().get(); - Assert.assertThat(response.readEntity(String.class), is(equalTo("foo--bar--bar"))); + Response response = + ClientBuilder.newClient() + .target(URI.create(new URL(base, "filtered/TestServlet").toExternalForm())) + .request() + .get(); + + assertThat(response.readEntity(String.class), is(equalTo("foo--bar--bar"))); } @Test @RunAsClient public void standard_servlet_should_return_simple_text() throws MalformedURLException { - Client client = ClientBuilder.newClient(); - WebTarget target = client.target(URI.create(new URL(base, "TestServlet").toExternalForm())); - - Response response = target.request().get(); - Assert.assertThat(response.readEntity(String.class), is(equalTo("bar"))); + Response response = + ClientBuilder.newClient() + .target(URI.create(new URL(base, "TestServlet").toExternalForm())) + .request() + .get(); + + assertThat(response.readEntity(String.class), is(equalTo("bar"))); } } diff --git a/servlet/servlet-libs/empty-app-servlet-lib/pom.xml b/servlet/servlet-libs/empty-app-servlet-lib/pom.xml new file mode 100644 index 000000000..5545d4563 --- /dev/null +++ b/servlet/servlet-libs/empty-app-servlet-lib/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + + org.javaee7 + servlet-libs + 1.0-SNAPSHOT + + + empty-app-servlet-lib + war + + Java EE 7 Sample: servlet - empty-app-servlet-lib + + + + org.javaee7 + servlet-lib + 1.0-SNAPSHOT + + + diff --git a/servlet/servlet-libs/empty-app-servlet-lib/src/test/java/org/javaee7/servlet/servlet_libs/empty/app/EmptyAppWithLibTest.java b/servlet/servlet-libs/empty-app-servlet-lib/src/test/java/org/javaee7/servlet/servlet_libs/empty/app/EmptyAppWithLibTest.java new file mode 100644 index 000000000..445d2f309 --- /dev/null +++ b/servlet/servlet-libs/empty-app-servlet-lib/src/test/java/org/javaee7/servlet/servlet_libs/empty/app/EmptyAppWithLibTest.java @@ -0,0 +1,59 @@ +package org.javaee7.servlet.servlet_libs.empty.app; + +import static org.junit.Assert.assertTrue; + +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; + +import javax.ws.rs.client.ClientBuilder; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * + * @author Arjan Tijms + * + */ +@RunWith(Arquillian.class) +public class EmptyAppWithLibTest { + + @ArquillianResource + private URL base; + + @Deployment(testable = false) + public static WebArchive deploy() throws URISyntaxException { + JavaArchive[] archiveWithServlet = + Maven.resolver() + .loadPomFromFile("pom.xml") + .resolve("org.javaee7:servlet-lib") + .withoutTransitivity() + .as(JavaArchive.class); + + return ShrinkWrap.create(WebArchive.class) + .addAsLibraries(archiveWithServlet); + } + + @Test + @RunAsClient + public void invokeBasicServlet() throws MalformedURLException, URISyntaxException { + String response = + ClientBuilder.newClient() + .target(new URL(base, "basic").toURI()) + .request() + .get() + .readEntity(String.class); + + assertTrue(response.startsWith("get request")); + } + +} diff --git a/servlet/servlet-libs/pom.xml b/servlet/servlet-libs/pom.xml new file mode 100644 index 000000000..ee2519d80 --- /dev/null +++ b/servlet/servlet-libs/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + + + + This module contains samples for functioning of web apps and code in libraries + (jars in WEB-INF/lib). + + + servlet-libs + pom + + Java EE 7 Sample: Servlet - libs + + + servlet-lib + empty-app-servlet-lib + + diff --git a/servlet/servlet-libs/servlet-lib/pom.xml b/servlet/servlet-libs/servlet-lib/pom.xml new file mode 100644 index 000000000..8ad86b342 --- /dev/null +++ b/servlet/servlet-libs/servlet-lib/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + org.javaee7 + servlet-lib + 1.0-SNAPSHOT + + Java EE 7 Sample: servlet - servlet-lib + + This module delivers a jar with a single Servlet in it. The intend is for this to be included + in the WEB-INF/lib folder of a war, to test that Servlets are found and correctly excecuted + from there. As such this module itself contains no tests. + + + + UTF-8 + 1.7 + + + + + javax + javaee-api + 7.0 + provided + + + junit + junit + 4.13.1 + + + + + + + src/main/resources + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + ${java.min.version} + ${java.min.version} + + + + + diff --git a/servlet/servlet-libs/servlet-lib/src/main/java/org/javaee7/servlet/servlet_libs/basic/servlet/BasicServlet.java b/servlet/servlet-libs/servlet-lib/src/main/java/org/javaee7/servlet/servlet_libs/basic/servlet/BasicServlet.java new file mode 100644 index 000000000..183ed6669 --- /dev/null +++ b/servlet/servlet-libs/servlet-lib/src/main/java/org/javaee7/servlet/servlet_libs/basic/servlet/BasicServlet.java @@ -0,0 +1,24 @@ +package org.javaee7.servlet.servlet_libs.basic.servlet; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author Arjan Tijms + */ +@WebServlet("/basic") +public class BasicServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.getWriter().print("get request"); + } + +} diff --git a/servlet/simple-servlet/pom.xml b/servlet/simple-servlet/pom.xml index 5a2d35483..1a54652f1 100644 --- a/servlet/simple-servlet/pom.xml +++ b/servlet/simple-servlet/pom.xml @@ -6,11 +6,10 @@ org.javaee7 servlet 1.0-SNAPSHOT - ../pom.xml - - org.javaee7 + + servlet-simple-servlet - 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - simple-servlet diff --git a/servlet/simple-servlet/src/main/java/org/javaee7/servlet/simple/SimpleServlet.java b/servlet/simple-servlet/src/main/java/org/javaee7/servlet/simple/SimpleServlet.java index 6f929c4ce..79687c40b 100644 --- a/servlet/simple-servlet/src/main/java/org/javaee7/servlet/simple/SimpleServlet.java +++ b/servlet/simple-servlet/src/main/java/org/javaee7/servlet/simple/SimpleServlet.java @@ -1,6 +1,7 @@ package org.javaee7.servlet.simple; import java.io.IOException; + import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -12,15 +13,16 @@ */ @WebServlet("/SimpleServlet") public class SimpleServlet extends HttpServlet { + + private static final long serialVersionUID = -8359235999619949424L; + @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.getWriter().print("my GET"); } @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.getWriter().print("my POST"); } } diff --git a/servlet/simple-servlet/src/test/java/org/javaee7/servlet/metadata/complete/SimpleServletTest.java b/servlet/simple-servlet/src/test/java/org/javaee7/servlet/metadata/complete/SimpleServletTest.java index 76829dd03..0e7e1eac7 100644 --- a/servlet/simple-servlet/src/test/java/org/javaee7/servlet/metadata/complete/SimpleServletTest.java +++ b/servlet/simple-servlet/src/test/java/org/javaee7/servlet/metadata/complete/SimpleServletTest.java @@ -1,24 +1,26 @@ package org.javaee7.servlet.metadata.complete; -import org.javaee7.servlet.simple.SimpleServlet; -import com.gargoylesoftware.htmlunit.HttpMethod; -import com.gargoylesoftware.htmlunit.TextPage; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.WebRequest; -import java.io.File; +import static org.junit.Assert.assertEquals; + import java.io.IOException; import java.net.URL; + +import org.javaee7.servlet.simple.SimpleServlet; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; -import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.xml.sax.SAXException; +import com.gargoylesoftware.htmlunit.HttpMethod; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.WebRequest; + /** * @author Arun Gupta */ diff --git a/servlet/web-fragment/pom.xml b/servlet/web-fragment/pom.xml index 224442afe..f639b7a4c 100644 --- a/servlet/web-fragment/pom.xml +++ b/servlet/web-fragment/pom.xml @@ -8,9 +8,11 @@ 1.0-SNAPSHOT ../pom.xml + org.javaee7 servlet-web-fragment 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - web-fragment diff --git a/test-utils/pom.xml b/test-utils/pom.xml index ca0100e77..263f2eb41 100644 --- a/test-utils/pom.xml +++ b/test-utils/pom.xml @@ -1,21 +1,18 @@ - - 4.0.0 - - - 1.1.14.Final - UTF-8 - UTF-8 - 1.7 - 1.7 - + 4.0.0 org.javaee7 test-utils 1.0-SNAPSHOT + Java EE 7 Sample: javaee7-samples - test-utils + + UTF-8 + 1.7.0.Alpha1 + 1.7 + + @@ -38,7 +35,7 @@ junit junit - 4.11 + 4.13.1 org.jboss.arquillian.container @@ -50,4 +47,24 @@ + + + + src/main/resources + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + ${java.min.version} + ${java.min.version} + + + + + diff --git a/test-utils/src/main/java/org/javaee7/CliCommands.java b/test-utils/src/main/java/org/javaee7/CliCommands.java index 1540800b9..ee1604726 100644 --- a/test-utils/src/main/java/org/javaee7/CliCommands.java +++ b/test-utils/src/main/java/org/javaee7/CliCommands.java @@ -21,8 +21,12 @@ public class CliCommands { private static final Logger logger = Logger.getLogger(CliCommands.class.getName()); private static final String OS = System.getProperty("os.name").toLowerCase(); - + public static int payaraGlassFish(List cliCommands) { + return payaraGlassFish(cliCommands, null); + } + + public static int payaraGlassFish(List cliCommands, List output) { String gfHome = System.getProperty("glassfishRemote_gfHome"); if (gfHome == null) { @@ -60,6 +64,7 @@ public static int payaraGlassFish(List cliCommands) { return waitToFinish( readAllInput( + output, destroyAtShutDown( processBuilder.start()))); } catch (IOException e) { @@ -86,11 +91,15 @@ public void run() { return process; } - public static Process readAllInput(Process process) { + public static Process readAllInput(List output, Process process) { // Read any output from the process try (Scanner scanner = new Scanner(process.getInputStream())) { while (scanner.hasNextLine()) { - System.out.println(scanner.nextLine()); + String nextLine = scanner.nextLine(); + System.out.println(nextLine); + if (output != null) { + output.add(nextLine); + } } } diff --git a/test-utils/src/main/java/org/javaee7/ServerOperations.java b/test-utils/src/main/java/org/javaee7/ServerOperations.java index f44bcd3e6..d1ae5983d 100644 --- a/test-utils/src/main/java/org/javaee7/ServerOperations.java +++ b/test-utils/src/main/java/org/javaee7/ServerOperations.java @@ -56,7 +56,11 @@ public static void addUsersToContainerIdentityStore() { cmd.add("u1"); CliCommands.payaraGlassFish(cmd); - } else { + } else if ("piranha-embedded".equals(javaEEServer)) { + System.out.println("Adding user for piranha-embedded"); + System.setProperty("io.piranha.identitystore.callers", ""); + } + else { if (javaEEServer == null) { System.out.println("javaEEServer not specified"); } else { @@ -91,22 +95,26 @@ public static void addCertificateToContainerTrustStore(Certificate clientCertifi logger.severe("glassfishRemote_gfHome at " + gfHome + " is not a directory"); return; } - - // TODO: support current domain + String domain = System.getProperty("payara_domain", "domain1"); + if (domain != null) { + domain = getPayaraDomainFromServer(); + logger.info("Using domain \"" + domain + "\" obtained from server. If this is not correct use -Dpayara_domain to override."); + } Path cacertsPath = gfHomePath.resolve("glassfish/domains/" + domain + "/config/cacerts.jks"); if (!cacertsPath.toFile().exists()) { - logger.severe("The trust store at " + cacertsPath.toAbsolutePath() + " does not exists"); + logger.severe("The container trust store at " + cacertsPath.toAbsolutePath() + " does not exists"); + logger.severe("Is the domain \"" + domain + "\" correct?"); return; } - logger.info("*** Adding certificate to: " + cacertsPath.toAbsolutePath()); + logger.info("*** Adding certificate to container trust store: " + cacertsPath.toAbsolutePath()); KeyStore keyStore = null; try (InputStream in = new FileInputStream(cacertsPath.toAbsolutePath().toFile())) { - keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); + keyStore = KeyStore.getInstance("JKS"); keyStore.load(in, "changeit".toCharArray()); keyStore.setCertificateEntry("arquillianClientTestCert", clientCertificate); @@ -115,6 +123,8 @@ public static void addCertificateToContainerTrustStore(Certificate clientCertifi } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException | IOException e) { throw new IllegalStateException(e); } + + restartContainer(domain); } else { if (javaEEServer == null) { System.out.println("javaEEServer not specified"); @@ -123,7 +133,6 @@ public static void addCertificateToContainerTrustStore(Certificate clientCertifi } } - restartContainer(); } public static URL toContainerHttps(URL url) { @@ -145,8 +154,7 @@ public static URL toContainerHttps(URL url) { url.getFile() ); - System.out.println("Returning " + httpsUrl + " for " + url); - logger.info("Returning " + httpsUrl + " for " + url); + System.out.println("Changing base URL from " + url + " into " + httpsUrl); return httpsUrl; @@ -167,7 +175,63 @@ public static URL toContainerHttps(URL url) { return null; } + private static String getPayaraDomainFromServer() { + System.out.println("Getting Payara domain from server"); + + List output = new ArrayList<>(); + List cmd = new ArrayList<>(); + + cmd.add("list-domains"); + + CliCommands.payaraGlassFish(cmd, output); + + String domain = null; + for (String line : output) { + if (line.contains(" not running")) { + continue; + } + + if (line.contains(" running")) { + domain = line.substring(0, line.lastIndexOf(" running")); + break; + } + } + + if (domain == null) { + throw new IllegalStateException("Running domain could not be obtained for target Payara. Please specify explicitly using -Dpayara_domain"); + } + + return domain; + } + + public static void addContainerSystemProperty(String key, String value) { + String javaEEServer = System.getProperty("javaEEServer"); + + if ("glassfish-remote".equals(javaEEServer) || "payara-remote".equals(javaEEServer)) { + + System.out.println("Adding system property"); + + List cmd = new ArrayList<>(); + + cmd.add("create-jvm-options"); + cmd.add("-D" + key + "=\"" + value + "\""); + + CliCommands.payaraGlassFish(cmd); + + } else { + if (javaEEServer == null) { + System.out.println("javaEEServer not specified"); + } else { + System.out.println(javaEEServer + " not supported"); + } + } + } + public static void restartContainer() { + restartContainer(null); + } + + public static void restartContainer(String domain) { // Arquillian connectors can stop/start already, but not on demand by code String javaEEServer = System.getProperty("javaEEServer"); @@ -180,7 +244,16 @@ public static void restartContainer() { cmd.add("restart-domain"); - cmd.add(System.getProperty("payara_domain", "domain1")); + String restartDomain = domain; + if (restartDomain == null) { + restartDomain = System.getProperty("payara_domain"); + } + + if (restartDomain == null) { + restartDomain = getPayaraDomainFromServer(); + } + + cmd.add(restartDomain); CliCommands.payaraGlassFish(cmd); diff --git a/test-utils/src/main/resources/arquillian.xml b/test-utils/src/main/resources/arquillian.xml index 2553915b7..99181b426 100644 --- a/test-utils/src/main/resources/arquillian.xml +++ b/test-utils/src/main/resources/arquillian.xml @@ -7,7 +7,7 @@ - payaradomain + ${payara_domain} diff --git a/validation/pom.xml b/validation/pom.xml index 77243943e..4b7e1bf4a 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -1,17 +1,15 @@ - - 4.0.0 + 4.0.0 org.javaee7 samples-parent 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + validation - 1.0-SNAPSHOT pom + Java EE 7 Sample: validation @@ -24,6 +22,7 @@ org.javaee7 test-utils ${project.version} + test diff --git a/websocket/atmosphere-chat/pom.xml b/websocket/atmosphere-chat/pom.xml index f627751e2..2f6dd9c8a 100644 --- a/websocket/atmosphere-chat/pom.xml +++ b/websocket/atmosphere-chat/pom.xml @@ -30,7 +30,7 @@ ch.qos.logback logback-core - 1.0.13 + 1.2.0 org.atmosphere diff --git a/websocket/chat/pom.xml b/websocket/chat/pom.xml index a84dc1d3c..4b63b856e 100644 --- a/websocket/chat/pom.xml +++ b/websocket/chat/pom.xml @@ -1,17 +1,14 @@ - - - 4.0.0 - + 4.0.0 org.javaee7 websocket 1.0-SNAPSHOT - ../pom.xml + org.javaee7 websocket-chat - 1.0-SNAPSHOT + war Java EE 7 Sample: websocket - chat diff --git a/websocket/google-docs/client/pom.xml b/websocket/google-docs/client/pom.xml deleted file mode 100644 index f7f78de86..000000000 --- a/websocket/google-docs/client/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - 4.0.0 - - org.javaee7.websocket.google-docs - google-docs-sample - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.websocket.google-docs - client - 1.0-SNAPSHOT - jar - - - 1.8-ea-b123 - ${java.home}/lib/jfxrt.jar - - - - - io.undertow - undertow-core - 1.0.16.Final - - - io.undertow - undertow-websockets-jsr - 1.0.16.Final - - - javax - javaee-api - 7.0 - - - com.oracle - javafx - ${javafx.version} - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - - true - org.javaee7.websocket.googledocs.client.GoogleDocClient - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - test - - java - - - org.javaee7.websocket.googledocs.client.GoogleDocClient - - - - - - - diff --git a/websocket/google-docs/client/src/main/java/org/javaee7/websocket/googledocs/client/GoogleDocClient.java b/websocket/google-docs/client/src/main/java/org/javaee7/websocket/googledocs/client/GoogleDocClient.java deleted file mode 100644 index beaf3ecca..000000000 --- a/websocket/google-docs/client/src/main/java/org/javaee7/websocket/googledocs/client/GoogleDocClient.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.javaee7.websocket.googledocs.client; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.logging.Level; -import java.util.logging.Logger; -import javafx.application.Application; -import javafx.application.Platform; -import javafx.beans.value.ChangeListener; -import javafx.beans.value.ObservableValue; -import javafx.scene.Scene; -import javafx.scene.control.TextArea; -import javafx.stage.Stage; - -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.DeploymentException; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; - -/** - * @author Arun Gupta - */ -@ClientEndpoint -public class GoogleDocClient extends Application { - - static TextArea textarea; - - public static void main(String[] args) { - launch(args); - } - - @Override - public void start(Stage stage) throws Exception { - final Session session = connectToServer(); - System.out.println("Connected to server: " + session.getId()); - stage.setTitle("Google Docs Emulator using WebSocket"); - textarea = new TextArea(); - textarea.textProperty().addListener( - new ChangeListener() { - - @Override - public void changed(ObservableValue observable, String oldValue, String newValue) { - System.out.println("New value: " + newValue); - - try { - session.getBasicRemote().sendText(newValue); - } catch (IOException ex) { - Logger.getLogger(GoogleDocClient.class.getName()).log(Level.SEVERE, null, ex); - } - } - - } - ); - - textarea.setPrefSize(500, 300); - textarea.setWrapText(true); - Scene scene = new Scene(textarea); - stage.setScene(scene); - stage.show(); - } - - @OnOpen - public void onOpen(Session session) { - System.out.println("Connected to endpoint: " + session.getBasicRemote()); - } - - @OnMessage - public void onMessage(String message, Session session) throws IOException { - final String newMessage = message; - System.out.println("Received message in client: " + message); - Platform.runLater(new Runnable() { - @Override - public void run() { - textarea.setText(newMessage); - textarea.positionCaret(newMessage.length()); - } - }); - - } - - private Session connectToServer() throws URISyntaxException, DeploymentException, IOException { - WebSocketContainer container = ContainerProvider.getWebSocketContainer(); - return container.connectToServer(GoogleDocClient.class, new URI("ws://localhost:8080/server/websocket")); - } - -} diff --git a/websocket/google-docs/pom.xml b/websocket/google-docs/pom.xml deleted file mode 100644 index 588e2eeb0..000000000 --- a/websocket/google-docs/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - org.javaee7.websocket - websocket-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.websocket.google-docs - google-docs-sample - pom - Java EE 7 WebSocket Google Docs - - - server - client - - diff --git a/websocket/google-docs/readme.asciidoc b/websocket/google-docs/readme.asciidoc deleted file mode 100644 index d4724315c..000000000 --- a/websocket/google-docs/readme.asciidoc +++ /dev/null @@ -1,7 +0,0 @@ -Install JavaFX library locally: - -[source,text] ----- -mvn install:install-file -Dfile=$JAVA_HOME/jre/lib/ext/jfxrt.jar -DgroupId=com.oracle -DartifactId=javafx -Dversion=1.8-ea-b123 -Dpackaging=jar ----- - diff --git a/websocket/google-docs/server/pom.xml b/websocket/google-docs/server/pom.xml deleted file mode 100644 index 563e7b957..000000000 --- a/websocket/google-docs/server/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - - org.javaee7.websocket.google-docs - google-docs-sample - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.websocket.google-docs - server - 1.0-SNAPSHOT - war - diff --git a/websocket/google-docs/server/src/main/java/org/javaee7/websocket/googledocs/server/GoogleDocServer.java b/websocket/google-docs/server/src/main/java/org/javaee7/websocket/googledocs/server/GoogleDocServer.java deleted file mode 100644 index 2e9406037..000000000 --- a/websocket/google-docs/server/src/main/java/org/javaee7/websocket/googledocs/server/GoogleDocServer.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.javaee7.websocket.googledocs.server; - -import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.websocket.EncodeException; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; - -/** - * @author Arun Gupta - */ -@ServerEndpoint(value = "/websocket") -public class GoogleDocServer { - - private static final Logger LOGGER = Logger.getLogger(GoogleDocServer.class.getName()); - - @OnOpen - public void onOpen(Session client) { - LOGGER.log(Level.INFO, "connected"); - } - - @OnMessage - public void broadcastText(String text, Session session) throws IOException, EncodeException { - LOGGER.log(Level.INFO, "broadcastText: {0}", text); - for (Session peer : session.getOpenSessions()) { - if (!peer.equals(session)) { - peer.getBasicRemote().sendText(text); - } - } - } -} diff --git a/websocket/google-docs/server/src/main/webapp/index.html b/websocket/google-docs/server/src/main/webapp/index.html deleted file mode 100644 index f9e46ee14..000000000 --- a/websocket/google-docs/server/src/main/webapp/index.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Google Docs Server - - - - -
Google Docs Server
- - diff --git a/websocket/pom.xml b/websocket/pom.xml index a2224ae33..1db267456 100644 --- a/websocket/pom.xml +++ b/websocket/pom.xml @@ -1,16 +1,15 @@ - - 4.0.0 + 4.0.0 org.javaee7 samples-parent 1.0-SNAPSHOT - ../pom.xml - org.javaee7 + websocket pom + Java EE 7 Sample: websocket @@ -21,13 +20,11 @@ endpoint endpoint-async endpoint-javatypes - endpoint-config endpoint-programmatic endpoint-programmatic-async endpoint-programmatic-config endpoint-programmatic-injection - endpoint-security httpsession injection @@ -45,7 +42,6 @@ whiteboard endpoint-singleton websocket-vs-rest-payload - @@ -53,6 +49,7 @@ org.javaee7 test-utils ${project.version} + test