You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/08/23 08:59:53 UTC
svn commit: r568850 - in /incubator/tuscany/java/sca: demos/bigbank-account/
demos/bigbank-account/src/main/resources/
demos/bigbank-calculator/src/main/resources/ distribution/bundle/
distribution/manifest/ distribution/webapp/ modules/ modules/bindin...
Author: jsdelfino
Date: Wed Aug 22 23:59:50 2007
New Revision: 568850
URL: http://svn.apache.org/viewvc?rev=568850&view=rev
Log:
Renmaed binding-resource to binding-http and moved it to its own module.
Added:
incubator/tuscany/java/sca/modules/binding-http/ (with props)
incubator/tuscany/java/sca/modules/binding-http/DISCLAIMER
incubator/tuscany/java/sca/modules/binding-http/LICENSE (with props)
incubator/tuscany/java/sca/modules/binding-http/NOTICE (with props)
incubator/tuscany/java/sca/modules/binding-http/pom.xml (with props)
incubator/tuscany/java/sca/modules/binding-http/src/
incubator/tuscany/java/sca/modules/binding-http/src/main/
incubator/tuscany/java/sca/modules/binding-http/src/main/java/
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java (with props)
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java (with props)
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java (with props)
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java (with props)
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java (with props)
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java (with props)
incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java (with props)
incubator/tuscany/java/sca/modules/binding-http/src/main/resources/
incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/
incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/
incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory
incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
incubator/tuscany/java/sca/modules/binding-http/src/test/
incubator/tuscany/java/sca/modules/binding-http/src/test/java/
incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/
incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/
incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/
incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/
incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java (with props)
incubator/tuscany/java/sca/modules/binding-http/src/test/resources/
incubator/tuscany/java/sca/modules/binding-http/src/test/resources/content/
incubator/tuscany/java/sca/modules/binding-http/src/test/resources/content/test.html (with props)
incubator/tuscany/java/sca/modules/binding-http/src/test/resources/resource.composite (with props)
Removed:
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/
incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.resource.HTTPResourceBindingFactory
incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
Modified:
incubator/tuscany/java/sca/demos/bigbank-account/pom.xml
incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/BigBank.composite
incubator/tuscany/java/sca/demos/bigbank-calculator/src/main/resources/Calculator.composite
incubator/tuscany/java/sca/distribution/bundle/pom.xml
incubator/tuscany/java/sca/distribution/manifest/pom.xml
incubator/tuscany/java/sca/distribution/webapp/pom.xml
incubator/tuscany/java/sca/modules/implementation-resource/pom.xml
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
incubator/tuscany/java/sca/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
incubator/tuscany/java/sca/modules/implementation-resource/src/test/resources/resource.composite
incubator/tuscany/java/sca/modules/pom.xml
incubator/tuscany/java/sca/samples/web-resource/pom.xml
incubator/tuscany/java/sca/samples/web-resource/src/main/java/web/resource/SampleServer.java
incubator/tuscany/java/sca/samples/web-resource/src/main/resources/WebResource.composite
incubator/tuscany/java/sca/samples/web-resource/src/main/resources/myContent/index.html
Modified: incubator/tuscany/java/sca/demos/bigbank-account/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/bigbank-account/pom.xml?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/bigbank-account/pom.xml (original)
+++ incubator/tuscany/java/sca/demos/bigbank-account/pom.xml Wed Aug 22 23:59:50 2007
@@ -86,6 +86,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-http</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-http-jetty</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
Modified: incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/BigBank.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/BigBank.composite?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/BigBank.composite (original)
+++ incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/BigBank.composite Wed Aug 22 23:59:50 2007
@@ -18,13 +18,14 @@
* 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://bigbank"
xmlns:bb="http://bigbank"
name="BigBank">
<component name="AccountServiceComponent">
<service name="AccountService">
- <binding.jsonrpc uri="/AccountJSONService"/>
+ <tuscany:binding.jsonrpc uri="/AccountJSONService"/>
<binding.ws wsdlElement="http://bigbank#wsdl.port(AccountService/AccountServiceSoap)"/>
<binding.sca/>
</service>
@@ -33,7 +34,7 @@
<reference name="accountDataService" target="AccountDataServiceComponent"/>
<reference name="calculatorService">
- <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
+ <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
</reference>
<reference name="stockQuoteService">
<binding.ws uri="http://localhost:8081/services/StockQuoteWebService"/>
@@ -44,8 +45,8 @@
<component name="AccountFeedComponent">
<service name="Collection">
- <binding.rss uri="/rss"/>
- <binding.atom uri="/atom"/>
+ <tuscany:binding.rss uri="/rss"/>
+ <tuscany:binding.atom uri="/atom"/>
</service>
<implementation.java class="bigbank.account.feed.AccountFeedImpl"/>
<reference name="accountService" target="AccountServiceComponent"/>
@@ -57,9 +58,9 @@
<component name="WebResourceComponent">
<service name="Resource">
- <binding.resource uri="/"/>
+ <tuscany:binding.http uri="/"/>
</service>
- <implementation.resource location="web"/>
+ <tuscany:implementation.resource location="web"/>
</component>
</composite>
Modified: incubator/tuscany/java/sca/demos/bigbank-calculator/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/bigbank-calculator/src/main/resources/Calculator.composite?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/bigbank-calculator/src/main/resources/Calculator.composite (original)
+++ incubator/tuscany/java/sca/demos/bigbank-calculator/src/main/resources/Calculator.composite Wed Aug 22 23:59:50 2007
@@ -18,13 +18,14 @@
* 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://calc"
xmlns:c="http://calc"
name="Calculator">
<component name="CalculatorServiceComponent">
<service name="CalculatorService">
- <binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
+ <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
</service>
<implementation.java class="calculator.CalculatorServiceImpl"/>
@@ -36,19 +37,19 @@
</component>
<component name="AddServiceComponent">
- <implementation.script script="calculator/AddServiceImpl.js"/>
+ <tuscany:implementation.script script="calculator/AddServiceImpl.js"/>
</component>
<component name="SubtractServiceComponent">
- <implementation.script script="calculator/SubtractServiceImpl.rb"/>
+ <tuscany:implementation.script script="calculator/SubtractServiceImpl.rb"/>
</component>
<component name="MultiplyServiceComponent">
- <implementation.script script="calculator/MultiplyServiceImpl.py"/>
+ <tuscany:implementation.script script="calculator/MultiplyServiceImpl.py"/>
</component>
<component name="DivideServiceComponent">
- <implementation.script script="calculator/DivideServiceImpl.groovy"/>
+ <tuscany:implementation.script script="calculator/DivideServiceImpl.groovy"/>
</component>
</composite>
Modified: incubator/tuscany/java/sca/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/bundle/pom.xml?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/bundle/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/bundle/pom.xml Wed Aug 22 23:59:50 2007
@@ -64,6 +64,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-http</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-jsonrpc</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: incubator/tuscany/java/sca/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/manifest/pom.xml?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/manifest/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/manifest/pom.xml Wed Aug 22 23:59:50 2007
@@ -62,6 +62,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-http</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-jsonrpc</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: incubator/tuscany/java/sca/distribution/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/pom.xml?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/webapp/pom.xml Wed Aug 22 23:59:50 2007
@@ -58,6 +58,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-http</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-jsonrpc</artifactId>
<version>${pom.version}</version>
</dependency>
Propchange: incubator/tuscany/java/sca/modules/binding-http/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 22 23:59:50 2007
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+
Added: incubator/tuscany/java/sca/modules/binding-http/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/DISCLAIMER?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/DISCLAIMER (added)
+++ incubator/tuscany/java/sca/modules/binding-http/DISCLAIMER Wed Aug 22 23:59:50 2007
@@ -0,0 +1,8 @@
+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.
+
Added: incubator/tuscany/java/sca/modules/binding-http/LICENSE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/LICENSE?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/LICENSE (added)
+++ incubator/tuscany/java/sca/modules/binding-http/LICENSE Wed Aug 22 23:59:50 2007
@@ -0,0 +1,205 @@
+
+ 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, service 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.
+
+
+
Propchange: incubator/tuscany/java/sca/modules/binding-http/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/java/sca/modules/binding-http/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/NOTICE?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/NOTICE (added)
+++ incubator/tuscany/java/sca/modules/binding-http/NOTICE Wed Aug 22 23:59:50 2007
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Propchange: incubator/tuscany/java/sca/modules/binding-http/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/java/sca/modules/binding-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/pom.xml?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/pom.xml (added)
+++ incubator/tuscany/java/sca/modules/binding-http/pom.xml Wed Aug 22 23:59:50 2007
@@ -0,0 +1,94 @@
+<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-binding-http</artifactId>
+ <name>Apache Tuscany HTTP Binding Model</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-java-xml</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-spi</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-http</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-http-jetty</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-resource</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: incubator/tuscany/java/sca/modules/binding-http/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/binding-http/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java Wed Aug 22 23:59:50 2007
@@ -0,0 +1,38 @@
+/*
+ * 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.http;
+
+import java.net.URL;
+
+/**
+ * The service interface of resource implementations.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface HTTPResource {
+
+ /**
+ * Returns the resource location URL.
+ *
+ * @return
+ */
+ public URL getLocationURL();
+
+}
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java Wed Aug 22 23:59:50 2007
@@ -0,0 +1,29 @@
+/*
+ * 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.http;
+
+import org.apache.tuscany.sca.assembly.Binding;
+
+
+/**
+ * HTTP resource binding model.
+ */
+public interface HTTPResourceBinding extends Binding {
+}
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java Wed Aug 22 23:59:50 2007
@@ -0,0 +1,35 @@
+/*
+ * 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.http;
+
+/**
+ * Factory for the HTTP resource binding model.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface HTTPResourceBindingFactory {
+
+ /**
+ * Creates a new HTTP resource binding.
+ * @return a new HTTP resource binding
+ */
+ HTTPResourceBinding createHTTPResourceBinding();
+
+}
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java Wed Aug 22 23:59:50 2007
@@ -0,0 +1,36 @@
+/*
+ * 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.http.impl;
+
+import org.apache.tuscany.sca.binding.http.HTTPResourceBinding;
+import org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory;
+
+/**
+ * Factory for the HTTP resource binding model.
+ *
+ * @version $Rev$ $Date$
+ */
+public class HTTPResourceBindingFactoryImpl implements HTTPResourceBindingFactory {
+
+ public HTTPResourceBinding createHTTPResourceBinding() {
+ return new HTTPResourceBindingImpl();
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java Wed Aug 22 23:59:50 2007
@@ -0,0 +1,66 @@
+/*
+ * 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.http.impl;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.tuscany.sca.binding.http.HTTPResourceBinding;
+
+
+/**
+ * Implementation of the HTTP resource binding model.
+ */
+class HTTPResourceBindingImpl implements HTTPResourceBinding {
+
+ private String name;
+ private String uri;
+
+ public String getName() {
+ return name;
+ }
+
+ public String getURI() {
+ return uri;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setURI(String uri) {
+ this.uri = uri;
+ }
+
+
+ public List<Object> getExtensions() {
+ // The sample binding does not support extensions
+ return Collections.emptyList();
+ }
+
+ public boolean isUnresolved() {
+ return false;
+ }
+
+ public void setUnresolved(boolean unresolved) {
+ // The sample binding is always resolved
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java Wed Aug 22 23:59:50 2007
@@ -0,0 +1,62 @@
+/*
+ * 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.http.provider;
+
+import org.apache.tuscany.sca.binding.http.HTTPResourceBinding;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.provider.BindingProviderFactory;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+
+
+/**
+ * Implementation of the Echo binding model.
+ */
+public class HTTPResourceBindingProviderFactory implements BindingProviderFactory<HTTPResourceBinding> {
+
+ private MessageFactory messageFactory;
+ private ServletHost servletHost;
+
+ public HTTPResourceBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
+ ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
+ this.servletHost = servletHosts.getServletHosts().get(0);
+ ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
+ messageFactory = modelFactories.getFactory(MessageFactory.class);
+ }
+
+ public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, HTTPResourceBinding binding) {
+ return null;
+ }
+
+ public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, HTTPResourceBinding binding) {
+ return new HTTPResourceServiceBindingProvider(component, service, binding, messageFactory, servletHost);
+ }
+
+ public Class<HTTPResourceBinding> getModelType() {
+ return HTTPResourceBinding.class;
+ }
+}
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java Wed Aug 22 23:59:50 2007
@@ -0,0 +1,107 @@
+/*
+ * 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.http.provider;
+
+import java.net.URL;
+
+import org.apache.tuscany.sca.binding.http.HTTPResourceBinding;
+import org.apache.tuscany.sca.host.http.DefaultResourceServlet;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.invocation.InvocationChain;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.Message;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.runtime.RuntimeWire;
+
+/**
+ * Implementation of the Echo binding provider.
+ */
+public class HTTPResourceServiceBindingProvider implements ServiceBindingProvider {
+
+ private RuntimeComponentService service;
+ private HTTPResourceBinding binding;
+ private MessageFactory messageFactory;
+ private ServletHost servletHost;
+ private String uri;
+
+ public HTTPResourceServiceBindingProvider(RuntimeComponent component,
+ RuntimeComponentService service,
+ HTTPResourceBinding binding,
+ MessageFactory messageFactory,
+ ServletHost servletHost) {
+ this.service = service;
+ this.binding = binding;
+ this.messageFactory = messageFactory;
+ this.servletHost = servletHost;
+
+ uri = binding.getURI();
+ if (!uri.endsWith("/")) {
+ uri += "/";
+ }
+ if (!uri.endsWith("*")) {
+ uri += "*";
+ }
+ }
+
+ public InterfaceContract getBindingInterfaceContract() {
+ return service.getInterfaceContract();
+ }
+
+ public void start() {
+
+ // Get the target component implementation, for now we are assuming
+ // that it's an implementation.resource
+ RuntimeComponentService componentService = (RuntimeComponentService) service;
+ RuntimeWire wire = componentService.getRuntimeWire(binding);
+
+ // Get the getLocationURL invoker
+ Invoker getLocationInvoker = null;
+ for (InvocationChain invocationChain : wire.getInvocationChains()) {
+ String operationName = invocationChain.getSourceOperation().getName();
+ if (operationName.equals("getLocationURL")) {
+ getLocationInvoker = invocationChain.getHeadInvoker();
+ }
+ }
+ if (getLocationInvoker == null) {
+ throw new IllegalStateException("No getLocationURL operation found on target component");
+ }
+
+ // Get the location URL
+ Message message = messageFactory.createMessage();
+ message = getLocationInvoker.invoke(message);
+ URL locationURL = message.getBody();
+
+ // Register the default resource servlet with the servlet host
+ DefaultResourceServlet resourceServlet = new DefaultResourceServlet(locationURL.toString());
+ servletHost.addServletMapping(uri, resourceServlet);
+
+ }
+
+ public void stop() {
+
+ // Unregister from the hosting server
+ servletHost.removeServletMapping(uri);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory Wed Aug 22 23:59:50 2007
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Implementation class for model factory
+org.apache.tuscany.sca.binding.http.impl.HTTPResourceBindingFactoryImpl
Added: incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Wed Aug 22 23:59:50 2007
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Implementation class for the artifact processor extension
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.http,model=org.apache.tuscany.sca.binding.http.HTTPResourceBinding,factory=org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory
Added: incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory Wed Aug 22 23:59:50 2007
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Implementation class for the binding extension
+org.apache.tuscany.sca.binding.http.provider.HTTPResourceBindingProviderFactory;model=org.apache.tuscany.sca.binding.http.HTTPResourceBinding
Added: incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java Wed Aug 22 23:59:50 2007
@@ -0,0 +1,107 @@
+/*
+ * 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.http;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class HTTPResourceBindingTestCase extends TestCase {
+
+// private static final String REQUEST1_HEADER =
+// "GET /ResourceServiceComponent/test.html HTTP/1.0\n" + "Host: localhost\n"
+// + "Content-Type: text/xml\n"
+// + "Connection: close\n"
+// + "Content-Length: ";
+// private static final String REQUEST1_CONTENT = "";
+// private static final String REQUEST1 =
+// REQUEST1_HEADER + REQUEST1_CONTENT.getBytes().length + "\n\n" + REQUEST1_CONTENT;
+
+ private static final String REQUEST2_HEADER =
+ "GET /webcontent/test.html HTTP/1.0\n" + "Host: localhost\n"
+ + "Content-Type: text/xml\n"
+ + "Connection: close\n"
+ + "Content-Length: ";
+ private static final String REQUEST2_CONTENT = "";
+ private static final String REQUEST2 =
+ REQUEST2_HEADER + REQUEST2_CONTENT.getBytes().length + "\n\n" + REQUEST2_CONTENT;
+
+ private static final int HTTP_PORT = 8085;
+
+ private SCADomain scaDomain;
+
+ @Override
+ protected void setUp() throws Exception {
+ scaDomain = SCADomain.newInstance("resource.composite");
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ scaDomain.close();
+ }
+
+ // This works with port 8080 but we can't use that port on the build
+ // machine as it's already in use
+// public void testResourceImplementation() throws Exception {
+// Socket client = new Socket("127.0.0.1", HTTP_PORT);
+// OutputStream os = client.getOutputStream();
+// os.write(REQUEST1.getBytes());
+// os.flush();
+//
+// String document = read(client);
+// assertTrue(document.indexOf("<body><p>hello</body>") != -1);
+// }
+
+ public void testResourceImplementationWithBindingURI() throws Exception {
+ Socket client = new Socket("127.0.0.1", HTTP_PORT);
+ OutputStream os = client.getOutputStream();
+ os.write(REQUEST2.getBytes());
+ os.flush();
+
+ String document = read(client);
+ assertTrue(document.indexOf("<body><p>hello</body>") != -1);
+ }
+
+ private static String read(Socket socket) throws IOException {
+ BufferedReader reader = null;
+ try {
+ reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+ StringBuffer sb = new StringBuffer();
+ String str;
+ while ((str = reader.readLine()) != null) {
+ sb.append(str);
+ }
+ return sb.toString();
+ } finally {
+ if (reader != null) {
+ reader.close();
+ }
+ }
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/binding-http/src/test/resources/content/test.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/test/resources/content/test.html?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/test/resources/content/test.html (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/test/resources/content/test.html Wed Aug 22 23:59:50 2007
@@ -0,0 +1,21 @@
+<html>
+<!--
+ * 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.
+-->
+<body><p>hello</body>
+</html>
\ No newline at end of file
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/test/resources/content/test.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/test/resources/content/test.html
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/binding-http/src/test/resources/resource.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/src/test/resources/resource.composite?rev=568850&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/src/test/resources/resource.composite (added)
+++ incubator/tuscany/java/sca/modules/binding-http/src/test/resources/resource.composite Wed Aug 22 23:59:50 2007
@@ -0,0 +1,41 @@
+<?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"
+ targetNamespace="http://sample/resource"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:sr="http://sample/resource"
+ name="resource">
+
+ <!-- This works with port 8080 but we can't test this on the build machine
+ as 8080 is already in use -->
+ <!--
+ <component name="ResourceServiceComponent">
+ <implementation.resource location="content"/>
+ </component>
+ -->
+
+ <component name="ResourceServiceComponent2">
+ <service name="Resource">
+ <tuscany:binding.http uri="http://localhost:8085/webcontent"/>
+ </service>
+ <tuscany:implementation.resource location="content"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/test/resources/resource.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/binding-http/src/test/resources/resource.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/implementation-resource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/pom.xml?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-resource/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-resource/pom.xml Wed Aug 22 23:59:50 2007
@@ -50,27 +50,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-http</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-http-jetty</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java Wed Aug 22 23:59:50 2007
@@ -24,7 +24,7 @@
/**
* The service interface of resource implementations.
*
- * @version $Rev$ $Date$
+ * @version $Rev: 548609 $ $Date: 2007-06-18 23:31:03 -0700 (Mon, 18 Jun 2007) $
*/
public interface Resource {
Modified: incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Wed Aug 22 23:59:50 2007
@@ -16,5 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.resource,model=org.apache.tuscany.sca.binding.resource.HTTPResourceBinding,factory=org.apache.tuscany.sca.binding.resource.HTTPResourceBindingFactory
org.apache.tuscany.sca.implementation.resource.impl.ResourceImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.resource,model=org.apache.tuscany.sca.implementation.resource.ResourceImplementation
Modified: incubator/tuscany/java/sca/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java Wed Aug 22 23:59:50 2007
@@ -18,11 +18,7 @@
*/
package org.apache.tuscany.sca.implementation.resource;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
+import java.net.URL;
import junit.framework.TestCase;
@@ -33,26 +29,6 @@
*/
public class ResourceImplementationTestCase extends TestCase {
-// private static final String REQUEST1_HEADER =
-// "GET /ResourceServiceComponent/test.html HTTP/1.0\n" + "Host: localhost\n"
-// + "Content-Type: text/xml\n"
-// + "Connection: close\n"
-// + "Content-Length: ";
-// private static final String REQUEST1_CONTENT = "";
-// private static final String REQUEST1 =
-// REQUEST1_HEADER + REQUEST1_CONTENT.getBytes().length + "\n\n" + REQUEST1_CONTENT;
-
- private static final String REQUEST2_HEADER =
- "GET /webcontent/test.html HTTP/1.0\n" + "Host: localhost\n"
- + "Content-Type: text/xml\n"
- + "Connection: close\n"
- + "Content-Length: ";
- private static final String REQUEST2_CONTENT = "";
- private static final String REQUEST2 =
- REQUEST2_HEADER + REQUEST2_CONTENT.getBytes().length + "\n\n" + REQUEST2_CONTENT;
-
- private static final int HTTP_PORT = 8085;
-
private SCADomain scaDomain;
@Override
@@ -64,44 +40,12 @@
protected void tearDown() throws Exception {
scaDomain.close();
}
-
- // This works with port 8080 but we can't use that port on the build
- // machine as it's already in use
-// public void testResourceImplementation() throws Exception {
-// Socket client = new Socket("127.0.0.1", HTTP_PORT);
-// OutputStream os = client.getOutputStream();
-// os.write(REQUEST1.getBytes());
-// os.flush();
-//
-// String document = read(client);
-// assertTrue(document.indexOf("<body><p>hello</body>") != -1);
-// }
-
- public void testResourceImplementationWithBindingURI() throws Exception {
- Socket client = new Socket("127.0.0.1", HTTP_PORT);
- OutputStream os = client.getOutputStream();
- os.write(REQUEST2.getBytes());
- os.flush();
-
- String document = read(client);
- assertTrue(document.indexOf("<body><p>hello</body>") != -1);
- }
-
- private static String read(Socket socket) throws IOException {
- BufferedReader reader = null;
- try {
- reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
- StringBuffer sb = new StringBuffer();
- String str;
- while ((str = reader.readLine()) != null) {
- sb.append(str);
- }
- return sb.toString();
- } finally {
- if (reader != null) {
- reader.close();
- }
- }
+
+ public void testResourceLocation() {
+ Resource resource = scaDomain.getService(Resource.class, "ResourceServiceComponent");
+ URL url = resource.getLocationURL();
+ int i = url.toString().indexOf("content");
+ assertTrue(i != -1);
}
}
Modified: incubator/tuscany/java/sca/modules/implementation-resource/src/test/resources/resource.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/src/test/resources/resource.composite?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-resource/src/test/resources/resource.composite (original)
+++ incubator/tuscany/java/sca/modules/implementation-resource/src/test/resources/resource.composite Wed Aug 22 23:59:50 2007
@@ -23,18 +23,7 @@
xmlns:sr="http://sample/resource"
name="resource">
- <!-- This works with port 8080 but we can't test this on the build machine
- as 8080 is already in use -->
- <!--
<component name="ResourceServiceComponent">
- <tuscany:implementation.resource location="content"/>
- </component>
- -->
-
- <component name="ResourceServiceComponent2">
- <service name="Resource">
- <tuscany:binding.resource uri="http://localhost:8085/webcontent"/>
- </service>
<tuscany:implementation.resource location="content"/>
</component>
Modified: incubator/tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/pom.xml Wed Aug 22 23:59:50 2007
@@ -42,6 +42,7 @@
<module>binding-dwr</module>
<module>binding-ejb</module>
<module>binding-feed</module>
+ <module>binding-http</module>
<module>binding-jms</module>
<module>binding-jsonrpc</module>
<module>binding-notification</module>
Modified: incubator/tuscany/java/sca/samples/web-resource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/web-resource/pom.xml?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/web-resource/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/web-resource/pom.xml Wed Aug 22 23:59:50 2007
@@ -51,6 +51,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-http</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-http-tomcat</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
Modified: incubator/tuscany/java/sca/samples/web-resource/src/main/java/web/resource/SampleServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/web-resource/src/main/java/web/resource/SampleServer.java?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/web-resource/src/main/java/web/resource/SampleServer.java (original)
+++ incubator/tuscany/java/sca/samples/web-resource/src/main/java/web/resource/SampleServer.java Wed Aug 22 23:59:50 2007
@@ -31,7 +31,7 @@
System.out.println("Sample server started (press enter to shutdown)");
System.out.println();
System.out.println("To get the Web resource, point your Web browser to the following address:");
- System.out.println("http://localhost:8080/MyWeb/index.html");
+ System.out.println("http://localhost:8080/myWeb/index.html");
System.out.println();
System.in.read();
} catch (IOException e) {
Modified: incubator/tuscany/java/sca/samples/web-resource/src/main/resources/WebResource.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/web-resource/src/main/resources/WebResource.composite?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/web-resource/src/main/resources/WebResource.composite (original)
+++ incubator/tuscany/java/sca/samples/web-resource/src/main/resources/WebResource.composite Wed Aug 22 23:59:50 2007
@@ -18,14 +18,15 @@
* 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://web"
name="WebResource">
<component name="myWeb">
- <service name="Resource">
- <binding.resource/>
- </service>
- <implementation.resource location="myContent"/>
+ <service name="Resource">
+ <tuscany:binding.http/>
+ </service>
+ <tuscany:implementation.resource location="myContent"/>
</component>
</composite>
Modified: incubator/tuscany/java/sca/samples/web-resource/src/main/resources/myContent/index.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/web-resource/src/main/resources/myContent/index.html?rev=568850&r1=568849&r2=568850&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/web-resource/src/main/resources/myContent/index.html (original)
+++ incubator/tuscany/java/sca/samples/web-resource/src/main/resources/myContent/index.html Wed Aug 22 23:59:50 2007
@@ -26,7 +26,7 @@
<p>Tuscany allows you to publish Web resources using SCA components declared with an
<b><implementation.resource></b> component implementation type and made available
- to HTTP clients using a <b><binding.resource></b> binding.</p>
+ to HTTP clients using a <b><binding.http></b> binding.</p>
<p>Here is the SCA composite that publishes this page:</p>
@@ -37,8 +37,8 @@
<component name="myWeb">
<service name="Resource">
- <binding.resource>
- </service>
+ <binding.http/>
+ </service>
<implementation.resource location="myContent"/>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org