You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/10/27 13:06:36 UTC
svn commit: r468343 - in /incubator/tuscany/branches/sca-java-M2/samples:
standalone/greeterwsclient-oneway/ webapp/greeterws-oneway/
webapp/greeterws-oneway/src/main/webapp/META-INF/
webapp/greeterws-oneway/src/main/webapp/WEB-INF/
Author: rineholt
Date: Fri Oct 27 04:06:35 2006
New Revision: 468343
URL: http://svn.apache.org/viewvc?view=rev&rev=468343
Log:
add greeter to M2 samples.
Added:
incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/
- copied from r468337, incubator/tuscany/java/samples/sca/greeterwsclient-oneway/
incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/LICENSE.txt
incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/NOTICE.txt
incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/
- copied from r468337, incubator/tuscany/java/samples/sca/greeterws-oneway/
incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/LICENSE.txt
incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/NOTICE.txt
incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/default.scdl
Removed:
incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/META-INF/
Modified:
incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/pom.xml
incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/pom.xml
incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/web.xml
Added: incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/LICENSE.txt?view=auto&rev=468343
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/LICENSE.txt (added)
+++ incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/LICENSE.txt Fri Oct 27 04:06:35 2006
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, serviceDefinition marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
Added: incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/NOTICE.txt?view=auto&rev=468343
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/NOTICE.txt (added)
+++ incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/NOTICE.txt Fri Oct 27 04:06:35 2006
@@ -0,0 +1,14 @@
+${pom.name}
+Copyright (c) 2005 - 2006 The Apache Software Foundation
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Modified: incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/pom.xml?view=diff&rev=468343&r1=468337&r2=468343
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/standalone/greeterwsclient-oneway/pom.xml Fri Oct 27 04:06:35 2006
@@ -19,7 +19,7 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.samples.sca</groupId>
+ <groupId>org.apache.tuscany.sca.samples</groupId>
<artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -28,67 +28,65 @@
<packaging>jar</packaging>
<name>Tuscany HelloWorld Web Service Async Client Sample</name>
<description>A sample client for a HelloWorld Web Service.</description>
- <properties>
- <ws.type>axis2</ws.type>
- </properties>
<dependencies>
<dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api-r2.0.1</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${scaVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r0.95</artifactId>
- <version>${tuscanyVersion}</version>
- <scope>compile</scope>
+ <version>1.0-incubator-M2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-api</artifactId>
- <version>${tuscanyVersion}</version>
- <scope>compile</scope>
+ <version>${scaVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${scaVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>axis2</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${scaVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${scaVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-sdo</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${scaVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-axiom</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${scaVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
+ <defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -97,11 +95,27 @@
<archive>
<manifest>
<mainClass>greeter.GreeterClient</mainClass>
+ <addClasspath>true</addClasspath>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${notice.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <filtering>true</filtering>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
Added: incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/LICENSE.txt?view=auto&rev=468343
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/LICENSE.txt (added)
+++ incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/LICENSE.txt Fri Oct 27 04:06:35 2006
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, serviceDefinition marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
Added: incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/NOTICE.txt?view=auto&rev=468343
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/NOTICE.txt (added)
+++ incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/NOTICE.txt Fri Oct 27 04:06:35 2006
@@ -0,0 +1,14 @@
+${pom.name}
+Copyright (c) 2005 - 2006 The Apache Software Foundation
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Modified: incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/pom.xml?view=diff&rev=468343&r1=468337&r2=468343
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/pom.xml Fri Oct 27 04:06:35 2006
@@ -19,7 +19,7 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.samples.sca</groupId>
+ <groupId>org.apache.tuscany.sca.samples</groupId>
<artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -29,84 +29,22 @@
<name>Tuscany Greeter Web Service Sample</name>
<description>A sample Greeter OneWay Web Service.</description>
- <properties>
- <ws.type>axis2</ws.type>
- </properties>
<dependencies>
<dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
- <version>1.0-incubator-M2-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-api</artifactId>
- <version>${pom.version}</version>
+ <version>${scaVersion}</version>
<scope>compile</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
-
- <dependency>
- <groupId>commonj</groupId>
- <artifactId>sdo-api-r2.0.1</artifactId>
- <version>1.0-incubator-M2-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>core</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.bindings</groupId>
- <artifactId>axis2</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-axiom</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
- </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp-host</artifactId>
- <version>${pom.version}</version>
+ <version>${scaVersion}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -130,7 +68,36 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <!-- Set to true to embed external jars for extensions in the WAR -->
+ <!-- Set to false to leave external jars for extensions to be resolved from maven repository -->
+ <loadExtensionDependencies>false</loadExtensionDependencies>
+
+ <extensions>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${scaVersion}</version>
+ </dependency>
+ </extensions>
+ </configuration>
+
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${notice.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <filtering>true</filtering>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Added: incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/default.scdl?view=auto&rev=468343
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/default.scdl (added)
+++ incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/default.scdl Fri Oct 27 04:06:35 2006
@@ -0,0 +1,40 @@
+<?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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ name="greeterws">
+
+ <service name="GreeterWebService" target="http:///foo">
+ <interface.wsdl xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ interface="http://greeter#wsdl.interface(Greeter)"
+ wsdli:wsdlLocation="http://greeter wsdl/greeter.wsdl" />
+
+ <!--FIXME the location attribute is a really bad hack here! does not follow to spec at all
+ -->
+ <binding.ws endpoint="http://greeter#wsdl.endpoint(GreeterService/GreeterSoapPort)"
+ conformanceURIs="http://ws-i.org/profiles/basic/1.1" location="wsdl/greeter.wsdl" />
+
+ <reference>GreeterServiceComponent</reference>
+ </service>
+
+ <component name="GreeterServiceComponent">
+ <implementation.java class="greeter.GreeterImpl" />
+ </component>
+
+</composite>
Modified: incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/web.xml?view=diff&rev=468343&r1=468337&r2=468343
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/webapp/greeterws-oneway/src/main/webapp/WEB-INF/web.xml Fri Oct 27 04:06:35 2006
@@ -23,15 +23,6 @@
<web-app>
<display-name>Tuscany Greeter Web Service Sample</display-name>
- <context-param>
- <param-name>tuscany.systemScdlPath</param-name>
- <param-value>/META-INF/tuscany/webapp.scdl</param-value>
- </context-param>
-
- <context-param>
- <param-name>tuscany.applicationScdlPath</param-name>
- <param-value>/META-INF/sca/default.scdl</param-value>
- </context-param>
<listener>
<listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org