diff --git a/samples/airline/client/pom.xml b/samples/airline/client/pom.xml new file mode 100644 index 00000000..920c742e --- /dev/null +++ b/samples/airline/client/pom.xml @@ -0,0 +1,16 @@ + + + + airline + org.springframework.ws + 2.0.0-M1-SNAPSHOT + ../pom.xml + + 4.0.0 + airline-client + pom + Spring WS Airline Sample - Clients + + saaj + + diff --git a/samples/airline/client/saaj/pom.xml b/samples/airline/client/saaj/pom.xml new file mode 100644 index 00000000..d156159d --- /dev/null +++ b/samples/airline/client/saaj/pom.xml @@ -0,0 +1,72 @@ + + + + airline-client + org.springframework.ws + 2.0.0-M1-SNAPSHOT + ../pom.xml + + 4.0.0 + airline-saaj-client + jar + Spring WS Airline Sample - SAAJ Client + + + jdk15 + + !1.6 + + + + javax.xml.soap + saaj-api + compile + + + com.sun.xml.messaging.saaj + saaj-impl + + + javax.activation + activation + + + com.sun.org.apache.xml.security + xmlsec + + + + + + + java.net + Java.net Repository for Maven2 + http://download.java.net/maven/1/ + legacy + + + + + + org.codehaus.mojo + exec-maven-plugin + + + + java + + + + + org.springframework.ws.samples.airline.client.saaj.GetFlights + + + + + + + com.sun.xml.wss + xws-security + + + diff --git a/samples/airline/client/saaj/src/org/springframework/ws/samples/airline/client/saaj/GetFlights.java b/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFlights.java similarity index 98% rename from samples/airline/client/saaj/src/org/springframework/ws/samples/airline/client/saaj/GetFlights.java rename to samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFlights.java index f70f0d11..96dae1bf 100644 --- a/samples/airline/client/saaj/src/org/springframework/ws/samples/airline/client/saaj/GetFlights.java +++ b/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFlights.java @@ -117,7 +117,7 @@ public class GetFlights { } public static void main(String[] args) throws Exception { - String url = "http://localhost:8080/airline/services"; + String url = "http://localhost:8080/airline-server/services"; if (args.length > 0) { url = args[0]; } diff --git a/samples/airline/client/saaj/src/org/springframework/ws/samples/airline/client/saaj/GetFrequentFlyerMileage.java b/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFrequentFlyerMileage.java similarity index 92% rename from samples/airline/client/saaj/src/org/springframework/ws/samples/airline/client/saaj/GetFrequentFlyerMileage.java rename to samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFrequentFlyerMileage.java index c6be87c4..40cfded8 100644 --- a/samples/airline/client/saaj/src/org/springframework/ws/samples/airline/client/saaj/GetFrequentFlyerMileage.java +++ b/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFrequentFlyerMileage.java @@ -128,17 +128,13 @@ public class GetFrequentFlyerMileage { } public static void main(String[] args) throws Exception { - String url = "http://localhost:8080/airline/services"; - if (args.length < 2) { - System.err.println( - "Usage: java org.springframework.ws.samples.airline.client.saaj.GetFrequentFlyerMileage " + - "username password [url]"); - } - String username = args[0]; - String password = args[1]; - if (args.length > 2) { - url = args[2]; + 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); } diff --git a/samples/airline/client/saaj/src/org/springframework/ws/samples/airline/client/saaj/securityPolicy.xml b/samples/airline/client/saaj/src/main/resources/org/springframework/ws/samples/airline/client/saaj/securityPolicy.xml similarity index 100% rename from samples/airline/client/saaj/src/org/springframework/ws/samples/airline/client/saaj/securityPolicy.xml rename to samples/airline/client/saaj/src/main/resources/org/springframework/ws/samples/airline/client/saaj/securityPolicy.xml diff --git a/samples/airline/pom.xml b/samples/airline/server/pom.xml similarity index 74% rename from samples/airline/pom.xml rename to samples/airline/server/pom.xml index 90098444..f400c50b 100644 --- a/samples/airline/pom.xml +++ b/samples/airline/server/pom.xml @@ -1,14 +1,14 @@ - spring-ws-samples + airline org.springframework.ws 2.0.0-M1-SNAPSHOT - ../samples/pom.xml + ../pom.xml 4.0.0 - airline + airline-server war - Spring WS Airline Sample + Spring WS Airline Sample - Server jdk15 @@ -56,90 +56,43 @@ - - java.net - Java.net Repository for Maven2 - http://download.java.net/maven/1/ - legacy - spring-ext Spring External Dependencies Repository https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/ - - - - maven-javadoc-plugin - - ${basedir}/../../src/main/javadoc/javadoc.css - - - - - - - java.net - Java.net Repository for Maven2 - http://download.java.net/maven/1/ - legacy - - - - - src/main/resources - - **/*.properties - - true - - - src/main/resources - - **/*.properties - - false - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - com.sun.tools.xjc.maven2 - maven-jaxb-plugin + org.codehaus.mojo + jaxb2-maven-plugin - generate-sources - generate + xjc - - - org.springframework.ws.samples.airline.schema - src/main/webapp/ - - + + + src/main/webapp/ + org.springframework.ws.samples.airline.schema + + - maven-antrun-plugin + org.codehaus.mojo + openjpa-maven-plugin + 1.0 + + org/springframework/ws/samples/airline/domain/*.class + org/springframework/ws/samples/airline/domain/ServiceClass.class + + enhancer process-classes - - - - - - run + enhance @@ -246,13 +199,8 @@ org.apache.openjpa - openjpa-lib - 1.0.0 - - - org.apache.openjpa - openjpa-persistence-jdbc - 1.0.0 + openjpa + 1.2.0 commons-dbcp @@ -318,12 +266,6 @@ XmlSchema - - org.easymock - easymock - test - 2.2 - org.springframework.security spring-security-core diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/FlightDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/FlightDao.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/FlightDao.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/FlightDao.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/FrequentFlyerDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/FrequentFlyerDao.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/FrequentFlyerDao.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/FrequentFlyerDao.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/TicketDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/TicketDao.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/TicketDao.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/TicketDao.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/jpa/DatabaseInitializer.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/DatabaseInitializer.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/jpa/DatabaseInitializer.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/DatabaseInitializer.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDao.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDao.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDao.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDao.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDao.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDao.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDao.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDao.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDao.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/Airport.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Airport.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/Airport.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Airport.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/Flight.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Flight.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/Flight.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Flight.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/FrequentFlyer.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/FrequentFlyer.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/FrequentFlyer.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/FrequentFlyer.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/Passenger.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Passenger.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/Passenger.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Passenger.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/ServiceClass.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/ServiceClass.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/ServiceClass.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/ServiceClass.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/Ticket.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Ticket.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/Ticket.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Ticket.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/DateTimeValueHandler.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/DateTimeValueHandler.java similarity index 98% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/DateTimeValueHandler.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/DateTimeValueHandler.java index 544e0b0d..e3d48426 100644 --- a/samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/DateTimeValueHandler.java +++ b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/DateTimeValueHandler.java @@ -45,10 +45,12 @@ public class DateTimeValueHandler extends AbstractValueHandler { return new Column[]{col}; } + @Override public Object toDataStoreValue(ValueMapping valueMapping, Object val, JDBCStore jdbcStore) { return val == null ? null : new Timestamp(((DateTime) val).getMillis()); } + @Override public Object toObjectValue(ValueMapping valueMapping, Object val) { return val == null ? null : new DateTime(val); } diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/LocalDateValueHandler.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/LocalDateValueHandler.java similarity index 98% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/LocalDateValueHandler.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/LocalDateValueHandler.java index d19c623b..b05a46bb 100644 --- a/samples/airline/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/LocalDateValueHandler.java +++ b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/LocalDateValueHandler.java @@ -39,10 +39,12 @@ public class LocalDateValueHandler extends AbstractValueHandler { return new Column[]{col}; } + @Override public Object toDataStoreValue(ValueMapping valueMapping, Object val, JDBCStore jdbcStore) { return val == null ? null : new Date(((LocalDate) val).toDateMidnight().getMillis()); } + @Override public Object toObjectValue(ValueMapping valueMapping, Object val) { return val == null ? null : new LocalDate(val); } diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/schema/support/SchemaConversionUtils.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/schema/support/SchemaConversionUtils.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/schema/support/SchemaConversionUtils.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/schema/support/SchemaConversionUtils.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerDetails.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerDetails.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerDetails.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerDetails.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerSecurityService.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerSecurityService.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerSecurityService.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerSecurityService.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityService.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityService.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityService.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityService.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/security/StubFrequentFlyerSecurityService.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/StubFrequentFlyerSecurityService.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/security/StubFrequentFlyerSecurityService.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/StubFrequentFlyerSecurityService.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/service/AirlineService.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/AirlineService.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/service/AirlineService.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/AirlineService.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/service/NoSeatAvailableException.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSeatAvailableException.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/service/NoSeatAvailableException.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSeatAvailableException.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFlightException.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFlightException.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFlightException.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFlightException.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFrequentFlyerException.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFrequentFlyerException.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFrequentFlyerException.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFrequentFlyerException.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImpl.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImpl.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImpl.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImpl.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/web/FlightsController.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/web/FlightsController.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/web/FlightsController.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/web/FlightsController.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/ws/AirlineWebServiceConstants.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/AirlineWebServiceConstants.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/ws/AirlineWebServiceConstants.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/AirlineWebServiceConstants.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpoint.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpoint.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpoint.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpoint.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpoint.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpoint.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpoint.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpoint.java diff --git a/samples/airline/src/main/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpoint.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpoint.java similarity index 100% rename from samples/airline/src/main/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpoint.java rename to samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpoint.java diff --git a/samples/airline/src/main/resources/META-INF/persistence.xml b/samples/airline/server/src/main/resources/META-INF/persistence.xml similarity index 100% rename from samples/airline/src/main/resources/META-INF/persistence.xml rename to samples/airline/server/src/main/resources/META-INF/persistence.xml diff --git a/samples/airline/src/main/resources/log4j.properties b/samples/airline/server/src/main/resources/log4j.properties similarity index 100% rename from samples/airline/src/main/resources/log4j.properties rename to samples/airline/server/src/main/resources/log4j.properties diff --git a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml similarity index 100% rename from samples/airline/src/main/resources/org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml rename to samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml diff --git a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml similarity index 100% rename from samples/airline/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml rename to samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml diff --git a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/security/applicationContext-security.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/applicationContext-security.xml similarity index 100% rename from samples/airline/src/main/resources/org/springframework/ws/samples/airline/security/applicationContext-security.xml rename to samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/applicationContext-security.xml diff --git a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/security/securityPolicy.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/securityPolicy.xml similarity index 100% rename from samples/airline/src/main/resources/org/springframework/ws/samples/airline/security/securityPolicy.xml rename to samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/securityPolicy.xml diff --git a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/service/applicationContext.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/service/applicationContext.xml similarity index 100% rename from samples/airline/src/main/resources/org/springframework/ws/samples/airline/service/applicationContext.xml rename to samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/service/applicationContext.xml diff --git a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml similarity index 100% rename from samples/airline/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml rename to samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml diff --git a/samples/airline/src/main/webapp/WEB-INF/jsp/error.jsp b/samples/airline/server/src/main/webapp/WEB-INF/jsp/error.jsp similarity index 100% rename from samples/airline/src/main/webapp/WEB-INF/jsp/error.jsp rename to samples/airline/server/src/main/webapp/WEB-INF/jsp/error.jsp diff --git a/samples/airline/src/main/webapp/WEB-INF/jsp/flight.jsp b/samples/airline/server/src/main/webapp/WEB-INF/jsp/flight.jsp similarity index 100% rename from samples/airline/src/main/webapp/WEB-INF/jsp/flight.jsp rename to samples/airline/server/src/main/webapp/WEB-INF/jsp/flight.jsp diff --git a/samples/airline/src/main/webapp/WEB-INF/jsp/flights.jsp b/samples/airline/server/src/main/webapp/WEB-INF/jsp/flights.jsp similarity index 100% rename from samples/airline/src/main/webapp/WEB-INF/jsp/flights.jsp rename to samples/airline/server/src/main/webapp/WEB-INF/jsp/flights.jsp diff --git a/samples/airline/src/main/webapp/WEB-INF/jsp/noSuchFlight.jsp b/samples/airline/server/src/main/webapp/WEB-INF/jsp/noSuchFlight.jsp similarity index 100% rename from samples/airline/src/main/webapp/WEB-INF/jsp/noSuchFlight.jsp rename to samples/airline/server/src/main/webapp/WEB-INF/jsp/noSuchFlight.jsp diff --git a/samples/airline/src/main/webapp/WEB-INF/mvc-servlet.xml b/samples/airline/server/src/main/webapp/WEB-INF/mvc-servlet.xml similarity index 100% rename from samples/airline/src/main/webapp/WEB-INF/mvc-servlet.xml rename to samples/airline/server/src/main/webapp/WEB-INF/mvc-servlet.xml diff --git a/samples/airline/src/main/webapp/WEB-INF/web.xml b/samples/airline/server/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/airline/src/main/webapp/WEB-INF/web.xml rename to samples/airline/server/src/main/webapp/WEB-INF/web.xml diff --git a/samples/airline/src/main/webapp/WEB-INF/ws-servlet.xml b/samples/airline/server/src/main/webapp/WEB-INF/ws-servlet.xml similarity index 100% rename from samples/airline/src/main/webapp/WEB-INF/ws-servlet.xml rename to samples/airline/server/src/main/webapp/WEB-INF/ws-servlet.xml diff --git a/samples/airline/src/main/webapp/index.jsp b/samples/airline/server/src/main/webapp/index.jsp similarity index 100% rename from samples/airline/src/main/webapp/index.jsp rename to samples/airline/server/src/main/webapp/index.jsp diff --git a/samples/airline/src/main/webapp/messages.xsd b/samples/airline/server/src/main/webapp/messages.xsd similarity index 100% rename from samples/airline/src/main/webapp/messages.xsd rename to samples/airline/server/src/main/webapp/messages.xsd diff --git a/samples/airline/src/main/webapp/types.xsd b/samples/airline/server/src/main/webapp/types.xsd similarity index 100% rename from samples/airline/src/main/webapp/types.xsd rename to samples/airline/server/src/main/webapp/types.xsd diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDaoTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDaoTest.java similarity index 100% rename from samples/airline/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDaoTest.java rename to samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDaoTest.java diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDaoTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDaoTest.java similarity index 100% rename from samples/airline/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDaoTest.java rename to samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDaoTest.java diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDaoTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDaoTest.java similarity index 100% rename from samples/airline/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDaoTest.java rename to samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDaoTest.java diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java similarity index 100% rename from samples/airline/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java rename to samples/airline/server/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImplTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImplTest.java similarity index 100% rename from samples/airline/src/test/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImplTest.java rename to samples/airline/server/src/test/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImplTest.java diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/web/FlightsControllerTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/web/FlightsControllerTest.java similarity index 100% rename from samples/airline/src/test/java/org/springframework/ws/samples/airline/web/FlightsControllerTest.java rename to samples/airline/server/src/test/java/org/springframework/ws/samples/airline/web/FlightsControllerTest.java diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpointTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpointTest.java similarity index 100% rename from samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpointTest.java rename to samples/airline/server/src/test/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpointTest.java diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpointTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpointTest.java similarity index 100% rename from samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpointTest.java rename to samples/airline/server/src/test/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpointTest.java diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpointTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpointTest.java similarity index 100% rename from samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpointTest.java rename to samples/airline/server/src/test/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpointTest.java diff --git a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/dao/jdbc.properties b/samples/airline/src/main/resources/org/springframework/ws/samples/airline/dao/jdbc.properties deleted file mode 100644 index b566d1f0..00000000 --- a/samples/airline/src/main/resources/org/springframework/ws/samples/airline/dao/jdbc.properties +++ /dev/null @@ -1,4 +0,0 @@ -jdbc.driverClassName=${jdbc.driverClassName} -jdbc.username=${jdbc.username} -jdbc.password=${jdbc.password} -jdbc.url=${jdbc.url} \ No newline at end of file