Author: owulff
Date: Fri Jan 18 15:15:08 2013
New Revision: 1435185

URL: http://svn.apache.org/viewvc?rev=1435185&view=rev
Log:
Integration tests for spring plugin added

Added:
    
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyPreAuthSpringTest.java
    
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyUtils.java
    cxf/fediz/trunk/systests/jetty8/src/test/resources/idp-server.xml
      - copied, changed from r1435183, 
cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/idp-server.xml
    cxf/fediz/trunk/systests/jetty8/src/test/resources/rp-server.xml
      - copied, changed from r1435183, 
cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/rp-server.xml
Removed:
    cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/idp-server.xml
    cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/rp-server.xml
Modified:
    
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationPreAuthenticatedProcessingFilter.java
    cxf/fediz/trunk/systests/jetty8/pom.xml
    
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyTest.java
    cxf/fediz/trunk/systests/jetty8/src/test/resources/fediz_config.xml
    cxf/fediz/trunk/systests/pom.xml
    
cxf/fediz/trunk/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
    
cxf/fediz/trunk/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java

Modified: 
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationPreAuthenticatedProcessingFilter.java
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationPreAuthenticatedProcessingFilter.java?rev=1435185&r1=1435184&r2=1435185&view=diff
==============================================================================
--- 
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationPreAuthenticatedProcessingFilter.java
 (original)
+++ 
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationPreAuthenticatedProcessingFilter.java
 Fri Jan 18 15:15:08 2013
@@ -61,9 +61,11 @@ public class FederationPreAuthenticatedP
             if (obj != null)  {
                 return obj;
             } else {
+                logger.error("Session must contain Federation response");
                 throw new IllegalStateException("Session must contain 
Federation response");
             }
         } else {
+            logger.error("Principal must be instance of FederationPrincipal: " 
+ principal.toString());
             throw new IllegalStateException("Principal must be instance of 
FederationPrincipal");
         }
         //return "N/A";

Modified: cxf/fediz/trunk/systests/jetty8/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/jetty8/pom.xml?rev=1435185&r1=1435184&r2=1435185&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/jetty8/pom.xml (original)
+++ cxf/fediz/trunk/systests/jetty8/pom.xml Fri Jan 18 15:15:08 2013
@@ -158,6 +158,13 @@
                                     <type>war</type>
                                     <overWrite>true</overWrite>
                                 </artifactItem>
+                                <artifactItem>
+                                    
<groupId>org.apache.cxf.fediz.systests</groupId>
+                                    
<artifactId>systests-springWebapp</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                </artifactItem>                                
                             </artifactItems>
                             
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
                             <outputDirectory>target</outputDirectory>
@@ -189,6 +196,7 @@
                             <includes>
                                 <include>**/integrationtests/**</include>
                             </includes>
+                            <argLine>-XX:MaxPermSize=512M</argLine>
                         </configuration>
                     </execution>
                     <execution>

Added: 
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyPreAuthSpringTest.java
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyPreAuthSpringTest.java?rev=1435185&view=auto
==============================================================================
--- 
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyPreAuthSpringTest.java
 (added)
+++ 
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyPreAuthSpringTest.java
 Fri Jan 18 15:15:08 2013
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.fediz.integrationtests;
+
+
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+
+
+public class JettyPreAuthSpringTest extends AbstractTests {
+
+    static String idpHttpsPort;
+    static String rpHttpsPort;
+    
+    @BeforeClass
+    public static void init() {
+        System.setProperty("org.apache.commons.logging.Log", 
"org.apache.commons.logging.impl.SimpleLog");
+
+        
System.setProperty("org.apache.commons.logging.simplelog.showdatetime", "true");
+
+        
System.setProperty("org.apache.commons.logging.simplelog.log.httpclient.wire", 
"debug");
+
+        
System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.commons.httpclient",
 "debug");
+
+        idpHttpsPort = System.getProperty("idp.https.port");
+        Assert.assertNotNull("Property 'idp.https.port' null", idpHttpsPort);
+        rpHttpsPort = System.getProperty("rp.https.port");
+        Assert.assertNotNull("Property 'rp.https.port' null", rpHttpsPort);
+
+        JettyUtils.initIdpServer();
+        JettyUtils.startIdpServer();
+        JettyUtils.initRpServer();
+        JettyUtils.startRpServer();
+    }
+    
+    @AfterClass
+    public static void cleanup() {
+        JettyUtils.stopIdpServer();
+        JettyUtils.stopRpServer();
+    }
+
+    @Override
+    public String getIdpHttpsPort() {
+        return idpHttpsPort;
+    }
+
+    @Override
+    public String getRpHttpsPort() {
+        return rpHttpsPort;
+    }
+    
+    @Override
+    public String getServletContextName() {
+        return "fedizspringhelloworld";
+    }
+    
+    
+}

Modified: 
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyTest.java
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyTest.java?rev=1435185&r1=1435184&r2=1435185&view=diff
==============================================================================
--- 
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyTest.java
 (original)
+++ 
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyTest.java
 Fri Jan 18 15:15:08 2013
@@ -20,11 +20,6 @@
 package org.apache.cxf.fediz.integrationtests;
 
 
-
-
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.xml.XmlConfiguration;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -35,9 +30,6 @@ public class JettyTest extends AbstractT
     static String idpHttpsPort;
     static String rpHttpsPort;
     
-    private static Server idpServer;
-    private static Server rpServer;
-    
     @BeforeClass
     public static void init() {
         System.setProperty("org.apache.commons.logging.Log", 
"org.apache.commons.logging.impl.SimpleLog");
@@ -53,50 +45,16 @@ public class JettyTest extends AbstractT
         rpHttpsPort = System.getProperty("rp.https.port");
         Assert.assertNotNull("Property 'rp.https.port' null", rpHttpsPort);
 
-        initIdp();
-        Assert.assertTrue("IDP server not running", idpServer.isRunning());
-        initRp();
-        Assert.assertTrue("RP server not running", rpServer.isRunning());
-    }
-    
-    private static void initIdp() {
-        try {
-            Resource testServerConfig = 
Resource.newSystemResource("jetty/rp-server.xml");
-            XmlConfiguration configuration = new 
XmlConfiguration(testServerConfig.getInputStream());
-            idpServer = (Server)configuration.configure();   
-            idpServer.start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    private static void initRp() {
-        try {
-            Resource testServerConfig = 
Resource.newSystemResource("jetty/idp-server.xml");
-            XmlConfiguration configuration = new 
XmlConfiguration(testServerConfig.getInputStream());
-            rpServer = (Server)configuration.configure();
-            rpServer.start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        JettyUtils.initIdpServer();
+        JettyUtils.startIdpServer();
+        JettyUtils.initRpServer();
+        JettyUtils.startRpServer();
     }
     
     @AfterClass
     public static void cleanup() {
-        if (idpServer != null && idpServer.isStarted()) {
-            try {
-                idpServer.stop();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        if (rpServer != null && rpServer.isStarted()) {
-            try {
-                rpServer.stop();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+        JettyUtils.stopIdpServer();
+        JettyUtils.stopRpServer();
     }
 
     @Override
@@ -109,5 +67,10 @@ public class JettyTest extends AbstractT
         return rpHttpsPort;
     }
     
+    @Override
+    public String getServletContextName() {
+        return "fedizhelloworld";
+    }
+    
     
 }

Added: 
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyUtils.java?rev=1435185&view=auto
==============================================================================
--- 
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyUtils.java
 (added)
+++ 
cxf/fediz/trunk/systests/jetty8/src/test/java/org/apache/cxf/fediz/integrationtests/JettyUtils.java
 Fri Jan 18 15:15:08 2013
@@ -0,0 +1,100 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.fediz.integrationtests;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.xml.XmlConfiguration;
+
+public final class JettyUtils {
+
+    private static Server idpServer;
+    private static Server rpServer;
+    
+    private JettyUtils() {
+    }
+        
+    public static void initIdpServer() {
+        if (idpServer == null) {
+            try {
+                Resource testServerConfig = 
Resource.newSystemResource("idp-server.xml");
+                XmlConfiguration configuration = new 
XmlConfiguration(testServerConfig.getInputStream());
+                idpServer = (Server)configuration.configure();   
+                
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    
+    public static void startIdpServer() {
+        if (idpServer != null && !idpServer.isStarted()) {
+            try {
+                idpServer.start();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    
+    public static void stopIdpServer() {
+        if (idpServer != null && idpServer.isStarted()) {
+            try {
+                idpServer.stop();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    
+    public static void initRpServer() {
+        if (rpServer == null) {
+            try {
+                Resource testServerConfig = 
Resource.newSystemResource("rp-server.xml");
+                XmlConfiguration configuration = new 
XmlConfiguration(testServerConfig.getInputStream());
+                rpServer = (Server)configuration.configure();   
+                
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    
+    public static void startRpServer() {
+        if (rpServer != null && !rpServer.isStarted()) {
+            try {
+                rpServer.start();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    
+    public static void stopRpServer() {
+        if (rpServer != null && rpServer.isStarted()) {
+            try {
+                rpServer.stop();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    
+}

Modified: cxf/fediz/trunk/systests/jetty8/src/test/resources/fediz_config.xml
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/jetty8/src/test/resources/fediz_config.xml?rev=1435185&r1=1435184&r2=1435185&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/jetty8/src/test/resources/fediz_config.xml 
(original)
+++ cxf/fediz/trunk/systests/jetty8/src/test/resources/fediz_config.xml Fri Jan 
18 15:15:08 2013
@@ -29,5 +29,30 @@
                        </claimTypesRequested>
                </protocol>
        </contextConfig>
+       <contextConfig name="/fedizspringhelloworld">
+               <audienceUris>
+                       
<audienceItem>urn:org:apache:cxf:fediz:fedizhelloworld</audienceItem>
+               </audienceUris>
+               <certificateStores>
+                       <trustManager>
+                               <keyStore file="stsstore.jks" 
password="stsspass" type="JKS" />
+                       </trustManager>
+               </certificateStores>
+               <trustedIssuers>
+                       <issuer subject=".*CN=www.sts.com.*" 
certificateValidation="ChainTrust"
+                               name="DoubleItSTSIssuer" />
+               </trustedIssuers>
+               <maximumClockSkew>1000</maximumClockSkew>
+               <protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+                       xsi:type="federationProtocolType" version="1.0.0">
+                        <realm>urn:org:apache:cxf:fediz:fedizhelloworld</realm>
+                       
<issuer>https://localhost:${idp.https.port}/fedizidp/</issuer>
+                       <roleDelimiter>,</roleDelimiter>
+                       
<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
+                       <claimTypesRequested>
+                               <claimType type="a particular claim type" 
optional="true" />
+                       </claimTypesRequested>
+               </protocol>
+       </contextConfig>        
 </FedizConfig>
 

Copied: cxf/fediz/trunk/systests/jetty8/src/test/resources/idp-server.xml (from 
r1435183, 
cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/idp-server.xml)
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/jetty8/src/test/resources/idp-server.xml?p2=cxf/fediz/trunk/systests/jetty8/src/test/resources/idp-server.xml&p1=cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/idp-server.xml&r1=1435183&r2=1435185&rev=1435185&view=diff
==============================================================================
    (empty)

Copied: cxf/fediz/trunk/systests/jetty8/src/test/resources/rp-server.xml (from 
r1435183, 
cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/rp-server.xml)
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/jetty8/src/test/resources/rp-server.xml?p2=cxf/fediz/trunk/systests/jetty8/src/test/resources/rp-server.xml&p1=cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/rp-server.xml&r1=1435183&r2=1435185&rev=1435185&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/jetty8/src/test/resources/jetty/rp-server.xml 
(original)
+++ cxf/fediz/trunk/systests/jetty8/src/test/resources/rp-server.xml Fri Jan 18 
15:15:08 2013
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" 
"http://www.eclipse.org/jetty/configure.dtd";>
  
-<Configure id="FileServer" class="org.eclipse.jetty.server.Server">
+<Configure id="RPServer" class="org.eclipse.jetty.server.Server">
  
        <Call class="org.eclipse.jetty.util.log.Log" name="getRootLogger">
          <Call name="setDebugEnabled">
@@ -44,6 +44,21 @@
                    </Get>
                  </New>
                    </Item>
+                   <Item>
+                     <New class="org.eclipse.jetty.webapp.WebAppContext">
+                   <Set name="contextPath">/fedizspringhelloworld</Set>
+                   <Set name="war">./target/systests-springWebapp.war</Set>
+                   <Set name="throwUnavailableOnStartupException">true</Set>
+                    
+                   <Get name="securityHandler">
+                     <Set name="authenticator">
+                       <New 
class="org.apache.cxf.fediz.jetty.FederationAuthenticator">
+                         <Set 
name="configFile">./target/test-classes/fediz_config.xml</Set>
+                       </New>
+                     </Set>
+                   </Get>
+                 </New>
+                   </Item>                 
                  </Array>
         </Set>
       </New>

Modified: cxf/fediz/trunk/systests/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/pom.xml?rev=1435185&r1=1435184&r2=1435185&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/pom.xml (original)
+++ cxf/fediz/trunk/systests/pom.xml Fri Jan 18 15:15:08 2013
@@ -32,9 +32,7 @@
    <modules>
       <module>tests</module>
       <module>simpleWebapp</module>
-<!--
       <module>springWebapp</module>
--->
       <module>jetty8</module>
       <module>tomcat7</module>
    </modules>

Modified: 
cxf/fediz/trunk/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java?rev=1435185&r1=1435184&r2=1435185&view=diff
==============================================================================
--- 
cxf/fediz/trunk/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
 (original)
+++ 
cxf/fediz/trunk/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
 Fri Jan 18 15:15:08 2013
@@ -55,10 +55,12 @@ public abstract class AbstractTests {
     public abstract String getIdpHttpsPort();
 
     public abstract String getRpHttpsPort();
+    
+    public abstract String getServletContextName();
 
     @org.junit.Test
     public void testUserAlice() throws Exception {
-        String url = "https://localhost:"; + getRpHttpsPort() + 
"/fedizhelloworld/secure/fedservlet";
+        String url = "https://localhost:"; + getRpHttpsPort() + "/" + 
getServletContextName() + "/secure/fedservlet";
         String user = "alice";
         String password = "ecila";
         String response = sendHttpGet(url, user, password);
@@ -82,7 +84,7 @@ public abstract class AbstractTests {
 
     @org.junit.Test
     public void testUserBob() throws Exception {
-        String url = "https://localhost:"; + getRpHttpsPort() + 
"/fedizhelloworld/secure/fedservlet";
+        String url = "https://localhost:"; + getRpHttpsPort() + "/" + 
getServletContextName() + "/secure/fedservlet";
         String user = "bob";
         String password = "bob";
         String response = sendHttpGet(url, user, password);
@@ -105,7 +107,7 @@ public abstract class AbstractTests {
 
     @org.junit.Test
     public void testUserTed() throws Exception {
-        String url = "https://localhost:"; + getRpHttpsPort() + 
"/fedizhelloworld/secure/fedservlet";
+        String url = "https://localhost:"; + getRpHttpsPort() + "/" + 
getServletContextName() + "/secure/fedservlet";
         String user = "ted";
         String password = "det";
         String response = sendHttpGet(url, user, password);
@@ -128,7 +130,8 @@ public abstract class AbstractTests {
 
     @org.junit.Test
     public void testUserAliceNoAccess() throws Exception {
-        String url = "https://localhost:"; + getRpHttpsPort() + 
"/fedizhelloworld/secure/admin/fedservlet";
+        String url = "https://localhost:"; + getRpHttpsPort() + "/"
+            + getServletContextName() + "/secure/admin/fedservlet";
         String user = "alice";
         String password = "ecila";
         sendHttpGet(url, user, password, 200, 403);        
@@ -137,7 +140,8 @@ public abstract class AbstractTests {
     @org.junit.Ignore
     @org.junit.Test
     public void testUserAliceWrongPassword() throws Exception {
-        String url = "https://localhost:"; + getRpHttpsPort() + 
"/fedizhelloworld/secure/fedservlet";
+        String url = "https://localhost:"; + getRpHttpsPort() + "/"
+            + getServletContextName() + "/secure/fedservlet";
         String user = "alice";
         String password = "alice";
         //[TODO] Fix IDP return code from 500 to 401
@@ -146,7 +150,8 @@ public abstract class AbstractTests {
 
     @org.junit.Test
     public void testUserTedNoAccess() throws Exception {
-        String url = "https://localhost:"; + getRpHttpsPort() + 
"/fedizhelloworld/secure/admin/fedservlet";
+        String url = "https://localhost:"; + getRpHttpsPort() + "/"
+            + getServletContextName() + "/secure/admin/fedservlet";
         String user = "ted";
         String password = "det";
         sendHttpGet(url, user, password, 200, 403);        
@@ -158,6 +163,7 @@ public abstract class AbstractTests {
 
     private String sendHttpGet(String url, String user, String password, int 
returnCodeIDP, int returnCodeRP)
         throws Exception {
+        System.out.println(">>>User: " + user + " Password: " + password + " 
URL: " + url);
         DefaultHttpClient httpclient = new DefaultHttpClient();
         try {
             httpclient.getCredentialsProvider().setCredentials(
@@ -232,6 +238,9 @@ public abstract class AbstractTests {
             }
 
             return EntityUtils.toString(entity);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw ex;
         } finally {
             // When HttpClient instance is no longer needed,
             // shut down the connection manager to ensure

Modified: 
cxf/fediz/trunk/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java?rev=1435185&r1=1435184&r2=1435185&view=diff
==============================================================================
--- 
cxf/fediz/trunk/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
 (original)
+++ 
cxf/fediz/trunk/systests/tomcat7/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
 Fri Jan 18 15:15:08 2013
@@ -170,5 +170,9 @@ public class TomcatTest extends Abstract
         return rpHttpsPort;
     }
     
+    @Override
+    public String getServletContextName() {
+        return "fedizhelloworld";
+    }
     
 }


Reply via email to