Move module to contrib as its not in the build or being actively worked on

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

13 files changed, 0 insertions, 852 deletions

diff --git a/sca-java-2.x/trunk/modules/webbeans/LICENSE b/sca-java-2.x/trunk/modules/webbeans/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/sca-java-2.x/trunk/modules/webbeans/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/webbeans/META-INF/MANIFEST.MF
deleted file mode 100644
index 97f6ffb8e2..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.web;uses:="org.apache.t

- uscany.sca.assembly";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.implementation.web.impl;version="2.0.0"

-SCA-Version: 1.1

-Bundle-Name: Apache Tuscany SCA Web Implementation Web Model

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Implementation Web Model

-Import-Package: javax.xml.stream;resolution:=optional,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.builder;version="2.0.0",

- org.apache.tuscany.sca.assembly.impl;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.implementation.web;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.apache.tuscany.sca.xsd;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.web

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/trunk/modules/webbeans/NOTICE b/sca-java-2.x/trunk/modules/webbeans/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2008 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/sca-java-2.x/trunk/modules/webbeans/pom.xml b/sca-java-2.x/trunk/modules/webbeans/pom.xml
deleted file mode 100644
index da276322ca..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * 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.

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-webbeans</artifactId>

-    <name>Apache Tuscany SCA Web Beans Integration</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca.shades</groupId>

-            <artifactId>tuscany-base</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.openwebbeans</groupId>

-            <artifactId>openwebbeans-impl</artifactId>

-		<version>1.0.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-</project>

diff --git a/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/JSR330Implementation.java b/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/JSR330Implementation.java
deleted file mode 100644
index 76106faaeb..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/JSR330Implementation.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.webbeans;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import javax.xml.namespace.QName;

-

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

-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.impl.ImplementationImpl;

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

-

-

-/**

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

- */

-class JSR330Implementation extends ImplementationImpl {

-

-    public static final QName TYPE = new QName(SCA11_TUSCANY_NS, "implementation.jsr330");

-

-    private List<Property> properties = new ArrayList<Property>();

-    private List<Reference> references = new ArrayList<Reference>();

-    private String uri;

-    private boolean unresolved;

-    private String location;

-

-    /**

-     * Constructs a new Web implementation.

-     */

-    JSR330Implementation() {

-        super(TYPE);

-    }

-

-    public List<Property> getProperties() {

-        return properties;

-    }

-

-    public List<Service> getServices() {

-        // The Web implementation does not offer services

-        return Collections.emptyList();

-    }

-

-    public List<Reference> getReferences() {

-        return references;

-    }

-

-    public String getURI() {

-        return uri;

-    }

-

-    public void setURI(String uri) {

-        this.uri = uri;

-    }

-

-    public boolean isUnresolved() {

-        return unresolved;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-        this.unresolved = unresolved;

-    }

-

-    public String getLocation() {

-        return location;

-    }

-

-    public void setLocation(String location) {

-        this.location = location;

-    }

-

-    /**

-     * Use preProcess to add any references and properties dynamically

-     * TODO: support introspection

-     */

-    public void build(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 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 createProperty(Property property) {

-        Property newProperty;

-        try {

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

-        } catch (CloneNotSupportedException e) {

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

-        }

-        return newProperty;

-    }

-

-}

diff --git a/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/JSR330ImplementationBuilder.java b/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/JSR330ImplementationBuilder.java
deleted file mode 100644
index e1c2406e54..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/JSR330ImplementationBuilder.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.webbeans;

-

-import javax.xml.namespace.QName;

-

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

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

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

-

-/**

- * 

- */

-public class JSR330ImplementationBuilder implements ImplementationBuilder<JSR330Implementation> {

-

-    public void build(Component component, JSR330Implementation implmentation, BuilderContext context) {

-        ((JSR330Implementation)implmentation).build(component);

-

-    }

-

-    public QName getImplementationType() {

-        return JSR330Implementation.TYPE;

-    }

-

-}

diff --git a/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/JSR330ImplementationProcessor.java b/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/JSR330ImplementationProcessor.java
deleted file mode 100644
index d1cff0c6f2..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/JSR330ImplementationProcessor.java
+++ /dev/null
@@ -1,119 +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.webbeans;

-

-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.processor.BaseStAXArtifactProcessor;

-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.monitor.Monitor;

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

-import org.apache.tuscany.sca.monitor.Problem.Severity;

-

-/**

- * Implements a StAX artifact processor for Web implementations.

- */

-public class JSR330ImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<JSR330Implementation> {

-    

-    private AssemblyFactory assemblyFactory;

-    

-    public JSR330ImplementationProcessor(ExtensionPointRegistry extensionPoints) {

-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);

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

-    }

-

-    public QName getArtifactType() {

-        return JSR330Implementation.TYPE;

-    }

-

-    public Class<JSR330Implementation> getModelType() {

-        return JSR330Implementation.class;

-    }

-

-    public JSR330Implementation read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {

-        

-        JSR330Implementation implementation = new JSR330Implementation();

-        implementation.setUnresolved(true);

-

-        String location = getString(reader, "location");

-        if (location == null) {

-            Monitor monitor = context.getMonitor();

-            Problem problem = monitor.createProblem(this.getClass().getName(),

-                                      "webbeans-validation-messages",

-                                      Severity.ERROR,

-                                      reader,

-                                      "LocationAttributeMissing");

-            monitor.problem(problem);

-        }

-

-        implementation.setLocation(location);

-

-        // Skip to end element

-        while (reader.hasNext()) {

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

-                break;

-            }

-        }

-        

-        return implementation;

-    }

-

-    public void write(JSR330Implementation implementation, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {

-        

-        // Write <implementation.jsr330>

-        writeStart(writer, JSR330Implementation.TYPE.getNamespaceURI(), JSR330Implementation.TYPE.getLocalPart(),

-                   new XAttr("location", implementation.getLocation()));

-        

-        writeEnd(writer);

-    }

-

-    public void resolve(JSR330Implementation implementation, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {

-        

-        // Resolve the component type

-        String uri = implementation.getURI();

-        if (uri != null) {

-            ComponentType componentType = assemblyFactory.createComponentType();

-            componentType.setURI("jsr330.componentType");

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

-            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);

-    }

-

-}

diff --git a/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/WebImplementationProviderFactory.java b/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/WebImplementationProviderFactory.java
deleted file mode 100644
index 6d4b6df3d5..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/src/main/java/org/apache/tuscany/sca/webbeans/WebImplementationProviderFactory.java
+++ /dev/null
@@ -1,55 +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.webbeans;

-

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

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

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.provider.ImplementationProvider;

-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;

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

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

-

-public class WebImplementationProviderFactory implements ImplementationProviderFactory<JSR330Implementation> {

-

-    public WebImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {

-    }

-

-    public ImplementationProvider createImplementationProvider(RuntimeComponent component, JSR330Implementation implementation) {

-

-        ImplementationProvider impl = new ImplementationProvider() {

-            public Invoker createInvoker(RuntimeComponentService arg0, Operation arg1) {

-                throw new UnsupportedOperationException("Components using implementation.web have no services");

-            }

-            public void start() {

-            }

-            public void stop() {

-            }

-            public boolean supportsOneWayInvocation() {

-                return false;

-            }

-        };

-        return impl;

-    }

-    

-    public Class<JSR330Implementation> getModelType() {

-        return JSR330Implementation.class;

-    }

-    

-}

diff --git a/sca-java-2.x/trunk/modules/webbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder b/sca-java-2.x/trunk/modules/webbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
deleted file mode 100644
index c4bf4a9291..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
+++ /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.webbeans.JSR330ImplementationBuilder;qname=http://tuscany.apache.org/xmlns/sca/1.1#implementation.jsr330

-

diff --git a/sca-java-2.x/trunk/modules/webbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/webbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 7f41d525b8..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,21 +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.webbeans.JSR330ImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#implementation.jsr330,model=org.apache.tuscany.sca.webbeans.JSR330Implementation
-
-

diff --git a/sca-java-2.x/trunk/modules/webbeans/src/test/java/org/apache/tuscany/sca/webbeans/ReadTestCase.java b/sca-java-2.x/trunk/modules/webbeans/src/test/java/org/apache/tuscany/sca/webbeans/ReadTestCase.java
deleted file mode 100644
index 0b1d2aa573..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/src/test/java/org/apache/tuscany/sca/webbeans/ReadTestCase.java
+++ /dev/null
@@ -1,64 +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.webbeans;

-

-import java.io.InputStream;

-

-import javax.xml.stream.XMLInputFactory;

-import javax.xml.stream.XMLStreamReader;

-

-import junit.framework.TestCase;

-

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

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

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

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

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

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

-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

-import org.apache.tuscany.sca.webbeans.JSR330Implementation;

-

-/**

- * Test reading Web implementations.

- */

-public class ReadTestCase extends TestCase {

-

-    private XMLInputFactory inputFactory;

-    private StAXArtifactProcessor<Object> staxProcessor;

-    private ProcessorContext context;

-

-    @Override

-    public void setUp() throws Exception {

-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

-        context = new ProcessorContext(extensionPoints);

-        inputFactory = XMLInputFactory.newInstance();

-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);

-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null);

-    }

-

-    public void testReadComposite() throws Exception {

-        InputStream is = getClass().getResourceAsStream("TestWeb.composite");

-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);

-        Composite composite = (Composite) staxProcessor.read(reader, context);

-        assertNotNull(composite);

-        assertTrue(((JSR330Implementation) composite.getComponents().get(0).getImplementation()).getLocation().equals("foo.jar"));

-    }

-

-}

diff --git a/sca-java-2.x/trunk/modules/webbeans/src/test/java/org/apache/tuscany/sca/webbeans/WriteTestCase.java b/sca-java-2.x/trunk/modules/webbeans/src/test/java/org/apache/tuscany/sca/webbeans/WriteTestCase.java
deleted file mode 100644
index bc7e15347b..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/src/test/java/org/apache/tuscany/sca/webbeans/WriteTestCase.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.webbeans;

-

-import java.io.ByteArrayOutputStream;

-import java.io.InputStream;

-

-import javax.xml.stream.XMLInputFactory;

-import javax.xml.stream.XMLOutputFactory;

-import javax.xml.stream.XMLStreamWriter;

-

-import junit.framework.TestCase;

-

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

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

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

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

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

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

-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

-

-/**

- * Test reading/write Web implementations.

- */

-public class WriteTestCase extends TestCase {

-

-    private XMLInputFactory inputFactory;

-    private XMLOutputFactory outputFactory;

-    private StAXArtifactProcessor<Object> staxProcessor;

-    private ProcessorContext context;

-

-    @Override

-    public void setUp() throws Exception {

-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

-        context = new ProcessorContext(extensionPoints);

-        inputFactory = XMLInputFactory.newInstance();

-        outputFactory = XMLOutputFactory.newInstance();

-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);

-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory);

-    }

-

-    public void testReadWriteComposite() throws Exception {

-        InputStream is = getClass().getResourceAsStream("TestWeb.composite");

-        Composite composite = (Composite) staxProcessor.read(inputFactory.createXMLStreamReader(is), context);

-        assertNotNull(composite);

-        ByteArrayOutputStream bos = new ByteArrayOutputStream();

-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);

-        staxProcessor.write(composite, writer, context);

-        writer.close();

-        assertTrue(bos.toString().contains("location=\"foo.jar\""));

-

-    }

-

-}

diff --git a/sca-java-2.x/trunk/modules/webbeans/src/test/resources/org/apache/tuscany/sca/webbeans/TestWeb.composite b/sca-java-2.x/trunk/modules/webbeans/src/test/resources/org/apache/tuscany/sca/webbeans/TestWeb.composite
deleted file mode 100644
index 09a6845087..0000000000
--- a/sca-java-2.x/trunk/modules/webbeans/src/test/resources/org/apache/tuscany/sca/webbeans/TestWeb.composite
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * 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.    

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-	targetNamespace="http://sample/web"

-	name="TestWeb">

-

-    <component name="TestWeb">

-        <tuscany:implementation.jsr330 location="foo.jar"/>

-    </component>

-

-</composite>