From 08adcf2e783e4733e0fd646d353db3592c62140d Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 16 Feb 2012 15:43:08 +0000 Subject: Delete old RC tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1245046 13f79535-47bb-0310-9956-ffa450edef68 --- .../script/ScriptImplementation.java | 46 ------ .../script/ScriptImplementationFactory.java | 27 ---- .../impl/ScriptImplementationFactoryImpl.java | 34 ----- .../script/impl/ScriptImplementationImpl.java | 102 ------------- .../script/xml/ScriptImplementationProcessor.java | 167 --------------------- ...ca.contribution.processor.StAXArtifactProcessor | 19 --- ...plementation.script.ScriptImplementationFactory | 17 --- 7 files changed, 412 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java delete mode 100644 sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java delete mode 100644 sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java delete mode 100644 sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor delete mode 100644 sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory (limited to 'sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main') diff --git a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java deleted file mode 100644 index d34dde61eb..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java +++ /dev/null @@ -1,46 +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.implementation.script; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.Base; -import org.apache.tuscany.sca.assembly.Implementation; - -/** - * Represents a Script implementation. - * - * @version $Rev$ $Date$ - */ -public interface ScriptImplementation extends Implementation { - QName TYPE = new QName(Base.SCA11_TUSCANY_NS, "implementation.script"); - - String getScript(); - - void setScript(String script); - - String getLocation(); - - void setLocation(String location); - - void setLanguage(String language); - - String getLanguage(); - -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java b/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java deleted file mode 100644 index c7a4c7fa2d..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java +++ /dev/null @@ -1,27 +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.implementation.script; - -/** - * - */ -public interface ScriptImplementationFactory { - ScriptImplementation createScriptImplementation(); -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java deleted file mode 100644 index d85d8924ba..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java +++ /dev/null @@ -1,34 +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.implementation.script.impl; - -import org.apache.tuscany.sca.implementation.script.ScriptImplementation; -import org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory; - -/** - * - */ -public class ScriptImplementationFactoryImpl implements ScriptImplementationFactory { - - public ScriptImplementation createScriptImplementation() { - return new ScriptImplementationImpl(); - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java b/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java deleted file mode 100644 index a610e77147..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java +++ /dev/null @@ -1,102 +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.implementation.script.impl; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.Base; -import org.apache.tuscany.sca.assembly.impl.ImplementationImpl; -import org.apache.tuscany.sca.implementation.script.ScriptImplementation; - -/** - * Represents a Script implementation. - * - * @version $Rev$ $Date$ - */ -public class ScriptImplementationImpl extends ImplementationImpl implements ScriptImplementation { - public static final QName TYPE = new QName(Base.SCA11_TUSCANY_NS, "implementation.script"); - - private String script; // Relative URI to the script - private String language; // Scripting lang - private String location; // Resolved location of the script - - public ScriptImplementationImpl() { - super(TYPE); - } - - public String getScript() { - return script; - } - - public void setScript(String script) { - this.script = script; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public void setLanguage(String language) { - this.language = language; - } - - public String getLanguage() { - return language; - } - - @Override - public String toString() { - return "Script : " + getScript(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = super.hashCode(); - result = prime * result + ((language == null) ? 0 : language.hashCode()); - result = prime * result + ((script == null) ? 0 : script.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (getClass() != obj.getClass()) - return false; - ScriptImplementationImpl other = (ScriptImplementationImpl)obj; - if (language == null) { - if (other.language != null) - return false; - } else if (!language.equals(other.language)) - return false; - if (script == null) { - if (other.script != null) - return false; - } else if (!script.equals(other.script)) - return false; - return true; - } -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java b/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java deleted file mode 100644 index a3f302d4fc..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java +++ /dev/null @@ -1,167 +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.implementation.script.xml; - -import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.ComponentType; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.ContributionFactory; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.implementation.script.ScriptImplementation; -import org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.Problem.Severity; - -/** - * ScriptImplementationProcessor - * - * @version $Rev$ $Date$ - */ -public class ScriptImplementationProcessor implements StAXArtifactProcessor { - private static final QName IMPLEMENTATION_SCRIPT = ScriptImplementation.TYPE; - - private AssemblyFactory assemblyFactory; - private ContributionFactory contributionFactory; - private ScriptImplementationFactory scriptImplementationFactory; - - public ScriptImplementationProcessor(ExtensionPointRegistry registry) { - FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class); - assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); - contributionFactory = modelFactories.getFactory(ContributionFactory.class); - scriptImplementationFactory = modelFactories.getFactory(ScriptImplementationFactory.class); - } - - public QName getArtifactType() { - return IMPLEMENTATION_SCRIPT; - } - - public Class getModelType() { - return ScriptImplementation.class; - } - - public ScriptImplementation read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException { - - // Read an element - - // Create and initialize the script implementation model - ScriptImplementation implementation = scriptImplementationFactory.createScriptImplementation(); - implementation.setUnresolved(true); - - // Read the script attribute - String script = reader.getAttributeValue(null, "script"); - if (script != null) { - implementation.setScript(script); - } - - // Read the language attribute - String language = reader.getAttributeValue(null, "language"); - if (language != null) { - implementation.setLanguage(language); - } - - // Skip to end element - while (reader.hasNext()) { - if (reader.next() == END_ELEMENT && IMPLEMENTATION_SCRIPT.equals(reader.getName())) { - break; - } - } - - return implementation; - } - - public void resolve(ScriptImplementation implementation, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { - - // Resolve the script location - if (implementation.getScript() != null) { - Artifact artifact = contributionFactory.createArtifact(); - artifact.setURI(implementation.getScript()); - Artifact resolved = resolver.resolveModel(Artifact.class, artifact, context); - if (resolved.getLocation() != null) { - implementation.setLocation(resolved.getLocation()); - } else { - error(context.getMonitor(), "CouldNotResolveScript", resolver, implementation.getScript()); - } - - // Resolve the componentType and add the declared properties, references - // and services to the implementation - String componentTypeURI = implementation.getScript(); - componentTypeURI = componentTypeURI.substring(0, componentTypeURI.lastIndexOf('.')); - componentTypeURI += ".componentType"; - ComponentType componentType = assemblyFactory.createComponentType(); - componentType.setUnresolved(true); - componentType.setURI(componentTypeURI); - componentType = resolver.resolveModel(ComponentType.class, componentType, context); - if (!componentType.isUnresolved()) { - implementation.getProperties().addAll(componentType.getProperties()); - implementation.getReferences().addAll(componentType.getReferences()); - implementation.getServices().addAll(componentType.getServices()); - } - } - - implementation.setUnresolved(false); - } - - public void write(ScriptImplementation implementation, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException { - - // Write - writer.setPrefix("script", IMPLEMENTATION_SCRIPT.getNamespaceURI()); - writer.writeStartElement(IMPLEMENTATION_SCRIPT.getNamespaceURI(), IMPLEMENTATION_SCRIPT.getLocalPart()); - writer.writeNamespace("script", IMPLEMENTATION_SCRIPT.getNamespaceURI()); - - if (implementation.getScript() != null) { - writer.writeAttribute("script", implementation.getScript()); - } - if (implementation.getLanguage() != null) { - writer.writeAttribute("language", implementation.getLanguage()); - } - - writer.writeEndElement(); - } - - /** - * Report a error. - * - * @param problems - * @param message - * @param model - */ - private void error(Monitor monitor, String message, Object model, Object... messageParameters) { - if (monitor != null) { - Problem problem = monitor.createProblem(this.getClass().getName(), "impl-script-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); - monitor.problem(problem); - } - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor deleted file mode 100644 index c3db94d4a8..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ /dev/null @@ -1,19 +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. - -# Implementation class for the artifact processor extension -org.apache.tuscany.sca.implementation.script.xml.ScriptImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#implementation.script,model=org.apache.tuscany.sca.implementation.script.ScriptImplementation \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory b/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory deleted file mode 100644 index 5da5a817aa..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory +++ /dev/null @@ -1,17 +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.implementation.script.impl.ScriptImplementationFactoryImpl \ No newline at end of file -- cgit v1.2.3