[jbossnative-commits] JBoss Native SVN: r2764 - in trunk/build/unix/util/jbossweb: org/jboss/test and 1 other directory.
Author: jfrederic.clere(a)jboss.com
Date: 2011-05-04 10:27:47 -0400 (Wed, 04 May 2011)
New Revision: 2764
Modified:
trunk/build/unix/util/jbossweb/build.xml
trunk/build/unix/util/jbossweb/org/jboss/test/JBossWeb.java
Log:
Arrange the SSL native tests...
Modified: trunk/build/unix/util/jbossweb/build.xml
===================================================================
--- trunk/build/unix/util/jbossweb/build.xml 2011-05-04 08:24:29 UTC (rev 2763)
+++ trunk/build/unix/util/jbossweb/build.xml 2011-05-04 14:27:47 UTC (rev 2764)
@@ -47,13 +47,21 @@
<antcall target="startjbossweb">
<param name="line" value="8009 node1 dom1 8005"/>
</antcall>
+ <delete file="index.html"/>
+ <exec executable="wget">
+ <arg value="--no-check-certificate"/>
+ <arg value="https://localhost:8009/index.html"/>
+ </exec>
+ <available file="index.html" property="exist"/>
+ <fail unless="exist" message="Can't get test file"/>
</target>
<target name="startjbossweb" depends="compile">
<java dir="${test.classes}"
classname="org.jboss.test.StartJBossWeb"
spawn="true" fork="yes">
<arg line="${line}"/>
- <jvmarg line="-Dcluster=${cluster}"/>
+ <jvmarg
line="-Djava.util.logging.config.file=node1/conf/logging.properties" />
+ <jvmarg
line="-Djava.util.logging.manager=org.jboss.test.ClassLoaderLogManager"/>
<classpath refid="jbossweb.test.classpath"/>
</java>
<echo message="startjbossweb ${line}"/>
Modified: trunk/build/unix/util/jbossweb/org/jboss/test/JBossWeb.java
===================================================================
--- trunk/build/unix/util/jbossweb/org/jboss/test/JBossWeb.java 2011-05-04 08:24:29 UTC
(rev 2763)
+++ trunk/build/unix/util/jbossweb/org/jboss/test/JBossWeb.java 2011-05-04 14:27:47 UTC
(rev 2764)
@@ -151,6 +151,13 @@
rootContext = createContext("/" + webapp, docBase );
rootContext.setIgnoreAnnotations(true);
rootContext.setPrivileged(true);
+
+ Wrapper wrapper = rootContext.createWrapper();
+ wrapper.setName("default");
+
wrapper.setServletClass("org.apache.catalina.servlets.DefaultServlet");
+ rootContext.addChild(wrapper);
+ rootContext.addServletMapping("/", "default");
+
baseHost.addChild( rootContext );
addEngine( baseEngine );
baseEngine.setService(this);