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, <[email protected]> wrote: > Author: timothyjward > Date: Fri Oct 28 15:24:42 2011 > New Revision: 1190398 > > URL: http://svn.apache.org/viewvc?rev=1190398&view=rev > 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/blueprint/utils/PlaceholdersUtils.java > - copied, changed from r1189089, > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java > - copied, changed from r1189089, > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceListener.java > - copied, changed from r1189089, > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceListener.java > Removed: > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceListener.java > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java > Modified: > aries/trunk/blueprint/blueprint-cm/pom.xml > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java > > > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java > aries/trunk/blueprint/blueprint-core/pom.xml > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo > > > aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java > > Modified: aries/trunk/blueprint/blueprint-cm/pom.xml > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1190398&r1=1190397&r2=1190398&view=diff > > ============================================================================== > --- aries/trunk/blueprint/blueprint-cm/pom.xml (original) > +++ aries/trunk/blueprint/blueprint-cm/pom.xml Fri Oct 28 15:24:42 2011 > @@ -41,6 +41,10 @@ > </scm> > > <properties> > + <aries.osgi.import> > + org.apache.aries.*;version="$<range;[==,=+)>", > + * > + </aries.osgi.import> > <!-- Export package versions are maintained in packageinfo files --> > <aries.osgi.export.pkg/> > <aries.osgi.private.pkg> > > Modified: > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/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=1190398&r1=1190397&r2=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java > (original) > +++ > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/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/blueprint/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=1190398&r1=1190397&r2=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java > (original) > +++ > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/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 = " > http://www.osgi.org/xmlns/blueprint/v1.0.0";; > public static final String BLUEPRINT_CM_NAMESPACE_1_0 = " > http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0";; > public static final String BLUEPRINT_CM_NAMESPACE_1_1 = " > http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0";; > - > + public static final String BLUEPRINT_EXT_NAMESPACE_V1_0 = " > http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";; > + public static final String BLUEPRINT_EXT_NAMESPACE_V1_1 = " > http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.1.0";; > + public static final String BLUEPRINT_EXT_NAMESPACE_V1_2 = " > http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.2.0";; > + > public static final String PROPERTY_PLACEHOLDER_ELEMENT = > "property-placeholder"; > public static final String MANAGED_PROPERTIES_ELEMENT = > "managed-properties"; > public static final String MANAGED_SERVICE_FACTORY_ELEMENT = > "managed-service-factory"; > @@ -91,8 +91,12 @@ public class CmNamespaceHandler implemen > public static final String INTERFACES_ELEMENT = "interfaces"; > public static final String VALUE_ELEMENT = "value"; > public static final String MANAGED_COMPONENT_ELEMENT = > "managed-component"; > + public static final String LOCATION_ELEMENT = "location"; > + public static final String SERVICE_PROPERTIES_ELEMENT = > "service-properties"; > + public static final String REGISTRATION_LISTENER_ELEMENT = > "registration-listener"; > > public static final String ID_ATTRIBUTE = "id"; > + public static final String SYSTEM_PROPERTIES_NEVER = "never"; > public static final String PERSISTENT_ID_ATTRIBUTE = "persistent-id"; > public static final String PLACEHOLDER_PREFIX_ATTRIBUTE = > "placeholder-prefix"; > public static final String PLACEHOLDER_SUFFIX_ATTRIBUTE = > "placeholder-suffix"; > @@ -104,6 +108,8 @@ public class CmNamespaceHandler implemen > public static final String RANKING_ATTRIBUTE = "ranking"; > public static final String INTERFACE_ATTRIBUTE = "interface"; > public static final String UPDATE_ATTRIBUTE = "update"; > + public static final String SYSTEM_PROPERTIES_ATTRIBUTE = > "system-properties"; > + public static final String IGNORE_MISSING_LOCATIONS_ATTRIBUTE = > "ignore-missing-locations"; > > public static final String AUTO_EXPORT_DISABLED = "disabled"; > public static final String AUTO_EXPORT_INTERFACES = "interfaces"; > @@ -216,7 +222,7 @@ public class CmNamespaceHandler implemen > } > String systemProperties = > extractSystemPropertiesAttribute(element); > if (systemProperties == null) { > - systemProperties = > ExtNamespaceHandler.SYSTEM_PROPERTIES_NEVER; > + systemProperties = SYSTEM_PROPERTIES_NEVER; > } > metadata.addProperty("systemProperties", createValue(context, > systemProperties)); > String updateStrategy = > element.getAttribute(UPDATE_STRATEGY_ATTRIBUTE); > @@ -240,15 +246,13 @@ public class CmNamespaceHandler implemen > Metadata props = parseDefaultProperties(context, > metadata, e); > metadata.addProperty("defaultProperties", props); > } > - } else if > (ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_0.equals(e.getNamespaceURI())) > { > - 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.getNamespaceURI())) > { > - 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 = null; > > - if > (element.hasAttributeNS(ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_0, > ExtNamespaceHandler.SYSTEM_PROPERTIES_ATTRIBUTE)) { > - systemProperties = > 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 = > element.getAttributeNS(ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_1, > ExtNamespaceHandler.SYSTEM_PROPERTIES_ATTRIBUTE); > + if (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_0, > SYSTEM_PROPERTIES_ATTRIBUTE)) { > + systemProperties = > element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_0, > SYSTEM_PROPERTIES_ATTRIBUTE); > + } else if (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_1, > SYSTEM_PROPERTIES_ATTRIBUTE)) { > + systemProperties = > element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_1, > SYSTEM_PROPERTIES_ATTRIBUTE); > + } else if (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_2, > SYSTEM_PROPERTIES_ATTRIBUTE)) { > + systemProperties = > element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_2, > SYSTEM_PROPERTIES_ATTRIBUTE); > } > return systemProperties; > } > > private String extractIgnoreMissingLocations(Element element) { > String ignoreMissingLocations = null; > - if > (element.hasAttributeNS(ExtNamespaceHandler.BLUEPRINT_EXT_NAMESPACE_V1_0, > ExtNamespaceHandler.IGNORE_MISSING_LOCATIONS_ATTRIBUTE)) { > - ignoreMissingLocations = > 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 = > 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 = > 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 = > 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 = > element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_1, > IGNORE_MISSING_LOCATIONS_ATTRIBUTE); > } > return ignoreMissingLocations; > } > @@ -334,9 +342,7 @@ public class CmNamespaceHandler implemen > interfaces = > Collections.singletonList(element.getAttribute(INTERFACE_ATTRIBUTE)); > factoryMetadata.addProperty("interfaces", createList(context, > interfaces)); > } > - > - Parser parser = getParser(context); > - > + > // Parse elements > List<RegistrationListener> listeners = new > ArrayList<RegistrationListener>(); > NodeList nl = element.getChildNodes(); > @@ -347,15 +353,17 @@ public class CmNamespaceHandler implemen > if (isBlueprintNamespace(e.getNamespaceURI())) { > if (nodeNameEquals(e, INTERFACES_ELEMENT)) { > if (interfaces != 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 = parseInterfaceNames(e); > factoryMetadata.addProperty("interfaces", > createList(context, interfaces)); > - } else if (nodeNameEquals(e, > Parser.SERVICE_PROPERTIES_ELEMENT)) { > - MapMetadata map = > parser.parseServiceProperties(e, factoryMetadata); > + } else if (nodeNameEquals(e, > SERVICE_PROPERTIES_ELEMENT)) { > + MapMetadata map = > 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<String> parseInterfaceNames(Element element) { > List<String> interfaceNames = new ArrayList<String>(); > NodeList nl = element.getChildNodes(); > > Modified: > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/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?rev=1190398&r1=1190397&r2=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java > (original) > +++ > aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/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.AbstractPropertyPlaceholder; > -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=1190398&r1=1190397&r2=1190398&view=diff > > ============================================================================== > --- 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=1.0.0 > </aries.osgi.export.pkg> > <!-- > > Modified: > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java?rev=1190398&r1=1190397&r2=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java > (original) > +++ > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java > Fri Oct 28 15:24:42 2011 > @@ -29,6 +29,7 @@ import java.util.Set; > import org.apache.aries.blueprint.ComponentDefinitionRegistry; > import org.apache.aries.blueprint.ExtendedBeanMetadata; > import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; > +import org.apache.aries.blueprint.utils.ServiceListener; > import org.apache.aries.blueprint.PassThroughMetadata; > import org.apache.aries.blueprint.di.ArrayRecipe; > import org.apache.aries.blueprint.di.CollectionRecipe; > > Modified: > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java?rev=1190398&r1=1190397&r2=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java > (original) > +++ > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java > Fri Oct 28 15:24:42 2011 > @@ -43,6 +43,7 @@ import org.apache.aries.blueprint.proxy. > import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; > 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.proxy.InvocationListener; > import org.apache.aries.proxy.UnableToProxyException; > import org.apache.aries.util.AriesFrameworkUtil; > > Modified: > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java?rev=1190398&r1=1190397&r2=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java > (original) > +++ > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java > Fri Oct 28 15:24:42 2011 > @@ -37,6 +37,8 @@ import org.apache.aries.blueprint.mutabl > import org.apache.aries.blueprint.mutable.MutableReferenceMetadata; > import org.apache.aries.blueprint.mutable.MutableServiceReferenceMetadata; > import org.apache.aries.blueprint.mutable.MutableValueMetadata; > +import org.apache.aries.blueprint.utils.PlaceholdersUtils; > +import org.apache.aries.blueprint.utils.PropertyPlaceholder; > import org.osgi.framework.BundleContext; > import org.osgi.service.blueprint.container.ComponentDefinitionException; > import org.osgi.service.blueprint.reflect.BeanMetadata; > > Modified: > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo?rev=1190398&r1=1190397&r2=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo > (original) > +++ > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo > Fri Oct 28 15:24:42 2011 > @@ -16,4 +16,4 @@ > # specific language governing permissions and limitations > # under the License. > # > -version 0.3.0 > +version 0.4.0 > > Copied: > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java > (from r1189089, > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java) > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java?p2=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java&p1=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java&r1=1189089&r2=1190398&rev=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java > (original) > +++ > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java > Fri Oct 28 15:24:42 2011 > @@ -16,10 +16,11 @@ > * specific language governing permissions and limitations > * under the License. > */ > -package org.apache.aries.blueprint.ext; > +package org.apache.aries.blueprint.utils; > > import org.apache.aries.blueprint.ComponentDefinitionRegistry; > import org.apache.aries.blueprint.ExtendedBeanMetadata; > +import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholder; > import org.apache.aries.blueprint.mutable.MutableBeanMetadata; > import org.osgi.service.blueprint.container.ComponentDefinitionException; > import org.osgi.service.blueprint.reflect.BeanMetadata; > > Copied: > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java > (from r1189089, > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java) > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java?p2=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java&p1=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java&r1=1189089&r2=1190398&rev=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java > (original) > +++ > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java > Fri Oct 28 15:24:42 2011 > @@ -16,7 +16,7 @@ > * specific language governing permissions and limitations > * under the License. > */ > -package org.apache.aries.blueprint.ext; > +package org.apache.aries.blueprint.utils; > > import java.io.IOException; > import java.io.InputStream; > @@ -27,6 +27,7 @@ import java.util.List; > import java.util.Map; > import java.util.Properties; > > +import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholder; > import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluator; > import org.slf4j.Logger; > import org.slf4j.LoggerFactory; > > Copied: > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceListener.java > (from r1189089, > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceListener.java) > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceListener.java?p2=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceListener.java&p1=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceListener.java&r1=1189089&r2=1190398&rev=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceListener.java > (original) > +++ > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceListener.java > Fri Oct 28 15:24:42 2011 > @@ -14,14 +14,13 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.aries.blueprint.container; > +package org.apache.aries.blueprint.utils; > > import java.lang.reflect.Method; > import java.util.List; > import java.util.Map; > > import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; > -import org.apache.aries.blueprint.utils.ReflectionUtils; > import org.osgi.service.blueprint.container.ComponentDefinitionException; > import org.slf4j.Logger; > import org.slf4j.LoggerFactory; > > Modified: > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo?rev=1190398&r1=1190397&r2=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo > (original) > +++ > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo > Fri Oct 28 15:24:42 2011 > @@ -16,4 +16,4 @@ > # specific language governing permissions and limitations > # under the License. > # > -version 0.3.2 > +version 0.4.0 > > Modified: > aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java?rev=1190398&r1=1190397&r2=1190398&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java > (original) > +++ > aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java > Fri Oct 28 15:24:42 2011 > @@ -23,6 +23,7 @@ import static org.junit.Assert.assertEqu > import java.util.HashMap; > import java.util.Map; > > +import org.apache.aries.blueprint.utils.PropertyPlaceholder; > import org.junit.Before; > import org.junit.Test; > import org.osgi.service.blueprint.reflect.ValueMetadata; > > > -- ------------------------ Guillaume Nodet ------------------------ Blog: http://gnodet.blogspot.com/ ------------------------ Open Source SOA http://fusesource.com
