Correct tag name

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1153404 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 0 insertions, 867 deletions

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
deleted file mode 100644
index 2aef3477ba..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
+++ /dev/null
@@ -1,71 +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.web;

-

-import java.util.Map;

-

-import org.apache.tuscany.sca.assembly.Implementation;

-import org.apache.tuscany.sca.contribution.jee.InjectionTarget;

-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;

-import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;

-

-

-

-/**

- * The model representing an Web implementation in an SCA assembly model.

- */

-public interface WebImplementation extends Implementation {

-    

-    /**

-     * Returns the webapp URI.

-     * @return the webapp URI

-     */

-    String getWebURI();

-    

-    /**

-     * Sets the Webapp URI.

-     * @param uri the webapp URI

-     */

-    void setWebURI(String webappURI);

-

-    /**

-     * Returns the injection points for SCA references

-     * 

-     * @return Map with injection points for SCA references

-     */

-    Map<String, JavaElementImpl> getReferenceInjectionPoints();

-    

-    /**

-     * Returns the injection points for SCA properties

-     * 

-     * @return Map with injection points for SCA properties

-     */

-    Map<String, JavaElementImpl> getPropertyInjectionPoints();

-

-    /**

-     * Returns the injection points for SCA resources like component context, component name, etc.

-     * 

-     * @return Map with injection points for SCA resources

-     */

-    Map<String, JavaResourceImpl> getResourceInjectionPoints();

-    

-    Map<InjectionTarget, Class<?>> getOptExtensionReferenceInjectionPoints();

-

-    Map<String, String> getOptExtensionPropertyInjectionPoints();

-}

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
deleted file mode 100644
index 0cb80de03e..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.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.web;

-

-

-/**

- * Factory for the Web implementation model.

- */

-public interface WebImplementationFactory {

-    

-    /**

-     * Creates a new Web implementation.

-     * @return a new Web implementation

-     */

-    WebImplementation createWebImplementation();

-

-}

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
deleted file mode 100644
index 744fefc39b..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
+++ /dev/null
@@ -1,37 +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.web.impl;

-

-import org.apache.tuscany.sca.implementation.web.WebImplementation;

-import org.apache.tuscany.sca.implementation.web.WebImplementationFactory;

-

-/**

- * Factory for the Web implementation model.

- */

-public class WebImplementationFactoryImpl implements WebImplementationFactory {

-    

-    public WebImplementationFactoryImpl() {

-    }

-

-    public WebImplementation createWebImplementation() {

-        return new WebImplementationImpl();

-    }

-

-}

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
deleted file mode 100644
index 7764d45693..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
+++ /dev/null
@@ -1,168 +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.web.impl;

-

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.apache.tuscany.sca.assembly.Component;

-import org.apache.tuscany.sca.assembly.ConstrainingType;

-import org.apache.tuscany.sca.assembly.Property;

-import org.apache.tuscany.sca.assembly.Reference;

-import org.apache.tuscany.sca.assembly.Service;

-import org.apache.tuscany.sca.assembly.builder.ComponentPreProcessor;

-import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;

-import org.apache.tuscany.sca.contribution.jee.InjectionTarget;

-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;

-import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;

-import org.apache.tuscany.sca.implementation.web.WebImplementation;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-

-

-/**

- * The model representing an Web implementation in an SCA assembly model.

- */

-class WebImplementationImpl extends ImplementationImpl implements WebImplementation, ComponentPreProcessor {

-

-    private String webURI;

-

-    private Map<String, JavaElementImpl> propertyInjectionPoints = new HashMap<String, JavaElementImpl>();

-

-    private Map<String, JavaElementImpl> referenceInjectionPoints = new HashMap<String, JavaElementImpl>();

-

-    private Map<String, JavaResourceImpl> resourceInjectionPoints = new HashMap<String, JavaResourceImpl>();

-    

-    private Map<InjectionTarget, Class<?>> optExtReferenceInjectionPoints = new HashMap<InjectionTarget, Class<?>>();

-    

-    private Map<String, String> optExtPropertyInjectionPoints = new HashMap<String, String>();

-    /**

-     * Constructs a new Web implementation.

-     */

-    WebImplementationImpl() {

-        super();

-    }

-

-    @Override

-    public ConstrainingType getConstrainingType() {

-        // The Web implementation does not support constrainingTypes

-        return null;

-    }

-

-    @Override

-    public List<Service> getServices() {

-        // The Web implementation does not offer services

-        return Collections.emptyList();

-    }

-    

-    @Override

-    public void setConstrainingType(ConstrainingType constrainingType) {

-        // The Web implementation does not support constrainingTypes

-    }

-

-    public String getWebURI() {

-        return webURI;

-    }

-

-    public void setWebURI(String webURI) {

-        this.webURI = webURI;

-    }

-

-    /**

-     * Use preProcess to add any references and properties dynamically

-     * TODO: also support introspection and handle WEB-INF/web.componentType (spec line 503) 

-     */

-    public void preProcess(Component component) {

-        if (!(component instanceof RuntimeComponent)) {

-            return;

-        }

-        RuntimeComponent rtc = (RuntimeComponent) component;

-        

-        for (Reference reference : rtc.getReferences()) {

-            if (getReference(reference.getName()) == null) {

-                getReferences().add(createReference(reference));

-            }

-        }

-

-        for (Property property : rtc.getProperties()) {

-            if (getProperty(property.getName()) == null) {

-                getProperties().add(createProperty(property));

-            }

-        }

-    }

-

-    protected Reference getReference(String name) {

-        for (Reference reference : getReferences()) {

-            if (reference.getName().equals(name)) {

-                return reference;

-            }

-        }

-        return null;

-    }

-

-    protected Reference createReference(Reference reference) {

-        Reference newReference;

-        try {

-            newReference = (Reference)reference.clone();

-        } catch (CloneNotSupportedException e) {

-            throw new AssertionError(e); // should not ever happen

-        }

-        return newReference;

-    }

-

-    protected Property getProperty(String name) {

-        for (Property property : getProperties()) {

-            if (property.getName().equals(name)) {

-                return property;

-            }

-        }

-        return null;

-    }

-

-    protected Property createProperty(Property property) {

-        Property newProperty;

-        try {

-            newProperty = (Property)property.clone();

-        } catch (CloneNotSupportedException e) {

-            throw new AssertionError(e); // should not ever happen

-        }

-        return newProperty;

-    }

-

-    public Map<String, JavaElementImpl> getPropertyInjectionPoints() {

-        return propertyInjectionPoints;

-    }

-

-    public Map<String, JavaElementImpl> getReferenceInjectionPoints() {

-        return referenceInjectionPoints;

-    }

-

-    public Map<String, JavaResourceImpl> getResourceInjectionPoints() {

-        return resourceInjectionPoints;

-    }

-

-    public Map<InjectionTarget, Class<?>> getOptExtensionReferenceInjectionPoints() {

-        return optExtReferenceInjectionPoints;

-    }

-

-    public Map<String, String> getOptExtensionPropertyInjectionPoints() {

-        return optExtPropertyInjectionPoints;

-    }

-}

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java
deleted file mode 100644
index 4bf53e8336..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java
+++ /dev/null
@@ -1,150 +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.web.introspect;
-
-import java.lang.annotation.ElementType;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicatePropertyException;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.IllegalPropertyException;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-
-/**
- * Class to handle annotations that add Properties.
- * 
- * @version $Rev$ $Date$
- */
-public class PropertyProcessor extends BaseJavaClassVisitor {
-    public PropertyProcessor(AssemblyFactory assemblyFactory) {
-        super(assemblyFactory);
-    }
-    
-    private boolean removeProperty(JavaElementImpl prop, JavaImplementation type) {
-        if(prop==null) {
-            return false;
-        }
-        List<Property> props = type.getProperties();
-        for(int i=0;i<props.size();i++) {
-            if(props.get(i).getName().equals(prop.getName())) {
-                props.remove(i);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        org.osoa.sca.annotations.Property annotation = method.getAnnotation(org.osoa.sca.annotations.Property.class);
-        if (annotation == null) {
-            return;
-        }
-
-        if (!JavaIntrospectionHelper.isSetter(method)) {
-            throw new IllegalPropertyException("Annotated method is not a setter: " + method, method);
-        }
-
-        String name = annotation.name();
-        if (name == null || "".equals(name)) {
-            name = method.getName();
-            if (name.startsWith("set")) {
-                name = JavaIntrospectionHelper.toPropertyName(method.getName());
-            }
-        }
-
-        Map<String, JavaElementImpl> properties = type.getPropertyMembers();
-        JavaElementImpl prop = properties.get(name);
-        // Setter override field
-        if (prop != null && prop.getElementType() != ElementType.FIELD) {
-            throw new DuplicatePropertyException(name);
-        }
-
-        removeProperty(prop, type);
-        
-        JavaElementImpl element = new JavaElementImpl(method, 0);
-        Property property = createProperty(name, element);
-
-        property.setMustSupply(annotation.required());
-        type.getProperties().add(property);
-        properties.put(name, element);
-    }
-
-    @Override
-    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-
-        org.osoa.sca.annotations.Property annotation = field.getAnnotation(org.osoa.sca.annotations.Property.class);
-        if (annotation == null) {
-            return;
-        }
-
-        String name = annotation.name();
-        if (name == null) {
-            name = "";
-        }
-        if ("".equals(name) || name.equals(field.getType().getName())) {
-            name = field.getName();
-        }
-
-        Map<String, JavaElementImpl> properties = type.getPropertyMembers();
-        JavaElementImpl prop = properties.get(name);
-        // Setter override field
-        if (prop != null && prop.getElementType() == ElementType.FIELD) {
-            throw new DuplicatePropertyException(name);
-        }
-
-        if (prop == null) {
-            JavaElementImpl element = new JavaElementImpl(field);
-            Property property = createProperty(name, element);
-            property.setMustSupply(annotation.required());
-            type.getProperties().add(property);
-            properties.put(name, element);
-        }
-    }
-
-    @Override
-    public void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type)
-        throws IntrospectionException {
-    }
-
-    protected Property createProperty(String name, JavaElementImpl element) throws IntrospectionException {
-
-        Property property = assemblyFactory.createProperty();
-        property.setName(name);
-        Class<?> baseType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
-        property.setXSDType(JavaXMLMapper.getXMLType(baseType));
-
-        Class<?> javaType = element.getType();
-        if (javaType.isArray() || Collection.class.isAssignableFrom(javaType)) {
-            property.setMany(true);
-        }
-        return property;
-    }
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java
deleted file mode 100644
index c68693f2e4..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java
+++ /dev/null
@@ -1,177 +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.web.introspect;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getBaseType;
-
-import java.lang.annotation.ElementType;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicateReferenceException;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.IllegalReferenceException;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * Class to handle annotations that add References.
- * 
- * @version $Rev$ $Date$
- */
-public class ReferenceProcessor extends BaseJavaClassVisitor {
-    private JavaInterfaceFactory javaFactory;
-
-    public ReferenceProcessor(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory) {
-        super(assemblyFactory);
-        this.javaFactory = javaFactory;
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        Reference annotation = method.getAnnotation(Reference.class);
-        if (annotation == null) {
-            return; // Not a reference annotation.
-        }
-        if (!JavaIntrospectionHelper.isSetter(method)) {
-            throw new IllegalReferenceException("Annotated method is not a setter: " + method, method);
-        }
-        String name = annotation.name();
-        if ("".equals(name)) {
-            name = JavaIntrospectionHelper.toPropertyName(method.getName());
-        }
-        JavaElementImpl ref = type.getReferenceMembers().get(name);
-        // Setter override field
-        if (ref != null && ref.getElementType() != ElementType.FIELD) {
-            throw new DuplicateReferenceException(name);
-        }
-        removeReference(ref, type);
-
-        JavaElementImpl element = new JavaElementImpl(method, 0);
-        org.apache.tuscany.sca.assembly.Reference reference = createReference(element, name);
-        type.getReferences().add(reference);
-        type.getReferenceMembers().put(name, element);
-    }
-
-    private boolean removeReference(JavaElementImpl ref, JavaImplementation type) {
-        if (ref == null) {
-            return false;
-        }
-        List<org.apache.tuscany.sca.assembly.Reference> refs = type.getReferences();
-        for (int i = 0; i < refs.size(); i++) {
-            if (refs.get(i).getName().equals(ref.getName())) {
-                refs.remove(i);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-        Reference annotation = field.getAnnotation(Reference.class);
-        if (annotation == null) {
-            return;
-        }
-        String name = annotation.name();
-        if ("".equals(name)) {
-            name = field.getName();
-        }
-        JavaElementImpl ref = type.getReferenceMembers().get(name);
-        if (ref != null && ref.getElementType() == ElementType.FIELD) {
-            throw new DuplicateReferenceException(name);
-        }
-
-        // Setter method override field
-        if (ref == null) {
-            JavaElementImpl element = new JavaElementImpl(field);
-            org.apache.tuscany.sca.assembly.Reference reference = createReference(element, name);
-            type.getReferences().add(reference);
-            type.getReferenceMembers().put(name, element);
-        }
-    }
-
-    @Override
-    public void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type)
-        throws IntrospectionException {
-    }
-
-    private org.apache.tuscany.sca.assembly.Reference createReference(JavaElementImpl element, String name)
-        throws IntrospectionException {
-        org.apache.tuscany.sca.assembly.Reference reference = assemblyFactory.createReference();
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        reference.setInterfaceContract(interfaceContract);
-
-        // reference.setMember((Member)element.getAnchor());
-        boolean required = true;
-        Reference ref = element.getAnnotation(Reference.class);
-        if (ref != null) {
-            required = ref.required();
-        }
-        // reference.setRequired(required);
-        reference.setName(name);
-        Class<?> rawType = element.getType();
-        if (rawType.isArray() || Collection.class.isAssignableFrom(rawType)) {
-            if (required) {
-                reference.setMultiplicity(Multiplicity.ONE_N);
-            } else {
-                reference.setMultiplicity(Multiplicity.ZERO_N);
-            }
-        } else {
-            if (required) {
-                reference.setMultiplicity(Multiplicity.ONE_ONE);
-            } else {
-                reference.setMultiplicity(Multiplicity.ZERO_ONE);
-            }
-        }
-        Type genericType = element.getGenericType();
-        Class<?> baseType = getBaseType(rawType, genericType);
-        if (CallableReference.class.isAssignableFrom(baseType)) {
-            if (Collection.class.isAssignableFrom(rawType)) {
-                genericType = JavaIntrospectionHelper.getParameterType(genericType);
-            }
-            baseType = JavaIntrospectionHelper.getBusinessInterface(baseType, genericType);
-        }
-        try {
-            JavaInterface callInterface = javaFactory.createJavaInterface(baseType);
-            reference.getInterfaceContract().setInterface(callInterface);
-            if (callInterface.getCallbackClass() != null) {
-                JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());
-                reference.getInterfaceContract().setCallbackInterface(callbackInterface);
-            }
-        } catch (InvalidInterfaceException e) {
-            throw new IntrospectionException(e);
-        }
-        return reference;
-    }
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
deleted file mode 100644
index 7c9af0fee5..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
+++ /dev/null
@@ -1,230 +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.web.xml;

-

-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;

-

-import java.net.URI;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-

-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.ComponentReference;

-import org.apache.tuscany.sca.assembly.ComponentType;

-import org.apache.tuscany.sca.assembly.Property;

-import org.apache.tuscany.sca.assembly.xml.Constants;

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo;

-import org.apache.tuscany.sca.contribution.jee.EnvEntryInfo;

-import org.apache.tuscany.sca.contribution.jee.JspReferenceTagInfo;

-import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;

-import org.apache.tuscany.sca.contribution.jee.JavaEEExtension;

-import org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension;

-import org.apache.tuscany.sca.contribution.jee.impl.WebModuleInfoImpl;

-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.service.ContributionReadException;

-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;

-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;

-import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;

-import org.apache.tuscany.sca.implementation.java.IntrospectionException;

-import org.apache.tuscany.sca.implementation.java.JavaImplementation;

-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;

-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;

-import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;

-import org.apache.tuscany.sca.implementation.java.introspect.impl.ComponentNameProcessor;

-import org.apache.tuscany.sca.implementation.java.introspect.impl.ContextProcessor;

-import org.apache.tuscany.sca.implementation.web.WebImplementation;

-import org.apache.tuscany.sca.implementation.web.WebImplementationFactory;

-import org.apache.tuscany.sca.implementation.web.introspect.PropertyProcessor;

-import org.apache.tuscany.sca.implementation.web.introspect.ReferenceProcessor;

-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;

-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;

-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;

-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;

-import org.apache.tuscany.sca.monitor.Monitor;

-

-

-/**

- * Implements a StAX artifact processor for Web implementations.

- */

-public class WebImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WebImplementation> {

-    private static final QName IMPLEMENTATION_WEB = new QName(Constants.SCA10_NS, "implementation.web");

-    

-    private AssemblyFactory assemblyFactory;

-    private WebImplementationFactory implementationFactory;

-    private Monitor monitor;

-    private JavaEEExtension jeeExtension;

-    private JavaEEOptionalExtension jeeOptionalExtension;

-    private JavaImplementationFactory javaImplementationFactory;

-    private JavaInterfaceFactory javaInterfaceFactory;

-    

-    public WebImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {

-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);

-        this.implementationFactory = modelFactories.getFactory(WebImplementationFactory.class);

-        this.jeeExtension = modelFactories.getFactory(JavaEEExtension.class);

-        this.jeeOptionalExtension = modelFactories.getFactory(JavaEEOptionalExtension.class);

-        this.monitor = monitor;

-        

-        this.javaImplementationFactory = new DefaultJavaImplementationFactory();

-        this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class);

-        javaImplementationFactory.addClassVisitor(new ReferenceProcessor(assemblyFactory, javaInterfaceFactory));

-        javaImplementationFactory.addClassVisitor(new PropertyProcessor(assemblyFactory));

-        javaImplementationFactory.addClassVisitor(new ComponentNameProcessor(assemblyFactory));

-        javaImplementationFactory.addClassVisitor(new ContextProcessor(assemblyFactory));

-    }

-

-    public QName getArtifactType() {

-        // Returns the QName of the XML element processed by this processor

-        return IMPLEMENTATION_WEB;

-    }

-

-    public Class<WebImplementation> getModelType() {

-        // Returns the type of model processed by this processor

-        return WebImplementation.class;

-    }

-

-    public WebImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

-        

-        // Read an <implementation.web> element

-        WebImplementation implementation = implementationFactory.createWebImplementation();

-        implementation.setUnresolved(true);

-

-        // Read the webapp uri attribute

-        String webURI = getString(reader, "web-uri");

-        if (webURI != null) {

-            implementation.setWebURI(webURI);

-

-            // Set the URI of the component type

-            // TODO: This should point to the base uri of the WAR file

-            implementation.setURI(webURI);

-        }

-

-        // Skip to end element

-        while (reader.hasNext()) {

-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_WEB.equals(reader.getName())) {

-                break;

-            }

-        }

-        

-        return implementation;

-    }

-

-    public void resolve(WebImplementation implementation, ModelResolver resolver) throws ContributionResolveException {

-        

-        // Resolve the component type

-        String uri = implementation.getURI();

-        if (uri != null) {

-            WebModuleInfo webModuleInfo = new WebModuleInfoImpl();

-            webModuleInfo.setUri(URI.create(uri));

-            webModuleInfo = resolver.resolveModel(WebModuleInfo.class, webModuleInfo);

-            if(jeeOptionalExtension != null) {

-                ComponentType ct = jeeOptionalExtension.createImplementationWebComponentType(webModuleInfo);

-                implementation.getReferences().addAll(ct.getReferences());

-                implementation.getProperties().addAll(ct.getProperties());

-                List<String> propertyNames = new ArrayList<String>();

-                for(Property prop : ct.getProperties()) {

-                    propertyNames.add(prop.getName());

-                }

-                // Injection points from optional extension

-                for(Map.Entry<String, EjbReferenceInfo> entry : webModuleInfo.getEjbReferences().entrySet()) {

-                    EjbReferenceInfo ejbRef = entry.getValue();

-                    implementation.getOptExtensionReferenceInjectionPoints().put(ejbRef.injectionTarget, ejbRef.businessInterface);

-                }

-                for(Map.Entry<String, EnvEntryInfo> entry : webModuleInfo.getEnvEntries().entrySet()) {

-                    EnvEntryInfo envEntry = entry.getValue();

-                    if(propertyNames.contains(envEntry.name.replace("/", "_"))) {

-                        implementation.getOptExtensionPropertyInjectionPoints().put(envEntry.name, envEntry.type);

-                    }

-                }

-            }

-            

-            // Introspection of classes

-            List<Class<?>> webArtifacts = new ArrayList<Class<?>>();

-            webArtifacts.addAll(webModuleInfo.getServletClasses());

-            webArtifacts.addAll(webModuleInfo.getFilterClasses());

-            webArtifacts.addAll(webModuleInfo.getListenerClasses());

-            webArtifacts.addAll(webModuleInfo.getJSFClasses());

-            JavaImplementation ji = javaImplementationFactory.createJavaImplementation();

-            for(Class<?> clazz : webArtifacts) {

-                try {

-                    javaImplementationFactory.createJavaImplementation(ji, clazz);

-                } catch (IntrospectionException e) {

-                    // TODO Auto-generated catch block

-                    e.printStackTrace();

-                }

-            }

-            implementation.getReferences().addAll(ji.getReferences());

-            implementation.getProperties().addAll(ji.getProperties());

-            for(Map.Entry<String, JavaElementImpl> entry : ji.getReferenceMembers().entrySet()) { 

-                implementation.getReferenceInjectionPoints().put(entry.getKey(), entry.getValue());

-            }

-            for(Map.Entry<String, JavaElementImpl> entry : ji.getPropertyMembers().entrySet()) { 

-                implementation.getPropertyInjectionPoints().put(entry.getKey(), entry.getValue());

-            }

-            for(Map.Entry<String, JavaResourceImpl> entry : ji.getResources().entrySet()) { 

-                implementation.getResourceInjectionPoints().put(entry.getKey(), entry.getValue());

-            }

-

-            // SCA References in JSP Tags

-            for(JspReferenceTagInfo jspRefTag : webModuleInfo.getJspReferenceTags()) {

-                ComponentReference ref = assemblyFactory.createComponentReference();

-                ref.setName(jspRefTag.name);

-                JavaInterfaceContract intfContract = javaInterfaceFactory.createJavaInterfaceContract();

-                try {

-                    intfContract.setInterface(javaInterfaceFactory.createJavaInterface(jspRefTag.type));

-                } catch (InvalidInterfaceException e) {

-                    // TODO Auto-generated catch block

-                    e.printStackTrace();

-                }

-                ref.setInterfaceContract(intfContract);

-                implementation.getReferences().add(ref);

-            }

-            

-            // Process componentType side file

-            ComponentType componentType = assemblyFactory.createComponentType();

-            componentType.setURI("WEB-INF/web.componentType");

-            componentType = resolver.resolveModel(ComponentType.class, componentType);

-            if (!componentType.isUnresolved()) {

-                

-                // Initialize the implementation's services, references and properties

-                implementation.getServices().addAll(componentType.getServices());

-                implementation.getReferences().addAll(componentType.getReferences());

-                implementation.getProperties().addAll(componentType.getProperties());

-            }

-        }

-        implementation.setUnresolved(false);

-    }

-

-    public void write(WebImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {

-        

-        // Write <implementation.web>

-        writeStart(writer, IMPLEMENTATION_WEB.getNamespaceURI(), IMPLEMENTATION_WEB.getLocalPart(),

-                   new XAttr("web-uri", implementation.getWebURI()));

-        

-        writeEnd(writer);

-    }

-}