You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2009/06/15 14:16:52 UTC
svn commit: r784750 - in
/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation:
defaulttag/ sling/
Author: cziegeler
Date: Mon Jun 15 12:16:52 2009
New Revision: 784750
URL: http://svn.apache.org/viewvc?rev=784750&view=rev
Log:
FELIX-1229 : Cache parameter map for annotations and fix activation methods if annotations are used.
Modified:
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/AbstractTag.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/AbstractTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/AbstractTag.java?rev=784750&r1=784749&r2=784750&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/AbstractTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/AbstractTag.java Mon Jun 15 12:16:52 2009
@@ -31,6 +31,8 @@
protected final JavaField field;
+ protected Map<String, String> parameters;
+
/**
* @param desc Description
* @param field Field
@@ -101,8 +103,19 @@
public abstract String getName();
/**
+ * @see org.apache.felix.scrplugin.tags.JavaTag#getNamedParameterMap()
+ */
+ public Map<String, String> getNamedParameterMap() {
+ if ( this.parameters == null ) {
+ this.parameters = this.createNamedParameterMap();
+ }
+ return this.parameters;
+ }
+
+ /**
+ * Create the parameter map.
* @see JavaTag#getNamedParameterMap()
*/
- public abstract Map<String, String> getNamedParameterMap();
+ protected abstract Map<String, String> createNamedParameterMap();
}
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java?rev=784750&r1=784749&r2=784750&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java Mon Jun 15 12:16:52 2009
@@ -106,7 +106,7 @@
}
@Override
- public Map<String, String> getNamedParameterMap() {
+ public Map<String, String> createNamedParameterMap() {
final Map<String, String> map = new HashMap<String, String>();
map.put(Constants.COMPONENT_NAME, emptyToNull(this.annotation.name()));
@@ -133,11 +133,11 @@
for(final JavaMethod jm : jms) {
final Annotation[] annotations = jm.getAnnotations();
for(final Annotation a : annotations) {
- if ( a.getType().getJavaClass().getName().equals(Activate.class) ) {
+ if ( a.getType().getJavaClass().getFullyQualifiedName().equals(Activate.class.getName()) ) {
map.put(Constants.COMPONENT_ACTIVATE, jm.getName());
}
- if ( a.getType().getJavaClass().getName().equals(Deactivate.class) ) {
- map.put(Constants.COMPONENT_ACTIVATE, jm.getName());
+ if ( a.getType().getJavaClass().getFullyQualifiedName().equals(Deactivate.class.getName()) ) {
+ map.put(Constants.COMPONENT_DEACTIVATE, jm.getName());
}
}
}
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java?rev=784750&r1=784749&r2=784750&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java Mon Jun 15 12:16:52 2009
@@ -125,7 +125,7 @@
}
@Override
- public Map<String, String> getNamedParameterMap() {
+ public Map<String, String> createNamedParameterMap() {
final Map<String, String> map = new LinkedHashMap<String, String>();
map.put(Constants.PROPERTY_NAME, emptyToNull(this.annotation.name()));
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java?rev=784750&r1=784749&r2=784750&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java Mon Jun 15 12:16:52 2009
@@ -92,7 +92,7 @@
}
@Override
- public Map<String, String> getNamedParameterMap() {
+ public Map<String, String> createNamedParameterMap() {
final Map<String, String> map = new HashMap<String, String>();
map.put(Constants.REFERENCE_NAME, emptyToNull(this.annotation.name()));
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java?rev=784750&r1=784749&r2=784750&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java Mon Jun 15 12:16:52 2009
@@ -63,7 +63,7 @@
}
@Override
- public Map<String, String> getNamedParameterMap() {
+ public Map<String, String> createNamedParameterMap() {
final Map<String, String> map = new HashMap<String, String>();
String serviceInterface = null;
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java?rev=784750&r1=784749&r2=784750&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java Mon Jun 15 12:16:52 2009
@@ -43,7 +43,7 @@
}
@Override
- public Map<String, String> getNamedParameterMap() {
+ public Map<String, String> createNamedParameterMap() {
final Map<String, String> map = new HashMap<String, String>();
map.put(Constants.COMPONENT_IMMEDIATE, String.valueOf(true));
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java?rev=784750&r1=784749&r2=784750&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java Mon Jun 15 12:16:52 2009
@@ -18,9 +18,7 @@
*/
package org.apache.felix.scrplugin.tags.annotation.sling;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
+import java.util.*;
import org.apache.felix.scrplugin.Constants;
import org.apache.felix.scrplugin.tags.JavaClassDescription;
@@ -52,7 +50,7 @@
}
@Override
- public Map<String, String> getNamedParameterMap() {
+ public Map<String, String> createNamedParameterMap() {
final SortedMap<String, String> map = new TreeMap<String, String>();
map.put(Constants.PROPERTY_NAME, this.name);
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java?rev=784750&r1=784749&r2=784750&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java Mon Jun 15 12:16:52 2009
@@ -45,7 +45,7 @@
}
@Override
- public Map<String, String> getNamedParameterMap() {
+ public Map<String, String> createNamedParameterMap() {
final Map<String, String> map = new HashMap<String, String>();
map.put(Constants.SERVICE_INTERFACE, Servlet.class.getName());