You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2012/01/18 03:36:08 UTC

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...

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>