Преглед изворни кода

removed dependency on J2EE.Helpers.

svn path=/branches/mainsoft/JSF/mcs/; revision=91540
Igor Zelmanovich пре 18 година
родитељ
комит
0bfa679fc8

+ 0 - 1
mcs/class/System.Web/System.Web.UI/Control.jvm.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using [email protected];
 using System.Web.Hosting;
 using System.Text;
 using javax.faces.context;

+ 0 - 22
mcs/class/System.Web/System.Web.UI/Page.jvm.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using [email protected];
 using javax.servlet.http;
 using System.Collections.Specialized;
 using System.Globalization;
@@ -46,8 +45,6 @@ namespace System.Web.UI
 	{
 		bool _emptyPortletNamespace = false;
 		string _PortletNamespace = null;
-		bool _renderResponseInit = false;
-		IPortletRenderResponse _renderResponse = null;
 		StateManager.SerializedView _facesSerializedView;
 
 
@@ -88,25 +85,6 @@ namespace System.Web.UI
 			}
 		}
 
-		internal bool IsPortletRender
-		{
-			get {
-				return RenderResponse != null;
-			}
-		}
-
-		internal IPortletRenderResponse RenderResponse
-		{
-			get {
-				if (!_renderResponseInit)
-					if (Context != null) {
-						_renderResponse = Context.ServletResponse as IPortletRenderResponse;
-						_renderResponseInit = true;
-					}
-				return _renderResponse;
-			}
-		}
-
 		internal string EncodeURL (string raw) {
 			//kostat: BUGBUG: complete
 			return raw;

+ 0 - 1
mcs/class/System.Web/System.Web/HttpContext.jvm.cs

@@ -32,7 +32,6 @@ using System.Collections;
 using System.Configuration;
 using System.Threading;
 using javax.servlet.http;
-using [email protected];
 using javax.faces.context;
 using System.Web.J2EE;
 using System.Web.UI;

+ 1 - 2
mcs/class/System.Web/System.Web/HttpRequest.jvm.cs

@@ -33,7 +33,6 @@ using javax.servlet.http;
 using System.Web.Configuration;
 using System.IO;
 using System.Collections;
-using [email protected];
 using System.Collections.Specialized;
 
 namespace System.Web
@@ -183,7 +182,7 @@ namespace System.Web
 			HttpServletRequest servletReq = context.ServletRequest;
 			if (servletReq == null)
 				return;
-			bool inPortletMode = servletReq is IPortletRequest;
+			bool inPortletMode = true; //servletReq is IPortletRequest;
 			bool shouldStoreCookiesCollection = false;
 			HttpSession javaSession = servletReq.getSession(false);
 

+ 0 - 15
mcs/class/System.Web/System.Web/HttpResponse.cs

@@ -39,9 +39,6 @@ using System.Web.Util;
 using System.Web.Configuration;
 using System.Globalization;
 using System.Security.Permissions;
-#if TARGET_J2EE
-using [email protected];
-#endif
 
 namespace System.Web {
 	
@@ -797,18 +794,6 @@ namespace System.Web {
 			if (headers_sent)
 				throw new HttpException ("Headers have already been sent");
 
-#if TARGET_J2EE
-			// In J2EE portal we need to handle Redirect at the processAction phase
-			// using the portlet ActionResponse that will send for us the redirect header.
-			IPortletActionResponse resp = context.ServletResponse as IPortletActionResponse;
-			if (resp != null) {
-				resp.sendRedirect (ApplyAppPathModifier (url));
-				if (endResponse)
-					End ();
-				return;
-			}
-#endif
-
 #if NET_2_0
 			is_request_being_redirected = true;
 #endif

+ 0 - 4
mcs/class/System.Web/System.Web20.csproj

@@ -1366,10 +1366,6 @@
       <Private>False</Private>
       <HintPath>..\lib\JavaEE.dll</HintPath>
     </Reference>
-    <Reference Include="J2EE.Helpers">
-      <Private>False</Private>
-      <HintPath>..\lib\J2EE.Helpers.dll</HintPath>
-    </Reference>
     <Reference Include="J2SE.Helpers">
       <Private>False</Private>
       <HintPath>..\lib\J2SE.Helpers.dll</HintPath>