You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/10/03 15:57:36 UTC
svn commit: r701380 - in /tuscany/java/sca:
demos/bigbank-stockquote/src/main/resources/
demos/bigbank/src/main/resources/ itest/wsdl/src/main/resources/wsdl/
modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/po...
Author: slaws
Date: Fri Oct 3 06:57:36 2008
New Revision: 701380
URL: http://svn.apache.org/viewvc?rev=701380&view=rev
Log:
TUSCANY-2614 - Add missing license headers.
Modified:
tuscany/java/sca/demos/bigbank-stockquote/src/main/resources/security.properties
tuscany/java/sca/demos/bigbank/src/main/resources/security.properties
tuscany/java/sca/itest/wsdl/src/main/resources/wsdl/Hello.xsd
tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
tuscany/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
tuscany/java/sca/samples/calculator-ws-secure-webapp/README
tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
Modified: tuscany/java/sca/demos/bigbank-stockquote/src/main/resources/security.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/demos/bigbank-stockquote/src/main/resources/security.properties?rev=701380&r1=701379&r2=701380&view=diff
==============================================================================
--- tuscany/java/sca/demos/bigbank-stockquote/src/main/resources/security.properties (original)
+++ tuscany/java/sca/demos/bigbank-stockquote/src/main/resources/security.properties Fri Oct 3 06:57:36 2008
@@ -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=sqkeystore
-org.apache.ws.security.crypto.merlin.file=stockQuote.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.file=stockQuote.jks
Modified: tuscany/java/sca/demos/bigbank/src/main/resources/security.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/demos/bigbank/src/main/resources/security.properties?rev=701380&r1=701379&r2=701380&view=diff
==============================================================================
--- tuscany/java/sca/demos/bigbank/src/main/resources/security.properties (original)
+++ tuscany/java/sca/demos/bigbank/src/main/resources/security.properties Fri Oct 3 06:57:36 2008
@@ -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=bbakeystore
-org.apache.ws.security.crypto.merlin.file=bigbank.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.file=bigbank.jks
Modified: tuscany/java/sca/itest/wsdl/src/main/resources/wsdl/Hello.xsd
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/wsdl/src/main/resources/wsdl/Hello.xsd?rev=701380&r1=701379&r2=701380&view=diff
==============================================================================
--- tuscany/java/sca/itest/wsdl/src/main/resources/wsdl/Hello.xsd (original)
+++ tuscany/java/sca/itest/wsdl/src/main/resources/wsdl/Hello.xsd Fri Oct 3 06:57:36 2008
@@ -1,4 +1,21 @@
-
+<!--
+ * 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.
+-->
<schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
<element name="getGreetings">
Modified: tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties?rev=701380&r1=701379&r2=701380&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties Fri Oct 3 06:57:36 2008
@@ -1,3 +1,19 @@
+## ---------------------------------------------------------------------------
+## 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=TuscanyWsUserPasswd
Modified: tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties?rev=701380&r1=701379&r2=701380&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties Fri Oct 3 06:57:36 2008
@@ -1,3 +1,19 @@
+## ---------------------------------------------------------------------------
+## 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=TuscanyWsUserPasswd
Modified: tuscany/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java?rev=701380&r1=701379&r2=701380&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java (original)
+++ tuscany/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java Fri Oct 3 06:57:36 2008
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
@javax.xml.bind.annotation.XmlSchema(namespace = "http://other.ws.binding.sca.tuscany.apache.org/")
package org.apache.tuscany.sca.binding.ws.other;
Modified: tuscany/java/sca/samples/calculator-ws-secure-webapp/README
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-ws-secure-webapp/README?rev=701380&r1=701379&r2=701380&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-ws-secure-webapp/README (original)
+++ tuscany/java/sca/samples/calculator-ws-secure-webapp/README Fri Oct 3 06:57:36 2008
@@ -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 @@
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.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 @@
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 @@
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 @@
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
Modified: tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/security.properties?rev=701380&r1=701379&r2=701380&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/security.properties (original)
+++ tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/security.properties Fri Oct 3 06:57:36 2008
@@ -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