Modified: tuscany/sca-java-2.x/trunk/modules/wink/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/wink/pom.xml?rev=951651&r1=951650&r2=951651&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/wink/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/wink/pom.xml Sat Jun  5 05:17:47 2010
@@ -1,69 +1,69 @@
-<?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-wink</artifactId>
-    <name>Apache Tuscany SCA Apache Wink JAX-RS Integration</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.wink</groupId>
-            <artifactId>wink-server</artifactId>
-            <version>1.1-incubating</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.wink</groupId>
-            <artifactId>wink-common</artifactId>
-            <version>1.1-incubating</version>
-            <scope>provided</scope>
-        </dependency>
-       
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
+<?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-wink</artifactId>
+    <name>Apache Tuscany SCA Apache Wink JAX-RS Integration</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.wink</groupId>
+            <artifactId>wink-server</artifactId>
+            <version>1.1-incubating</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.wink</groupId>
+            <artifactId>wink-common</artifactId>
+            <version>1.1-incubating</version>
+            <scope>provided</scope>
+        </dependency>
+       
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

Propchange: tuscany/sca-java-2.x/trunk/modules/wink/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java?rev=951651&r1=951650&r2=951651&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java
 Sat Jun  5 05:17:47 2010
@@ -1,66 +1,66 @@
-/*
- * 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.wink;
-
-import java.beans.Introspector;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Member;
-import java.lang.reflect.Type;
-
-import javax.servlet.ServletContext;
-
-import org.apache.tuscany.sca.implementation.web.runtime.utils.ContextHelper;
-import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.registry.Injectable;
-import org.oasisopen.sca.annotation.Property;
-
-public class PropertyInjectable extends Injectable {
-
-    private String name;
-
-    public PropertyInjectable(Property propertyAnnotation,
-                                  ParamType paramType,
-                                  Class<?> type,
-                                  Type genericType,
-                                  Annotation[] annotations,
-                                  Member member) {
-        super(paramType, type, genericType, annotations, member);
-        this.name = getPropertyName(propertyAnnotation.name(), member);
-    }
-
-    @Override
-    public Object getValue(RuntimeContext runtimeContext) throws IOException {
-        return ContextHelper.getProperty(name, 
runtimeContext.getAttribute(ServletContext.class));
-    }
-
-    private String getPropertyName(String annotationName, Member member) {
-        String name;
-        if (annotationName != null && !annotationName.equals("")) {
-            name = annotationName;
-        } else {
-            name = getMember().getName();
-            if (name.startsWith("set")) {
-                name = Introspector.decapitalize(name.substring(3));
-            }
-        }
-        return name;
-    }
-}
+/*
+ * 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.wink;
+
+import java.beans.Introspector;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Member;
+import java.lang.reflect.Type;
+
+import javax.servlet.ServletContext;
+
+import org.apache.tuscany.sca.implementation.web.runtime.utils.ContextHelper;
+import org.apache.wink.common.RuntimeContext;
+import org.apache.wink.common.internal.registry.Injectable;
+import org.oasisopen.sca.annotation.Property;
+
+public class PropertyInjectable extends Injectable {
+
+    private String name;
+
+    public PropertyInjectable(Property propertyAnnotation,
+                                  ParamType paramType,
+                                  Class<?> type,
+                                  Type genericType,
+                                  Annotation[] annotations,
+                                  Member member) {
+        super(paramType, type, genericType, annotations, member);
+        this.name = getPropertyName(propertyAnnotation.name(), member);
+    }
+
+    @Override
+    public Object getValue(RuntimeContext runtimeContext) throws IOException {
+        return ContextHelper.getProperty(name, 
runtimeContext.getAttribute(ServletContext.class));
+    }
+
+    private String getPropertyName(String annotationName, Member member) {
+        String name;
+        if (annotationName != null && !annotationName.equals("")) {
+            name = annotationName;
+        } else {
+            name = getMember().getName();
+            if (name.startsWith("set")) {
+                name = Introspector.decapitalize(name.substring(3));
+            }
+        }
+        return name;
+    }
+}

Propchange: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java?rev=951651&r1=951650&r2=951651&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java
 Sat Jun  5 05:17:47 2010
@@ -1,66 +1,66 @@
-/*
- * 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.wink;
-
-import java.beans.Introspector;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Member;
-import java.lang.reflect.Type;
-
-import javax.servlet.ServletContext;
-
-import org.apache.tuscany.sca.implementation.web.runtime.utils.ContextHelper;
-import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.registry.Injectable;
-import org.oasisopen.sca.annotation.Reference;
-
-public class ReferenceInjectable extends Injectable {
-
-    private String referenceName;
-
-    public ReferenceInjectable(Reference referenceAnnotation,
-                                  ParamType paramType,
-                                  Class<?> type,
-                                  Type genericType,
-                                  Annotation[] annotations,
-                                  Member member) {
-        super(paramType, type, genericType, annotations, member);
-        this.referenceName = getReferenceName(referenceAnnotation.name(), 
member);
-    }
-
-    @Override
-    public Object getValue(RuntimeContext runtimeContext) throws IOException {
-        return ContextHelper.getReference(referenceName, 
(Class<?>)getGenericType(), runtimeContext.getAttribute(ServletContext.class));
-    }
-
-    private String getReferenceName(String annotationName, Member member) {
-        String name;
-        if (annotationName != null && !annotationName.equals("")) {
-            name = annotationName;
-        } else {
-            name = getMember().getName();
-            if (name.startsWith("set")) {
-                name = Introspector.decapitalize(name.substring(3));
-            }
-        }
-        return name;
-    }
-}
+/*
+ * 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.wink;
+
+import java.beans.Introspector;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Member;
+import java.lang.reflect.Type;
+
+import javax.servlet.ServletContext;
+
+import org.apache.tuscany.sca.implementation.web.runtime.utils.ContextHelper;
+import org.apache.wink.common.RuntimeContext;
+import org.apache.wink.common.internal.registry.Injectable;
+import org.oasisopen.sca.annotation.Reference;
+
+public class ReferenceInjectable extends Injectable {
+
+    private String referenceName;
+
+    public ReferenceInjectable(Reference referenceAnnotation,
+                                  ParamType paramType,
+                                  Class<?> type,
+                                  Type genericType,
+                                  Annotation[] annotations,
+                                  Member member) {
+        super(paramType, type, genericType, annotations, member);
+        this.referenceName = getReferenceName(referenceAnnotation.name(), 
member);
+    }
+
+    @Override
+    public Object getValue(RuntimeContext runtimeContext) throws IOException {
+        return ContextHelper.getReference(referenceName, 
(Class<?>)getGenericType(), runtimeContext.getAttribute(ServletContext.class));
+    }
+
+    private String getReferenceName(String annotationName, Member member) {
+        String name;
+        if (annotationName != null && !annotationName.equals("")) {
+            name = annotationName;
+        } else {
+            name = getMember().getName();
+            if (name.startsWith("set")) {
+                name = Introspector.decapitalize(name.substring(3));
+            }
+        }
+        return name;
+    }
+}

Propchange: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java?rev=951651&r1=951650&r2=951651&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java
 Sat Jun  5 05:17:47 2010
@@ -1,38 +1,38 @@
-/*
- * 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.wink;
-
-import org.apache.wink.common.internal.registry.InjectableFactory;
-import org.apache.wink.server.internal.DeploymentConfiguration;
-
-/**
- * Subclass the default Wink DeploymentConfiguration and override
- * the initRegistries method so the InjectableFactory instance can
- * be set to the Tuscany one. 
- */
-public class TuscanyDeploymentConfiguration extends DeploymentConfiguration {
-
-    @Override
-    protected void initRegistries() {
-        super.initRegistries();
-        InjectableFactory.setInstance(new TuscanyInjectableFactory());
-    }
-
-}
+/*
+ * 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.wink;
+
+import org.apache.wink.common.internal.registry.InjectableFactory;
+import org.apache.wink.server.internal.DeploymentConfiguration;
+
+/**
+ * Subclass the default Wink DeploymentConfiguration and override
+ * the initRegistries method so the InjectableFactory instance can
+ * be set to the Tuscany one. 
+ */
+public class TuscanyDeploymentConfiguration extends DeploymentConfiguration {
+
+    @Override
+    protected void initRegistries() {
+        super.initRegistries();
+        InjectableFactory.setInstance(new TuscanyInjectableFactory());
+    }
+
+}

Propchange: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java?rev=951651&r1=951650&r2=951651&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java
 Sat Jun  5 05:17:47 2010
@@ -1,52 +1,52 @@
-/*
- * 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.wink;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Member;
-import java.lang.reflect.Type;
-
-import org.apache.wink.common.internal.registry.Injectable;
-import org.apache.wink.server.internal.registry.ServerInjectableFactory;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * Subclass the Wink default ServerInjectableFactory to look
- * for SCA @Reference or @Property annotations. 
- */
-public class TuscanyInjectableFactory extends ServerInjectableFactory {
-
-    @Override
-    public Injectable create(Type genericType,
-                             Annotation[] annotations,
-                             Member member,
-                             boolean encoded,
-                             String defaultValue) {
-        for (Annotation a : annotations) {
-            if (a instanceof Reference) {
-                return new ReferenceInjectable((Reference)a, null, null, 
genericType, annotations, member);
-            } else if (a instanceof Property) {
-                return new PropertyInjectable((Property)a, null, null, 
genericType, annotations, member);
-            }
-        }
-        return super.create(genericType, annotations, member, encoded, 
defaultValue);
-    }
-}
+/*
+ * 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.wink;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Member;
+import java.lang.reflect.Type;
+
+import org.apache.wink.common.internal.registry.Injectable;
+import org.apache.wink.server.internal.registry.ServerInjectableFactory;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+
+/**
+ * Subclass the Wink default ServerInjectableFactory to look
+ * for SCA @Reference or @Property annotations. 
+ */
+public class TuscanyInjectableFactory extends ServerInjectableFactory {
+
+    @Override
+    public Injectable create(Type genericType,
+                             Annotation[] annotations,
+                             Member member,
+                             boolean encoded,
+                             String defaultValue) {
+        for (Annotation a : annotations) {
+            if (a instanceof Reference) {
+                return new ReferenceInjectable((Reference)a, null, null, 
genericType, annotations, member);
+            } else if (a instanceof Property) {
+                return new PropertyInjectable((Property)a, null, null, 
genericType, annotations, member);
+            }
+        }
+        return super.create(genericType, annotations, member, encoded, 
defaultValue);
+    }
+}

Propchange: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tuscany/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date


Reply via email to