diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-09 22:51:48 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-09 22:51:48 +0000 |
commit | 212e0b44dac194a5fa9a37c386985fa43bbf016b (patch) | |
tree | 960a4a5b4df1176baf7740b6cb256bc90c1a3603 /branches/sca-java-1.3/modules/node2-api/src/main/java/org | |
parent | e7bad91576a64b9116cd04504df80639333b5be5 (diff) |
Merge fix for TUSCANY-2409 from trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@675373 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.3/modules/node2-api/src/main/java/org')
2 files changed, 78 insertions, 31 deletions
diff --git a/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java b/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java new file mode 100644 index 0000000000..de7f352122 --- /dev/null +++ b/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java @@ -0,0 +1,54 @@ +/* + * 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.node; + +/** + * Represents an SCA contribution uri + location. + */ +public final class SCAContribution { + private String uri; + private String location; + + /** + * Constructs a new SCA contribution. + * + * @param uri The URI that uniquely identifies the contribution in the SCA domain + * @param location The URL of the contribution archive + */ + public SCAContribution(String uri, String location) { + this.uri = uri; + this.location = location; + } + + /** + * Get the URI of the contribution + * @return The URI that uniquely identifies the contribution in the SCA domain + */ + public String getURI() { + return uri; + } + + /** + * The location of the contribution + * @return The URL of the contribution archive + */ + public String getLocation() { + return location; + } +}
\ No newline at end of file diff --git a/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java b/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java index 77d37fd921..35ffbc4024 100644 --- a/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java +++ b/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java @@ -66,18 +66,38 @@ public abstract class SCANode2Factory { } /** - * Creates a new SCA node. + * Create a SCA node based on the discovery of the contribution on the classpath for the + * given classloader. This method should be treated a convinient shortcut with the following + * assumptions: + * <ul> + * <li>This is a standalone application and there is a deployable composite file on the classpath. + * <li>There is only one contribution which contains the deployable composite file physically in its packaging hierarchy. + * </ul> + * @param compositeURI The URI of the composite file relative to the root of the enclosing contribution + * @param classLoader The ClassLoader used to load the composite file as a resource. If the value is null, + * then thread context classloader will be used + * @return A newly created SCA node + */ + public abstract SCANode2 createSCANodeFromClassLoader(String compositeURI, ClassLoader classLoader); + + /** + * Creates a new SCA node from the configuration URL * - * @param configurationURI the URI of the node configuration + * @param configurationURL the URL of the node configuration which is the ATOM feed + * that contains the URI of the composite and a collection of URLs for the contributions + * * @return a new SCA node. */ - public abstract SCANode2 createSCANode(String configurationURI); + public abstract SCANode2 createSCANodeFromURL(String configurationURL); /** * Creates a new SCA node. * * @param compositeURI the URI of the composite to use - * @param contributions the URI of the contributions that provides the composites and related artifacts + * @param contributions the URI of the contributions that provides the composites and related + * artifacts. If the list is empty, then we will use the thread context classloader to discover + * the contribution on the classpath + * * @return a new SCA node. */ public abstract SCANode2 createSCANode(String compositeURI, SCAContribution... contributions); @@ -91,32 +111,5 @@ public abstract class SCANode2Factory { * @return a new SCA node. */ public abstract SCANode2 createSCANode(String compositeURI, String compositeContent, SCAContribution... contributions); - - /** - * Represents an SCA contribution uri + location. - */ - public static final class SCAContribution { - private String uri; - private String location; - - /** - * Constructs a new SCA contribution. - * - * @param uri - * @param location - */ - public SCAContribution(String uri, String location) { - this.uri = uri; - this.location = location; - } - - public String getURI() { - return uri; - } - - public String getLocation() { - return location; - } - } } |