From 725006d4c47e63986ac042ade23a4d193298b1fe Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:08:29 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835131 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/workspace/DefaultWorkspaceFactory.java | 32 ----- .../apache/tuscany/sca/workspace/Workspace.java | 39 ------ .../tuscany/sca/workspace/WorkspaceFactory.java | 36 ------ .../builder/ContributionDependencyBuilder.java | 42 ------ .../sca/workspace/impl/WorkspaceFactoryImpl.java | 40 ------ .../tuscany/sca/workspace/impl/WorkspaceImpl.java | 142 --------------------- ...g.apache.tuscany.sca.workspace.WorkspaceFactory | 18 --- 7 files changed, 349 deletions(-) delete mode 100644 branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java delete mode 100644 branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java delete mode 100644 branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java delete mode 100644 branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java delete mode 100644 branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java delete mode 100644 branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java delete mode 100644 branches/sca-java-1.4/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory (limited to 'branches/sca-java-1.4/modules/workspace/src') diff --git a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java deleted file mode 100644 index e895669d23..0000000000 --- a/branches/sca-java-1.4/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/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java deleted file mode 100644 index 66f38afec7..0000000000 --- a/branches/sca-java-1.4/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/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java deleted file mode 100644 index 2656068bea..0000000000 --- a/branches/sca-java-1.4/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/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java b/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java deleted file mode 100644 index 6fab700243..0000000000 --- a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java +++ /dev/null @@ -1,42 +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.util.List; - -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.workspace.Workspace; - -/** - * A contribution dependency builder. - * - * @version $Rev$ $Date$ - */ -public interface ContributionDependencyBuilder { - - /** - * Build the set of contributions that a contribution depends on. - * @param workspace - * @param contribution - * @return - */ - List buildContributionDependencies(Contribution contribution, Workspace workspace); - -} diff --git a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java deleted file mode 100644 index e41cc3ea83..0000000000 --- a/branches/sca-java-1.4/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/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java deleted file mode 100644 index e60a5d8108..0000000000 --- a/branches/sca-java-1.4/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java +++ /dev/null @@ -1,142 +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; - - /** - * 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 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; - } -} diff --git a/branches/sca-java-1.4/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory b/branches/sca-java-1.4/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory deleted file mode 100644 index d390d29d90..0000000000 --- a/branches/sca-java-1.4/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory +++ /dev/null @@ -1,18 +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. - -org.apache.tuscany.sca.workspace.DefaultWorkspaceFactory \ No newline at end of file -- cgit v1.2.3