Return-Path: X-Original-To: apmail-aries-dev-archive@www.apache.org Delivered-To: apmail-aries-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 789F99B65 for ; Thu, 10 Nov 2011 11:40:08 +0000 (UTC) Received: (qmail 31078 invoked by uid 500); 10 Nov 2011 11:40:08 -0000 Delivered-To: apmail-aries-dev-archive@aries.apache.org Received: (qmail 31043 invoked by uid 500); 10 Nov 2011 11:40:08 -0000 Mailing-List: contact dev-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 dev@aries.apache.org Received: (qmail 31035 invoked by uid 99); 10 Nov 2011 11:40:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 11:40:08 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=FREEMAIL_FROM,HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of gnodet@gmail.com designates 209.85.210.178 as permitted sender) Received: from [209.85.210.178] (HELO mail-iy0-f178.google.com) (209.85.210.178) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 11:40:03 +0000 Received: by iadj38 with SMTP id j38so4031744iad.23 for ; Thu, 10 Nov 2011 03:39:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=TAuzp6sFNJSlOrxAyyxpgJEz0TaVhVcT2w9PhWnmT4o=; b=ICYvXT1CIcqW6jZ4IZf2AGWXEzMwfD2DJySxyMkHoh9gTT4Igtw7CRtO+Mp6IY7c1W UqAGcRE2fLJLvf4V99gX2J9S7N/EVLo3iv2qHP2pYQxO7m2BbEVsMMHdFD+9tN6gOdYj 6y5jm0+TtyKNYrrDAEp3jU4bwv1M0GBDw3LNg= MIME-Version: 1.0 Received: by 10.50.169.33 with SMTP id ab1mr7424098igc.0.1320925181546; Thu, 10 Nov 2011 03:39:41 -0800 (PST) Received: by 10.231.15.137 with HTTP; Thu, 10 Nov 2011 03:39:41 -0800 (PST) In-Reply-To: References: Date: Thu, 10 Nov 2011 03:39:41 -0800 Message-ID: Subject: Re: svn commit: r1190398 - in /aries/trunk/blueprint: blueprint-cm/ blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ blueprint-core/ blueprint-core/src/main/java/org/apache/aries/blueprint/container/ blueprint-core/src/main/java/o From: Guillaume Nodet To: dev@aries.apache.org Content-Type: multipart/alternative; boundary=e89a8f3ba8713890ef04b15fdc80 --e89a8f3ba8713890ef04b15fdc80 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable I don't really blame anyone, it's just I was not really seing those guidelines in a very friendly way from the beginning, and if those aren't applicable atm, we should just find a smarter way until we reach 1.0, at which point having a stronger policy would make sense. On Thu, Nov 10, 2011 at 03:26, Timothy Ward wrote= : > > That's a reasonable point. I think the idea is that we can share some > packages that haven't changed between versions, but I'm not sure how > realistic that is at the moment. Jeremy and I tried to follow the existin= g > Aries versioning guidelines as best we could. > > Regards, > > Tim > > > Date: Thu, 10 Nov 2011 03:20:15 -0800 > > Subject: Re: svn commit: r1190398 - in /aries/trunk/blueprint: > blueprint-cm/ > blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ > blueprint-core/ > blueprint-core/src/main/java/org/apache/aries/blueprint/container/ > blueprint-core/src/main/java/o > > From: gnodet@gmail.com > > To: dev@aries.apache.org > > > > I guess I forgot those dicussions, sorry about that. > > Anyway, what's the point of trying to version package individually unti= l > we > > reach a 1.0 then ? It just sounds more work with no benefits. > > blueprint-cm has been released with 0.3.2 and blueprint-core with 0.4 > which > > just leads to more confusion, especially if we don't really follow the > > semantic versioning rules. > > It would be safer to release everything with 0.4 and import with a > > [0.4,0.5) range in that case. > > > > On Thu, Nov 10, 2011 at 03:03, Timothy Ward > wrote: > > > > > > > > Hi Guillaume, > > > > > > We have had discussions about this on the list in the past (quite a > while > > > ago now). We decided that increasing major versions while we were sti= ll > > > stabilizing our API and bundle structure would quickly lead to packag= es > > > with huge version numbers. As a result we made the assertion that min= or > > > version increments would indicate breaking changes until we declared = a > > > package to be version 1.0. This is why I changed the version ranges o= n > our > > > package imports to be [0.x, 0.x+1). We were already in the situation > where > > > 0.2 and 0.3 bundles couldn't live together, and we need to fix that > problem > > > until we're ready for 1.0. > > > > > > I'm sorry that this has caused you problems, but I believe I am > sticking > > > to what we agreed in the past with these version changes, as do (I > assume) > > > the people who voted on the release. > > > > > > Regards, > > > > > > Tim > > > > > > > Date: Wed, 9 Nov 2011 07:13:57 -0800 > > > > Subject: Re: svn commit: r1190398 - in /aries/trunk/blueprint: > > > blueprint-cm/ > > > blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ > > > blueprint-core/ > > > blueprint-core/src/main/java/org/apache/aries/blueprint/container/ > > > blueprint-core/src/main/java/o > > > > From: gnodet@gmail.com > > > > To: dev@aries.apache.org > > > > > > > > There's a big problem with this commit. > > > > Removing a class from an exported package should lead to a major > version > > > > upgrade on the package, given we're supposed to strictly adhere to > > > semantic > > > > versioning. > > > > Now, it seems the whole recent aries release cause problems on > downstream > > > > projects because backward compatibility isn't possible. > > > > > > > > > > > > On Fri, Oct 28, 2011 at 08:24, wrote: > > > > > > > > > Author: timothyjward > > > > > Date: Fri Oct 28 15:24:42 2011 > > > > > New Revision: 1190398 > > > > > > > > > > URL: http://svn.apache.org/viewvc?rev=3D1190398&view=3Drev > > > > > Log: > > > > > ARIES-771: Remove blueprint.ext and blueprint.parser dependency > from CM > > > > > bundle, and expose blueprint.utils from the core bundle. > > > > > > > > > > Added: > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blue= print/utils/PlaceholdersUtils.java > > > > > - copied, changed from r1189089, > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/bluep= rint/ext/PlaceholdersUtils.java > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blue= print/utils/PropertyPlaceholder.java > > > > > - copied, changed from r1189089, > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/bluep= rint/ext/PropertyPlaceholder.java > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blue= print/utils/ServiceListener.java > > > > > - copied, changed from r1189089, > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/bluep= rint/container/ServiceListener.java > > > > > Removed: > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blue= print/container/ServiceListener.java > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blue= print/ext/PlaceholdersUtils.java > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blue= print/ext/PropertyPlaceholder.java > > > > > Modified: > > > > > aries/trunk/blueprint/blueprint-cm/pom.xml > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepr= int/compendium/cm/CmManagedServiceFactory.java > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepr= int/compendium/cm/CmNamespaceHandler.java > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepr= int/compendium/cm/CmPropertyPlaceholder.java > > > > > aries/trunk/blueprint/blueprint-core/pom.xml > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blue= print/container/RecipeBuilder.java > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blue= print/container/ServiceRecipe.java > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blue= print/ext/ExtNamespaceHandler.java > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blue= print/ext/packageinfo > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blue= print/utils/packageinfo > > > > > > > > > > > > > > aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blue= print/ext/PropertyPlaceholderTest.java > > > > > > > > > > Modified: aries/trunk/blueprint/blueprint-cm/pom.xml > > > > > URL: > > > > > > > > > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?r= ev=3D1190398&r1=3D1190397&r2=3D1190398&view=3Ddiff > > > > > > > > > > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > > > > --- aries/trunk/blueprint/blueprint-cm/pom.xml (original) > > > > > +++ aries/trunk/blueprint/blueprint-cm/pom.xml Fri Oct 28 15:24:4= 2 > 2011 > > > > > @@ -41,6 +41,10 @@ > > > > > > > > > > > > > > > > > > > > + > > > > > + org.apache.aries.*;version=3D"$<range;[=3D=3D,=3D= +)>", > > > > > + * > > > > > + > > > > > > > > > > > > > > > > > > > > > > > > > Modified: > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepri= nt/compendium/cm/CmManagedServiceFactory.java > > > > > URL: > > > > > > > > > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/= java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java?= rev=3D1190398&r1=3D1190397&r2=3D1190398&view=3Ddiff > > > > > > > > > > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > > > > --- > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepri= nt/compendium/cm/CmManagedServiceFactory.java > > > > > (original) > > > > > +++ > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepri= nt/compendium/cm/CmManagedServiceFactory.java > > > > > Fri Oct 28 15:24:42 2011 > > > > > @@ -32,9 +32,9 @@ import java.util.concurrent.ConcurrentHa > > > > > import org.apache.aries.blueprint.BeanProcessor; > > > > > import > org.apache.aries.blueprint.services.ExtendedBlueprintContainer; > > > > > import org.apache.aries.blueprint.ServiceProcessor; > > > > > -import org.apache.aries.blueprint.container.ServiceListener; > > > > > import org.apache.aries.blueprint.utils.JavaUtils; > > > > > import org.apache.aries.blueprint.utils.ReflectionUtils; > > > > > +import org.apache.aries.blueprint.utils.ServiceListener; > > > > > import org.apache.aries.util.AriesFrameworkUtil; > > > > > import org.osgi.framework.Bundle; > > > > > import org.osgi.framework.Constants; > > > > > > > > > > Modified: > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepri= nt/compendium/cm/CmNamespaceHandler.java > > > > > URL: > > > > > > > > > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/= java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java?rev= =3D1190398&r1=3D1190397&r2=3D1190398&view=3Ddiff > > > > > > > > > > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > > > > --- > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepri= nt/compendium/cm/CmNamespaceHandler.java > > > > > (original) > > > > > +++ > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepri= nt/compendium/cm/CmNamespaceHandler.java > > > > > Fri Oct 28 15:24:42 2011 > > > > > @@ -36,11 +36,6 @@ import org.w3c.dom.NodeList; > > > > > import org.apache.aries.blueprint.ComponentDefinitionRegistry; > > > > > import org.apache.aries.blueprint.NamespaceHandler; > > > > > import org.apache.aries.blueprint.ParserContext; > > > > > -import org.apache.aries.blueprint.parser.Parser; > > > > > -import org.apache.aries.blueprint.parser.ParserContextImpl; > > > > > -import org.apache.aries.blueprint.container.ServiceListener; > > > > > -import org.apache.aries.blueprint.ext.ExtNamespaceHandler; > > > > > -import org.apache.aries.blueprint.ext.PlaceholdersUtils; > > > > > import org.apache.aries.blueprint.mutable.MutableBeanMetadata; > > > > > import > org.apache.aries.blueprint.mutable.MutableCollectionMetadata; > > > > > import > org.apache.aries.blueprint.mutable.MutableComponentMetadata; > > > > > @@ -48,6 +43,8 @@ import org.apache.aries.blueprint.mutabl > > > > > import org.apache.aries.blueprint.mutable.MutableMapMetadata; > > > > > import org.apache.aries.blueprint.mutable.MutableRefMetadata; > > > > > import org.apache.aries.blueprint.mutable.MutableValueMetadata; > > > > > +import org.apache.aries.blueprint.utils.PlaceholdersUtils; > > > > > +import org.apache.aries.blueprint.utils.ServiceListener; > > > > > import > > > org.osgi.service.blueprint.container.ComponentDefinitionException; > > > > > import org.osgi.service.blueprint.reflect.BeanMetadata; > > > > > import org.osgi.service.blueprint.reflect.BeanProperty; > > > > > @@ -81,7 +78,10 @@ public class CmNamespaceHandler implemen > > > > > public static final String BLUEPRINT_NAMESPACE =3D " > > > > > http://www.osgi.org/xmlns/blueprint/v1.0.0"; > > > > > public static final String BLUEPRINT_CM_NAMESPACE_1_0 =3D " > > > > > http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"; > > > > > public static final String BLUEPRINT_CM_NAMESPACE_1_1 =3D " > > > > > http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"; > > > > > - > > > > > + public static final String BLUEPRINT_EXT_NAMESPACE_V1_0 =3D = " > > > > > http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"; > > > > > + public static final String BLUEPRINT_EXT_NAMESPACE_V1_1 =3D = " > > > > > http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.1.0"; > > > > > + public static final String BLUEPRINT_EXT_NAMESPACE_V1_2 =3D = " > > > > > http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.2.0"; > > > > > + > > > > > public static final String PROPERTY_PLACEHOLDER_ELEMENT =3D > > > > > "property-placeholder"; > > > > > public static final String MANAGED_PROPERTIES_ELEMENT =3D > > > > > "managed-properties"; > > > > > public static final String MANAGED_SERVICE_FACTORY_ELEMENT = =3D > > > > > "managed-service-factory"; > > > > > @@ -91,8 +91,12 @@ public class CmNamespaceHandler implemen > > > > > public static final String INTERFACES_ELEMENT =3D "interfaces= "; > > > > > public static final String VALUE_ELEMENT =3D "value"; > > > > > public static final String MANAGED_COMPONENT_ELEMENT =3D > > > > > "managed-component"; > > > > > + public static final String LOCATION_ELEMENT =3D "location"; > > > > > + public static final String SERVICE_PROPERTIES_ELEMENT =3D > > > > > "service-properties"; > > > > > + public static final String REGISTRATION_LISTENER_ELEMENT =3D > > > > > "registration-listener"; > > > > > > > > > > public static final String ID_ATTRIBUTE =3D "id"; > > > > > + public static final String SYSTEM_PROPERTIES_NEVER =3D "neve= r"; > > > > > public static final String PERSISTENT_ID_ATTRIBUTE =3D > > > "persistent-id"; > > > > > public static final String PLACEHOLDER_PREFIX_ATTRIBUTE =3D > > > > > "placeholder-prefix"; > > > > > public static final String PLACEHOLDER_SUFFIX_ATTRIBUTE =3D > > > > > "placeholder-suffix"; > > > > > @@ -104,6 +108,8 @@ public class CmNamespaceHandler implemen > > > > > public static final String RANKING_ATTRIBUTE =3D "ranking"; > > > > > public static final String INTERFACE_ATTRIBUTE =3D "interface= "; > > > > > public static final String UPDATE_ATTRIBUTE =3D "update"; > > > > > + public static final String SYSTEM_PROPERTIES_ATTRIBUTE =3D > > > > > "system-properties"; > > > > > + public static final String IGNORE_MISSING_LOCATIONS_ATTRIBUT= E > =3D > > > > > "ignore-missing-locations"; > > > > > > > > > > public static final String AUTO_EXPORT_DISABLED =3D "disabled= "; > > > > > public static final String AUTO_EXPORT_INTERFACES =3D > "interfaces"; > > > > > @@ -216,7 +222,7 @@ public class CmNamespaceHandler implemen > > > > > } > > > > > String systemProperties =3D > > > > > extractSystemPropertiesAttribute(element); > > > > > if (systemProperties =3D=3D null) { > > > > > - systemProperties =3D > > > > > ExtNamespaceHandler.SYSTEM_PROPERTIES_NEVER; > > > > > + systemProperties =3D SYSTEM_PROPERTIES_NEVER; > > > > > } > > > > > metadata.addProperty("systemProperties", > createValue(context, > > > > > systemProperties)); > > > > > String updateStrategy =3D > > > > > element.getAttribute(UPDATE_STRATEGY_ATTRIBUTE); > > > > > @@ -240,15 +246,13 @@ public class CmNamespaceHandler implemen > > > > > Metadata props =3D > > > parseDefaultProperties(context, > > > > > metadata, e); > > > > > metadata.addProperty("defaultProperties", > > > props); > > > > > } > > > > > - } else if > > > > > > > > > (ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_0.equals(e.getNamespaceUR= I())) > > > > > { > > > > > - if (nodeNameEquals(e, > > > > > ExtNamespaceHandler.LOCATION_ELEMENT)) { > > > > > + } else if > > > > > (BLUEPRINT_EXT_NAMESPACE_V1_0.equals(e.getNamespaceURI()) > > > > > + || > > > > > BLUEPRINT_EXT_NAMESPACE_V1_1.equals(e.getNamespaceURI()) > > > > > + || > > > > > BLUEPRINT_EXT_NAMESPACE_V1_2.equals(e.getNamespaceURI())) { > > > > > + if (nodeNameEquals(e, LOCATION_ELEMENT)) { > > > > > locations.add(getTextValue(e)); > > > > > } > > > > > - } else if > > > > > > > > > (ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_1.equals(e.getNamespaceUR= I())) > > > > > { > > > > > - if (nodeNameEquals(e, > > > > > ExtNamespaceHandler.LOCATION_ELEMENT)) { > > > > > - locations.add(getTextValue(e)); > > > > > - } > > > > > - } > > > > > + } > > > > > } > > > > > } > > > > > if (!locations.isEmpty()) { > > > > > @@ -263,20 +267,24 @@ public class CmNamespaceHandler implemen > > > > > private String extractSystemPropertiesAttribute(Element > element) { > > > > > String systemProperties =3D null; > > > > > > > > > > - if > > > > > > > > > (element.hasAttributeNS(ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_0, > > > > > ExtNamespaceHandler.SYSTEM_PROPERTIES_ATTRIBUTE)) { > > > > > - systemProperties =3D > > > > > > > > > element.getAttributeNS(ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_0, > > > > > ExtNamespaceHandler.SYSTEM_PROPERTIES_ATTRIBUTE); > > > > > - } else if > > > > > > > > > (element.hasAttributeNS(ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_1, > > > > > ExtNamespaceHandler.SYSTEM_PROPERTIES_ATTRIBUTE)) { > > > > > - systemProperties =3D > > > > > > > > > element.getAttributeNS(ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_1, > > > > > ExtNamespaceHandler.SYSTEM_PROPERTIES_ATTRIBUTE); > > > > > + if (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_0, > > > > > SYSTEM_PROPERTIES_ATTRIBUTE)) { > > > > > + systemProperties =3D > > > > > element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_0, > > > > > SYSTEM_PROPERTIES_ATTRIBUTE); > > > > > + } else if > (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_1, > > > > > SYSTEM_PROPERTIES_ATTRIBUTE)) { > > > > > + systemProperties =3D > > > > > element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_1, > > > > > SYSTEM_PROPERTIES_ATTRIBUTE); > > > > > + } else if > (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_2, > > > > > SYSTEM_PROPERTIES_ATTRIBUTE)) { > > > > > + systemProperties =3D > > > > > element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_2, > > > > > SYSTEM_PROPERTIES_ATTRIBUTE); > > > > > } > > > > > return systemProperties; > > > > > } > > > > > > > > > > private String extractIgnoreMissingLocations(Element element)= { > > > > > String ignoreMissingLocations =3D null; > > > > > - if > > > > > > > > > (element.hasAttributeNS(ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_0, > > > > > ExtNamespaceHandler.IGNORE_MISSING_LOCATIONS_ATTRIBUTE)) { > > > > > - ignoreMissingLocations =3D > > > > > > > > > element.getAttributeNS(ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_0, > > > > > ExtNamespaceHandler.IGNORE_MISSING_LOCATIONS_ATTRIBUTE); > > > > > - } else if > > > > > > > > > (element.hasAttributeNS(ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_1, > > > > > ExtNamespaceHandler.IGNORE_MISSING_LOCATIONS_ATTRIBUTE)) { > > > > > - ignoreMissingLocations =3D > > > > > > > > > element.getAttributeNS(ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_1, > > > > > ExtNamespaceHandler.IGNORE_MISSING_LOCATIONS_ATTRIBUTE); > > > > > + if (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_0, > > > > > IGNORE_MISSING_LOCATIONS_ATTRIBUTE)) { > > > > > + ignoreMissingLocations =3D > > > > > element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_0, > > > > > IGNORE_MISSING_LOCATIONS_ATTRIBUTE); > > > > > + } else if > (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_1, > > > > > IGNORE_MISSING_LOCATIONS_ATTRIBUTE)) { > > > > > + ignoreMissingLocations =3D > > > > > element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_1, > > > > > IGNORE_MISSING_LOCATIONS_ATTRIBUTE); > > > > > + } else if > (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_2, > > > > > IGNORE_MISSING_LOCATIONS_ATTRIBUTE)) { > > > > > + ignoreMissingLocations =3D > > > > > element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_1, > > > > > IGNORE_MISSING_LOCATIONS_ATTRIBUTE); > > > > > } > > > > > return ignoreMissingLocations; > > > > > } > > > > > @@ -334,9 +342,7 @@ public class CmNamespaceHandler implemen > > > > > interfaces =3D > > > > > > Collections.singletonList(element.getAttribute(INTERFACE_ATTRIBUTE)); > > > > > factoryMetadata.addProperty("interfaces", > > > createList(context, > > > > > interfaces)); > > > > > } > > > > > - > > > > > - Parser parser =3D getParser(context); > > > > > - > > > > > + > > > > > // Parse elements > > > > > List listeners =3D new > > > > > ArrayList(); > > > > > NodeList nl =3D element.getChildNodes(); > > > > > @@ -347,15 +353,17 @@ public class CmNamespaceHandler implemen > > > > > if (isBlueprintNamespace(e.getNamespaceURI())) { > > > > > if (nodeNameEquals(e, INTERFACES_ELEMENT)) { > > > > > if (interfaces !=3D null) { > > > > > - throw new > > > ComponentDefinitionException("Only > > > > > one of " + Parser.INTERFACE_ATTRIBUTE + " attribute or " + > > > > > INTERFACES_ELEMENT + " element must be used"); > > > > > + throw new > > > ComponentDefinitionException("Only > > > > > one of " + INTERFACE_ATTRIBUTE + " attribute or " + > INTERFACES_ELEMENT > > > + " > > > > > element must be used"); > > > > > } > > > > > interfaces =3D parseInterfaceNames(e); > > > > > factoryMetadata.addProperty("interfaces", > > > > > createList(context, interfaces)); > > > > > - } else if (nodeNameEquals(e, > > > > > Parser.SERVICE_PROPERTIES_ELEMENT)) { > > > > > - MapMetadata map =3D > > > > > parser.parseServiceProperties(e, factoryMetadata); > > > > > + } else if (nodeNameEquals(e, > > > > > SERVICE_PROPERTIES_ELEMENT)) { > > > > > + MapMetadata map =3D > > > > > context.parseElement(MapMetadata.class, > > > > > + factoryMetadata, e); > > > > > > > > factoryMetadata.addProperty("serviceProperties", > > > > > map); > > > > > - } else if (nodeNameEquals(e, > > > > > Parser.REGISTRATION_LISTENER_ELEMENT)) { > > > > > - > > > listeners.add(parser.parseRegistrationListener(e, > > > > > factoryMetadata)); > > > > > + } else if (nodeNameEquals(e, > > > > > REGISTRATION_LISTENER_ELEMENT)) { > > > > > + > > > > > listeners.add(context.parseElement(RegistrationListener.class, > > > > > + factoryMetadata, e)); > > > > > } > > > > > } else if > > > > > (BLUEPRINT_CM_NAMESPACE_1_0.equals(e.getNamespaceURI()) > > > > > || > > > > > BLUEPRINT_CM_NAMESPACE_1_1.equals(e.getNamespaceURI())) { > > > > > @@ -561,13 +569,6 @@ public class CmNamespaceHandler implemen > > > > > return id; > > > > > } > > > > > > > > > > - private Parser getParser(ParserContext ctx) { > > > > > - if (ctx instanceof ParserContextImpl) { > > > > > - return ((ParserContextImpl) ctx).getParser(); > > > > > - } > > > > > - throw new RuntimeException("Unable to get parser"); > > > > > - } > > > > > - > > > > > public List parseInterfaceNames(Element element) { > > > > > List interfaceNames =3D new ArrayList(); > > > > > NodeList nl =3D element.getChildNodes(); > > > > > > > > > > Modified: > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepri= nt/compendium/cm/CmPropertyPlaceholder.java > > > > > URL: > > > > > > > > > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/= java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java?re= v=3D1190398&r1=3D1190397&r2=3D1190398&view=3Ddiff > > > > > > > > > > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > > > > --- > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepri= nt/compendium/cm/CmPropertyPlaceholder.java > > > > > (original) > > > > > +++ > > > > > > > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/bluepri= nt/compendium/cm/CmPropertyPlaceholder.java > > > > > Fri Oct 28 15:24:42 2011 > > > > > @@ -18,16 +18,14 @@ > > > > > */ > > > > > package org.apache.aries.blueprint.compendium.cm; > > > > > > > > > > -import java.io.IOException; > > > > > -import java.util.*; > > > > > +import java.util.Dictionary; > > > > > +import java.util.Enumeration; > > > > > +import java.util.Properties; > > > > > > > > > > import > org.apache.aries.blueprint.services.ExtendedBlueprintContainer; > > > > > -import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholde= r; > > > > > -import org.apache.aries.blueprint.ext.PropertyPlaceholder; > > > > > +import org.apache.aries.blueprint.utils.PropertyPlaceholder; > > > > > import org.osgi.framework.Bundle; > > > > > import org.osgi.framework.Constants; > > > > > -import org.osgi.service.blueprint.container.BlueprintContainer; > > > > > -import > > > org.osgi.service.blueprint.container.ComponentDefinitionException; > > > > > import org.osgi.service.cm.Configuration; > > > > > import org.osgi.service.cm.ConfigurationAdmin; > > > > > import org.slf4j.Logger; > > > > > > > > > > Modified: aries/trunk/blueprint/blueprint-core/pom.xml > > > > > URL: > > > > > > > > > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml= ?rev=3D1190398&r1=3D1190397&r2=3D1190398&view=3Ddiff > > > > > > > > > > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > > > > --- aries/trunk/blueprint/blueprint-core/pom.xml (original) > > > > > +++ aries/trunk/blueprint/blueprint-core/pom.xml Fri Oct 28 > 15:24:42 > > > 2011 > > > > > @@ -51,6 +51,7 @@ > > > > > org.apache.aries.blueprint.mutable, > > > > > org.apache.aries.blueprint.ext.evaluator, > > > > > org.apache.aries.blueprint.services, > > > > > + org.apache.aries.blueprint.utils, > > > > > org.osgi.service.blueprint;version=3D1.0.0 > > > > > > > > > >