Author: cziegeler
Date: Wed Oct 24 08:20:37 2007
New Revision: 587906

URL: http://svn.apache.org/viewvc?rev=587906&view=rev
Log:
Fix FELIX-409 and fail building if an empty @scr.service tag is specified 
without the component implementing an interface.

Modified:
    
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
    
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java

Modified: 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java?rev=587906&r1=587905&r2=587906&view=diff
==============================================================================
--- 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
 (original)
+++ 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
 Wed Oct 24 08:20:37 2007
@@ -226,6 +226,9 @@
                     // verify service
                     boolean isServiceFactory = false;
                     if (this.getService() != null) {
+                        if ( this.getService().getInterfaces().size() == 0 ) {
+                            issues.add(this.getMessage("Service interface 
information is missing for @scr.service tag"));
+                        }
                         this.getService().validate(issues, warnings);
                         isServiceFactory = 
Boolean.valueOf(this.getService().getServicefactory()).booleanValue();
                     }

Modified: 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java?rev=587906&r1=587905&r2=587906&view=diff
==============================================================================
--- 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java 
(original)
+++ 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java 
Wed Oct 24 08:20:37 2007
@@ -48,7 +48,7 @@
     public void setServicefactory(String servicefactory) {
         this.servicefactory = servicefactory;
     }
-    
+
     public void setServicefactory(boolean servicefactory) {
         this.servicefactory = String.valueOf(servicefactory);
     }


Reply via email to