Setting svn:eol-style for java and xml files

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

5 files changed, 291 insertions, 291 deletions

diff --git a/sca-java-2.x/trunk/modules/wink/pom.xml b/sca-java-2.x/trunk/modules/wink/pom.xml
index 5444bdb8b5..b000effbf8 100644
--- a/sca-java-2.x/trunk/modules/wink/pom.xml
+++ b/sca-java-2.x/trunk/modules/wink/pom.xml
@@ -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>
diff --git a/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java b/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java
index b0dfb0c100..dd21302cfa 100644
--- a/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java
+++ b/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java
@@ -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;
+    }
+}
diff --git a/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java b/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java
index 1cb0d0c2f2..7a58e97fb9 100644
--- a/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java
+++ b/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java
@@ -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;
+    }
+}
diff --git a/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java b/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java
index 8aef24fa40..dc7ef3fc2c 100644
--- a/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java
+++ b/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java
@@ -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());
+    }
+
+}
diff --git a/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java b/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java
index 3410ecd804..ca71856a3b 100644
--- a/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java
+++ b/sca-java-2.x/trunk/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java
@@ -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);
+    }
+}