From commits-return-3994-apmail-aries-commits-archive=aries.apache.org@aries.apache.org Fri Jul 29 16:31:49 2011 Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 07FC36FCD for ; Fri, 29 Jul 2011 16:31:49 +0000 (UTC) Received: (qmail 41055 invoked by uid 500); 29 Jul 2011 16:31:48 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 41001 invoked by uid 500); 29 Jul 2011 16:31:48 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 40993 invoked by uid 99); 29 Jul 2011 16:31:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jul 2011 16:31:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 29 Jul 2011 16:31:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 851062388901; Fri, 29 Jul 2011 16:31:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1152296 - /aries/trunk/application/application-modeller-standalone/src/main/java/org/apache/aries/application/modelling/standalone/OfflineModellingFactory.java Date: Fri, 29 Jul 2011 16:31:24 -0000 To: commits@aries.apache.org From: timothyjward@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110729163124.851062388901@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: timothyjward Date: Fri Jul 29 16:31:23 2011 New Revision: 1152296 URL: http://svn.apache.org/viewvc?rev=1152296&view=rev Log: ARIES-716 : Allow extensions to the modelling code Modified: aries/trunk/application/application-modeller-standalone/src/main/java/org/apache/aries/application/modelling/standalone/OfflineModellingFactory.java Modified: aries/trunk/application/application-modeller-standalone/src/main/java/org/apache/aries/application/modelling/standalone/OfflineModellingFactory.java URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller-standalone/src/main/java/org/apache/aries/application/modelling/standalone/OfflineModellingFactory.java?rev=1152296&r1=1152295&r2=1152296&view=diff ============================================================================== --- aries/trunk/application/application-modeller-standalone/src/main/java/org/apache/aries/application/modelling/standalone/OfflineModellingFactory.java (original) +++ aries/trunk/application/application-modeller-standalone/src/main/java/org/apache/aries/application/modelling/standalone/OfflineModellingFactory.java Fri Jul 29 16:31:23 2011 @@ -1,10 +1,14 @@ package org.apache.aries.application.modelling.standalone; +import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.net.URI; import java.net.URL; +import java.util.ArrayList; import java.util.Collections; +import java.util.Enumeration; import java.util.List; import java.util.Set; @@ -12,6 +16,7 @@ import javax.xml.validation.Schema; import org.apache.aries.application.modelling.ModelledResourceManager; import org.apache.aries.application.modelling.ParserProxy; +import org.apache.aries.application.modelling.ServiceModeller; import org.apache.aries.application.modelling.impl.AbstractParserProxy; import org.apache.aries.application.modelling.impl.ModelledResourceManagerImpl; import org.apache.aries.application.modelling.impl.ModellingManagerImpl; @@ -108,6 +113,27 @@ public class OfflineModellingFactory { result.setModellingManager(modellingManager); result.setParserProxy(parserProxy); + List plugins = new ArrayList(); + + ClassLoader cl = OfflineModellingFactory.class.getClassLoader(); + try { + Enumeration e = cl.getResources( + "META-INF/services/" + ServiceModeller.class.getName()); + + while(e.hasMoreElements()) { + BufferedReader reader = new BufferedReader(new InputStreamReader( + e.nextElement().openStream())); + try { + plugins.add((ServiceModeller) Class.forName(reader.readLine(), true, cl).newInstance()); + } catch (Exception e1) { + e1.printStackTrace(System.err); + } + } + } catch (IOException e) { + e.printStackTrace(System.err); + } + + result.setModellingPlugins(plugins); return result; } }