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@948774 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 0 insertions, 671 deletions

diff --git a/sca-java-2.x/trunk/modules/wicket/LICENSE b/sca-java-2.x/trunk/modules/wicket/LICENSE
deleted file mode 100644
index c77d3fe856..0000000000
--- a/sca-java-2.x/trunk/modules/wicket/LICENSE
+++ /dev/null
@@ -1,241 +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.

-

-===============================================================================

-

-Apache Tuscany SCA for Java Subcomponents

-=========================================: 

-

-The Tuscany SCA for Java release includes a number of subcomponents with

-separate copyright notices and license terms. Your use of the source

-code for the these subcomponents is subject to the terms and

-conditions of the following licenses.

-

-===============================================================================

-The module host-webapp includes files under the following license:

-

-Permission to copy, display and distribute the Service Component Architecture Specification and/or

-portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided

-that you include the following on ALL copies of the Service Component Architecture Specification, or

-portions thereof, that you make:

-

-1. A link or URL to the Service Component Architecture Specification at this location:

-· http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications

-

-2. The full text of the copyright notice as shown in the Service Component Architecture Specification.

-

-BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,

-SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a

-royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem

-necessary to implement the Service Component Architecture Specification.

-THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE

-AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,

-REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,

-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A

-PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.

-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL

-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR

-DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.

-The name and trademarks of the Authors may NOT be used in any manner, including advertising or

-publicity pertaining to the Service Component Architecture Specification or its contents without specific,

-

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

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Webapp Host

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0

-Bnd-LastModified: 1222833658000

-Bundle-ManifestVersion: 2

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

-Bundle-Description: Apache Tuscany SCA Stripes

-Import-Package: javax.naming,

- javax.servlet,

- javax.servlet.http,

- javax.servlet.jsp,

- javax.servlet.jsp.tagext,

- net.sourceforge.stripes;version="1.5",

- net.sourceforge.stripes.action;version="1.5",

- net.sourceforge.stripes.config;version="1.5",

- net.sourceforge.stripes.controller;version="1.5",

- net.sourceforge.stripes.exception;version="1.5",

- net.sourceforge.stripes.util;version="1.5",

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

- org.apache.tuscany.sca.host.http;version="2.0",

- org.apache.tuscany.sca.host.webapp;version="2.0",

- org.apache.tuscany.sca.implementation.web.runtime.utils;version="2.0",

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

- org.oasisopen.sca;version="2.0",

- org.oasisopen.sca.annotation;version="2.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.stripes

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

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/trunk/modules/wicket/NOTICE b/sca-java-2.x/trunk/modules/wicket/NOTICE
deleted file mode 100644
index dfde08644b..0000000000
--- a/sca-java-2.x/trunk/modules/wicket/NOTICE
+++ /dev/null
@@ -1,12 +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/).

-

-This product also includes software under the Service Component Architecture specification license

-(see the LICENSE file contained in this distribution) with the following copyright

-

-(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA

-Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens

-AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.

diff --git a/sca-java-2.x/trunk/modules/wicket/pom.xml b/sca-java-2.x/trunk/modules/wicket/pom.xml
deleted file mode 100644
index 19533bd99c..0000000000
--- a/sca-java-2.x/trunk/modules/wicket/pom.xml
+++ /dev/null
@@ -1,65 +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-wicket</artifactId>
-    <name>Apache Tuscany SCA Wicket Web Framework Integration</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket-ioc</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-       
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/IContextLocator.java b/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/IContextLocator.java
deleted file mode 100644
index 589c240b84..0000000000
--- a/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/IContextLocator.java
+++ /dev/null
@@ -1,60 +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.wicket;
-import javax.servlet.ServletContext;
-
-import org.apache.wicket.IClusterable;
-
-
-/**
- * Interface representing object that can locate a spring context. The implementation should take up
- * little room when serialized.
- * 
- * SpringObjectLocator uses this interface to locate the spring context so that it in turn can
- * locate a bean.
- * 
- * Ideal implementations use a static lookup to locate the context.
- * 
- * For Example:
- * 
- * <pre>
- * class SpringContextLocator implements ISpringContextLocator
- * {
- *      public ApplicationContext getSpringContext()
- *      {
- *              //MyApplication is the subclass of WebApplication used by the application
- *              return ((MyApplication)Application.get()).getContext();
- *      }
- * }
- * </pre>
- * 
- * @see SpringBeanLocator
- * 
- * Based on code from Apache Wicket by Igor Vaynberg
- */
-public interface IContextLocator extends IClusterable
-{
-        /**
-         * Getter for spring application context
-         * 
-         * @return spring application context
-         */
-        ServletContext getServletContext();
-}
diff --git a/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyComponentInjector.java b/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyComponentInjector.java
deleted file mode 100644
index b1e9097cdf..0000000000
--- a/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyComponentInjector.java
+++ /dev/null
@@ -1,158 +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.wicket;
-import javax.servlet.ServletContext;
-
-import org.apache.wicket.Application;
-import org.apache.wicket.IClusterable;
-import org.apache.wicket.MetaDataKey;
-import org.apache.wicket.Session;
-import org.apache.wicket.application.IComponentInstantiationListener;
-import org.apache.wicket.injection.ComponentInjector;
-import org.apache.wicket.injection.web.InjectorHolder;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.protocol.http.WebApplication;
-
-/**
- * {@link IComponentInstantiationListener} that injects component properties annotated with {@link
- * SpringBean} annotations.
- * 
- * To install in yourapplication.init() call
- * <code>addComponentInstantiationListener(new SpringComponentInjector(this));</code> Non-wicket
- * components such as {@link Session}, {@link Model}, and any other pojo can be injected by calling
- * <code>InjectorHolder.getInjector().inject(this)</code> in their constructor.
- * 
- * Based on code from Apache Wicket by Igor Vaynberg and Justin Lee
- */
-public class TuscanyComponentInjector extends ComponentInjector
-{
-
-        /**
-         * Metadata key used to store application context holder in application's metadata
-         */
-        private static MetaDataKey<ApplicationContextHolder> CONTEXT_KEY = new MetaDataKey<ApplicationContextHolder>()
-        {
-
-                private static final long serialVersionUID = 1L;
-
-        };
-
-        /**
-         * Constructor used when spring application context is declared in the spring standard way and
-         * can be located through {@link
-         * WebApplicationContextUtils#getRequiredWebApplicationContext(ServletContext)}
-         * 
-         * @param webapp
-         *              wicket web application
-         */
-        public TuscanyComponentInjector(WebApplication webapp)
-        {
-                // locate application context through spring's default location
-                // mechanism and pass it on to the proper constructor
-                this(webapp, webapp.getServletContext());
-        }
-
-        /**
-         * Constructor
-         * 
-         * @param webapp
-         *              wicket web application
-         * @param ctx
-         *              spring's application context
-         */
-        public TuscanyComponentInjector(WebApplication webapp, ServletContext ctx)
-        {
-                if (webapp == null)
-                {
-                        throw new IllegalArgumentException("Argument [[webapp]] cannot be null");
-                }
-
-                if (ctx == null)
-                {
-                        throw new IllegalArgumentException("Argument [[ctx]] cannot be null");
-                }
-
-                // store context in application's metadata ...
-                webapp.setMetaData(CONTEXT_KEY, new ApplicationContextHolder(ctx));
-
-                // ... and create and register the annotation aware injector
-                InjectorHolder.setInjector(new TuscanyInjector(new ContextLocator()));
-        }
-
-        /**
-         * This is a holder for the application context. The reason we need a holder is that metadata
-         * only supports storing serializable objects but application context is not. The holder acts as
-         * a serializable wrapper for the context. Notice that although holder implements IClusterable
-         * it really is not because it has a reference to non serializable context - but this is ok
-         * because metadata objects in application are never serialized.
-         * 
-         * @author ivaynberg
-         * 
-         */
-        private static class ApplicationContextHolder implements IClusterable
-        {
-                private static final long serialVersionUID = 1L;
-
-                private final ServletContext context;
-
-                /**
-                 * Constructor
-                 * 
-                 * @param context
-                 */
-                public ApplicationContextHolder(ServletContext context)
-                {
-                        this.context = context;
-                }
-
-                /**
-                 * @return the context
-                 */
-                public ServletContext getContext()
-                {
-                        return context;
-                }
-        }
-
-        /**
-         * A context locator that locates the context in application's metadata. This locator also keeps
-         * a transient cache of the lookup.
-         * 
-         * @author ivaynberg
-         * 
-         */
-        private static class ContextLocator implements IContextLocator
-        {
-                private transient ServletContext context;
-
-                private static final long serialVersionUID = 1L;
-
-                public ServletContext getServletContext()
-                {
-                        if (context == null)
-                        {
-                                context = (Application.get().getMetaData(CONTEXT_KEY)).getContext();
-                        }
-                        return context;
-                }
-
-        }
-
-}
diff --git a/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyFieldValueFactory.java b/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyFieldValueFactory.java
deleted file mode 100644
index f2814fbcbe..0000000000
--- a/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyFieldValueFactory.java
+++ /dev/null
@@ -1,66 +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.wicket;
-
-import java.lang.reflect.Field;
-
-import org.apache.tuscany.sca.implementation.web.runtime.utils.ContextHelper;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.wicket.injection.IFieldValueFactory;
-import org.oasisopen.sca.annotation.ComponentName;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-public class TuscanyFieldValueFactory implements IFieldValueFactory {
-
-    private IContextLocator contextLocator;
-    
-    public TuscanyFieldValueFactory(IContextLocator contextLocator) {
-        this.contextLocator = contextLocator;
-    }
-
-    public Object getFieldValue(Field field, Object instance) {
-        Object value = null;
-        if (field.isAnnotationPresent(Reference.class)) {
-            Reference ref = field.getAnnotation(Reference.class);
-            String name = ref.name() != null && !ref.name().equals("") ? ref.name() : field.getName();
-            value = ContextHelper.getReference(name, field.getType(), contextLocator.getServletContext());
-        } else if (field.isAnnotationPresent(Property.class)) {
-            Property prop = field.getAnnotation(Property.class);
-            String name = prop.name() != null && !prop.name().equals("") ? prop.name() : field.getName();
-            value = ContextHelper.getProperty(name, contextLocator.getServletContext());
-        } else if (field.isAnnotationPresent(ComponentName.class)) {
-            RuntimeComponent rc = (RuntimeComponent)contextLocator.getServletContext().getAttribute(ContextHelper.COMPONENT_ATTR);
-            value = rc.getName();
-        } else if (field.isAnnotationPresent(Context.class)) {
-            value = ContextHelper.getComponentContext(contextLocator.getServletContext());
-        }
-        return value;
-    }
-
-    public boolean supportsField(Field field) {
-        return field.isAnnotationPresent(Reference.class) 
-            || field.isAnnotationPresent(Property.class)
-            || field.isAnnotationPresent(Context.class)
-            || field.isAnnotationPresent(ComponentName.class);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyInjector.java b/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyInjector.java
deleted file mode 100644
index 03c44d96f6..0000000000
--- a/sca-java-2.x/trunk/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyInjector.java
+++ /dev/null
@@ -1,38 +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.wicket;
-
-import org.apache.wicket.injection.ConfigurableInjector;
-import org.apache.wicket.injection.IFieldValueFactory;
-
-public class TuscanyInjector extends ConfigurableInjector {
-
-    private TuscanyFieldValueFactory factory;
-
-    public TuscanyInjector(IContextLocator contextLocator) {
-        factory = new TuscanyFieldValueFactory(contextLocator);
-    }
-
-    @Override
-    protected IFieldValueFactory getFieldValueFactory() {
-        return factory;
-    }
-
-}