Return-Path: 
 <commits-return-4611-apmail-aries-commits-archive=aries.apache.org@aries.apache.org>
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 A552794B5
	for <apmail-aries-commits-archive@www.apache.org>;
 Fri,  2 Dec 2011 23:36:44 +0000 (UTC)
Received: (qmail 22755 invoked by uid 500); 2 Dec 2011 23:36:44 -0000
Delivered-To: apmail-aries-commits-archive@aries.apache.org
Received: (qmail 22689 invoked by uid 500); 2 Dec 2011 23:36:44 -0000
Mailing-List: contact commits-help@aries.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@aries.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@aries.apache.org>
List-Post: <mailto:commits@aries.apache.org>
List-Id: <commits.aries.apache.org>
Reply-To: dev@aries.apache.org
Delivered-To: mailing list commits@aries.apache.org
Received: (qmail 22680 invoked by uid 99); 2 Dec 2011 23:36:44 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 23:36:44 +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, 02 Dec 2011 23:36:43 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 28266238897F;
	Fri,  2 Dec 2011 23:36:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1209780 - in /aries/trunk/blueprint:
 blueprint-cm/pom.xml
 blueprint-core-compatibility/ blueprint-core-compatibility/pom.xml
 blueprint-core/pom.xml pom.xml
Date: Fri, 02 Dec 2011 23:36:21 -0000
To: commits@aries.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111202233622.28266238897F@eris.apache.org>

Author: djencks
Date: Fri Dec  2 23:36:21 2011
New Revision: 1209780

URL: http://svn.apache.org/viewvc?rev=1209780&view=rev
Log:
ARIES-797 introduce a o.a.a.b.core.compatibility fragment bundle, revert the cm export of ...compendium.cm which I think xbean-blueprint won't need

Added:
    aries/trunk/blueprint/blueprint-core-compatibility/
      - copied from r1209699, aries/trunk/blueprint/blueprint-compatibility/
    aries/trunk/blueprint/blueprint-core-compatibility/pom.xml
      - copied, changed from r1209710, aries/trunk/blueprint/blueprint-compatibility/pom.xml
Modified:
    aries/trunk/blueprint/blueprint-cm/pom.xml
    aries/trunk/blueprint/blueprint-core/pom.xml
    aries/trunk/blueprint/pom.xml

Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1209780&r1=1209779&r2=1209780&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Fri Dec  2 23:36:21 2011
@@ -41,18 +41,18 @@
    </scm>
 
     <properties>
-        <aries.osgi.import>
+        <!-- Export package versions are maintained in packageinfo files -->
+        <aries.osgi.export.pkg/>
+        <aries.osgi.import.pkg>
             org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
             *
-        </aries.osgi.import>
-        <!-- 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 />
-     </properties>
+        </aries.osgi.import.pkg>
+        <aries.osgi.private.pkg>
+            org.apache.aries.blueprint.compendium.cm
+        </aries.osgi.private.pkg>
+    </properties>
 
-  <dependencies>
+    <dependencies>
       <dependency>
           <groupId>org.apache.aries.blueprint</groupId>
           <artifactId>org.apache.aries.blueprint.api</artifactId>

Copied: aries/trunk/blueprint/blueprint-core-compatibility/pom.xml (from r1209710, aries/trunk/blueprint/blueprint-compatibility/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core-compatibility/pom.xml?p2=aries/trunk/blueprint/blueprint-core-compatibility/pom.xml&p1=aries/trunk/blueprint/blueprint-compatibility/pom.xml&r1=1209710&r2=1209780&rev=1209780&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-compatibility/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core-compatibility/pom.xml Fri Dec  2 23:36:21 2011
@@ -24,19 +24,19 @@
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
-    <artifactId>org.apache.aries.blueprint.compatibility</artifactId>
+    <artifactId>org.apache.aries.blueprint.core.compatibility</artifactId>
     <packaging>jar</packaging>
-    <name>Apache Aries Blueprint Compatiblity Fragment Bundle</name>
+    <name>Apache Aries Blueprint Core Compatiblity Fragment Bundle</name>
     <version>0.4.1-SNAPSHOT</version>
     <description>
-        This bundle contains extra classes and exports to allow Blueprint to be compatible
+        This bundle contains extra classes and exports to allow Blueprint core 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>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-core-compatibility</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-core-compatibility</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core-compatibility</url>
     </scm>
 
     <properties>
@@ -44,14 +44,13 @@
             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>
+            <artifactId>org.apache.aries.blueprint.core</artifactId>
             <version>0.4.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
@@ -71,7 +70,7 @@
                 </executions>
                 <configuration>
                     <instructions>
-                        <Fragment-Host>org.apache.aries.blueprint</Fragment-Host>
+                        <Fragment-Host>org.apache.aries.blueprint.core</Fragment-Host>
                         <Export-Package>${aries.osgi.export}</Export-Package>
                         <Import-Package>!*</Import-Package>
                     </instructions>

Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1209780&r1=1209779&r2=1209780&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Fri Dec  2 23:36:21 2011
@@ -53,9 +53,6 @@
           org.apache.aries.blueprint.ext.evaluator,
           org.apache.aries.blueprint.services,
           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.osgi.service.blueprint;version=1.0.0
       </aries.osgi.export.pkg>
       <!-- 

Modified: aries/trunk/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/pom.xml?rev=1209780&r1=1209779&r2=1209780&view=diff
==============================================================================
--- aries/trunk/blueprint/pom.xml (original)
+++ aries/trunk/blueprint/pom.xml Fri Dec  2 23:36:21 2011
@@ -44,6 +44,7 @@
         <module>blueprint-cm</module>
         <module>blueprint-bundle</module>
         <module>blueprint-compatibility</module>
+        <module>blueprint-core-compatibility</module>
         <module>blueprint-jexl-evaluator</module>
         <module>blueprint-sample</module>
         <module>blueprint-annotation-api</module>