diff --git a/samples/airline/client/axis1/src/org/springframework/ws/samples/airline/client/axis1/Main.java b/samples/airline/client/axis1/src/org/springframework/ws/samples/airline/client/axis1/Main.java
index b7843dfa..18c25b40 100644
--- a/samples/airline/client/axis1/src/org/springframework/ws/samples/airline/client/axis1/Main.java
+++ b/samples/airline/client/axis1/src/org/springframework/ws/samples/airline/client/axis1/Main.java
@@ -32,9 +32,9 @@ public class Main {
     public static void main(String[] args) throws ServiceException, RemoteException {
         AirlineServiceLocator service = new AirlineServiceLocator();
         if (args.length > 0) {
-            service.setAirlinePortEndpointAddress(args[0]);
+            service.setAirlineSoap11EndpointAddress(args[0]);
         }
-        Airline airline = service.getAirlinePort();
+        Airline airline = service.getAirlineSoap11();
         GetFlightsRequest request = new GetFlightsRequest();
         request.setFrom("AMS");
         request.setTo("VCE");
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jaxws/Main.java b/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jaxws/Main.java
index 75f6d358..12e2d2bd 100644
--- a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jaxws/Main.java
+++ b/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jaxws/Main.java
@@ -43,7 +43,7 @@ public class Main {
                         "AirlineService");
                 service = new AirlineService(new URL(args[0]), serviceName);
             }
-            Airline airline = service.getAirlinePort();
+            Airline airline = service.getAirlineSoap11();
             GetFlightsRequest request = new GetFlightsRequest();
             request.setFrom("AMS");
             request.setTo("VCE");
diff --git a/samples/airline/pom.xml b/samples/airline/pom.xml
index 35339f97..a8dcadf9 100644
--- a/samples/airline/pom.xml
+++ b/samples/airline/pom.xml
@@ -18,7 +18,6 @@
                 <dependency>
                     <groupId>javax.xml.bind</groupId>
                     <artifactId>jaxb-api</artifactId>
-                    <optional>true</optional>
                     <version>2.1</version>
                     <exclusions>
                         <exclusion>
@@ -50,6 +49,7 @@
                 <dependency>
                     <groupId>javax.activation</groupId>
                     <artifactId>activation</artifactId>
+                    <scope>runtime</scope>
                 </dependency>
             </dependencies>
         </profile>
@@ -356,6 +356,10 @@
             <version>10.3.1.4</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+        </dependency>
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.easymock</groupId>
diff --git a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml b/samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
index 3bf13489..6ca45503 100644
--- a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
+++ b/samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
@@ -11,6 +11,14 @@
 
     <bean id="messageReceiver" class="org.springframework.ws.soap.server.SoapMessageDispatcher"/>
 
+    <bean id="schemaCollection" class="org.springframework.xml.xsd.commons.CommonsXsdSchemaCollection">
+        <description>
+            This bean wrap the messages.xsd (which imports types.xsd), and inlines them as a one.
+        </description>
+        <property name="xsds" value="/messages.xsd"/>
+        <property name="inline" value="true"/>
+    </bean>
+
     <!-- ===================== ENDPOINTS  ===================================== -->
 
     <!--
diff --git a/samples/airline/src/main/webapp/WEB-INF/ws-servlet.xml b/samples/airline/src/main/webapp/WEB-INF/ws-servlet.xml
index c8e1816c..da6dbca4 100644
--- a/samples/airline/src/main/webapp/WEB-INF/ws-servlet.xml
+++ b/samples/airline/src/main/webapp/WEB-INF/ws-servlet.xml
@@ -6,23 +6,16 @@
 
     <!-- ===================== WSDL DEFINITION    ============================== -->
 
-    <bean id="airline" class="org.springframework.ws.wsdl.wsdl11.DynamicWsdl11Definition">
+    <bean id="airline" class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">
         <description>
-            Dynamically builds a WSDL from the airline.xsd.This bean definition represents the airline.wsdl file found
-            in the root of the web application. It is used
-            by the WsdlDefinitionHandlerAdapter in airline-servlet.xml.
+            Builds a WSDL from the airline.xsd.This bean definition represents the airline.wsdl file found
+            in the root of the web application.
         </description>
-        <property name="builder">
-            <bean class="org.springframework.ws.wsdl.wsdl11.builder.XsdBasedSoap11Wsdl4jDefinitionBuilder">
-                <property name="schema" value="/messages.xsd"/>
-                <property name="schemaLocation" value="messages.xsd"/>
-                <property name="portTypeName" value="Airline"/>
-                <property name="locationUri" value="http://localhost:8080/airline/services"/>
-                <property name="targetNamespace"
-                        value="http://www.springframework.org/spring-ws/samples/airline/definitions"/>
-            </bean>
-        </property>
+        <property name="schemaCollection" ref="schemaCollection"/>
+        <property name="portTypeName" value="Airline"/>
+        <property name="locationUri" value="http://localhost:8080/airline/services"/>
+        <property name="targetNamespace"
+                value="http://www.springframework.org/spring-ws/samples/airline/definitions"/>
     </bean>
-
-
+    
 </beans>
\ No newline at end of file
diff --git a/samples/airline/src/main/webapp/messages.xsd b/samples/airline/src/main/webapp/messages.xsd
index 9d888b08..309a03da 100644
--- a/samples/airline/src/main/webapp/messages.xsd
+++ b/samples/airline/src/main/webapp/messages.xsd
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
         targetNamespace="http://www.springframework.org/spring-ws/samples/airline/schemas/messages"
+        xmlns:tns="http://www.springframework.org/spring-ws/samples/airline/schemas/messages"
         xmlns:types="http://www.springframework.org/spring-ws/samples/airline/schemas/types"
         elementFormDefault="qualified">