geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1148462 - in /geronimo/server/trunk: ./ framework/configs/karaf-framework/src/main/filtered-resources/etc/ plugins/jetty8/ plugins/jetty8/geronimo-jetty8/ plugins/myfaces/ plugins/openejb/geronimo-openejb/ plugins/openejb/openejb/ plugins/...
Date Tue, 19 Jul 2011 17:51:12 GMT
Author: djencks
Date: Tue Jul 19 17:51:10 2011
New Revision: 1148462

URL: http://svn.apache.org/viewvc?rev=1148462&view=rev
Log:
GERONIMO-5893 start a lot of bundles as a karaf feature so they don't necessarily get added
to geronimo dependency tracking

Added:
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/etc/
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
      - copied, changed from r1148359, geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/
    geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml
  (with props)
Removed:
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml
    geronimo/server/trunk/plugins/jetty8/pom.xml
    geronimo/server/trunk/plugins/myfaces/pom.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=1148462&r1=1148461&r2=1148462&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
Tue Jul 19 17:51:10 2011
@@ -40,7 +40,7 @@ org/apache/aries/blueprint/org.apache.ar
 org/apache/geronimo/framework/geronimo-shell/${pom.version}/geronimo-shell-${pom.version}.jar=30
 org/apache/karaf/shell/org.apache.karaf.shell.console/${karaf.version}/org.apache.karaf.shell.console-${karaf.version}.jar=30
 org/apache/karaf/deployer/org.apache.karaf.deployer.blueprint/${karaf.version}/org.apache.karaf.deployer.blueprint-${karaf.version}.jar=30
-#org/apache/karaf/deployer/org.apache.karaf.deployer.features/${karaf.version}/org.apache.karaf.deployer.features-${karaf.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.features/${karaf.version}/org.apache.karaf.deployer.features-${karaf.version}.jar=30
 org/apache/karaf/shell/org.apache.karaf.shell.osgi/${karaf.version}/org.apache.karaf.shell.osgi-${karaf.version}.jar=30
 org/apache/karaf/shell/org.apache.karaf.shell.log/${karaf.version}/org.apache.karaf.shell.log-${karaf.version}.jar=30
 org/apache/karaf/shell/org.apache.karaf.shell.config/${karaf.version}/org.apache.karaf.shell.config-${karaf.version}.jar=30
@@ -50,8 +50,12 @@ org/apache/karaf/shell/org.apache.karaf.
 org/apache/karaf/jaas/org.apache.karaf.jaas.config/${karaf.version}/org.apache.karaf.jaas.config-${karaf.version}.jar=30
 org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${karaf.version}/org.apache.karaf.jaas.modules-${karaf.version}.jar=30
 
-#org/apache/karaf/features/org.apache.karaf.features.core/${karaf.version}/org.apache.karaf.features.core-${karaf.version}.jar=30
-#org/apache/karaf/features/org.apache.karaf.features.command/${karaf.version}/org.apache.karaf.features.command-${karaf.version}.jar=30
+#org/apache/karaf/org.apache.karaf.management/${karaf.version}/org.apache.karaf.management-${karaf.version}.jar=30
+#org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
+#org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
+
+org/apache/karaf/features/org.apache.karaf.features.core/${karaf.version}/org.apache.karaf.features.core-${karaf.version}.jar=30
+org/apache/karaf/features/org.apache.karaf.features.command/${karaf.version}/org.apache.karaf.features.command-${karaf.version}.jar=30
 #org/apache/karaf/features/org.apache.karaf.features.management/${karaf.version}/org.apache.karaf.features.management-${karaf.version}.jar=30
 
 org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
@@ -59,6 +63,8 @@ org/apache/sshd/sshd-core/${sshd.version
 org/apache/karaf/shell/org.apache.karaf.shell.ssh/${karaf.version}/org.apache.karaf.shell.ssh-${karaf.version}.jar=30
 
 org/apache/geronimo/specs/geronimo-osgi-registry/1.1-SNAPSHOT/geronimo-osgi-registry-1.1-SNAPSHOT.jar=35
+#feature service has trouble with this repackaged bundle
+org/apache/xbean/xbean-asm-shaded/${xbeanVersion}/xbean-asm-shaded-${xbeanVersion}.jar=35
 
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.xstream/1.3_3/org.apache.servicemix.bundles.xstream-1.3_3.jar=40
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_3/org.apache.servicemix.bundles.xpp3-1.1.4c_3.jar=40

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml?rev=1148462&r1=1148461&r2=1148462&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml Tue Jul 19 17:51:10 2011
@@ -69,6 +69,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-jsf</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${project.version}</version>

Modified: geronimo/server/trunk/plugins/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/pom.xml?rev=1148462&r1=1148461&r2=1148462&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/pom.xml Tue Jul 19 17:51:10 2011
@@ -40,6 +40,13 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>openejb</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
                 <version>${jettyVersion}</version>

Modified: geronimo/server/trunk/plugins/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/pom.xml?rev=1148462&r1=1148461&r2=1148462&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/pom.xml Tue Jul 19 17:51:10 2011
@@ -33,9 +33,9 @@
         MyFaces plugin
     </description>
 
-    <properties>
-        <myfacesVersion>2.0.8-SNAPSHOT</myfacesVersion>
-    </properties>
+    <!--<properties>-->
+        <!--<myfacesVersion>2.0.8-SNAPSHOT</myfacesVersion>-->
+    <!--</properties>-->
     
     <modules>
         <module>geronimo-myfaces</module>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=1148462&r1=1148461&r2=1148462&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Tue Jul 19 17:51:10 2011
@@ -189,6 +189,7 @@
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-jsf</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
@@ -204,5 +205,22 @@
         </dependency>
 
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                        <Import-Package>
+                            org.apache.webbeans.jsf;resolution:="optional",
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
 
+        </plugins>
+    </build>
 </project>

Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=1148462&r1=1148461&r2=1148462&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Tue Jul 19 17:51:10 2011
@@ -259,6 +259,8 @@
                             <config-substitution key="MultipointServers" />
                             <config-substitution key="ClusterName">cluster1</config-substitution>
                           
                             <copy-file relative-to="geronimo" dest-dir="schema">schema/</copy-file>
+                            <copy-file relative-to="geronimo" dest-dir="etc">etc/</copy-file>
+                            <copy-file relative-to="geronimo" dest-dir="repository">repository/</copy-file>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Copied: geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(from r1148359, geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.karaf.features.cfg)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?p2=geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&p1=geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&r1=1148359&r2=1148462&rev=1148462&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Tue Jul 19 17:51:10 2011
@@ -20,9 +20,10 @@
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories=mvn:org.apache.karaf/apache-karaf/${project.version}/xml/features
+featuresRepositories=mvn:org.apache.geronimo.features/openejb-feature/${project.version}/xml/features
 
 #
 # Comma separated list of features to install at startup
 #
-featuresBoot=config,ssh,management
+featuresBoot=openejb-feature
+#  config,ssh,management

Added: geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml?rev=1148462&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml
(added)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml
Tue Jul 19 17:51:10 2011
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="openejb-feature-${project.version}">
+    <feature resolver="(OBR)" description="openejb-feature-feature" version="${project.version}"
name="openejb-feature">
+        <details>openejb-feature details</details>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>
+        <bundle start-level="35">mvn:org.apache.myfaces.core/myfaces-bundle/${myfacesVersion}</bundle>
+        <bundle start-level="35">mvn:commons-collections/commons-collections/3.2.1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-jaxws_2.2_spec/1.1-SNAPSHOT</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-jaxrs_1.1_spec/1.0</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-jsp_2.2_spec/1.0</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.bundles/jstl/1.2_1</bundle>
+        <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/1.3_2</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.bundles/commons-digester/1.8_1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.bundles/commons-discovery/0.4_1</bundle>
+        <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_2</bundle>
+        <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/3.12.0.ga_1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${javamail.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.openejb/openejb-core/${openejbVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openejb/mbean-annotation-api/${openejbVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openejb/openejb-api/${openejbVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openejb/openejb-loader/${openejbVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openejb/openejb-javaagent/${openejbVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openejb/openejb-jee/${openejbVersion}</bundle>
+        <bundle start-level="35">mvn:commons-cli/commons-cli/1.2</bundle>
+        <bundle start-level="35">mvn:org.apache.xbean/xbean-reflect/${xbeanVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.xbean/xbean-naming/${xbeanVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.xbean/xbean-bundleutils/${xbeanVersion}</bundle>
+        <bundle start-level="35">mvn:commons-dbcp/commons-dbcp/1.4</bundle>
+        <bundle start-level="35">mvn:commons-pool/commons-pool/1.5.4</bundle>
+        <bundle start-level="35">mvn:org.apache.openwebbeans/openwebbeans-impl/${openwebbeansVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openwebbeans/openwebbeans-spi/${openwebbeansVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openwebbeans/openwebbeans-ejb/${openwebbeansVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openwebbeans/openwebbeans-ee/${openwebbeansVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openwebbeans/openwebbeans-web/${openwebbeansVersion}</bundle>
+        <!--<bundle start-level="35">mvn:org.beanshell/bsh/2.0b5</bundle>-->
+        <bundle start-level="35">mvn:org.apache.openejb/openejb-client/${openejbVersion}</bundle>
+        <!--<bundle start-level="35">mvn:org.apache.openejb/commons-dbcp-all/1.3-r699049</bundle>-->
+        <bundle start-level="35">mvn:org.apache.geronimo.modules/geronimo-openejb/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-interceptor_1.1_spec/1.0</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
+        <!--<bundle start-level="35">mvn:org.ops4j.pax.logging/pax-logging-api/1.6.1</bundle>-->
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-el_2.2_spec/${geronimoel.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-validation_1.0_spec/1.1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/1.0</bundle>
+        <!--<bundle start-level="35">mvn:org.codehaus.swizzle/swizzle-stream/1.0.2</bundle>-->
+        <bundle start-level="35">mvn:org.apache.openejb/openejb-ejbd/${openejbVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openejb/openejb-server/${openejbVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openejb/openejb-multicast/${openejbVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.openejb/openejb-osgi-core/${openejbVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.bundles/jaxb-impl/${jaxbImplVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-stax-api_1.2_spec/1.1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-jaxb_2.2_spec/1.0.1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/1.1</bundle>
+        <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/1.6.2_2</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.bundles/woodstox-core-asl/${woodstoxVersion}</bundle>
+        <!--<bundle start-level="35">mvn:org.codehaus.woodstox/stax2-api/3.1.1</bundle>-->
+        <bundle start-level="35">mvn:org.apache.xbean/xbean-finder/${xbeanVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.bundles/scannotation/1.0.2_1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.modules/geronimo-bval/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.modules/geronimo-j2ee/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.framework/geronimo-system/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.framework/geronimo-cli/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.framework/geronimo-common/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.framework/geronimo-kernel/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/${geronimoosgiregistry.version}</bundle>
+        <bundle start-level="35">mvn:asm/asm-all/3.2</bundle>
+        <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
+        <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/1.3_3</bundle>
+        <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_3</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.framework/geronimo-crypto/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.framework/geronimo-pax-logging/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.felix/org.apache.felix.configadmin/1.2.4</bundle>
+        <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-jexl/1.1_3</bundle>
+        <bundle start-level="35">mvn:commons-lang/commons-lang/2.5</bundle>
+        <bundle start-level="35">mvn:org.apache.felix/org.apache.felix.bundlerepository/1.6.6</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.framework/geronimo-management/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-saaj_1.3_spec/1.1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-jaxrpc_1.1_spec/2.1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-ejb_3.1_spec/1.0.2</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.framework/geronimo-naming/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+        <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/1.0.1-1_1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.components/geronimo-transaction/${txmanagerVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.6_spec/1.0</bundle>
+        <bundle start-level="35">mvn:commons-beanutils/commons-beanutils/1.8.3</bundle>
+        <bundle start-level="35">mvn:org.apache.bval/org.apache.bval.bundle/0.2-incubating</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.modules/geronimo-persistence-jpa20/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.modules/geronimo-connector-1_6/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.components/geronimo-connector/${txmanagerVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.framework/geronimo-security/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-jacc_1.4_spec/1.0</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1</bundle>
+        <!--<bundle start-level="35">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.boot/3.0.0-SNAPSHOT</bundle>-->
+        <bundle start-level="35">mvn:org.apache.geronimo.components/geronimo-jaspi/1.1.1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.bundles/sxc-jaxb/0.7.2_1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.bundles/sxc-jaxb/0.7.3_1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.bundles/sxc-runtime/0.7.3_1</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.modules/geronimo-transaction-1_6/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.framework/geronimo-core/${project.version}</bundle>
+        <bundle start-level="35">mvn:org.tranql/tranql-connector/1.7</bundle>
+        <bundle start-level="35">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle>
+        <bundle start-level="35">mvn:org.apache.openwebbeans/openwebbeans-ee-common/${openwebbeansVersion}</bundle>
+        <bundle start-level="35">mvn:org.apache.yoko/yoko-spec-corba/${yokoVersion}</bundle>
+        <!--<bundle start-level="35">mvn:org.osgi/org.osgi.core/4.2.0</bundle>-->
+        <!--<bundle start-level="35">mvn:org.osgi/org.osgi.compendium/4.2.0</bundle>-->
+        <!--<bundle start-level="35">mvn:org.apache.xbean/xbean-asm-shaded/3.8-SNAPSHOT</bundle>-->
+        <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.8.3_1</bundle>
+        <bundle start-level="35">mvn:org.apache.openwebbeans/openwebbeans-jsf/${openwebbeansVersion}</bundle>
+    </feature>
+</features>

Propchange: geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/openejb/openejb/src/main/filtered-resources/repository/org/apache/geronimo/features/openejb-feature/3.0-SNAPSHOT/openejb-feature-3.0-SNAPSHOT-features.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1148462&r1=1148461&r2=1148462&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jul 19 17:51:10 2011
@@ -90,6 +90,10 @@
         <sxcVersion>0.7.3_1</sxcVersion>
         <yokoVersion>1.2-SNAPSHOT</yokoVersion>
         <juddiv3.version>3.1.0</juddiv3.version>
+        <javamail.version>1.8.3-SNAPSHOT</javamail.version>
+        <geronimoel.version>1.0.2-SNAPSHOT</geronimoel.version>
+        <geronimoosgiregistry.version>1.1-SNAPSHOT</geronimoosgiregistry.version>
+        <myfacesVersion>2.0.8-SNAPSHOT</myfacesVersion>
 
         <!-- Deployers -->
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${project.version}/car
@@ -161,7 +165,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-osgi-registry</artifactId>
-                <version>1.1-SNAPSHOT</version>
+                <version>${geronimoosgiregistry.version}</version>
             </dependency>
 
             <dependency>
@@ -197,7 +201,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-el_2.2_spec</artifactId>
-                <version>1.0.2-SNAPSHOT</version>
+                <version>${geronimoel.version}</version>
             </dependency>
 
             <dependency>
@@ -244,7 +248,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.javamail</groupId>
                 <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                <version>1.8.3-SNAPSHOT</version>
+                <version>${javamail.version}</version>
             </dependency>
 
             <dependency>



Mime
View raw message