TUSCANY-2614 - Add missing license headers.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@701380 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 33 insertions, 9 deletions

diff --git a/java/sca/samples/calculator-ws-secure-webapp/README b/java/sca/samples/calculator-ws-secure-webapp/README
index a6e6c897e4..d0d3307b3a 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/README
+++ b/java/sca/samples/calculator-ws-secure-webapp/README
@@ -1,7 +1,10 @@
-Calculator Sample Exposing Web Services In A WebApp

-===================================================

+Calculator Sample Exposing Secure Web Services In A WebApp

+==========================================================

 This sample uses the same code as the calculator sample, it deploys the

 sample wrapped in a web app and exposes the AddService as a web service. 

+The autentication intent is applied to communications with the add 

+component. The integrity intent is applied to communication with the 

+subtract component. 

 

 The README in the samples directory (the directory above this) provides 

 general instructions about building and running samples. Take a look there 

@@ -9,12 +12,12 @@ first.
 

 As this sample provides a web app there is a manual step where the WAR file

 that contains the sample is copied to your web app container. If you just want 

-to give this sample a go deploy the WAR file (target/sample-calculator-ws-webapp.war)

+to give this sample a go deploy the WAR file (target/sample-calculator-ws-secure-webapp.war)

 to you web application server. 

   

 Once the web app is deployed use your browser to visit the following URL;

 

-http://localhost:8080/sample-calculator-ws-webapp

+http://localhost:8080/sample-calculator-ws-secure-webapp

 

 The sample is configured to use a service on port 8080. If your servlet container

 is using a port other than 8080 then you will need to edit the Calculator.composite

@@ -48,6 +51,11 @@ calculator-webapp/
         Calculator.composite      - As calculator sample except that the 

                                     connection between the CalculatorService

                                     and the AddService is web services

+        definitions.xml           - intent and polci set specification

+        security.properties       - security configuration for the 

+                                    rampart security engine that runs 

+                                    inside of Axis

+        calculatorKeys.jks        - keystore

       webapp

         META-INF/

           sca-contribution.xml    - specifies the composite to be deployed

@@ -68,10 +76,10 @@ Building And Running The Sample Using Ant
 With the binary distribution the sample can be built using Ant as 

 follows

 

-cd calculator-ws-webapp

+cd calculator-ws-secure-webapp

 ant package

 

-This should result in a war file (sample-calculator-ws-webapp.war) in the target 

+This should result in a war file (sample-calculator-ws-secure-webapp.war) in the target 

 directory. Copy this war file to your web app deployment directory in you

 web app container. 

 

@@ -81,7 +89,7 @@ of copying the WAR file to the webapps directory.
 

 Once the web app is deployed use your browser to visit the following URL;

 

-http://localhost:8080/sample-calculator-ws-webapp

+http://localhost:8080/sample-calculator-ws-secure-webapp

 

 The port and hostname will of course vary depending on your local installation. 

 

@@ -98,7 +106,7 @@ Building And Running The Sample Using Maven
 With either the binary or source distributions the sample can be built and run 

 using Maven as follows. 

 

-cd calculator-ws-webapp 

+cd calculator-ws-secure-webapp 

 mvn

 

 Again this should result in a war file (sample-calculator-ws-webapp.war) in the target 

diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
index a7a6f3aa9c..8ef9928018 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
+++ b/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
@@ -1,4 +1,20 @@
+## ---------------------------------------------------------------------------

+## 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.

+## ---------------------------------------------------------------------------

 org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin

 org.apache.ws.security.crypto.merlin.keystore.type=jks

 org.apache.ws.security.crypto.merlin.keystore.password=CalculatorAdmin

-org.apache.ws.security.crypto.merlin.file=calculatorKeys.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.file=calculatorKeys.jks