Remove as not required in release

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

9 files changed, 0 insertions, 503 deletions

diff --git a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java b/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
deleted file mode 100644
index 3b104d7c93..0000000000
--- a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
+++ /dev/null
@@ -1,97 +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.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tuscany.sca.assembly.ComponentReference;
-
-/**
- * Servlet that handles the GET request for the componentContext.js script
- * 
- * The script is generated by calling ScriptProcessors to output the code 
- * for the SCA references, properties etc.
- */
-public class ComponentContextServlet extends HttpServlet {
-    private static final long serialVersionUID = 1L;
-
-    protected static final String HEADER = "/** --- Apache Tuscany componentContext.js --- */\n";
-    protected static final String FOOTER = "/** --- Apache Tuscany componentContext.js EOF --- */\n";
-
-    public static final String COMPONENT_CONTEXT_SCRIPT_URI = "org.apache.tuscany.sca.componentContext.js";
-
-    @Override
-    public void doGet(HttpServletRequest req, HttpServletResponse response) throws IOException  {
-        response.setContentType("text/plain;charset=utf-8");
-        OutputStream out = response.getOutputStream();
-
-        doScriptInit(out);
-
-        doScriptReferences(out);
-
-        out.write(FOOTER.getBytes("UTF-8"));
-
-        out.flush();
-        out.close();
-    }
-
-    /**
-     * Calls each ContextScriptProcessor once to insert any required initilization code into componentContext.js  
-     */
-    protected void doScriptInit(OutputStream out) throws IOException, UnsupportedEncodingException {
-        out.write(HEADER.getBytes("UTF-8"));
-
-        for (ContextScriptProcessor csp : WebSingleton.INSTANCE.getContextScriptProcessors()) {
-            csp.scriptInit(out);
-        }
-    }
-
-    /**
-     * Calls each ContextScriptProcessor for each SCA reference to insert code for the reference into componentContext.js  
-     */
-    protected void doScriptReferences(OutputStream out) throws IOException, UnsupportedEncodingException {
-
-        out.write("// SCA References\n".getBytes("UTF-8"));
-        
-        for (ComponentReference cr : WebSingleton.INSTANCE.getRuntimeComponent().getReferences()) {
-            String ref = "// SCA Reference " + cr.getName() + "\n";
-            out.write(ref.getBytes("UTF-8"));
-            for (ContextScriptProcessor csp : WebSingleton.INSTANCE.getContextScriptProcessors()) {
-                csp.scriptReference(cr, out);
-            }
-        }
-
-        out.write("\n// SCA References end.\n".getBytes("UTF-8"));
-    }
-
-    /**
-     * Calls each ContextScriptProcessor for each SCA property to insert code for the property into componentContext.js  
-     */
-    protected void doScriptProperties(OutputStream out) throws IOException, UnsupportedEncodingException {
-        // TODO: support properties
-    }
-
-}
diff --git a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java b/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java
deleted file mode 100644
index 28157feba5..0000000000
--- a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java
+++ /dev/null
@@ -1,29 +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.io.OutputStream;
-
-import org.apache.tuscany.sca.assembly.ComponentReference;
-
-public interface ContextScriptProcessor {
-    void scriptInit(OutputStream out);
-    void scriptReference(ComponentReference cr, OutputStream out);
-}
diff --git a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java b/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java
deleted file mode 100644
index 6d3f590309..0000000000
--- a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.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.web;
-
-
-public interface ContextScriptProcessorExtensionPoint {
-
-    void addContextScriptProcessor(ContextScriptProcessor csp);
-    
-}
diff --git a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java b/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java
deleted file mode 100644
index 49124331df..0000000000
--- a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java
+++ /dev/null
@@ -1,29 +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;
-
-
-public class DefaultContextScriptProcessorExtensionPoint implements ContextScriptProcessorExtensionPoint {
-
-    public void addContextScriptProcessor(ContextScriptProcessor csp) {
-        WebSingleton.INSTANCE.addContextScriptProcessor(csp);
-    }
-
-}
diff --git a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java b/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
deleted file mode 100644
index 36d564a697..0000000000
--- a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.implementation.web;
-
-
-/**
- * Represents a Script implementation.
- */
-public class WebImplementation {
-
-    protected String war;
-
-    public String getWar() {
-        return war;
-    }
-
-    public void setWar(String war) {
-        this.war = war;
-    }
-}
diff --git a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationActivator.java b/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationActivator.java
deleted file mode 100644
index dd3c2e4c94..0000000000
--- a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationActivator.java
+++ /dev/null
@@ -1,67 +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 org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.extension.helper.ImplementationActivator;
-import org.apache.tuscany.sca.extension.helper.InvokerFactory;
-import org.apache.tuscany.sca.extension.helper.utils.PropertyValueObjectFactory;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-import static org.apache.tuscany.sca.implementation.web.ComponentContextServlet.COMPONENT_CONTEXT_SCRIPT_URI;
-
-public class WebImplementationActivator implements ImplementationActivator<WebImplementation> {
-
-    protected ServletHost servletHost;
-    // TODO: seems wrong to need PropertyValueObjectFactory, could it be on Property somehow? 
-    protected PropertyValueObjectFactory propertyFactory;
-
-    public WebImplementationActivator(ServletHost servletHost, PropertyValueObjectFactory propertyFactory) {
-        this.servletHost = servletHost;
-        this.propertyFactory = propertyFactory;
-    }
-
-    public Class<WebImplementation> getImplementationClass() {
-        return WebImplementation.class;
-    }
-
-    public InvokerFactory createInvokerFactory(RuntimeComponent rc, ComponentType ct, WebImplementation implementation) {
-
-        initServlet(servletHost);
-
-        WebSingleton.INSTANCE.setRuntimeComponent(rc);
-
-        return new InvokerFactory() {
-            public Invoker createInvoker(Operation arg0) {
-                throw new IllegalStateException("can't invoke an implementation.web component");
-            }
-        };
-    }
-
-    private void initServlet(ServletHost servletHost) {
-        if (servletHost.getServletMapping(COMPONENT_CONTEXT_SCRIPT_URI) == null) {
-            servletHost.addServletMapping(COMPONENT_CONTEXT_SCRIPT_URI, new ComponentContextServlet());
-        }
-    }
-
-}
diff --git a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebSingleton.java b/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebSingleton.java
deleted file mode 100644
index 5fcf2a2799..0000000000
--- a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebSingleton.java
+++ /dev/null
@@ -1,73 +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.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * Singleton instance to share data between the ModuleActivator,
- * ContextScriptProcessorExtensionPoint, and Taglib tags.
- * 
- * TODO: find a way to share the data without needing a singleton
- */
-public class WebSingleton {
-
-    private List<ContextScriptProcessor> contextScriptProcessors = new ArrayList<ContextScriptProcessor>();
-    private RuntimeComponent runtimeComponent;
-
-    public static final WebSingleton INSTANCE = new WebSingleton();
-    private WebSingleton() {
-    }
-        
-    public ComponentReference getComponentReference(String name)  {
-        if (runtimeComponent == null) {
-            throw new IllegalStateException("RuntimeComponent is null. Missing a <implementation.web>?");
-        }
-        for (ComponentReference cr : runtimeComponent.getReferences()) {
-            if (cr.getName().equals(name)) {
-                return cr;
-            }
-        }
-        return null;
-    }
-
-    public void addContextScriptProcessor(ContextScriptProcessor csp) {
-        contextScriptProcessors.add(csp);
-    }
-
-    public List<ContextScriptProcessor> getContextScriptProcessors() {
-        return contextScriptProcessors;
-    }
-
-    public RuntimeComponent getRuntimeComponent() {
-        return runtimeComponent;
-    }
-
-    public void setRuntimeComponent(RuntimeComponent rc) {
-        if (this.runtimeComponent != null) {
-            throw new IllegalStateException("adding component '" + rc.getName() + "' but web module already has a component: " + runtimeComponent.getName());
-        }
-        this.runtimeComponent = rc;
-    }
-}
diff --git a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/taglib/ReferenceTEI.java b/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/taglib/ReferenceTEI.java
deleted file mode 100644
index cba6359d2f..0000000000
--- a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/taglib/ReferenceTEI.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.implementation.web.taglib;
-
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
-
-/**
- * TagExtraInfo class for the SCA reference tags
- * <sca:reference name="service" type="test.MyService" scope="1" />
- */
-public class ReferenceTEI extends TagExtraInfo {
-
-    public VariableInfo[] getVariableInfo(TagData data) {
-        VariableInfo info1
-           = new VariableInfo(
-              data.getAttributeString("name"),
-              data.getAttributeString("type"),
-              true,
-              VariableInfo.AT_END);
-        VariableInfo[] info = { info1 } ;
-        return info;
-     }
-}
diff --git a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/taglib/ReferenceTag.java b/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/taglib/ReferenceTag.java
deleted file mode 100644
index 69f70859b2..0000000000
--- a/branches/sca-java-1.3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/taglib/ReferenceTag.java
+++ /dev/null
@@ -1,103 +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.taglib;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.implementation.web.WebSingleton;
-
-/**
- * Tag to handle SCA references
- * <sca:reference name="service" type="test.MyService" scope="1" />
- */
-public class ReferenceTag extends TagSupport {
-    private static final long serialVersionUID = 1L;
-
-    protected String name;
-    protected String type;
-    protected Integer scope = PageContext.PAGE_SCOPE;
-
-    public int doStartTag() throws JspException {
-        return SKIP_BODY;
-    }
-
-    public int doEndTag() throws JspException {
-
-//        ServletContext servletContext = pageContext.getServletContext();
-//        try {
-//            WebAppServletHost.getInstance().init(servletContext);
-//        } catch (ServletException e) {
-//            throw new JspException("Exception initializing Tuscany webapp: " + e, e);
-//        }
-//
-        Class<?> typeClass;
-        try {
-            typeClass = Class.forName(type, true, Thread.currentThread().getContextClassLoader());
-        } catch (ClassNotFoundException e) {
-            throw new JspException("Reference '" + name + "' type class not found: " + type);
-        }
-
-        ComponentReference ref = WebSingleton.INSTANCE.getComponentReference(name);
-        if (ref == null) {
-            throw new JspException("Reference '" + name + "' type class not found: " + type);
-        }
-
-        Object o;
-        try {
-            o = WebSingleton.INSTANCE.getRuntimeComponent().getComponentContext().getService(typeClass, name);
-        } catch (Exception e) {
-            throw new JspException("Exception getting service proxy for reference '" + name + "': " + e, e);
-        }
-        if (o == null) {
-            throw new JspException("Reference '" + name + "' not found");
-        }
-
-        pageContext.setAttribute(name, o, scope);
-
-        return EVAL_PAGE;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getScope() {
-        return scope;
-    }
-
-    public void setScope(Integer scope) {
-        this.scope = scope;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}