summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-1.6/modules
diff options
context:
space:
mode:
authorvamsic007 <vamsic007@13f79535-47bb-0310-9956-ffa450edef68>2010-01-28 06:34:34 +0000
committervamsic007 <vamsic007@13f79535-47bb-0310-9956-ffa450edef68>2010-01-28 06:34:34 +0000
commite3dc7b8b4ce751cde37910dbcea05b5737e29f1a (patch)
tree38a530c6eadc5ebfd7d7587c289b3a6f5df5b05e /sca-java-1.x/branches/sca-java-1.6/modules
parent91a52055e615bff69e36a291798e38c10cd02e6e (diff)
TUSCANY-3448 SCA Property and Reference annotation processing in web application results in incorrect computed names
o Removed the classname prefix when name attribute is not specified in the annotation git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@903972 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/branches/sca-java-1.6/modules')
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java4
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java4
2 files changed, 0 insertions, 8 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java
index 8bee80659a..4bf53e8336 100644
--- a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java
@@ -78,8 +78,6 @@ public class PropertyProcessor extends BaseJavaClassVisitor {
if (name.startsWith("set")) {
name = JavaIntrospectionHelper.toPropertyName(method.getName());
}
- // When the name is not specified, prefix the computed name with the class name
- name = method.getDeclaringClass().getName()+"_"+name;
}
Map<String, JavaElementImpl> properties = type.getPropertyMembers();
@@ -113,8 +111,6 @@ public class PropertyProcessor extends BaseJavaClassVisitor {
}
if ("".equals(name) || name.equals(field.getType().getName())) {
name = field.getName();
- // When the name is not specified, prefix the computed name with the class name
- name = field.getDeclaringClass().getName()+"_"+name;
}
Map<String, JavaElementImpl> properties = type.getPropertyMembers();
diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java
index d8c44fbcf2..c68693f2e4 100644
--- a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java
@@ -69,8 +69,6 @@ public class ReferenceProcessor extends BaseJavaClassVisitor {
String name = annotation.name();
if ("".equals(name)) {
name = JavaIntrospectionHelper.toPropertyName(method.getName());
- // When the name is not specified, prefix the computed name with the class name
- name = method.getDeclaringClass().getName()+"_"+name;
}
JavaElementImpl ref = type.getReferenceMembers().get(name);
// Setter override field
@@ -108,8 +106,6 @@ public class ReferenceProcessor extends BaseJavaClassVisitor {
String name = annotation.name();
if ("".equals(name)) {
name = field.getName();
- // When the name is not specified, prefix the computed name with the class name
- name = field.getDeclaringClass().getName()+"_"+name;
}
JavaElementImpl ref = type.getReferenceMembers().get(name);
if (ref != null && ref.getElementType() == ElementType.FIELD) {