Temporarily renamed sca-android branch to pull a recent revision of trunk into sca-android.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695316 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 0 insertions, 847 deletions

diff --git a/branches/sca-android/modules/extensibility/.classpath b/branches/sca-android/modules/extensibility/.classpath
deleted file mode 100644
index 4bd80ca1d6..0000000000
--- a/branches/sca-android/modules/extensibility/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src/main/java"/>

-	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>

-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>

-	<classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>

-	<classpathentry kind="output" path="target/classes"/>

-</classpath>

diff --git a/branches/sca-android/modules/extensibility/.project b/branches/sca-android/modules/extensibility/.project
deleted file mode 100644
index 7e1a2e5ff6..0000000000
--- a/branches/sca-android/modules/extensibility/.project
+++ /dev/null
@@ -1,13 +0,0 @@
-<projectDescription>
-  <name>tuscany-extensibility</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/branches/sca-android/modules/extensibility/.settings/org.eclipse.jdt.core.prefs b/branches/sca-android/modules/extensibility/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index af3f96beaa..0000000000
--- a/branches/sca-android/modules/extensibility/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Mar 20 19:19:21 PDT 2008

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

diff --git a/branches/sca-android/modules/extensibility/DISCLAIMER b/branches/sca-android/modules/extensibility/DISCLAIMER
deleted file mode 100644
index d68a410903..0000000000
--- a/branches/sca-android/modules/extensibility/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-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.

-

diff --git a/branches/sca-android/modules/extensibility/LICENSE b/branches/sca-android/modules/extensibility/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/branches/sca-android/modules/extensibility/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 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.

-

-

-

diff --git a/branches/sca-android/modules/extensibility/NOTICE b/branches/sca-android/modules/extensibility/NOTICE
deleted file mode 100644
index 65c52d01c7..0000000000
--- a/branches/sca-android/modules/extensibility/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Copyright (c) 2005 - 2008 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/branches/sca-android/modules/extensibility/pom.xml b/branches/sca-android/modules/extensibility/pom.xml
deleted file mode 100644
index 991ee1aeaf..0000000000
--- a/branches/sca-android/modules/extensibility/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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>2.0-incubating-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-extensibility</artifactId>

-    <name>Apache Tuscany SCA Extensibility</name>

-

-</project>

diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
deleted file mode 100644
index ff7d215d2e..0000000000
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*

- * 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.extensibility;

-

-import java.lang.ref.WeakReference;

-import java.net.URL;

-import java.util.Map;

-

-/**

- * Service declaration using J2SE Jar service provider spec Classes specified

- * inside this declaration are loaded using the ClassLoader used to read the

- * configuration file corresponding to this declaration.

- */

-public class ServiceDeclaration {

-

-    private WeakReference<ClassLoader> classLoader;

-

-    private String className;

-

-    private Map<String, String> attributes;

-

-    /**

-     * Service declaration constructor

-     * 

-     * @param className Service implementation class name

-     * @param classLoader ClassLoader corresponding to this service

-     *                implementation

-     * @param attributes Optional attributes for this service declaration

-     */

-    public ServiceDeclaration(String className, ClassLoader classLoader, Map<String, String> attributes) {

-

-        this.className = className;

-        this.classLoader = new WeakReference<ClassLoader>(classLoader);

-        this.attributes = attributes;

-    }

-

-    /**

-     * Load this service implementation class

-     * 

-     * @return Class

-     * @throws ClassNotFoundException

-     */

-    @SuppressWarnings("unchecked")

-    public Class<?> loadClass() throws ClassNotFoundException {

-

-        return Class.forName(className, true, classLoader.get());

-    }

-

-    /**

-     * Load another class using the ClassLoader of this service implementation

-     * 

-     * @param anotherClassName

-     * @return Class

-     * @throws ClassNotFoundException

-     */

-    public Class<?> loadClass(String anotherClassName) throws ClassNotFoundException {

-

-        return Class.forName(anotherClassName, true, classLoader.get());

-    }

-

-    /**

-     * Return the resource corresponding to this service implementation class

-     * 

-     * @return resource URL

-     */

-    public URL getResource() {

-        return classLoader.get().getResource(className);

-    }

-

-    /**

-     * ClassLoader associated with this service declaration

-     * 

-     * @return ClassLoader

-     */

-    public ClassLoader getClassLoader() {

-        return classLoader.get();

-    }

-

-    /**

-     * Service implementation class corresponding to this declaration

-     * 

-     * @return The Service implementation class corresponding to this declaration 

-     */

-    public String getClassName() {

-        return className;

-    }

-

-    /**

-     * Attributes specified for this declaration

-     * 

-     * @return attributes

-     */

-    public Map<String, String> getAttributes() {

-        return attributes;

-    }

-

-    /**

-     * Equals method used to ensure that each service declaration is stored only

-     * once in a set of declarations.

-     */

-    @Override

-    public boolean equals(Object o) {

-        if (!(o instanceof ServiceDeclaration))

-            return false;

-        ServiceDeclaration s = (ServiceDeclaration)o;

-        if (!className.equals(s.className))

-            return false;

-        else if (!classLoader.equals(s.classLoader))

-            return false;

-        else if (attributes == null)

-            return s.attributes == null;

-        else

-            return attributes.equals(s.attributes);

-

-    }

-

-}

diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
deleted file mode 100644
index a7358590de..0000000000
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*

- * 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.extensibility;

-

-import java.io.BufferedReader;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.InputStreamReader;

-import java.net.URL;

-import java.security.AccessController;

-import java.security.PrivilegedActionException;

-import java.security.PrivilegedExceptionAction;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Hashtable;

-import java.util.Map;

-import java.util.Set;

-import java.util.StringTokenizer;

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-/**

- * Service discovery for Tuscany based on J2SE Jar service provider spec.

- * Services are described using configuration files in META-INF/services.

- * Service description specifies a class name followed by optional properties.

- * Multi-ClassLoader environments are supported through a ClassLoader

- * registration API

- */

-public class ServiceDiscovery {

-	private final static Logger logger = Logger

-			.getLogger(ServiceDiscovery.class.getName());

-

-	private static ServiceDiscovery instance;

-

-	private HashSet<ClassLoader> registeredClassLoaders;

-

-	/**

-	 * Get an instance of Service discovery, one instance is created per

-	 * ClassLoader that this class is loaded from

-	 * 

-	 * @return

-	 */

-	public static ServiceDiscovery getInstance() {

-

-		if (instance == null) {

-			instance = new ServiceDiscovery();

-			instance.registeredClassLoaders = new HashSet<ClassLoader>();

-			instance.registeredClassLoaders.add(ServiceDiscovery.class

-					.getClassLoader());

-		}

-		return instance;

-	}

-

-	/**

-	 * Register a ClassLoader with this discovery mechanism. Tuscany extension

-	 * ClassLoaders are registered here.

-	 * 

-	 * @param classLoader

-	 */

-	public void registerClassLoader(ClassLoader classLoader) {

-		registeredClassLoaders.add(classLoader);

-	}

-

-	/**

-	 * Get all service declarations for this name

-	 * 

-	 * @param name

-	 * @return set of service declarations

-	 * @throws IOException

-	 */

-	public Set<ServiceDeclaration> getServiceDeclarations(String name)

-			throws IOException {

-

-		Set<ServiceDeclaration> classSet = new HashSet<ServiceDeclaration>();

-

-		for (ClassLoader classLoader : registeredClassLoaders) {

-			getServiceClasses(classLoader, name, classSet, true);

-		}

-		return classSet;

-	}

-

-	/**

-	 * Get all service declarations for this interface

-	 * 

-	 * @param serviceInterface

-	 * @return set of service declarations

-	 * @throws IOException

-	 */

-	public Set<ServiceDeclaration> getServiceDeclarations(

-			Class<?> serviceInterface) throws IOException {

-

-		return getServiceDeclarations(serviceInterface.getName());

-	}

-

-	/**

-	 * Load one service implementation class for this interface

-	 * 

-	 * @param serviceInterface

-	 * @return service implementation class

-	 * @throws IOException

-	 * @throws ClassNotFoundException

-	 */

-	public Class<?> loadFirstServiceClass(Class<?> serviceInterface)

-			throws IOException, ClassNotFoundException {

-

-		Set<ServiceDeclaration> classSet = new HashSet<ServiceDeclaration>();

-

-		for (ClassLoader classLoader : registeredClassLoaders) {

-			getServiceClasses(classLoader, serviceInterface.getName(),

-					classSet, false);

-			if (classSet.size() > 0)

-				break;

-		}

-		if (classSet.size() > 0)

-			return classSet.iterator().next().loadClass();

-		else

-			return null;

-

-	}

-

-	/**

-	 * Returns a unique list of resource URLs of name META-INF/services/<name>

-	 * Each URL is associated with the first ClassLoader that it was visible

-	 * from

-	 * 

-	 * @param name Name of resource

-	 * @return Table of URLs with associated ClassLoaders

-	 * @throws IOException

-	 */

-	public Hashtable<ClassLoader, Set<URL>> getServiceResources(

-			final String name) throws IOException {

-

-		Hashtable<ClassLoader, Set<URL>> resourceTable = new Hashtable<ClassLoader, Set<URL>>();

-

-		HashSet<URL> allURLs = new HashSet<URL>();

-		for (final ClassLoader classLoader : registeredClassLoaders) {

-			HashSet<URL> urls = new HashSet<URL>();

-			resourceTable.put(classLoader, urls);

-			boolean debug = logger.isLoggable(Level.FINE);

-			if (debug) {

-				logger.fine("Discovering service resources using class loader "

-						+ classLoader);

-			}

-			// Allow privileged access to read META-INF/services/*. Add FilePermission to added to security policy file.

-			ArrayList<URL> urlList;

-			try {

-				// FIXME J2 Security - promote this to callers of this method

-				urlList = AccessController

-						.doPrivileged(new PrivilegedExceptionAction<ArrayList<URL>>() {

-							public ArrayList<URL> run() throws IOException {

-								return Collections.list(classLoader

-										.getResources("META-INF/services/"

-												+ name));

-							}

-						});

-			} catch (PrivilegedActionException e) {

-				throw (IOException) e.getException();

-			}

-

-			for (URL url : urlList) {

-				if (allURLs.contains(url))

-					continue;

-				urls.add(url);

-			}

-			allURLs.addAll(urls);

-		}

-		return resourceTable;

-	}

-

-	/**

-	 * Parse a service declaration in the form class;attr=value,attr=value and

-	 * return a map of attributes

-	 * 

-	 * @param declaration

-	 * @return a map of attributes

-	 */

-	private Map<String, String> parseServiceDeclaration(String declaration) {

-		Map<String, String> attributes = new HashMap<String, String>();

-		int index = declaration.indexOf(';');

-		if (index != -1) {

-			attributes.put("class", declaration.substring(0, index).trim());

-			declaration = declaration.substring(index);

-		} else {

-			int j = declaration.indexOf('=');

-			if (j == -1) {

-				attributes.put("class", declaration.trim());

-				return attributes;

-			} else {

-				declaration = ";" + declaration;

-			}

-		}

-		StringTokenizer tokens = new StringTokenizer(declaration);

-		for (; tokens.hasMoreTokens();) {

-			String key = tokens.nextToken("=").substring(1).trim();

-			if (key == null)

-				break;

-			String value = tokens.nextToken(",").substring(1).trim();

-			if (value == null)

-				break;

-			attributes.put(key, value);

-		}

-		return attributes;

-	}

-

-	/**

-	 * Load the service class whose name specified in a configuration file

-	 * 

-	 * @param classLoader

-	 * @param name The name of the service class

-	 * @param classSet Populate this set with classes extends/implements the

-	 *                service class

-	 * @throws IOException

-	 */

-	private void getServiceClasses(final ClassLoader classLoader,

-			final String name, Set<ServiceDeclaration> classSet,

-			boolean findAllClasses) throws IOException {

-		

-		if ("org.apache.tuscany.sca.contribution.processor.PackageProcessor"

-				.equals(name)) {

-

-			for (String reg : new String[] {

-					"org.apache.tuscany.sca.contribution.processor.impl.FolderContributionProcessor;type=application/vnd.tuscany.folder",

-					"org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;type=application/x-compressed",

-					"org.apache.tuscany.sca.contribution.processor.impl.DexContributionProcessor;type=application/x-dex" }) {

-

-				Map<String, String> attributes = parseServiceDeclaration(reg);

-				String className = attributes.get("class");

-				ServiceDeclaration serviceClass = new ServiceDeclaration(

-						className, classLoader, attributes);

-				classSet.add(serviceClass);

-

-			}

-			

-		} else if ("org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor"

-				.equals(name)) {

-			

-			for (String reg : new String[] {

-					"org.apache.tuscany.sca.implementation.java.xml.JavaImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation"

-					}) {

-

-				Map<String, String> attributes = parseServiceDeclaration(reg);

-				String className = attributes.get("class");

-				ServiceDeclaration serviceClass = new ServiceDeclaration(

-						className, classLoader, attributes);

-				classSet.add(serviceClass);

-

-			}

-			

-		} else if ("org.apache.tuscany.sca.provider.PolicyProviderFactory"

-				.equals(name)) {

-			

-			for (String reg : new String[] {

-					"org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicyProviderFactory;model=org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicy"

-					}) {

-

-				Map<String, String> attributes = parseServiceDeclaration(reg);

-				String className = attributes.get("class");

-				ServiceDeclaration serviceClass = new ServiceDeclaration(

-						className, classLoader, attributes);

-				classSet.add(serviceClass);

-

-			}

-			

-		} else if ("org.apache.tuscany.sca.provider.BindingProviderFactory"

-				.equals(name)) {

-			

-			for (String reg : new String[] {

-					"org.apache.tuscany.sca.binding.sca.impl.RuntimeSCABindingProviderFactory;model=org.apache.tuscany.sca.assembly.SCABinding"

-					

-					}) {

-

-				Map<String, String> attributes = parseServiceDeclaration(reg);

-				String className = attributes.get("class");

-				ServiceDeclaration serviceClass = new ServiceDeclaration(

-						className, classLoader, attributes);

-				classSet.add(serviceClass);

-

-			}

-			

-		} else if ("org.apache.tuscany.sca.contribution.resolver.ModelResolver"

-				.equals(name)) {

-			

-			for (String reg : new String[] {

-					"org.apache.tuscany.sca.contribution.resource.impl.ArtifactModelResolver;model=org.apache.tuscany.sca.contribution.Artifact",

-					"org.apache.tuscany.sca.assembly.xml.CompositeModelResolver;model=org.apache.tuscany.sca.assembly.Composite",

-					"org.apache.tuscany.sca.assembly.xml.ComponentTypeModelResolver;model=org.apache.tuscany.sca.assembly.ComponentType",

-					"org.apache.tuscany.sca.assembly.xml.ConstrainingTypeModelResolver;model=org.apache.tuscany.sca.assembly.ConstrainingType",

-					"org.apache.tuscany.sca.contribution.java.impl.ClassReferenceModelResolver;model=org.apache.tuscany.sca.contribution.resolver.ClassReference",

-					"org.apache.tuscany.sca.contribution.xml.ContributionModelResolver;model=org.apache.tuscany.sca.contribution.Contribution"

-					/*"org.apache.tuscany.sca.contribution.java.impl.ClassReferenceModelResolver;model=org.apache.tuscany.sca.contribution.resolver.ClassReference",

-					"org.apache.tuscany.sca.contribution.resolver.impl.ResourceReferenceModelResolver;model=org.apache.tuscany.sca.contribution.resolver.ResourceReference",

-					"org.apache.tuscany.sca.assembly.xml.ComponentTypeModelResolver;model=org.apache.tuscany.sca.assembly.ComponentType",

-					"org.apache.tuscany.sca.assembly.xml.ConstrainingTypeModelResolver;model=org.apache.tuscany.sca.assembly.ConstrainingType",

-					"org.apache.tuscany.sca.assembly.xml.CompositeModelResolver;model=org.apache.tuscany.sca.assembly.Composite",

-					"org.apache.tuscany.sca.interfacedef.wsdl.xml.XSDModelResolver;model=org.apache.tuscany.sca.interfacedef.wsdl.XSDefinition",

-					"org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLModelResolver;model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition",

-					"org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleReferenceModelResolver;model=org.apache.tuscany.sca.contribution.osgi.BundleReference"*/

-					}) {

-

-				Map<String, String> attributes = parseServiceDeclaration(reg);

-				String className = attributes.get("class");

-				ServiceDeclaration serviceClass = new ServiceDeclaration(

-						className, classLoader, attributes);

-				classSet.add(serviceClass);

-

-			}

-			

-		} else if ("org.apache.tuscany.sca.core.ModuleActivator"

-				.equals(name)) {

-

-			for (String reg : new String[] {

-					"org.apache.tuscany.sca.core.databinding.module.DataBindingModuleActivator",

-					"org.apache.tuscany.sca.implementation.java.module.JavaRuntimeModuleActivator"

-			/*

-			 * "org.apache.tuscany.sca.contribution.java.impl.ClassReferenceModelResolver;model=org.apache.tuscany.sca.contribution.resolver.ClassReference",

-			 * "org.apache.tuscany.sca.contribution.resolver.impl.ResourceReferenceModelResolver;model=org.apache.tuscany.sca.contribution.resolver.ResourceReference",

-			 * "org.apache.tuscany.sca.assembly.xml.ComponentTypeModelResolver;model=org.apache.tuscany.sca.assembly.ComponentType",

-			 * "org.apache.tuscany.sca.assembly.xml.ConstrainingTypeModelResolver;model=org.apache.tuscany.sca.assembly.ConstrainingType",

-			 * "org.apache.tuscany.sca.assembly.xml.CompositeModelResolver;model=org.apache.tuscany.sca.assembly.Composite",

-			 * "org.apache.tuscany.sca.interfacedef.wsdl.xml.XSDModelResolver;model=org.apache.tuscany.sca.interfacedef.wsdl.XSDefinition",

-			 * "org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLModelResolver;model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition",

-			 * "org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleReferenceModelResolver;model=org.apache.tuscany.sca.contribution.osgi.BundleReference"

-			 */

-			}) {

-

-				Map<String, String> attributes = parseServiceDeclaration(reg);

-				String className = attributes.get("class");

-				ServiceDeclaration serviceClass = new ServiceDeclaration(

-						className, classLoader, attributes);

-				classSet.add(serviceClass);

-

-			}

-			

-		} else {

-			boolean debug = logger.isLoggable(Level.FINE);

-			if (debug) {

-				logger.fine("Discovering service providers using class loader "

-						+ classLoader);

-			}

-			// Allow privileged access to read META-INF/services/*. Add FilePermission to added to

-			// security policy file.

-			ArrayList<URL> urlList;

-			try {

-				urlList = AccessController

-						.doPrivileged(new PrivilegedExceptionAction<ArrayList<URL>>() {

-							public ArrayList<URL> run() throws IOException {

-								return Collections.list(classLoader

-										.getResources("META-INF/services/"

-												+ name));

-							}

-						});

-			} catch (PrivilegedActionException e) {

-				throw (IOException) e.getException();

-			}

-

-			for (final URL url : urlList) {

-				if (debug) {

-					logger.fine("Reading service provider file: "

-							+ url.toExternalForm());

-				}

-

-				// Allow privileged access to open URL stream. Add FilePermission to added to security

-				// policy file.

-				InputStream is;

-				try {

-					is = AccessController

-							.doPrivileged(new PrivilegedExceptionAction<InputStream>() {

-								public InputStream run() throws IOException {

-									return url.openStream();

-								}

-							});

-				} catch (PrivilegedActionException e) {

-					throw (IOException) e.getException();

-				}

-				BufferedReader reader = null;

-				try {

-					reader = new BufferedReader(new InputStreamReader(is));

-					while (true) {

-						String line = reader.readLine();

-						if (line == null)

-							break;

-						line = line.trim();

-						if (!line.startsWith("#") && !"".equals(line)) {

-							String reg = line.trim();

-							if (debug) {

-								logger.fine("Registering service provider: "

-										+ reg);

-							}

-

-							Map<String, String> attributes = parseServiceDeclaration(reg);

-							String className = attributes.get("class");

-							ServiceDeclaration serviceClass = new ServiceDeclaration(

-									className, classLoader, attributes);

-							classSet.add(serviceClass);

-

-							if (!findAllClasses)

-								break;

-						}

-					}

-				} finally {

-					if (reader != null)

-						reader.close();

-					if (is != null) {

-						try {

-							is.close();

-						} catch (IOException ioe) {

-						}

-					}

-				}

-				if (!findAllClasses && classSet.size() > 0)

-					break;

-			}

-

-		}

-	}

-

-}