From cdc5060abcdf963ad1e1de02e7275f41dbca9707 Mon Sep 17 00:00:00 2001 From: antelder Date: Mon, 23 Mar 2009 08:00:46 +0000 Subject: Delete old m2 branch in the sandbox git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@757344 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/workspace/DefaultWorkspaceFactory.java | 32 ----- .../apache/tuscany/sca/workspace/Workspace.java | 39 ------ .../tuscany/sca/workspace/WorkspaceFactory.java | 36 ----- .../sca/workspace/builder/ContributionBuilder.java | 49 ------- .../builder/ContributionBuilderException.java | 45 ------- .../builder/ContributionBuilderExtensionPoint.java | 51 ------- .../DefaultContributionBuilderExtensionPoint.java | 138 ------------------- .../sca/workspace/impl/WorkspaceFactoryImpl.java | 40 ------ .../tuscany/sca/workspace/impl/WorkspaceImpl.java | 147 --------------------- 9 files changed, 577 deletions(-) delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java (limited to 'sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache') diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java deleted file mode 100644 index e895669d23..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java +++ /dev/null @@ -1,32 +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.workspace; - -import org.apache.tuscany.sca.workspace.impl.WorkspaceFactoryImpl; - - -/** - * Default implementation of a contribution workspace model factory. - * - * @version $Rev$ $Date$ - */ -public class DefaultWorkspaceFactory extends WorkspaceFactoryImpl { - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java deleted file mode 100644 index 66f38afec7..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java +++ /dev/null @@ -1,39 +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.workspace; - -import java.util.List; - -import org.apache.tuscany.sca.contribution.Contribution; - -/** - * A workspace containing contributions. - * - * @version $Rev$ $Date$ - */ -public interface Workspace extends Contribution { - - /** - * Returns the list of contributions in the workspace. - * @return the list of contributions - */ - List getContributions(); - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java deleted file mode 100644 index 2656068bea..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java +++ /dev/null @@ -1,36 +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.workspace; - - - -/** - * A factory for the contribution workspace model. - * - * @version $Rev$ $Date$ - */ -public interface WorkspaceFactory { - - /** - * Create a new contribution workspace model object. - * @return - */ - Workspace createWorkspace(); -} \ No newline at end of file diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java b/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java deleted file mode 100644 index b7c11f769b..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java +++ /dev/null @@ -1,49 +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.workspace.builder; - -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.workspace.Workspace; - -/** - * A contribution builder. - * - * @version $Rev$ $Date$ - */ -public interface ContributionBuilder { - - /** - * Returns the ID of the builder. - * - * @return - */ - String getID(); - - /** - * Build a contribution. - * - * @param contribution - * @param workspace - * @param monitor - */ - void build(Contribution contribution, Workspace workspace, Monitor monitor) throws ContributionBuilderException; - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java b/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java deleted file mode 100644 index 10c18def10..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java +++ /dev/null @@ -1,45 +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.workspace.builder; - -/** - * Reports a contribution builder exception. - * - * @version $Rev$ $Date$ - */ -public class ContributionBuilderException extends Exception { - private static final long serialVersionUID = -1198817287971778953L; - - public ContributionBuilderException() { - } - - public ContributionBuilderException(String message) { - super(message); - } - - public ContributionBuilderException(Throwable cause) { - super(cause); - } - - public ContributionBuilderException(String message, Throwable cause) { - super(message, cause); - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java b/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java deleted file mode 100644 index 8200321eec..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java +++ /dev/null @@ -1,51 +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.workspace.builder; - -/** - * An extension point for Contribution builders. - * - * @version $Rev: $ $Date: $ - */ -public interface ContributionBuilderExtensionPoint { - - /** - * Adds a contribution builder. - * - * @param contributionBuilder - */ - void addContributionBuilder(ContributionBuilder contributionBuilder); - - /** - * Removes a contribution builder. - * - * @param contributionBuilder - */ - void removeContributionBuilder(ContributionBuilder contributionBuilder); - - /** - * Returns the contribution builder with the given id. - * - * @param id - * @return - */ - ContributionBuilder getContributionBuilder(String id); - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java b/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java deleted file mode 100644 index 8ce6f53f20..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java +++ /dev/null @@ -1,138 +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.workspace.builder; - -import java.lang.reflect.Constructor; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.extensibility.ServiceDeclaration; -import org.apache.tuscany.sca.extensibility.ServiceDiscovery; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.workspace.Workspace; - -/** - * Default implementation of a provider factory extension point. - * - * @version $Rev$ $Date$ - */ -public class DefaultContributionBuilderExtensionPoint implements ContributionBuilderExtensionPoint { - - private ExtensionPointRegistry registry; - private final Map builders = new HashMap(); - private boolean loaded; - - public DefaultContributionBuilderExtensionPoint(ExtensionPointRegistry registry) { - this.registry = registry; - } - - public void addContributionBuilder(ContributionBuilder builder) { - builders.put(builder.getID(), builder); - } - - public void removeContributionBuilder(ContributionBuilder builder) { - builders.remove(builder.getID()); - } - - public ContributionBuilder getContributionBuilder(String id) { - loadBuilders(); - return builders.get(id); - } - - /** - * Load builders declared under META-INF/services. - */ - private synchronized void loadBuilders() { - if (loaded) - return; - - FactoryExtensionPoint factories = registry.getExtensionPoint(FactoryExtensionPoint.class); - - // Get the provider factory service declarations - Set builderDeclarations; - ServiceDiscovery serviceDiscovery = ServiceDiscovery.getInstance(); - try { - builderDeclarations = serviceDiscovery.getServiceDeclarations(ContributionBuilder.class.getName()); - } catch (Exception e) { - throw new IllegalStateException(e); - } - - for (ServiceDeclaration builderDeclaration : builderDeclarations) { - Map attributes = builderDeclaration.getAttributes(); - String id = attributes.get("id"); - - ContributionBuilder builder = new LazyContributionBuilder(id, builderDeclaration, this, factories); - builders.put(id, builder); - } - } - - /** - * A wrapper around a contribution builder allowing lazy - * loading and initialization of implementation providers. - */ - private static class LazyContributionBuilder implements ContributionBuilder { - - private FactoryExtensionPoint factories; - private String id; - private ServiceDeclaration builderDeclaration; - private ContributionBuilder builder; - private ContributionBuilderExtensionPoint builders; - - private LazyContributionBuilder(String id, ServiceDeclaration factoryDeclaration, - ContributionBuilderExtensionPoint builders, FactoryExtensionPoint factories) { - this.id = id; - this.builderDeclaration = factoryDeclaration; - this.builders = builders; - this.factories = factories; - } - - public String getID() { - return id; - } - - public void build(Contribution contribution, Workspace workspace, Monitor monitor) throws ContributionBuilderException { - getBuilder().build(contribution, workspace, monitor); - } - - private ContributionBuilder getBuilder() { - if (builder == null) { - try { - Class builderClass = (Class)builderDeclaration.loadClass(); - try { - Constructor constructor = builderClass.getConstructor(FactoryExtensionPoint.class); - builder = constructor.newInstance(factories); - } catch (NoSuchMethodException e) { - Constructor constructor = builderClass.getConstructor(ContributionBuilderExtensionPoint.class, FactoryExtensionPoint.class); - builder = constructor.newInstance(builders, factories); - } - } catch (Exception e) { - throw new IllegalStateException(e); - } - } - return builder; - } - - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java deleted file mode 100644 index e41cc3ea83..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java +++ /dev/null @@ -1,40 +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.workspace.impl; - -import org.apache.tuscany.sca.workspace.Workspace; -import org.apache.tuscany.sca.workspace.WorkspaceFactory; - - -/** - * Default implementation of a contribution workspace model factory. - * - * @version $Rev$ $Date$ - */ -public class WorkspaceFactoryImpl implements WorkspaceFactory { - - protected WorkspaceFactoryImpl() { - } - - public Workspace createWorkspace() { - return new WorkspaceImpl(); - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java deleted file mode 100644 index 8c2e119493..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java +++ /dev/null @@ -1,147 +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.workspace.impl; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.tuscany.sca.assembly.Composite; -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; -import org.apache.tuscany.sca.workspace.Workspace; - -/** - * WorkspaceImpl - * - * @version $Rev$ $Date$ - */ -class WorkspaceImpl implements Workspace { - - 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(); - - /** - * Constructs a new workspace. - */ - WorkspaceImpl() { - } - - 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; - } -} -- cgit v1.2.3