From ed0219292429a5c297248fe323e2edf4b6122be8 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 May 2010 21:36:30 +0000
Subject: Merge revision r944885 from 1.0 release branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946411 13f79535-47bb-0310-9956-ffa450edef68
---
 .../payment/creditcard/CreditCardPayment.java      | 19 +++++++++++++++++++
 .../src/main/resources/META-INF/ejb-jar.xml        | 22 ++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/CreditCardPayment.java b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/CreditCardPayment.java
index 9f508ecc59..4c0a421e42 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/CreditCardPayment.java
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/CreditCardPayment.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.tuscanyscatours.payment.creditcard;
 
 import javax.jws.WebMethod;
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/resources/META-INF/ejb-jar.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/resources/META-INF/ejb-jar.xml
index 116a25630c..1dae371cdc 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/resources/META-INF/ejb-jar.xml
@@ -1,2 +1,20 @@
-<?xml version="1.0"?>
- <ejb-jar/>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.    
+-->
+<ejb-jar/>
-- 
cgit v1.2.3