[jboss-svn-commits] JBL Code SVN: r30011 - in labs/jbossesb/trunk/product: rosetta/src/org/jboss/soa/esb/http and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2009-11-05 06:51:32 -0500 (Thu, 05 Nov 2009)
New Revision: 30011

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/http/HttpResponse.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/http/HttpResponse.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/http/HttpMessageComposer.java
   labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/src/org/jboss/soa/esb/samples/https/client/HttpResponsePrinter.java
Log:
JBESB-2953: HttpResponse not deprecated properly

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/http/HttpResponse.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/http/HttpResponse.java	2009-11-05 11:27:15 UTC (rev 30010)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/http/HttpResponse.java	2009-11-05 11:51:32 UTC (rev 30011)
@@ -21,6 +21,12 @@
  */
 package org.jboss.soa.esb.actions.routing.http;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
+import org.jboss.soa.esb.message.Message;
+
 /**
  * Http Response Object. 
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
@@ -30,4 +36,20 @@
     public HttpResponse(int responseCode) {
         super(responseCode);
     }
+
+    /**
+     * @deprecated Use {@link #addHeader(org.jboss.soa.esb.http.HttpHeader).
+     */
+    public List<HttpHeader> getHeaders() {
+    	List<HttpHeader> newArray =  new ArrayList<HttpHeader>();
+    	List<org.jboss.soa.esb.http.HttpHeader> baseArray = super.getHttpHeaders();
+    	
+    	for(org.jboss.soa.esb.http.HttpHeader baseArrayEntry : baseArray) {
+    		if(baseArrayEntry instanceof HttpHeader) {
+    			newArray.add((HttpHeader) baseArrayEntry);
+    		}
+    	}
+    	
+    	return newArray;
+    }
 }

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/http/HttpResponse.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/http/HttpResponse.java	2009-11-05 11:27:15 UTC (rev 30010)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/http/HttpResponse.java	2009-11-05 11:51:32 UTC (rev 30011)
@@ -71,7 +71,7 @@
         this.encoding = encoding;
     }
 
-    public List<HttpHeader> getHeaders() {
+    public List<HttpHeader> getHttpHeaders() {
         return headers;
     }
 

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/http/HttpMessageComposer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/http/HttpMessageComposer.java	2009-11-05 11:27:15 UTC (rev 30010)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/http/HttpMessageComposer.java	2009-11-05 11:51:32 UTC (rev 30011)
@@ -165,7 +165,7 @@
         HttpResponse responseInfo = org.jboss.soa.esb.http.HttpResponse.getResponse(message);
 
         if(responseInfo != null) {
-            for(org.jboss.soa.esb.http.HttpHeader header : responseInfo.getHeaders()) {
+            for(org.jboss.soa.esb.http.HttpHeader header : responseInfo.getHttpHeaders()) {
                 String headerName = header.getName().toLowerCase();
                 if(headerName.equals("content-type")) {
                     response.setContentType(header.getValue());

Modified: labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/src/org/jboss/soa/esb/samples/https/client/HttpResponsePrinter.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/src/org/jboss/soa/esb/samples/https/client/HttpResponsePrinter.java	2009-11-05 11:27:15 UTC (rev 30010)
+++ labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/src/org/jboss/soa/esb/samples/https/client/HttpResponsePrinter.java	2009-11-05 11:51:32 UTC (rev 30011)
@@ -2,8 +2,8 @@
 
 import org.jboss.soa.esb.actions.AbstractActionLifecycle;
 import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.actions.routing.http.HttpResponse;
-import org.jboss.soa.esb.actions.routing.http.HttpHeader;
+import org.jboss.soa.esb.http.HttpHeader;
+import org.jboss.soa.esb.http.HttpResponse;
 import org.jboss.soa.esb.message.Message;
 
 import java.util.List;
@@ -32,7 +32,7 @@
         System.out.println("\tEncoding: " + httpResponse.getEncoding());
 
         System.out.println("\tHeaders:");
-        List<HttpHeader> headers = httpResponse.getHeaders();
+        List<HttpHeader> headers = httpResponse.getHttpHeaders();
         for (HttpHeader header : headers) {
             System.out.println("\t\t" + header.getName() + ": " + header.getValue());
         }