You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/12/05 10:59:10 UTC

svn commit: r723697 - in /tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo: ./ impl/

Author: lresende
Date: Fri Dec  5 01:59:09 2008
New Revision: 723697

URL: http://svn.apache.org/viewvc?rev=723697&view=rev
Log:
Models for common java artifacts and their implementations

Added:
    tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java   (with props)
    tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java   (with props)
    tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java   (with props)
    tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java   (with props)
    tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java   (contents, props changed)
      - copied, changed from r723439, tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
    tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java   (contents, props changed)
      - copied, changed from r723439, tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
    tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java   (contents, props changed)
      - copied, changed from r723439, tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
    tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java   (contents, props changed)
      - copied, changed from r723439, tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java

Added: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java?rev=723697&view=auto
==============================================================================
--- tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java (added)
+++ tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java Fri Dec  5 01:59:09 2008
@@ -0,0 +1,42 @@
+/*
+ * 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.pojo;
+
+import java.lang.reflect.Constructor;
+
+
+/**
+ * Hold injection information for the constructor used to instantiate a
+ * component implementation instance
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface JavaConstructor<T> {
+
+	/**
+	 * @return the constructor
+	 */
+	Constructor<T> getConstructor();
+
+	/**
+	 * @return the parameters
+	 */
+	JavaParameter[] getParameters();
+
+}
\ No newline at end of file

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java?rev=723697&view=auto
==============================================================================
--- tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java (added)
+++ tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java Fri Dec  5 01:59:09 2008
@@ -0,0 +1,92 @@
+/*
+ * 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.pojo;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Type;
+
+
+/**
+ * This class represents a java element such as a Package, Class, Constructor,
+ * Field, Method or Parameter.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface JavaElement {
+
+	/**
+	 * @return the anchor
+	 */
+	AnnotatedElement getAnchor();
+
+	/**
+	 * @return the elementType
+	 */
+	ElementType getElementType();
+
+	/**
+	 * @return the genericType
+	 */
+	Type getGenericType();
+
+	/**
+	 * @return the index
+	 */
+	int getIndex();
+
+	/**
+	 * @return the type
+	 */
+	Class<?> getType();
+
+	/**
+	 * @return the annotations
+	 */
+	Annotation[] getAnnotations();
+
+	/**
+	 * Return a given annotation
+	 * @param annotationType the annotation type
+	 * @return the annotation
+	 */
+	<T extends Annotation> T getAnnotation(Class<T> annotationType);
+
+	/**
+	 * @return the name
+	 */
+	String getName();
+
+	/**
+	 * @param name the name to set
+	 */
+	void setName(String name);
+
+	/**
+	 * @return the classifier
+	 */
+	Class<? extends Annotation> getClassifer();
+
+	/**
+	 * @param classifer the classifier to set
+	 */
+	void setClassifer(Class<? extends Annotation> classifer);
+
+}
\ No newline at end of file

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java?rev=723697&view=auto
==============================================================================
--- tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java (added)
+++ tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java Fri Dec  5 01:59:09 2008
@@ -0,0 +1,29 @@
+/*
+ * 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.pojo;
+
+/**
+ * This class represents a java element such as a Package, Class, Constructor,
+ * Field, Method or Parameter.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface JavaParameter extends JavaElement {
+
+}
\ No newline at end of file

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java?rev=723697&view=auto
==============================================================================
--- tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java (added)
+++ tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java Fri Dec  5 01:59:09 2008
@@ -0,0 +1,65 @@
+/*
+ * 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.pojo;
+
+
+/**
+ * A resource dependency declared by a Java component implementation
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface JavaResource {
+
+	/**
+	 * The name of the resource
+	 * 
+	 * @return the name of the resource
+	 */
+	String getName();
+
+	/**
+	 * Returns the URI of the resource
+	 * 
+	 * @return the URI of the resource
+	 */
+	String getMappedName();
+
+	/**
+	 * Sets the resource URI
+	 */
+	void setMappedName(String mappedName);
+
+	/**
+	 * If true, the resource is optional
+	 * 
+	 * @return true if the resource is optional
+	 */
+	boolean isOptional();
+
+	/**
+	 * Sets whether the resource is optional
+	 */
+	void setOptional(boolean optional);
+
+	/**
+	 * @return the element
+	 */
+	JavaElement getElement();
+
+}
\ No newline at end of file

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java (from r723439, tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java?p2=tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java&p1=tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java&r1=723439&r2=723697&rev=723697&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java (original)
+++ tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java Fri Dec  5 01:59:09 2008
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.implementation.java;
+package org.apache.tuscany.sca.pojo.impl;
 
 import java.lang.reflect.Constructor;
 
+import org.apache.tuscany.sca.pojo.JavaConstructor;
+
 
 /**
  * Hold injection information for the constructor used to instantiate a
@@ -27,7 +29,7 @@
  * 
  * @version $Rev$ $Date$
  */
-public class JavaConstructorImpl<T> {
+public class JavaConstructorImpl<T> implements JavaConstructor<T> {
     private Constructor<T> constructor;
     private JavaParameterImpl[] parameters;
 
@@ -40,16 +42,12 @@
         }
     }
 
-    /**
-     * @return the constructor
-     */
+
     public Constructor<T> getConstructor() {
         return constructor;
     }
 
-    /**
-     * @return the parameters
-     */
+
     public JavaParameterImpl[] getParameters() {
         return parameters;
     }

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  5 01:59:09 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java:671193
+/tuscany/branches/sca-java-1.x/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java:713805-714043
+/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java:694816-713804

Copied: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java (from r723439, tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java?p2=tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java&p1=tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java&r1=723439&r2=723697&rev=723697&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java (original)
+++ tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java Fri Dec  5 01:59:09 2008
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.implementation.java;
+package org.apache.tuscany.sca.pojo.impl;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
@@ -27,13 +27,15 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 
+import org.apache.tuscany.sca.pojo.JavaElement;
+
 /**
  * This class represents a java element such as a Package, Class, Constructor,
  * Field, Method or Parameter.
  * 
  * @version $Rev$ $Date$
  */
-public class JavaElementImpl {
+public class JavaElementImpl implements JavaElement {
     private AnnotatedElement anchor;
     private ElementType elementType;
     private Class<?> type;
@@ -91,44 +93,26 @@
         this.classifer = classifer;
     }
 
-    /**
-     * @return the anchor
-     */
     public AnnotatedElement getAnchor() {
         return anchor;
     }
 
-    /**
-     * @return the elementType
-     */
     public ElementType getElementType() {
         return elementType;
     }
 
-    /**
-     * @return the genericType
-     */
     public Type getGenericType() {
         return genericType;
     }
 
-    /**
-     * @return the index
-     */
     public int getIndex() {
         return index;
     }
 
-    /**
-     * @return the type
-     */
     public Class<?> getType() {
         return type;
     }
 
-    /**
-     * @return the annotations
-     */
     public Annotation[] getAnnotations() {
         if (elementType == ElementType.PARAMETER) {
             if (anchor instanceof Method) {
@@ -151,30 +135,18 @@
         return null;
     }
 
-    /**
-     * @return the name
-     */
     public String getName() {
         return name;
     }
 
-    /**
-     * @param name the name to set
-     */
     public void setName(String name) {
         this.name = name;
     }
 
-    /**
-     * @return the classifier
-     */
     public Class<? extends Annotation> getClassifer() {
         return classifer;
     }
 
-    /**
-     * @param classifer the classifier to set
-     */
     public void setClassifer(Class<? extends Annotation> classifer) {
         this.classifer = classifer;
     }

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  5 01:59:09 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java:671193
+/tuscany/branches/sca-java-1.x/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java:713805-714043
+/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java:694816-713804

Copied: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java (from r723439, tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java?p2=tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java&p1=tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java&r1=723439&r2=723697&rev=723697&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java (original)
+++ tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java Fri Dec  5 01:59:09 2008
@@ -17,15 +17,16 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.implementation.java;
+package org.apache.tuscany.sca.pojo.impl;
 
 import java.lang.reflect.Constructor;
 
+import org.apache.tuscany.sca.pojo.JavaParameter;
 
 /**
  * @version $Rev$ $Date$
  */
-public class JavaParameterImpl extends JavaElementImpl {
+public class JavaParameterImpl extends JavaElementImpl implements JavaParameter {
     /**
      * @param constructor
      * @param index

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  5 01:59:09 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java:671193
+/tuscany/branches/sca-java-1.x/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java:713805-714043
+/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java:694816-713804

Copied: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java (from r723439, tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java?p2=tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java&p1=tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java&r1=723439&r2=723697&rev=723697&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java (original)
+++ tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java Fri Dec  5 01:59:09 2008
@@ -16,69 +16,46 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.implementation.java;
-
+package org.apache.tuscany.sca.pojo.impl;
 
+import org.apache.tuscany.sca.pojo.JavaElement;
+import org.apache.tuscany.sca.pojo.JavaResource;
 
 /**
  * A resource dependency declared by a Java component implementation
  * 
  * @version $Rev$ $Date$
  */
-public class JavaResourceImpl {
-    private JavaElementImpl element;
+public class JavaResourceImpl implements JavaResource {
+    private JavaElement element;
     private String mappedName;
     private boolean optional;
 
-    public JavaResourceImpl(JavaElementImpl element) {
+    public JavaResourceImpl(JavaElement element) {
         this.element = element;
     }
 
-    /**
-     * The name of the resource
-     * 
-     * @return the name of the resource
-     */
     public String getName() {
         return element.getName();
     }
 
-    /**
-     * Returns the URI of the resource
-     * 
-     * @return the URI of the resource
-     */
     public String getMappedName() {
         return mappedName;
     }
 
-    /**
-     * Sets the resource URI
-     */
     public void setMappedName(String mappedName) {
         this.mappedName = mappedName;
     }
 
-    /**
-     * If true, the resource is optional
-     * 
-     * @return true if the resource is optional
-     */
     public boolean isOptional() {
         return optional;
     }
 
-    /**
-     * Sets whether the resource is optional
-     */
     public void setOptional(boolean optional) {
         this.optional = optional;
     }
 
-    /**
-     * @return the element
-     */
-    public JavaElementImpl getElement() {
+    public JavaElement getElement() {
         return element;
     }
 

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  5 01:59:09 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java:671193
+/tuscany/branches/sca-java-1.x/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java:713805-714043
+/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java:694816-713804