Shouldn't the artifactId of this new compatibiity bundle be org.apache.aries.blueprint.compatibility? (. instead of -)
Also I think we need to remove the extra imports from the little bundles as well. If the compendium.cm package is only used by xbean-blueprint I'd like to experiment with copying the classes into xbean-blueprint rather than exporting them. I _think_ this will work fine but haven't checked yet. thanks david jencks On Nov 28, 2011, at 9:30 AM, [email protected] wrote: > Author: dkulp > Date: Mon Nov 28 17:30:55 2011 > New Revision: 1207473 > > URL: http://svn.apache.org/viewvc?rev=1207473&view=rev > Log: > Add a compatibility bundle to enable the exports of blueprint > > Added: > aries/trunk/blueprint/blueprint-compatibility/ > aries/trunk/blueprint/blueprint-compatibility/pom.xml (with props) > Modified: > aries/trunk/blueprint/blueprint-bundle/pom.xml > aries/trunk/blueprint/pom.xml > > Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1207473&r1=1207472&r2=1207473&view=diff > ============================================================================== > --- aries/trunk/blueprint/blueprint-bundle/pom.xml (original) > +++ aries/trunk/blueprint/blueprint-bundle/pom.xml Mon Nov 28 17:30:55 2011 > @@ -83,10 +83,6 @@ > org.apache.aries.blueprint.ext, > org.apache.aries.blueprint.ext.evaluator, > org.apache.aries.blueprint.utils, > - org.apache.aries.blueprint.container;deprecated="true", > - org.apache.aries.blueprint.di;deprecated="true", > - org.apache.aries.blueprint.reflect;deprecated="true", > - org.apache.aries.blueprint.compendium.cm;deprecated="true", > </aries.osgi.export.pkg> > <aries.osgi.private.pkg> > org.apache.aries.blueprint.parser, > @@ -97,6 +93,10 @@ > org.apache.aries.blueprint.namespace, > org.apache.aries.blueprint.proxy, > org.apache.aries.blueprint.utils.*, > + org.apache.aries.blueprint.container, > + org.apache.aries.blueprint.di, > + org.apache.aries.blueprint.reflect, > + org.apache.aries.blueprint.compendium.cm, > OSGI-INF* > </aries.osgi.private.pkg> > <aries.osgi.export.service> > > Added: aries/trunk/blueprint/blueprint-compatibility/pom.xml > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-compatibility/pom.xml?rev=1207473&view=auto > ============================================================================== > --- aries/trunk/blueprint/blueprint-compatibility/pom.xml (added) > +++ aries/trunk/blueprint/blueprint-compatibility/pom.xml Mon Nov 28 17:30:55 > 2011 > @@ -0,0 +1,139 @@ > +<!-- > + Licensed to the Apache Software Foundation (ASF) under one or more > + contributor license agreements. See the NOTICE file distributed with > + this work for additional information regarding copyright ownership. > + The ASF licenses this file to You under the Apache License, Version 2.0 > + (the "License"); you may not use this file except in compliance with > + the License. You may obtain a copy of the License at > + > + http://www.apache.org/licenses/LICENSE-2.0 > + > + Unless required by applicable law or agreed to in writing, software > + distributed under the License is distributed on an "AS IS" BASIS, > + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > + See the License for the specific language governing permissions and > + limitations under the License. > +--> > +<project xmlns="http://maven.apache.org/POM/4.0.0"; > xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; > xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 > http://maven.apache.org/maven-v4_0_0.xsd";> > + <modelVersion>4.0.0</modelVersion> > + <parent> > + <groupId>org.apache.aries</groupId> > + <artifactId>java5-parent</artifactId> > + <version>0.5</version> > + <relativePath /> > + </parent> > + > + <groupId>org.apache.aries.blueprint</groupId> > + <artifactId>org.apache.aries.blueprint-compatibility</artifactId> > + <packaging>jar</packaging> > + <name>Apache Aries Blueprint Compatiblity Fragment Bundle</name> > + <version>0.4.1-SNAPSHOT</version> > + <description> > + This bundle contains extra classes and exports to allow Blueprint to > be compatible > + with previous versions of Blueprint. > + </description> > + > + <scm> > + > <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-compatibility</connection> > + > <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-compatibility</developerConnection> > + > <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-compatibility</url> > + </scm> > + > + <properties> > + <aries.osgi.export> > + org.apache.aries.blueprint.container;deprecated="true", > + org.apache.aries.blueprint.di;deprecated="true", > + org.apache.aries.blueprint.reflect;deprecated="true", > + org.apache.aries.blueprint.compendium.cm;deprecated="true", > + </aries.osgi.export> > + </properties> > + > + <dependencies> > + <dependency> > + <groupId>org.apache.aries.blueprint</groupId> > + <artifactId>org.apache.aries.blueprint</artifactId> > + <version>0.4.1-SNAPSHOT</version> > + <scope>provided</scope> > + </dependency> > + </dependencies> > + <build> > + <plugins> > + <plugin> > + <groupId>org.apache.felix</groupId> > + <artifactId>maven-bundle-plugin</artifactId> > + <executions> > + <execution> > + <id>create-manifest</id> > + <goals> > + <goal>manifest</goal> > + </goals> > + </execution> > + </executions> > + <configuration> > + <instructions> > + > <Fragment-Host>org.apache.aries.blueprint</Fragment-Host> > + <Export-Package>${aries.osgi.export}</Export-Package> > + <Import-Package>!*</Import-Package> > + </instructions> > + </configuration> > + </plugin> > + </plugins> > + <pluginManagement> > + <plugins> > + <plugin> > + <artifactId>maven-jar-plugin</artifactId> > + <configuration> > + <archive> > + > <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> > + </archive> > + </configuration> > + </plugin> > + </plugins> > + </pluginManagement> > + </build> > + > + <profiles> > + <profile> > + <id>deploy</id> > + <properties> > + <createSourcesJar>true</createSourcesJar> > + </properties> > + <build> > + <plugins> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-source-plugin</artifactId> > + <executions> > + <execution> > + <id>attach-sources</id> > + <phase>process-classes</phase> > + <goals> > + <goal>jar</goal> > + </goals> > + </execution> > + </executions> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-javadoc-plugin</artifactId> > + <executions> > + <execution> > + <id>package</id> > + <phase>package</phase> > + <goals> > + <goal>jar</goal> > + </goals> > + </execution> > + </executions> > + <configuration> > + <minmemory>128m</minmemory> > + <maxmemory>512m</maxmemory> > + > <sourcepath>${project.build.directory}/sources</sourcepath> > + </configuration> > + </plugin> > + </plugins> > + </build> > + </profile> > + </profiles> > + > +</project> > > Propchange: aries/trunk/blueprint/blueprint-compatibility/pom.xml > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: aries/trunk/blueprint/blueprint-compatibility/pom.xml > ------------------------------------------------------------------------------ > svn:keywords = Rev Date > > Propchange: aries/trunk/blueprint/blueprint-compatibility/pom.xml > ------------------------------------------------------------------------------ > svn:mime-type = text/xml > > Modified: aries/trunk/blueprint/pom.xml > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/pom.xml?rev=1207473&r1=1207472&r2=1207473&view=diff > ============================================================================== > --- aries/trunk/blueprint/pom.xml (original) > +++ aries/trunk/blueprint/pom.xml Mon Nov 28 17:30:55 2011 > @@ -43,6 +43,7 @@ > <module>blueprint-core</module> > <module>blueprint-cm</module> > <module>blueprint-bundle</module> > + <module>blueprint-compatibility</module> > <module>blueprint-jexl-evaluator</module> > <module>blueprint-sample</module> > <module>blueprint-annotation-api</module> > >
