You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/09/28 20:22:25 UTC
svn commit: r580450 - in /geronimo/server/branches/2.0/testsuite:
deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/
enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/
enterprise-testsuite/jpa...
Author: gawor
Date: Fri Sep 28 11:22:25 2007
New Revision: 580450
URL: http://svn.apache.org/viewvc?rev=580450&view=rev
Log:
merge some testsuite fixes from trunk
Modified:
geronimo/server/branches/2.0/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp
Modified: geronimo/server/branches/2.0/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java?rev=580450&r1=580449&r2=580450&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java (original)
+++ geronimo/server/branches/2.0/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java Fri Sep 28 11:22:25 2007
@@ -33,10 +33,16 @@
{
@Test
public void testIndexContent() throws Exception {
+ /*
+ * Disabled until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed
+ * since the module is not deployed, see pom.xml.
+ */
+ /*
selenium.open("/test-1_3/");
selenium.waitForPageToLoad("30000");
assertEquals("Hello J2EE 1.3", selenium.getTitle());
assertEquals("Hello J2EE 1.3", selenium.getText("xpath=/html/body"));
+ */
}
}
Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml?rev=580450&r1=580449&r2=580450&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml Fri Sep 28 11:22:25 2007
@@ -62,7 +62,11 @@
</module>
<ext-module>
<connector>TestJMS</connector>
- <external-path>org.apache.geronimo.modules/geronimo-activemq-ra/${version}/rar</external-path>
+ <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+ <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
+ <dep:type>rar</dep:type>
+ </external-path>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<resourceadapter>
<resourceadapter-instance>
Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?rev=580450&r1=580449&r2=580450&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Fri Sep 28 11:22:25 2007
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=580450&r1=580449&r2=580450&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml Fri Sep 28 11:22:25 2007
@@ -53,6 +53,22 @@
</role>
</role-mappings>
</security>
+ <gbean name="test-realm"
+ class="org.apache.geronimo.security.realm.GenericSecurityRealm">
+ <attribute name="realmName">test-realm</attribute>
+ <xml-reference name="LoginModuleConfiguration">
+ <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-${geronimoSchemaVersion}">
+ <lc:login-module control-flag="REQUIRED" wrap-principals="false">
+ <lc:login-domain-name>test-realm</lc:login-domain-name>
+ <lc:login-module-class>org.apache.geronimo.itest.TestLoginModule</lc:login-module-class>
+ <lc:option name="users">foo,bar</lc:option>
+ </lc:login-module>
+ </lc:login-config>
+ </xml-reference>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
<gbean name="TestCredentialStore" class="org.apache.geronimo.security.credentialstore.SimpleCredentialStoreImpl">
<xml-attribute name="credentialStore">
<credential-store xmlns="http://geronimo.apache.org/xml/ns/credentialstore-1.0">
@@ -82,22 +98,6 @@
</realm>
</credential-store>
</xml-attribute>
- </gbean>
- <gbean name="test-realm"
- class="org.apache.geronimo.security.realm.GenericSecurityRealm">
- <attribute name="realmName">test-realm</attribute>
- <xml-reference name="LoginModuleConfiguration">
- <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-${geronimoSchemaVersion}">
- <lc:login-module control-flag="REQUIRED" wrap-principals="false">
- <lc:login-domain-name>test-realm</lc:login-domain-name>
- <lc:login-module-class>org.apache.geronimo.itest.TestLoginModule</lc:login-module-class>
- <lc:option name="users">foo,bar</lc:option>
- </lc:login-module>
- </lc:login-config>
- </xml-reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
</gbean>
</openejb-jar>
Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java?rev=580450&r1=580449&r2=580450&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java (original)
+++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java Fri Sep 28 11:22:25 2007
@@ -17,6 +17,7 @@
package org.apache.geronimo.itest;
import java.io.IOException;
+import java.io.PrintWriter;
import java.rmi.AccessException;
import java.rmi.RemoteException;
@@ -40,7 +41,7 @@
}
protected void service(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException {
- ServletOutputStream out = httpServletResponse.getOutputStream();
+ PrintWriter out = httpServletResponse.getWriter();
out.println("TestServlet principal: " + httpServletRequest.getUserPrincipal().getName());
try {
InitialContext ctx = new InitialContext();
@@ -65,7 +66,7 @@
} catch (CreateException e) {
e.printStackTrace();
}
- httpServletResponse.flushBuffer();
+ out.flush();
}
Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp?rev=580450&r1=580449&r2=580450&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp (original)
+++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp Fri Sep 28 11:22:25 2007
@@ -18,12 +18,13 @@
<%@ page import="javax.naming.InitialContext" %>
<%@ page import="org.apache.geronimo.itest.TestSessionHome" %>
<%@ page import="javax.naming.NamingException" %>
+<%@ page import="java.io.PrintWriter" %>
<%@ page import="java.rmi.AccessException" %>
<%@ page import="java.rmi.RemoteException" %>
<%@ page import="javax.ejb.CreateException" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%
- ServletOutputStream myout = response.getOutputStream();
+ PrintWriter myout = response.getWriter();
myout.println("TestServlet principal: " + request.getUserPrincipal().getName());
try {
InitialContext ctx = new InitialContext();
@@ -48,5 +49,5 @@
} catch (CreateException e) {
e.printStackTrace();
}
- myout.flush();
+ out.flush();
%>