From 027624234d3d6e72d8103edc854239c8478b2f47 Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 21 Oct 2009 23:29:42 +0000 Subject: Remove the dependency on NodeImpl and add the service registration git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@828250 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/modules/node-impl/META-INF/MANIFEST.MF | 2 +- .../tuscany/sca/deployment/impl/Contributions.java | 160 +++++++++++++++++++++ .../tuscany/sca/deployment/impl/DeployerImpl.java | 4 +- .../tuscany/sca/node/impl/Contributions.java | 160 --------------------- .../org.apache.tuscany.sca.deployment.Deployer | 17 +++ 5 files changed, 179 insertions(+), 164 deletions(-) create mode 100644 java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java delete mode 100644 java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Contributions.java create mode 100644 java/sca/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer (limited to 'java/sca/modules/node-impl') diff --git a/java/sca/modules/node-impl/META-INF/MANIFEST.MF b/java/sca/modules/node-impl/META-INF/MANIFEST.MF index 6e14e309ef..f352334527 100644 --- a/java/sca/modules/node-impl/META-INF/MANIFEST.MF +++ b/java/sca/modules/node-impl/META-INF/MANIFEST.MF @@ -11,8 +11,8 @@ Export-Package: org.apache.tuscany.sca.deployment;version="2.0.0"; uses:="org.apache.tuscany.sca.assembly, org.apache.tuscany.sca.definitions, org.apache.tuscany.sca.common.xml.stax, - org.apache.tuscany.sca.core, org.apache.tuscany.sca.contribution, + org.apache.tuscany.sca.core, org.apache.tuscany.sca.deployment, org.apache.tuscany.sca.monitor, javax.xml.stream, diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java new file mode 100644 index 0000000000..8180ac6465 --- /dev/null +++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java @@ -0,0 +1,160 @@ +/* + * 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.deployment.impl; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Extension; +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.Export; +import org.apache.tuscany.sca.contribution.Import; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; + +/** + * A Contribution impl wrapping multiple other contributions + * Currently the sole reason for this is so + */ +public class Contributions implements Contribution { + + private List contributions = new ArrayList(); + private String location; + private String uri; + private Object model; + private byte[] contents; + private boolean unresolved; + private ModelResolver modelResolver; + private List dependencies = new ArrayList(); + + public Contributions(List contributions) { + this.contributions = contributions; + } + + public String getLocation() { + return location; + } + + public Object getModel() { + return model; + } + + public String getURI() { + return uri; + } + + public void setLocation(String location) { + this.location = location; + } + + public void setModel(Object model) { + this.model = model; + } + + public byte[] getContents() { + return contents; + } + + public void setContents(byte[] contents) { + this.contents = contents; + } + + public void setURI(String uri) { + this.uri = uri; + } + + public boolean isUnresolved() { + return unresolved; + } + + public void setUnresolved(boolean unresolved) { + this.unresolved = unresolved; + } + + public List getContributions() { + return contributions; + } + + public List getArtifacts() { + return (List)(Object)contributions; + } + + public List getDependencies() { + return dependencies; + } + + public ClassLoader getClassLoader() { + //FIXME Remove later + return null; + } + + public void setClassLoader(ClassLoader classLoader) { + //FIXME Remove later + } + + public List getDeployables() { + List deployables = new ArrayList(); + for (Contribution contribution: contributions) { + deployables.addAll(contribution.getDeployables()); + } + return deployables; + } + + public List getExports() { + List exports = new ArrayList(); + for (Contribution contribution: contributions) { + exports.addAll(contribution.getExports()); + } + return exports; + } + + public List getImports() { + List imports = new ArrayList(); + for (Contribution contribution: contributions) { + imports.addAll(contribution.getImports()); + } + return imports; + } + + public ModelResolver getModelResolver() { + return modelResolver; + } + + public void setModelResolver(ModelResolver modelResolver) { + this.modelResolver = modelResolver; + } + + public List getAttributeExtensions() { + // TODO Auto-generated method stub + return null; + } + + public List getExtensions() { + // TODO Auto-generated method stub + return null; + } + + public Set getTypes() { + return Collections.emptySet(); + } +} diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java index 5449230bc9..f3462ad1da 100644 --- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java +++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java @@ -78,14 +78,12 @@ import org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint; import org.apache.tuscany.sca.deployment.Deployer; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; -import org.apache.tuscany.sca.node.impl.Contributions; -import org.apache.tuscany.sca.node.impl.NodeImpl; /** * */ public class DeployerImpl implements Deployer { - protected static final Logger logger = Logger.getLogger(NodeImpl.class.getName()); + protected static final Logger logger = Logger.getLogger(DeployerImpl.class.getName()); protected boolean inited; protected boolean schemaValidationEnabled; diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Contributions.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Contributions.java deleted file mode 100644 index 6aace875b5..0000000000 --- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Contributions.java +++ /dev/null @@ -1,160 +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.node.impl; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Extension; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.Export; -import org.apache.tuscany.sca.contribution.Import; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; - -/** - * A Contribution impl wrapping multiple other contributions - * Currently the sole reason for this is so - */ -public class Contributions implements Contribution { - - private List contributions = new ArrayList(); - private String location; - private String uri; - private Object model; - private byte[] contents; - private boolean unresolved; - private ModelResolver modelResolver; - private List dependencies = new ArrayList(); - - public Contributions(List contributions) { - this.contributions = contributions; - } - - public String getLocation() { - return location; - } - - public Object getModel() { - return model; - } - - public String getURI() { - return uri; - } - - public void setLocation(String location) { - this.location = location; - } - - public void setModel(Object model) { - this.model = model; - } - - public byte[] getContents() { - return contents; - } - - public void setContents(byte[] contents) { - this.contents = contents; - } - - public void setURI(String uri) { - this.uri = uri; - } - - public boolean isUnresolved() { - return unresolved; - } - - public void setUnresolved(boolean unresolved) { - this.unresolved = unresolved; - } - - public List getContributions() { - return contributions; - } - - public List getArtifacts() { - return (List)(Object)contributions; - } - - public List getDependencies() { - return dependencies; - } - - public ClassLoader getClassLoader() { - //FIXME Remove later - return null; - } - - public void setClassLoader(ClassLoader classLoader) { - //FIXME Remove later - } - - public List getDeployables() { - List deployables = new ArrayList(); - for (Contribution contribution: contributions) { - deployables.addAll(contribution.getDeployables()); - } - return deployables; - } - - public List getExports() { - List exports = new ArrayList(); - for (Contribution contribution: contributions) { - exports.addAll(contribution.getExports()); - } - return exports; - } - - public List getImports() { - List imports = new ArrayList(); - for (Contribution contribution: contributions) { - imports.addAll(contribution.getImports()); - } - return imports; - } - - public ModelResolver getModelResolver() { - return modelResolver; - } - - public void setModelResolver(ModelResolver modelResolver) { - this.modelResolver = modelResolver; - } - - public List getAttributeExtensions() { - // TODO Auto-generated method stub - return null; - } - - public List getExtensions() { - // TODO Auto-generated method stub - return null; - } - - public Set getTypes() { - return Collections.emptySet(); - } -} diff --git a/java/sca/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer b/java/sca/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer new file mode 100644 index 0000000000..9ba95bc94b --- /dev/null +++ b/java/sca/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer @@ -0,0 +1,17 @@ +# 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. +org.apache.tuscany.sca.deployment.impl.DeployerImpl -- cgit v1.2.3