소스 검색

update test with jsf implementation

svn path=/trunk/mcs/; revision=91862
Igor Zelmanovich 18 년 전
부모
커밋
aa489f1d26

+ 1 - 0
mcs/class/System.Web/Test/mainsoft/MainsoftWebApp20/MainsoftWebApp20.csproj

@@ -197,6 +197,7 @@
   <ItemGroup>
     <Content Include="App_Themes\Theme2\Theme2.skin" />
     <Content Include="GridViewUpdate.aspx" />
+    <Content Include="WEB-INF\faces-config.xml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

+ 11 - 0
mcs/class/System.Web/Test/mainsoft/MainsoftWebApp20/WEB-INF/faces-config.xml

@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+
+<faces-config>
+	<application>
+		<state-manager>Mainsoft.Web.Hosting.ServletFacesStateManager</state-manager>
+		<view-handler>Mainsoft.Web.Hosting.ServletFacesViewHandler</view-handler>
+	</application>
+</faces-config>

+ 18 - 0
mcs/class/System.Web/Test/mainsoft/MainsoftWebApp20/WEB-INF/web.xml

@@ -15,6 +15,24 @@
         <param-value>Virtual</param-value>
     </context-param>      
 
+	<context-param>
+		<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+		<param-value>client</param-value>
+	</context-param>
+	<context-param>
+		<param-name>javax.faces.application.CONFIG_FILES</param-name>
+		<param-value>/WEB-INF/faces-config.xml</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+		<param-value>.aspx</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+	</listener>
+
     <listener>
         <listener-class>system.Web.GH.SessionListener</listener-class>
     </listener>

+ 4 - 0
mcs/class/System.Web/run-mono-tests.bat

@@ -46,6 +46,7 @@ REM ********************************************************
 
 set JGAC_PATH=%VMW_HOME%\java_refs\framework\
 set TOMCAT_PATH=%VMW_HOME%\jakarta-tomcat\common\lib\
+set TOMCAT_SHARED_PATH=%VMW_HOME%\jakarta-tomcat\shared\lib\
 set JAVA_HOME=%VMW_HOME%\jre
 
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
@@ -65,6 +66,7 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\De
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\MainsoftWebTest\bin\Debug_Java20\HtmlCompare.jar
 
 set TOMCAT_CLASSPATH=%TOMCAT_PATH%servlet-api.jar
+set TOMCAT_CLASSPATH=%TOMCAT_CLASSPATH%;%TOMCAT_SHARED_PATH%myfaces-api-1.1.5.jar
 set NUNIT_OPTIONS=/exclude=NotWorking
 
 if "%GH_VERSION%"=="" (
@@ -86,6 +88,8 @@ set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_ASSEMBLY%
 
 set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%;%TOMCAT_CLASSPATH%"
 
+IF "%BUILD_OPTION%"=="nobuild" GOTO RUN
+
 REM ********************************************************
 @echo Building GH solution...
 REM ********************************************************