5 files changed, 8 insertions, 16 deletions
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml b/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml
index 118a06d942..5514e9130f 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml
@@ -77,30 +77,19 @@
         <testSourceDirectory>${basedir}/test</testSourceDirectory>
         <resources>
             <resource>
-                <directory>${basedir}</directory>
+                <directory>${basedir}/src</directory>
                 <excludes>
                     <exclude>**/*.java</exclude>
                     <exclude>**/.*/**</exclude>
-                    <exclude>pom.xml</exclude>
-                    <exclude>build.xml</exclude>
-                    <exclude>target/**</exclude>
-                    <exclude>src/**</exclude>
-                    <exclude>test/**</exclude>
-                    <exclude>*.composite</exclude>
                 </excludes>
             </resource>
         </resources>
         <testResources>
             <testResource>
-                <directory>${basedir}</directory>
+                <directory>${basedir}/test</directory>
                 <excludes>
                     <exclude>**/*.java</exclude>
                     <exclude>**/.*/**</exclude>
-                    <exclude>pom.xml</exclude>
-                    <exclude>build.xml</exclude>
-                    <exclude>target/**</exclude>
-                    <exclude>src/**</exclude>
-                    <exclude>test/**</exclude>
                 </excludes>
             </testResource>
         </testResources>
@@ -137,7 +126,7 @@
                     </goals>
                     <configuration>
                         <packageName>scatours.emailgateway</packageName>
-                        <wsdlDirectory>${basedir}/wsdl
+                        <wsdlDirectory>${basedir}/src/wsdl
                         </wsdlDirectory>
                         <wsdlFiles>
                             <wsdlFile>EmailGateway.wsdl</wsdlFile>
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/META-INF/sca-contribution.xml
index d77df2fd7e..d77df2fd7e 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/wsdl/EmailGateway.wsdl b/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/wsdl/EmailGateway.wsdl
index c103ad947d..c103ad947d 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/wsdl/EmailGateway.wsdl
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/wsdl/EmailGateway.wsdl
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/emailgatewaytest.composite b/sandbox/travelsample/shared-contributions/emailgateway-contribution/test/emailgatewaytest.composite
index 5be71b4d66..5daf27a61d 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/emailgatewaytest.composite
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/test/emailgatewaytest.composite
@@ -23,7 +23,7 @@
            targetNamespace="http://creditcard" 
            name="emailgateway">
     <component name="EmailGatewayClient">
-        <implementation.java class="scatours.emailgateway.EmailGatewayClientImpl" />
+        <implementation.java class="scatours.emailgateway.client.EmailGatewayClientImpl" />
         <reference name="emailGateway">
             <binding.ws uri="http://localhost:8082/EmailGateway" />
         </reference>
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayClientImpl.java b/sandbox/travelsample/shared-contributions/emailgateway-contribution/test/scatours/emailgateway/client/EmailGatewayClientImpl.java
index a6b76c525f..074c3bffa4 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayClientImpl.java
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/test/scatours/emailgateway/client/EmailGatewayClientImpl.java
@@ -17,11 +17,14 @@
  * under the License.    
  */
 
-package scatours.emailgateway;
+package scatours.emailgateway.client;
 
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
+import scatours.emailgateway.EmailGateway;
+import scatours.emailgateway.EmailType;
+
 /**
  * 
  */