tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r1149171 - in /tuscany/sca-java-2.x/branches/2.0-Beta3: ./ distribution/ distribution/all/src/main/release/bin/ maven/tuscany-maven-plugin/ modules/binding-comet-runtime/ modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/bind...
Date Thu, 21 Jul 2011 13:26:02 GMT
Author: antelder
Date: Thu Jul 21 13:25:57 2011
New Revision: 1149171

URL: http://svn.apache.org/viewvc?rev=1149171&view=rev
Log:
Merge in the license header fixes from trunk to beta3

Modified:
    tuscany/sca-java-2.x/branches/2.0-Beta3/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/CHANGES   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/RELEASE_NOTES   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/all/src/main/release/bin/   (props
changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.java
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.java
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.java
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.java
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.java
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.java
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.java
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/core/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/databinding-json/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/domain-node/src/test/resources/test-domains/MyDomain/domain.properties
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-http-osgi/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebContextConfigurator.java
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/sca-client-impl/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/pom.xml   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/samples/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/samples/applications/store/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-ant/   (props
changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jaxrs/   (props
changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jsonrpc/  
(props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-spring/   (props
changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/   (props
changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webservice/
  (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/testing/itest/distribution/src-distro-rat/pom.xml

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,3 @@
 /tuscany/branches/sca-java-1.3:671193
 /tuscany/branches/sca-java-2.0-M3:786047*
+/tuscany/sca-java-2.x/trunk:1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/CHANGES
            ('svn:mergeinfo' removed)

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/RELEASE_NOTES
            ('svn:mergeinfo' removed)

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/distribution:671193
-/tuscany/sca-java-2.x/trunk/distribution:1148729
+/tuscany/sca-java-2.x/trunk/distribution:1148729,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/all/src/main/release/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/distribution/all/src/main/release/bin:671193
-/tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin:1147891,1148369,1148729
+/tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin:1147891,1148369,1148729,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/maven/tuscany-maven-plugin:671193
-/tuscany/sca-java-2.x/trunk/maven/tuscany-maven-plugin:1147834-1147835
+/tuscany/sca-java-2.x/trunk/maven/tuscany-maven-plugin:1147834-1147835,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/modules/binding-comet-runtime:671193
-/tuscany/sca-java-2.x/trunk/modules/binding-comet-runtime:1147891,1148256
+/tuscany/sca-java-2.x/trunk/modules/binding-comet-runtime:1147891,1148256,1149156-1149161

Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.java?rev=1149171&r1=1149170&r2=1149171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.java
Thu Jul 21 13:25:57 2011
@@ -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;

Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.java?rev=1149171&r1=1149170&r2=1149171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.java
Thu Jul 21 13:25:57 2011
@@ -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;
 
 /**

Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.java?rev=1149171&r1=1149170&r2=1149171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.java
Thu Jul 21 13:25:57 2011
@@ -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;
 
 /**

Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.java?rev=1149171&r1=1149170&r2=1149171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.java
Thu Jul 21 13:25:57 2011
@@ -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;

Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.java?rev=1149171&r1=1149170&r2=1149171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.java
Thu Jul 21 13:25:57 2011
@@ -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;

Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.java?rev=1149171&r1=1149170&r2=1149171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.java
Thu Jul 21 13:25:57 2011
@@ -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;

Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.java?rev=1149171&r1=1149170&r2=1149171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.java
Thu Jul 21 13:25:57 2011
@@ -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;

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/modules/core:671193
-/tuscany/sca-java-2.x/trunk/modules/core:1148761,1148841,1149101
+/tuscany/sca-java-2.x/trunk/modules/core:1148761,1148841,1149101,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/databinding-json/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/modules/databinding-json:671193
-/tuscany/sca-java-2.x/trunk/modules/databinding-json:1148839
+/tuscany/sca-java-2.x/trunk/modules/databinding-json:1148839,1149156-1149161

Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/domain-node/src/test/resources/test-domains/MyDomain/domain.properties
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/domain-node/src/test/resources/test-domains/MyDomain/domain.properties?rev=1149171&r1=1149170&r2=1149171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/modules/domain-node/src/test/resources/test-domains/MyDomain/domain.properties
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/modules/domain-node/src/test/resources/test-domains/MyDomain/domain.properties
Thu Jul 21 13:25:57 2011
@@ -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

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-http-osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,3 +1,4 @@
 /tuscany/branches/sca-java-1.3/modules/host-http-osgi:671193
 /tuscany/branches/sca-java-1.x/modules/host-http-osgi:713805-714043
 /tuscany/java/sca/modules/host-http-osgi:694816-713804
+/tuscany/sca-java-2.x/trunk/modules/host-http-osgi:1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/modules/host-webapp:671193
-/tuscany/sca-java-2.x/trunk/modules/host-webapp:1148838
+/tuscany/sca-java-2.x/trunk/modules/host-webapp:1148838,1149156-1149161

Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebContextConfigurator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebContextConfigurator.java?rev=1149171&r1=1149170&r2=1149171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebContextConfigurator.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebContextConfigurator.java
Thu Jul 21 13:25:57 2011
@@ -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;

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/sca-client-impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/modules/sca-client-impl:671193
-/tuscany/sca-java-2.x/trunk/modules/sca-client-impl:1147839
+/tuscany/sca-java-2.x/trunk/modules/sca-client-impl:1147839,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/pom.xml
            ('svn:mergeinfo' removed)

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/samples:671193
-/tuscany/sca-java-2.x/trunk/samples:1148730
+/tuscany/sca-java-2.x/trunk/samples:1148730,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/applications/store/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1 +1,2 @@
 /tuscany/branches/sca-java-1.3/samples/applications/store:671193
+/tuscany/sca-java-2.x/trunk/samples/applications/store:1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/samples/getting-started:671193
-/tuscany/sca-java-2.x/trunk/samples/getting-started:1148679
+/tuscany/sca-java-2.x/trunk/samples/getting-started:1148679,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
-/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld:1148679
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld:1148679,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-ant/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
-/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-ant:1148679
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-ant:1148679,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jaxrs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
-/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-jaxrs:1148679
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-jaxrs:1148679,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-jsonrpc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
-/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonrpc:1148679
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonrpc:1148679,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-spring/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
-/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-spring:1148679
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-spring:1148679,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/unreleased/samples/helloworld-webapp:671193
-/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp:1148679
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp:1148679,1149156-1149161

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/samples/getting-started/helloworld-webservice/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:25:57 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/samples/getting-started/helloworld-contribution:671193
-/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webservice:1148679
+/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webservice:1148679,1149156-1149161

Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/testing/itest/distribution/src-distro-rat/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/testing/itest/distribution/src-distro-rat/pom.xml?rev=1149171&r1=1149170&r2=1149171&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/testing/itest/distribution/src-distro-rat/pom.xml
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/testing/itest/distribution/src-distro-rat/pom.xml
Thu Jul 21 13:25:57 2011
@@ -71,6 +71,7 @@
                               <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers</exclude>
                               <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas</exclude>
                               <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/maven/archetypes/binding/src/test/resources/projects/basic/goal.txt</exclude>
+                              <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/maven/archetypes/implementation/src/test/resources/projects/basic/goal.txt</exclude>
                               <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/__init__.py</exclude>
                               <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/utils/__init__.py</exclude>
 
@@ -80,6 +81,7 @@
                               <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld</exclude>
                               <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd04.xml</exclude>
                               <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java</exclude>
+                              <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/binding-comet-runtime/src/main/resources/jquery.guid.js</exclude>
                               <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/binding-comet-runtime/src/main/resources/jquery.json-2.2.min.js</exclude>
                               <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/utils/simplejson/*</exclude>
                               <exclude>tuscany-sca-2.0-Beta3-SNAPSHOT-src/testing/compliance-tests/binding-jms/src/test/resources/tuscany-oasis-sca-tests-errors.properties</exclude>



Mime
View raw message