Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 85490 invoked from network); 12 Jun 2009 10:17:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Jun 2009 10:17:01 -0000 Received: (qmail 39397 invoked by uid 500); 12 Jun 2009 10:17:12 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 39369 invoked by uid 500); 12 Jun 2009 10:17:12 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 39360 invoked by uid 99); 12 Jun 2009 10:17:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2009 10:17:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2009 10:17:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 13405238888E; Fri, 12 Jun 2009 10:16:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r784057 - in /felix/trunk/scrplugin: pom.xml src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java Date: Fri, 12 Jun 2009 10:16:49 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090612101650.13405238888E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri Jun 12 10:16:49 2009 New Revision: 784057 URL: http://svn.apache.org/viewvc?rev=784057&view=rev Log: FELIX-1225 : Set factoryPid attribute of Designate element if component is a factory. Modified: felix/trunk/scrplugin/pom.xml felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java Modified: felix/trunk/scrplugin/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/pom.xml?rev=784057&r1=784056&r2=784057&view=diff ============================================================================== --- felix/trunk/scrplugin/pom.xml (original) +++ felix/trunk/scrplugin/pom.xml Fri Jun 12 10:16:49 2009 @@ -109,7 +109,7 @@ org.apache.felix org.apache.felix.scr.annotations - 0.9.1-SNAPSHOT + 0.9.0 Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java?rev=784057&r1=784056&r2=784057&view=diff ============================================================================== --- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java (original) +++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java Fri Jun 12 10:16:49 2009 @@ -434,7 +434,11 @@ // designate final Designate designate = new Designate(); metaData.addDesignate(designate); - designate.setPid(component.getName()); + if ( component.getFactory() != null ) { + designate.setFactoryPid(component.getName()); + } else { + designate.setPid(component.getName()); + } // designate.object final MTObject mtobject = new MTObject(); designate.setObject(mtobject); Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java?rev=784057&r1=784056&r2=784057&view=diff ============================================================================== --- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java (original) +++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java Fri Jun 12 10:16:49 2009 @@ -22,6 +22,8 @@ protected String pid; + protected String factoryPid; + protected MTObject object; public String getPid() { @@ -32,6 +34,14 @@ this.pid = pid; } + public String getFactoryPid() { + return this.factoryPid; + } + + public void setFactoryPid(String pid) { + this.factoryPid = pid; + } + public MTObject getObject() { return this.object; } Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java?rev=784057&r1=784056&r2=784057&view=diff ============================================================================== --- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java (original) +++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java Fri Jun 12 10:16:49 2009 @@ -178,6 +178,7 @@ throws SAXException { final AttributesImpl ai = new AttributesImpl(); IOUtils.addAttribute(ai, "pid", designate.getPid()); + IOUtils.addAttribute(ai, "factoryPid", designate.getFactoryPid()); IOUtils.indent(contentHandler, 1); contentHandler.startElement(INNER_NAMESPACE_URI, DESIGNATE_ELEMENT, DESIGNATE_ELEMENT_QNAME, ai); IOUtils.newline(contentHandler);