You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/12/10 11:33:50 UTC
svn commit: r725052 - in /tuscany/branches/sca-java-1.4:
itest/references-collection/src/main/java/crawler/impl/ modules/
modules/core-spi/
modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/
modules/sca-api-extension/ modules/sca-api-extens...
Author: slaws
Date: Wed Dec 10 02:33:50 2008
New Revision: 725052
URL: http://svn.apache.org/viewvc?rev=725052&view=rev
Log:
TUSCANY-2732 - Separate a Tuscany extension to the component context from the OSOA component context
Added:
tuscany/branches/sca-java-1.4/modules/sca-api-extension/ (with props)
tuscany/branches/sca-java-1.4/modules/sca-api-extension/LICENSE (with props)
tuscany/branches/sca-java-1.4/modules/sca-api-extension/NOTICE (with props)
tuscany/branches/sca-java-1.4/modules/sca-api-extension/pom.xml (with props)
tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/
tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/
tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/
tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/
tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/
tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/
tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/
tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/
tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java (with props)
Modified:
tuscany/branches/sca-java-1.4/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java
tuscany/branches/sca-java-1.4/modules/core-spi/pom.xml
tuscany/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
tuscany/branches/sca-java-1.4/modules/pom.xml
tuscany/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
Modified: tuscany/branches/sca-java-1.4/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java?rev=725052&r1=725051&r2=725052&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java (original)
+++ tuscany/branches/sca-java-1.4/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java Wed Dec 10 02:33:50 2008
@@ -24,6 +24,7 @@
import java.util.Collection;
import java.util.List;
+import org.apache.tuscany.sca.api.ComponentContextExtension;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.annotations.AllowsPassByReference;
import org.osoa.sca.annotations.Context;
@@ -65,7 +66,7 @@
*/
public Crawler findCrawler(String crawlerId)
{
- Collection<Crawler> crawlers = componentContext.getServices(Crawler.class, "crawlers");
+ Collection<Crawler> crawlers = ((ComponentContextExtension)componentContext).getServices(Crawler.class, "crawlers");
for (Crawler crawler : crawlers)
{
String id = crawler.getCrawlerId();
Modified: tuscany/branches/sca-java-1.4/modules/core-spi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/core-spi/pom.xml?rev=725052&r1=725051&r2=725052&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/core-spi/pom.xml (original)
+++ tuscany/branches/sca-java-1.4/modules/core-spi/pom.xml Wed Dec 10 02:33:50 2008
@@ -40,6 +40,12 @@
<artifactId>tuscany-sca-api</artifactId>
<version>1.4</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api-extension</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified: tuscany/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java?rev=725052&r1=725051&r2=725052&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java (original)
+++ tuscany/branches/sca-java-1.4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java Wed Dec 10 02:33:50 2008
@@ -23,6 +23,7 @@
import java.io.Reader;
import java.io.Writer;
+import org.apache.tuscany.sca.api.ComponentContextExtension;
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.ComponentService;
import org.osoa.sca.CallableReference;
@@ -32,7 +33,7 @@
/**
* @version $Rev$ $Date$
*/
-public interface RuntimeComponentContext extends ComponentContext {
+public interface RuntimeComponentContext extends ComponentContextExtension {
/**
* Activate the reference (creating runtime wires)
* @param reference
Modified: tuscany/branches/sca-java-1.4/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/pom.xml?rev=725052&r1=725051&r2=725052&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/pom.xml (original)
+++ tuscany/branches/sca-java-1.4/modules/pom.xml Wed Dec 10 02:33:50 2008
@@ -179,6 +179,7 @@
<module>runtime-tomcat</module -->
<!--module>runtime-war</module-->
<module>sca-api</module>
+ <module>sca-api-extension</module>
<module>workspace</module>
<module>workspace-impl</module>
<module>workspace-xml</module>
Propchange: tuscany/branches/sca-java-1.4/modules/sca-api-extension/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 10 02:33:50 2008
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: tuscany/branches/sca-java-1.4/modules/sca-api-extension/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/sca-api-extension/LICENSE?rev=725052&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/sca-api-extension/LICENSE (added)
+++ tuscany/branches/sca-java-1.4/modules/sca-api-extension/LICENSE Wed Dec 10 02:33:50 2008
@@ -0,0 +1,203 @@
+
+ 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: tuscany/branches/sca-java-1.4/modules/sca-api-extension/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.4/modules/sca-api-extension/LICENSE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: tuscany/branches/sca-java-1.4/modules/sca-api-extension/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/sca-api-extension/NOTICE?rev=725052&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/sca-api-extension/NOTICE (added)
+++ tuscany/branches/sca-java-1.4/modules/sca-api-extension/NOTICE Wed Dec 10 02:33:50 2008
@@ -0,0 +1,5 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Propchange: tuscany/branches/sca-java-1.4/modules/sca-api-extension/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.4/modules/sca-api-extension/NOTICE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: tuscany/branches/sca-java-1.4/modules/sca-api-extension/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/sca-api-extension/pom.xml?rev=725052&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/sca-api-extension/pom.xml (added)
+++ tuscany/branches/sca-java-1.4/modules/sca-api-extension/pom.xml Wed Dec 10 02:33:50 2008
@@ -0,0 +1,62 @@
+<?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.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api-extension</artifactId>
+ <name>Apache Tuscany SCA API Extension</name>
+
+ <description>Extensions to the API classes for the Service Component Architecture</description>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+
+ <configuration>
+ <instructions>
+ <Bundle-Version>1.4</Bundle-Version>
+ <Bundle-SymbolicName>org.apache.tuscany.sca.api</Bundle-SymbolicName>
+ <Bundle-Description>${pom.description}</Bundle-Description>
+ <Export-Package>org.osoa.sca*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
+</project>
Propchange: tuscany/branches/sca-java-1.4/modules/sca-api-extension/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.4/modules/sca-api-extension/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.4/modules/sca-api-extension/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java?rev=725052&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java (added)
+++ tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java Wed Dec 10 02:33:50 2008
@@ -0,0 +1,56 @@
+/*
+ * 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.api;
+
+import java.util.Collection;
+
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
+
+/**
+ * An extension of the OSOA ComponentContext that provides access to collections
+ * of references.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface ComponentContextExtension extends ComponentContext {
+
+
+ /* ******************** Contribution for issue TUSCANY-2281 ******************** */
+
+ /**
+ * Returns a Collection of typed service proxies for a business interface type and a reference name.
+ * @param businessInterface the interface that will be used to invoke the service
+ * @param referenceName the name of the reference
+ * @param <B> the Java type of the business interface for the reference
+ * @return a Collection of objects that implements the business interface
+ */
+ <B> Collection<B> getServices(Class<B> businessInterface, String referenceName);
+
+
+ /**
+ * Returns a Collection of typed service reference for a business interface type and a reference name.
+ * @param businessInterface the interface that will be used to invoke the service
+ * @param referenceName the name of the reference
+ * @param <B> the Java type of the business interface for the reference
+ * @return a Collection of objects that implements the business interface
+ */
+ <B> Collection<ServiceReference<B>> getServiceReferences(Class<B> businessInterface, String referenceName);
+}
+
Propchange: tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.4/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java?rev=725052&r1=725051&r2=725052&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java (original)
+++ tuscany/branches/sca-java-1.4/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java Wed Dec 10 02:33:50 2008
@@ -96,27 +96,5 @@
*
* @return the SCA request context; may be null
*/
- RequestContext getRequestContext();
-
-
- /* ******************** Contribution for issue TUSCANY-2281 ******************** */
-
- /**
- * Returns a Collection of typed service proxies for a business interface type and a reference name.
- * @param businessInterface the interface that will be used to invoke the service
- * @param referenceName the name of the reference
- * @param <B> the Java type of the business interface for the reference
- * @return a Collection of objects that implements the business interface
- */
- <B> Collection<B> getServices(Class<B> businessInterface, String referenceName);
-
-
- /**
- * Returns a Collection of typed service reference for a business interface type and a reference name.
- * @param businessInterface the interface that will be used to invoke the service
- * @param referenceName the name of the reference
- * @param <B> the Java type of the business interface for the reference
- * @return a Collection of objects that implements the business interface
- */
- <B> Collection<ServiceReference<B>> getServiceReferences(Class<B> businessInterface, String referenceName);
+ RequestContext getRequestContext();
}