Return-Path: 
 <scm-return-48092-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A370EBD93
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Wed, 18 Jan 2012 02:36:44 +0000 (UTC)
Received: (qmail 68797 invoked by uid 500); 18 Jan 2012 02:36:42 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 67886 invoked by uid 500); 18 Jan 2012 02:36:36 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 67750 invoked by uid 99); 18 Jan 2012 02:36:33 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jan 2012 02:36:33 +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; Wed, 18 Jan 2012 02:36:30 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E65742388993;
	Wed, 18 Jan 2012 02:36:08 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1232723 - in /geronimo/server/trunk:
 assemblies/geronimo-jetty8-javaee6-web/ assemblies/geronimo-jetty8-javaee6/
 assemblies/geronimo-tomcat7-javaee6-web/
 assemblies/geronimo-tomcat7-javaee6/ assemblies/geronimo-tomcat7-minimal/
 framework/a...
Date: Wed, 18 Jan 2012 02:36:08 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120118023608.E65742388993@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Wed Jan 18 02:36:08 2012
New Revision: 1232723

URL: http://svn.apache.org/viewvc?rev=1232723&view=rev
Log:
adapt to aries feature for full blueprint

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml
    geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml?rev=1232723&r1=1232722&r2=1232723&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml Wed Jan 18 02:36:08 2012
@@ -95,6 +95,8 @@
                         <feature>obr</feature>
                         <feature>framework</feature>
                         <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>aries-annotation</feature>
+                        <feature>org.apache.karaf.scr.feature</feature>
                     </startupFeatures>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/pom.xml?rev=1232723&r1=1232722&r2=1232723&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/pom.xml Wed Jan 18 02:36:08 2012
@@ -96,6 +96,8 @@
                         <feature>obr</feature>
                         <feature>framework</feature>
                         <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>aries-annotation</feature>
+                        <feature>org.apache.karaf.scr.feature</feature>
                     </startupFeatures>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml?rev=1232723&r1=1232722&r2=1232723&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml Wed Jan 18 02:36:08 2012
@@ -95,6 +95,8 @@
                         <feature>obr</feature>
                         <feature>framework</feature>
                         <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>aries-annotation</feature>
+                        <feature>org.apache.karaf.scr.feature</feature>
                     </startupFeatures>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml?rev=1232723&r1=1232722&r2=1232723&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml Wed Jan 18 02:36:08 2012
@@ -102,6 +102,7 @@
                         <feature>obr</feature>
                         <feature>framework</feature>
                         <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>aries-annotation</feature>
                         <feature>org.apache.karaf.scr.feature</feature>
                     </startupFeatures>
                 </configuration>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml?rev=1232723&r1=1232722&r2=1232723&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml Wed Jan 18 02:36:08 2012
@@ -97,6 +97,8 @@
                         <feature>obr</feature>
                         <feature>framework</feature>
                         <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>aries-annotation</feature>
+                        <feature>org.apache.karaf.scr.feature</feature>
                     </startupFeatures>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml?rev=1232723&r1=1232722&r2=1232723&view=diff
==============================================================================
--- geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml Wed Jan 18 02:36:08 2012
@@ -188,6 +188,7 @@
                         <feature>kar</feature>
                         <feature>obr</feature>
                         <feature>framework</feature>
+                        <feature>aries-annotation</feature>
                     </startupFeatures>
                 </configuration>
             </plugin>