-1 Please revert this commit. One can't just decide that packages are now to be hidden. Those packages are actually used, so this would warrant a major version and needs to be discussed with possible upgrade paths.
On Wed, Oct 12, 2011 at 06:03, <[email protected]> wrote: > Author: timothyjward > Date: Wed Oct 12 13:03:02 2011 > New Revision: 1182345 > > URL: http://svn.apache.org/viewvc?rev=1182345&view=rev > Log: > ARIES-754: More updates to blueprint and transaction ready to release for > use - prevent blueprint exposing internals > > Added: > > > aries/trunk/transaction/transaction-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml > Removed: > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/BundleDelegatingClassLoader.java > > > aries/trunk/transaction/transaction-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110304.xml > Modified: > aries/trunk/blueprint/blueprint-bundle/pom.xml > aries/trunk/blueprint/blueprint-cm/pom.xml > aries/trunk/blueprint/blueprint-core/pom.xml > > > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java > aries/trunk/transaction/transaction-blueprint/pom.xml > > > aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java > > > aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java > > > aries/trunk/transaction/transaction-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java > > > aries/trunk/transaction/transaction-itests/src/test/resources/ss-runner.properties > aries/trunk/transaction/transaction-manager/pom.xml > aries/trunk/transaction/transaction-wrappers/pom.xml > > Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1182345&r1=1182344&r2=1182345&view=diff > > ============================================================================== > --- aries/trunk/blueprint/blueprint-bundle/pom.xml (original) > +++ aries/trunk/blueprint/blueprint-bundle/pom.xml Wed Oct 12 13:03:02 2011 > @@ -74,10 +74,22 @@ > org.osgi.service.blueprint.container, > org.osgi.service.blueprint.reflect, > !org.apache.aries.blueprint.annotation*, > - org.apache.aries.blueprint* > + org.apache.aries.blueprint, > + org.apache.aries.blueprint.mutable, > + org.apache.aries.blueprint.ext.evaluator > </aries.osgi.export.pkg> > <aries.osgi.private.pkg> > - OSGI-INF* > + org.apache.aries.blueprint.parser, > + org.apache.aries.blueprint.reflect, > + org.apache.aries.blueprint.container, > + org.apache.aries.blueprint.di, > + org.apache.aries.blueprint.ext, > + org.apache.aries.blueprint.namespace, > + org.apache.aries.blueprint.proxy, > + org.apache.aries.blueprint.services, > + org.apache.aries.blueprint.utils*, > + org.apache.aries.blueprint.compendium.cm, > + OSGI-INF* > </aries.osgi.private.pkg> > <aries.osgi.export.service> > org.apache.aries.blueprint.ParserService > > Modified: aries/trunk/blueprint/blueprint-cm/pom.xml > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1182345&r1=1182344&r2=1182345&view=diff > > ============================================================================== > --- aries/trunk/blueprint/blueprint-cm/pom.xml (original) > +++ aries/trunk/blueprint/blueprint-cm/pom.xml Wed Oct 12 13:03:02 2011 > @@ -42,10 +42,10 @@ > > <properties> > <!-- Export package versions are maintained in packageinfo files --> > - <aries.osgi.export.pkg> > - org.apache.aries.blueprint.compendium.cm* > - </aries.osgi.export.pkg> > - <aries.osgi.private.pkg /> > + <aries.osgi.export.pkg/> > + <aries.osgi.private.pkg> > + org.apache.aries.blueprint.compendium.cm > + </aries.osgi.private.pkg> > </properties> > > <dependencies> > > Modified: aries/trunk/blueprint/blueprint-core/pom.xml > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1182345&r1=1182344&r2=1182345&view=diff > > ============================================================================== > --- aries/trunk/blueprint/blueprint-core/pom.xml (original) > +++ aries/trunk/blueprint/blueprint-core/pom.xml Wed Oct 12 13:03:02 2011 > @@ -47,7 +47,9 @@ > <!-- Export package versions are maintained in packageinfo files --> > <aries.osgi.export.pkg> > !org.apache.aries.blueprint.annotation*, > - org.apache.aries.blueprint*, > + org.apache.aries.blueprint, > + org.apache.aries.blueprint.mutable, > + org.apache.aries.blueprint.ext.evaluator, > org.osgi.service.blueprint;version=1.0.0 > </aries.osgi.export.pkg> > <!-- > @@ -67,7 +69,17 @@ > org.apache.aries.*;version="$<range;[==,=+)>", > * > </aries.osgi.import> > - <aries.osgi.private.pkg /> > + <aries.osgi.private.pkg> > + org.apache.aries.blueprint.parser, > + org.apache.aries.blueprint.reflect, > + org.apache.aries.blueprint.container, > + org.apache.aries.blueprint.di, > + org.apache.aries.blueprint.ext, > + org.apache.aries.blueprint.namespace, > + org.apache.aries.blueprint.proxy, > + org.apache.aries.blueprint.services, > + org.apache.aries.blueprint.utils* > + </aries.osgi.private.pkg> > <aries.osgi.export.service> > org.apache.aries.blueprint.ParserService > </aries.osgi.export.service> > > Modified: > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java > URL: > http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java?rev=1182345&r1=1182344&r2=1182345&view=diff > > ============================================================================== > --- > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java > (original) > +++ > aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java > Wed Oct 12 13:03:02 2011 > @@ -43,9 +43,7 @@ import org.apache.aries.blueprint.Extend > import org.apache.aries.blueprint.di.AbstractRecipe; > import org.apache.aries.blueprint.di.CollectionRecipe; > import org.apache.aries.blueprint.di.Recipe; > -import org.apache.aries.blueprint.utils.BundleDelegatingClassLoader; > import org.apache.aries.blueprint.utils.ReflectionUtils; > -import org.apache.aries.proxy.UnableToProxyException; > import org.osgi.framework.BundleContext; > import org.osgi.framework.Constants; > import org.osgi.framework.InvalidSyntaxException; > > Modified: aries/trunk/transaction/transaction-blueprint/pom.xml > URL: > http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=1182345&r1=1182344&r2=1182345&view=diff > > ============================================================================== > --- aries/trunk/transaction/transaction-blueprint/pom.xml (original) > +++ aries/trunk/transaction/transaction-blueprint/pom.xml Wed Oct 12 > 13:03:02 2011 > @@ -45,8 +45,9 @@ > org.apache.aries.transaction.exception > </aries.osgi.export.pkg> > <aries.osgi.import> > - org.osgi.framework;version="1.5", > - org.osgi.service.cm;version="[1.2.0,2.0.0)", > + org.osgi.framework, > + org.osgi.service.cm, > + org.apache.aries.*;version="$<range;[==,=+)>", > * > </aries.osgi.import> > <aries.osgi.private.pkg> > @@ -59,6 +60,7 @@ > <dependency> > <groupId>org.osgi</groupId> > <artifactId>org.osgi.core</artifactId> > + <version>4.2.0</version> > <scope>provided</scope> > </dependency> > <dependency> > @@ -68,8 +70,8 @@ > </dependency> > <dependency> > <groupId>org.apache.aries.blueprint</groupId> > - <artifactId>org.apache.aries.blueprint</artifactId> > - <version>0.3</version> > + <artifactId>org.apache.aries.blueprint.core</artifactId> > + <version>0.3.2-SNAPSHOT</version> > <scope>provided</scope> > </dependency> > <dependency> > > Modified: > aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java > URL: > http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java?rev=1182345&r1=1182344&r2=1182345&view=diff > > ============================================================================== > --- > aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java > (original) > +++ > aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java > Wed Oct 12 13:03:02 2011 > @@ -29,10 +29,10 @@ import javax.transaction.TransactionMana > import org.apache.aries.blueprint.ComponentDefinitionRegistry; > import org.apache.aries.blueprint.NamespaceHandler; > import org.apache.aries.blueprint.container.NamespaceHandlerRegistry; > -import org.apache.aries.blueprint.container.Parser; > -import > org.apache.aries.blueprint.container.NamespaceHandlerRegistry.NamespaceHandlerSet; > -import > org.apache.aries.blueprint.namespace.ComponentDefinitionRegistryImpl; > import org.apache.aries.blueprint.namespace.NamespaceHandlerRegistryImpl; > +import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; > +import org.apache.aries.blueprint.parser.NamespaceHandlerSet; > +import org.apache.aries.blueprint.parser.Parser; > import org.apache.aries.blueprint.reflect.PassThroughMetadataImpl; > import org.apache.aries.mocks.BundleContextMock; > import org.apache.aries.mocks.BundleMock; > > Modified: > aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java > URL: > http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java?rev=1182345&r1=1182344&r2=1182345&view=diff > > ============================================================================== > --- > aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java > (original) > +++ > aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java > Wed Oct 12 13:03:02 2011 > @@ -66,6 +66,6 @@ public abstract class AbstractIntegratio > PaxRunnerOptions.rawPaxRunnerOption("config", > "classpath:ss-runner.properties"), > > equinox().version("3.5.0"), > - equinox().version("3.7.0.v20110304")); > + equinox().version("3.7.0.v20110613")); > } > } > \ No newline at end of file > > Modified: > aries/trunk/transaction/transaction-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java > URL: > http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java?rev=1182345&r1=1182344&r2=1182345&view=diff > > ============================================================================== > --- > aries/trunk/transaction/transaction-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java > (original) > +++ > aries/trunk/transaction/transaction-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java > Wed Oct 12 13:03:02 2011 > @@ -42,7 +42,7 @@ public class SsActivator extends Abstrac > new EquinoxPlatformBuilder( bundleContext, "3.5.0" ), > new EquinoxPlatformBuilder( bundleContext, "3.5.1" ), > new EquinoxPlatformBuilder( bundleContext, "3.6.0" ), > - new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110304" > ), > + new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110613" > ), > new EquinoxPlatformBuilderSnapshot( bundleContext ) > }; > } > > Added: > aries/trunk/transaction/transaction-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml > URL: > http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml?rev=1182345&view=auto > > ============================================================================== > --- > aries/trunk/transaction/transaction-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml > (added) > +++ > aries/trunk/transaction/transaction-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml > Wed Oct 12 13:03:02 2011 > @@ -0,0 +1,8 @@ > +<platform> > + > + <name>Equinox 3.7.0</name> > + <system>mvn:org.eclipse.tycho/org.eclipse.osgi/3.7.0.v20110613</system> > + > + <profile name="minimal" default="true"/> > + > +</platform> > > Modified: > aries/trunk/transaction/transaction-itests/src/test/resources/ss-runner.properties > URL: > http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/resources/ss-runner.properties?rev=1182345&r1=1182344&r2=1182345&view=diff > > ============================================================================== > --- > aries/trunk/transaction/transaction-itests/src/test/resources/ss-runner.properties > (original) > +++ > aries/trunk/transaction/transaction-itests/src/test/resources/ss-runner.properties > Wed Oct 12 13:03:02 2011 > @@ -64,7 +64,7 @@ platform.equinox.3.5.1=org.ops4j.pax.run > > > platform.equinox.3.6.0=org.ops4j.pax.runner.platform.equinox.internal.SsActivator > > > platform.equinox.SNAPSHOT=org.ops4j.pax.runner.platform.equinox.internal.SsActivator > > > platform.equinox.V43PROTOTYPE-3.6.0.201003231329=org.ops4j.pax.runner.platform.equinox.internal.SsActivator > > -platform.equinox.3.7.0.V20110304=org.ops4j.pax.runner.platform.equinox.internal.SsActivator > > +platform.equinox.3.7.0.V20110613=org.ops4j.pax.runner.platform.equinox.internal.SsActivator > # Felix > > platform.felix.1.0.0=org.ops4j.pax.runner.platform.felix.internal.Activator > > platform.felix.1.0.1=org.ops4j.pax.runner.platform.felix.internal.Activator > > Modified: aries/trunk/transaction/transaction-manager/pom.xml > URL: > http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1182345&r1=1182344&r2=1182345&view=diff > > ============================================================================== > --- aries/trunk/transaction/transaction-manager/pom.xml (original) > +++ aries/trunk/transaction/transaction-manager/pom.xml Wed Oct 12 > 13:03:02 2011 > @@ -46,10 +46,11 @@ > <aries.osgi.import> > org.springframework.*;resolution:=optional;version="[2.5,4)", > !org.apache.geronimo.transaction*, > - javax.resource.spi;version="1.5";resolution:=optional, > - org.osgi.framework;version="1.4", > - org.osgi.service.cm;version="[1.2.0,2.0.0)", > - javax.transaction*;version="[1.1.0,2.0.0)", > + javax.resource.spi;resolution:=optional, > + org.osgi.framework, > + org.osgi.service.cm, > + javax.transaction*, > + org.apache.aries.*;version="$<range;[==,=+)>", > * > </aries.osgi.import> > <aries.osgi.private.pkg> > @@ -81,6 +82,7 @@ > <dependency> > <groupId>org.osgi</groupId> > <artifactId>org.osgi.core</artifactId> > + <version>4.1.0</version> > <scope>provided</scope> > </dependency> > <dependency> > > Modified: aries/trunk/transaction/transaction-wrappers/pom.xml > URL: > http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-wrappers/pom.xml?rev=1182345&r1=1182344&r2=1182345&view=diff > > ============================================================================== > --- aries/trunk/transaction/transaction-wrappers/pom.xml (original) > +++ aries/trunk/transaction/transaction-wrappers/pom.xml Wed Oct 12 > 13:03:02 2011 > @@ -41,6 +41,10 @@ > <aries.osgi.export.pkg> > !org.apache.aries.transaction.jdbc > </aries.osgi.export.pkg> > + <aries.osgi.import> > + org.apache.aries.*;version="$<range;[==,=+)>", > + * > + </aries.osgi.import> > <aries.osgi.private.pkg> > org.apache.aries.transaction.jdbc > </aries.osgi.private.pkg> > @@ -53,7 +57,7 @@ > <dependency> > <groupId>org.apache.aries.transaction</groupId> > <artifactId>org.apache.aries.transaction.manager</artifactId> > - <version>0.3.1-SNAPSHOT</version> > + <version>0.3</version> > </dependency> > <dependency> > <groupId>org.apache.aries</groupId> > > > -- ------------------------ Guillaume Nodet ------------------------ Blog: http://gnodet.blogspot.com/ ------------------------ Open Source SOA http://fusesource.com
