Author: antelder
Date: Mon May 18 08:15:38 2009
New Revision: 775855
URL: http://svn.apache.org/viewvc?rev=775855&view=rev
Log:
Merge license header fixes from 1.x trunk
Modified:
tuscany/branches/sca-java-1.5/modules/binding-ejb-runtime/ (props changed)
tuscany/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceRemote.java
tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/ (props
changed)
tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite
tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite
tuscany/branches/sca-java-1.5/modules/contribution-java/ (props changed)
tuscany/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
tuscany/branches/sca-java-1.5/modules/core-databinding/ (props changed)
tuscany/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/OMElementXMLAdapter.java
tuscany/branches/sca-java-1.5/samples/holder-ws-service/ (props changed)
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl
tuscany/branches/sca-java-1.5/samples/store-webapp/ (props changed)
tuscany/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
tuscany/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
Propchange: tuscany/branches/sca-java-1.5/modules/binding-ejb-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May 18 08:15:38 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/binding-ejb-runtime:671193
+/tuscany/branches/sca-java-1.x/modules/binding-ejb-runtime:775835,775837
Modified:
tuscany/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceRemote.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceRemote.java?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceRemote.java
(original)
+++
tuscany/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceRemote.java
Mon May 18 08:15:38 2009
@@ -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 calculator;
import javax.ejb.Remote;
Propchange: tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May 18 08:15:38 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/binding-erlang-runtime:671193
+/tuscany/branches/sca-java-1.x/modules/binding-erlang-runtime:775837
Modified:
tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite
(original)
+++
tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite
Mon May 18 08:15:38 2009
@@ -1,39 +1,58 @@
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
- xmlns:sample="http://sample";
- name="ErlangReferenceBinding">
-
- <component name="ReferenceTest">
- <implementation.java
class="org.apache.tuscany.sca.binding.erlang.testing.ReferenceTestComponentImpl"
/>
- <reference name="mboxReference">
- <tuscany:binding.erlang node="MboxServer" mbox="true"/>
- </reference>
-
- <reference name="timeoutMboxReference">
- <tuscany:binding.erlang node="MboxServer" mbox="true"
timeout="500"/>
- </reference>
-
- <reference name="cookieMboxReference">
- <tuscany:binding.erlang node="MboxServer" mbox="true"
cookie="cookie"/>
- </reference>
-
- <reference name="moduleReference">
- <tuscany:binding.erlang node="RPCServer" module="hello"/>
- </reference>
-
- <reference name="cookieModuleReference">
- <tuscany:binding.erlang node="RPCServerCookie"
module="hello_cookie" cookie="cookie"/>
- </reference>
-
- <reference name="invalidCookieModuleReference">
- <tuscany:binding.erlang node="RPCServerCookie"
module="hello_cookie" cookie="invalid_cookie"/>
- </reference>
-
- <reference name="timeoutModuleReference">
- <tuscany:binding.erlang node="RPCServerTimeout"
module="hello_timeout" timeout="500"/>
- </reference>
-
- </component>
-
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+ targetNamespace="http://sample";
+ xmlns:sample="http://sample";
+ name="ErlangReferenceBinding">
+
+ <component name="ReferenceTest">
+ <implementation.java
class="org.apache.tuscany.sca.binding.erlang.testing.ReferenceTestComponentImpl"
/>
+ <reference name="mboxReference">
+ <tuscany:binding.erlang node="MboxServer" mbox="true"/>
+ </reference>
+
+ <reference name="timeoutMboxReference">
+ <tuscany:binding.erlang node="MboxServer" mbox="true"
timeout="500"/>
+ </reference>
+
+ <reference name="cookieMboxReference">
+ <tuscany:binding.erlang node="MboxServer" mbox="true"
cookie="cookie"/>
+ </reference>
+
+ <reference name="moduleReference">
+ <tuscany:binding.erlang node="RPCServer" module="hello"/>
+ </reference>
+
+ <reference name="cookieModuleReference">
+ <tuscany:binding.erlang node="RPCServerCookie"
module="hello_cookie" cookie="cookie"/>
+ </reference>
+
+ <reference name="invalidCookieModuleReference">
+ <tuscany:binding.erlang node="RPCServerCookie"
module="hello_cookie" cookie="invalid_cookie"/>
+ </reference>
+
+ <reference name="timeoutModuleReference">
+ <tuscany:binding.erlang node="RPCServerTimeout"
module="hello_timeout" timeout="500"/>
+ </reference>
+
+ </component>
+
</composite>
\ No newline at end of file
Modified:
tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite
(original)
+++
tuscany/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite
Mon May 18 08:15:38 2009
@@ -1,35 +1,54 @@
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
- xmlns:sample="http://sample";
- name="ErlangServiceBinding">
-
- <component name="ServiceTest">
- <implementation.java
class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImpl"
/>
- </component>
- <service name="ServiceTest" promote="ServiceTest">
- <interface.java
interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent"
/>
- <tuscany:binding.erlang node="RPCServer" module="hello"/>
- </service>
- <service name="ServiceTestMbox" promote="ServiceTest">
- <interface.java
interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent"
/>
- <tuscany:binding.erlang node="RPCServerMbox" mbox="true"/>
- </service>
-
- <component name="ServiceTestTimeout">
- <implementation.java
class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImplTimeout"
/>
- </component>
- <service name="ServiceTestTimeout" promote="ServiceTestTimeout">
- <interface.java
interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent"
/>
- <tuscany:binding.erlang node="RPCServerTimeout"
module="hello_timeout" timeout="500"/>
- </service>
-
- <component name="ServiceTestCookie">
- <implementation.java
class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImpl"
/>
- </component>
- <service name="ServiceTestCookie" promote="ServiceTestCookie">
- <interface.java
interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent"
/>
- <tuscany:binding.erlang node="RPCServerCookie"
module="hello_cookie" cookie="cookie"/>
- </service>
-
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+ targetNamespace="http://sample";
+ xmlns:sample="http://sample";
+ name="ErlangServiceBinding">
+
+ <component name="ServiceTest">
+ <implementation.java
class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImpl"
/>
+ </component>
+ <service name="ServiceTest" promote="ServiceTest">
+ <interface.java
interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent"
/>
+ <tuscany:binding.erlang node="RPCServer" module="hello"/>
+ </service>
+ <service name="ServiceTestMbox" promote="ServiceTest">
+ <interface.java
interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent"
/>
+ <tuscany:binding.erlang node="RPCServerMbox" mbox="true"/>
+ </service>
+
+ <component name="ServiceTestTimeout">
+ <implementation.java
class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImplTimeout"
/>
+ </component>
+ <service name="ServiceTestTimeout" promote="ServiceTestTimeout">
+ <interface.java
interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent"
/>
+ <tuscany:binding.erlang node="RPCServerTimeout"
module="hello_timeout" timeout="500"/>
+ </service>
+
+ <component name="ServiceTestCookie">
+ <implementation.java
class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImpl"
/>
+ </component>
+ <service name="ServiceTestCookie" promote="ServiceTestCookie">
+ <interface.java
interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent"
/>
+ <tuscany:binding.erlang node="RPCServerCookie"
module="hello_cookie" cookie="cookie"/>
+ </service>
+
</composite>
\ No newline at end of file
Propchange: tuscany/branches/sca-java-1.5/modules/contribution-java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May 18 08:15:38 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/contribution-java:671193
+/tuscany/branches/sca-java-1.x/modules/contribution-java:775837
Modified:
tuscany/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
(original)
+++
tuscany/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
Mon May 18 08:15:38 2009
@@ -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.contribution.java.impl;
import java.io.File;
Propchange: tuscany/branches/sca-java-1.5/modules/core-databinding/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May 18 08:15:38 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/core-databinding:671193
+/tuscany/branches/sca-java-1.x/modules/core-databinding:775837
Modified:
tuscany/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/OMElementXMLAdapter.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/OMElementXMLAdapter.java?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/OMElementXMLAdapter.java
(original)
+++
tuscany/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/OMElementXMLAdapter.java
Mon May 18 08:15:38 2009
@@ -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.core.databinding.transformers;
import java.io.StringReader;
Propchange: tuscany/branches/sca-java-1.5/samples/holder-ws-service/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May 18 08:15:38 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/samples/holder-ws-service:671193
+/tuscany/branches/sca-java-1.x/samples/holder-ws-service:775826,775829
Modified:
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
(original)
+++
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
Mon May 18 08:15:38 2009
@@ -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.example.orderservice;
Modified:
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java
(original)
+++
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java
Mon May 18 08:15:38 2009
@@ -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.example.orderservice;
Modified:
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java
(original)
+++
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java
Mon May 18 08:15:38 2009
@@ -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.example.orderservice;
Modified:
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
(original)
+++
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
Mon May 18 08:15:38 2009
@@ -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.example.orderservice;
Modified:
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
(original)
+++
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
Mon May 18 08:15:38 2009
@@ -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.example.orderservice;
Modified:
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
(original)
+++
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
Mon May 18 08:15:38 2009
@@ -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.example.orderservice;
Modified:
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java
(original)
+++
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java
Mon May 18 08:15:38 2009
@@ -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.example.orderservice;
Modified:
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java
(original)
+++
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java
Mon May 18 08:15:38 2009
@@ -1,2 +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://www.example.org/OrderService/";)
package org.example.orderservice;
Modified:
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl
(original)
+++
tuscany/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl
Mon May 18 08:15:38 2009
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ * 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.
+-->
<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:tns="http://www.example.org/OrderService/";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; name="OrderService"
targetNamespace="http://www.example.org/OrderService/";>
<wsdl:types>
<xsd:schema targetNamespace="http://www.example.org/OrderService/";>
Propchange: tuscany/branches/sca-java-1.5/samples/store-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May 18 08:15:38 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/samples/store-webapp:671193
+/tuscany/branches/sca-java-1.x/samples/store-webapp:775826
Modified:
tuscany/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++
tuscany/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
Mon May 18 08:15:38 2009
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?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.
+-->
<web:web-app
xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0";
xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0";
Modified:
tuscany/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml?rev=775855&r1=775854&r2=775855&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++
tuscany/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
Mon May 18 08:15:38 2009
@@ -1,4 +1,22 @@
<?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.
+-->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; id="WebApp_ID" version="2.5">
<display-name>sample-store-secure-webapp</display-name>
