Bring airline sample up to date

Author: poutsma

samples/airline/client/saaj/pom.xml

@@ -58,7 +58,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <mainClass>org.springframework.ws.samples.airline.client.saaj.GetFlights</mainClass>
+                    <mainClass>org.springframework.ws.samples.airline.client.saaj.Driver</mainClass>
                 </configuration>
             </plugin>
         </plugins>

samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/Driver.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2005-2011 the original author or authors.
+ *
+ * Licensed 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.springframework.ws.samples.airline.client.saaj;
+
+/**
+ * @author Arjen Poutsma
+ */
+public class Driver {
+
+    public static void main(String[] args) throws Exception {
+        String url = "http://localhost:8080/airline-server/services";
+        if (args.length > 0) {
+            url = args[0];
+        }
+        GetFlights getFlights = new GetFlights(url);
+        getFlights.getFlights();
+
+        if (!System.getProperty("java.version").startsWith("1.5")) {
+            return;
+        }
+        String username = "john";
+        String password = "changeme";
+        GetFrequentFlyerMileage getMileage = new GetFrequentFlyerMileage(url);
+        getMileage.getMileage(username, password);
+    }
+
+}

samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFlights.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 the original author or authors.
+ * Copyright 2005-2011 the original author or authors.
  *
  * Licensed 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
+ *     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,
@@ -20,7 +20,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Iterator;
-
 import javax.xml.soap.MessageFactory;
 import javax.xml.soap.Name;
 import javax.xml.soap.SOAPBodyElement;
@@ -115,13 +114,4 @@ private void writeGetFlightsResponse(SOAPMessage message) throws SOAPException,
             transformer.transform(source, new StreamResult(System.out));
         }
     }
-
-    public static void main(String[] args) throws Exception {
-        String url = "http://localhost:8080/airline-server/services";
-        if (args.length > 0) {
-            url = args[0];
-        }
-        GetFlights getFlights = new GetFlights(url);
-        getFlights.getFlights();
-    }
 }

samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFrequentFlyerMileage.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2006 the original author or authors.
+ * Copyright 2005-2011 the original author or authors.
  *
  * Licensed 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
+ *     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,
@@ -20,7 +20,6 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
@@ -126,16 +125,4 @@ public void getMileage(String username, String password) throws SOAPException, I
             System.err.println("SOAP Fault String: " + fault.getFaultString());
         }
     }
-
-    public static void main(String[] args) throws Exception {
-        if (!System.getProperty("java.version").startsWith("1.5")) {
-            System.out.println("This sample will only run under JDK 1.5");
-            return;
-        }
-        String url = "http://localhost:8080/airline-server/services";
-        String username = "john";
-        String password = "changeme";
-        GetFrequentFlyerMileage getMileage = new GetFrequentFlyerMileage(url);
-        getMileage.getMileage(username, password);
-    }
 }

samples/airline/client/spring-ws/pom.xml

@@ -52,7 +52,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <mainClass>org.springframework.ws.samples.airline.client.sws.GetFlights</mainClass>
+                    <mainClass>org.springframework.ws.samples.airline.client.sws.Driver</mainClass>
                 </configuration>
             </plugin>
         </plugins>

samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/Driver.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2005-2011 the original author or authors.
+ *
+ * Licensed 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.springframework.ws.samples.airline.client.sws;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @author Arjen Poutsma
+ */
+public class Driver {
+
+    public static void main(String[] args) {
+        ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
+                "org/springframework/ws/samples/airline/client/sws/applicationContext.xml");
+        GetFlights getFlights = applicationContext.getBean("getFlights", GetFlights.class);
+        getFlights.getFlights();
+
+        GetFrequentFlyerMileage getFrequentFlyerMileage = applicationContext
+                .getBean("getFrequentFlyerMileage", GetFrequentFlyerMileage.class);
+        getFrequentFlyerMileage.getFrequentFlyerMileage();
+
+    }
+
+}

samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFlights.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2005-2011 the original author or authors.
  *
  * Licensed 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
+ *     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,
@@ -19,8 +19,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.springWs.samples.airline.schemas.messages.BookFlightRequestDocument;
 import org.springframework.springWs.samples.airline.schemas.messages.BookFlightResponseDocument;
 import org.springframework.springWs.samples.airline.schemas.messages.GetFlightsRequestDocument;
@@ -101,11 +99,4 @@ private void writeFlight(Flight flight) {
         System.out.println("\t" + flight.getTo().getCity());
     }
 
-    public static void main(String[] args) {
-        ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
-                "org/springframework/ws/samples/airline/client/sws/applicationContext.xml");
-        GetFlights getFlights = applicationContext.getBean("getFlights", GetFlights.class);
-        getFlights.getFlights();
-    }
-
 }

samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2008 the original author or authors.
+ * Copyright 2005-2011 the original author or authors.
  *
  * Licensed 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
+ *     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,
@@ -16,15 +16,11 @@
 
 package org.springframework.ws.samples.airline.client.sws;
 
-import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamResult;
 
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.ws.client.core.support.WebServiceGatewaySupport;
-import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
 
 public class GetFrequentFlyerMileage extends WebServiceGatewaySupport {
@@ -41,14 +37,4 @@ public void getFrequentFlyerMileage() {
 
     }
 
-    public static void main(String[] args) {
-        ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
-                "org/springframework/ws/samples/airline/client/sws/applicationContext.xml");
-
-        GetFrequentFlyerMileage getFrequentFlyerMileage = applicationContext
-                .getBean("getFrequentFlyerMileage", GetFrequentFlyerMileage.class);
-        getFrequentFlyerMileage.getFrequentFlyerMileage();
-    }
-
-
 }

samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/AirlineEndpoint.java

@@ -22,6 +22,8 @@
 import javax.xml.bind.JAXBElement;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
@@ -49,6 +51,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 import static org.springframework.ws.samples.airline.ws.AirlineWebServiceConstants.*;
 
@@ -65,6 +69,8 @@ public class AirlineEndpoint {
 
     private final ObjectFactory objectFactory = new ObjectFactory();
 
+    private final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+
     private final AirlineService airlineService;
 
     @Autowired
@@ -156,5 +162,18 @@ else if (passengerOrUsername instanceof String) {
         return SchemaConversionUtils.toSchemaType(domainTicket);
     }
 
+    @PayloadRoot(localPart = GET_FREQUENT_FLYER_MILEAGE_REQUEST, namespace = MESSAGES_NAMESPACE)
+    @ResponsePayload
+    public Element getFrequentFlyerMileage() throws Exception {
+        if (logger.isDebugEnabled()) {
+            logger.debug("Received GetFrequentFlyerMileageRequest");
+        }
+        int mileage = airlineService.getFrequentFlyerMileage();
+        DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
+        Document document = documentBuilder.newDocument();
+        Element response = document.createElementNS(MESSAGES_NAMESPACE, GET_FREQUENT_FLYER_MILEAGE_RESPONSE);
+        response.setTextContent(Integer.toString(mileage));
+        return response;
+    }
 
 }