From 5e19f79c4f96ec7ca50ddee392b3355078097ae0 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 21 Jul 2011 13:25:57 +0000 Subject: Merge in the license header fixes from trunk to beta3 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1149171 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/local/LocalSCABinding.java | 19 +++++++++++++++++++ .../sca/binding/local/LocalSCABindingFactory.java | 19 +++++++++++++++++++ .../sca/binding/local/LocalSCABindingFactoryImpl.java | 19 +++++++++++++++++++ .../sca/binding/local/LocalSCABindingImpl.java | 19 +++++++++++++++++++ .../binding/local/LocalSCABindingProviderFactory.java | 19 +++++++++++++++++++ .../local/LocalSCAReferenceBindingProvider.java | 19 +++++++++++++++++++ .../binding/local/LocalSCAServiceBindingProvider.java | 19 +++++++++++++++++++ .../resources/test-domains/MyDomain/domain.properties | 16 ++++++++++++++++ .../sca/host/webapp/WebContextConfigurator.java | 18 ++++++++++++++++++ .../testing/itest/distribution/src-distro-rat/pom.xml | 2 ++ 10 files changed, 169 insertions(+) (limited to 'sca-java-2.x/branches') diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.java index d6f951896f..701c148218 100644 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.java +++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.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 org.apache.tuscany.sca.binding.local; import javax.xml.namespace.QName; diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.java index ffc00cf0aa..14717d8f70 100644 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.java +++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.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 org.apache.tuscany.sca.binding.local; /** diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.java index 35d953dcc4..abf2efd876 100644 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.java +++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.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 org.apache.tuscany.sca.binding.local; /** diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.java index 3f589297d6..9ed9ccd1a9 100644 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.java +++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.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 org.apache.tuscany.sca.binding.local; import javax.xml.namespace.QName; diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.java index 486a465d03..4ba66fb47a 100644 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.java +++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.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 org.apache.tuscany.sca.binding.local; import org.apache.tuscany.sca.core.ExtensionPointRegistry; diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.java index f04b6aeb4c..199ab0a103 100644 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.java +++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.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 org.apache.tuscany.sca.binding.local; import org.apache.tuscany.sca.assembly.Endpoint; diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.java index 9c08cf6a48..3bcc25e5cb 100644 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.java +++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.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 org.apache.tuscany.sca.binding.local; import org.apache.tuscany.sca.interfacedef.InterfaceContract; diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/domain-node/src/test/resources/test-domains/MyDomain/domain.properties b/sca-java-2.x/branches/2.0-Beta3/modules/domain-node/src/test/resources/test-domains/MyDomain/domain.properties index 391414448e..d7ac22d6ad 100644 --- a/sca-java-2.x/branches/2.0-Beta3/modules/domain-node/src/test/resources/test-domains/MyDomain/domain.properties +++ b/sca-java-2.x/branches/2.0-Beta3/modules/domain-node/src/test/resources/test-domains/MyDomain/domain.properties @@ -1 +1,17 @@ +# +# 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. +# domainName=foo diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebContextConfigurator.java b/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebContextConfigurator.java index 66408f26d4..e1879c8f33 100644 --- a/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebContextConfigurator.java +++ b/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebContextConfigurator.java @@ -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. + */ package org.apache.tuscany.sca.host.webapp; import java.util.Enumeration; diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/distribution/src-distro-rat/pom.xml b/sca-java-2.x/branches/2.0-Beta3/testing/itest/distribution/src-distro-rat/pom.xml index 476de0920c..b8a70112e8 100644 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/distribution/src-distro-rat/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta3/testing/itest/distribution/src-distro-rat/pom.xml @@ -71,6 +71,7 @@ tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas tuscany-sca-2.0-Beta3-SNAPSHOT-src/maven/archetypes/binding/src/test/resources/projects/basic/goal.txt + tuscany-sca-2.0-Beta3-SNAPSHOT-src/maven/archetypes/implementation/src/test/resources/projects/basic/goal.txt tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/__init__.py tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/utils/__init__.py @@ -80,6 +81,7 @@ tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd04.xml tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java + tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/binding-comet-runtime/src/main/resources/jquery.guid.js tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/binding-comet-runtime/src/main/resources/jquery.json-2.2.min.js tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/utils/simplejson/* tuscany-sca-2.0-Beta3-SNAPSHOT-src/testing/compliance-tests/binding-jms/src/test/resources/tuscany-oasis-sca-tests-errors.properties -- cgit v1.2.3