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 2011/04/27 01:20:02 UTC
svn commit: r1096954 - in /geronimo/server/trunk/framework:
assemblies/geronimo-framework/ buildsupport/car-maven-plugin/
configs/j2ee-security/ configs/j2ee-security/src/main/plan/
configs/j2ee-system/ configs/jsr88-deploymentfactory/src/main/plan/ co...
Author: djencks
Date: Tue Apr 26 23:20:01 2011
New Revision: 1096954
URL: http://svn.apache.org/viewvc?rev=1096954&view=rev
Log:
update to use boot features instead of startup.properties
Modified:
geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml
geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml
geronimo/server/trunk/framework/configs/offline-deployer/src/main/plan/plan.xml
geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml
geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
geronimo/server/trunk/framework/configs/shutdown/src/main/plan/plan.xml
geronimo/server/trunk/framework/features/j2ee-security/pom.xml
geronimo/server/trunk/framework/features/j2ee-system/pom.xml
geronimo/server/trunk/framework/features/rmi-naming/pom.xml
geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml
geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml
geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/WrapperConfigurationStore.java
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=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml Tue Apr 26 23:20:01 2011
@@ -47,6 +47,7 @@
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>karaf-full</artifactId>
<type>kar</type>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
@@ -68,6 +69,7 @@
<version>${project.version}</version>
<type>xml</type>
<classifier>features</classifier>
+ <scope>runtime</scope>
</dependency>
</dependencies>
@@ -172,6 +174,27 @@
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <configuration>
+ <bootFeatures>
+ <feature>management</feature>
+ <feature>standard</feature>
+ <feature>karaf-full</feature>
+ <feature>ssh</feature>
+ <feature>config</feature>
+ <feature>declarative-services</feature>
+ <feature>management</feature>
+ <feature>jndi</feature>
+ <feature>obr</feature>
+ <feature>j2ee-system</feature>
+ </bootFeatures>
+ </configuration>
+ </plugin>
+
+ </plugins>
</build>
<profiles>
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Tue Apr 26 23:20:01 2011
@@ -255,6 +255,10 @@
</dependency>
<dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.boot</artifactId>
</dependency>
Modified: geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/pom.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/pom.xml Tue Apr 26 23:20:01 2011
@@ -51,11 +51,11 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-jmx-remoting</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>geronimo-jmx-remoting</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.components</groupId>
Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml Tue Apr 26 23:20:01 2011
@@ -36,16 +36,17 @@
</gbean>
<!-- JMX Remoting -->
- <gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
- <attribute name="protocol">rmi</attribute>
- <attribute name="host">${planServerHostname}</attribute>
- <attribute name="port">${planJMXPort}</attribute>
- <attribute name="urlPath">/jndi/rmi://${planServerHostname}:${planNamingPort}/JMXConnector</attribute>
- <attribute name="applicationConfigName">geronimo-admin</attribute>
- <reference name="MBeanServerReference">
- <name>MBeanServerReference</name>
- </reference>
- </gbean>
+ <!-- provided by karaf -->
+ <!--<gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">-->
+ <!--<attribute name="protocol">rmi</attribute>-->
+ <!--<attribute name="host">${planServerHostname}</attribute>-->
+ <!--<attribute name="port">${planJMXPort}</attribute>-->
+ <!--<attribute name="urlPath">/jndi/rmi://${planServerHostname}:${planNamingPort}/JMXConnector</attribute>-->
+ <!--<attribute name="applicationConfigName">geronimo-admin</attribute>-->
+ <!--<reference name="MBeanServerReference">-->
+ <!--<name>MBeanServerReference</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<gbean name="KeystoreManager" class="org.apache.geronimo.security.keystore.FileKeystoreManager">
<attribute name="keystoreDir">var/security/keystores</attribute>
Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Tue Apr 26 23:20:01 2011
@@ -129,21 +129,21 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-pax-logging</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.ops4j.pax.logging</groupId>-->
+ <!--<artifactId>pax-logging-api</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>geronimo-pax-logging</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.felix</groupId>-->
+ <!--<artifactId>org.apache.felix.configadmin</artifactId>-->
+ <!--</dependency>-->
</dependencies>
Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml Tue Apr 26 23:20:01 2011
@@ -21,7 +21,9 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- ServerInfo service -->
- <!--<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>-->
+ <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.WrappingServerInfo">
+ <!--<attribute name="useSystemProperties">true</attribute>-->
+ </gbean>
<!--Repository-->
<!--<gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">-->
@@ -32,21 +34,21 @@
<!--</gbean>-->
<!--Configuration Store service-->
- <!--<gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">-->
+ <gbean name="Local" class="org.apache.geronimo.system.configuration.WrapperConfigurationStore">
<!--<reference name="Repository">-->
<!--<name>Repository</name>-->
<!--</reference>-->
- <!--</gbean>-->
+ </gbean>
<!--User-editable attribute service-->
- <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+ <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.WrapperAttributeManager">
<!--<reference name="ServerInfo">-->
<!--<name>ServerInfo</name>-->
<!--</reference>-->
- <attribute name="readOnly">true</attribute>
- <attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
- <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
- <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
+ <!--<attribute name="readOnly">true</attribute>-->
+ <!--<attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>-->
+ <!--<attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>-->
+ <!--<attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>-->
</gbean>
<!-- ArtifactManager -->
Modified: geronimo/server/trunk/framework/configs/offline-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/offline-deployer/src/main/plan/plan.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/offline-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/offline-deployer/src/main/plan/plan.xml Tue Apr 26 23:20:01 2011
@@ -20,14 +20,14 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- <attribute name="readOnly">true</attribute>
- <attribute name="configFile">var/config/offline-deployer-config.xml</attribute>
- <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
- <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
+ <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.WrapperAttributeManager">
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
+ <!--<attribute name="readOnly">true</attribute>-->
+ <!--<attribute name="configFile">var/config/offline-deployer-config.xml</attribute>-->
+ <!--<attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>-->
+ <!--<attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>-->
</gbean>
<!-- System Properties -->
Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml Tue Apr 26 23:20:01 2011
@@ -21,7 +21,7 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- ServerInfo service -->
- <!--<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>-->
+ <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.WrappingServerInfo"/>
<!--Repository-->
<!--<gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">-->
@@ -32,11 +32,11 @@
<!--</gbean>-->
<!--Configuration Store service-->
- <!--<gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">-->
+ <gbean name="Local" class="org.apache.geronimo.system.configuration.WrapperConfigurationStore">
<!--<reference name="Repository">-->
<!--<name>Repository</name>-->
<!--</reference>-->
- <!--</gbean>-->
+ </gbean>
<!-- ArtifactManager -->
<!--<gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>-->
@@ -58,12 +58,12 @@
<!--</gbean>-->
<!--User-editable attribute service-->
- <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+ <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.WrapperAttributeManager">
<!--<reference name="ServerInfo">-->
<!--<name>ServerInfo</name>-->
<!--</reference>-->
- <attribute name="readOnly">true</attribute>
- <attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
+ <!--<attribute name="readOnly">true</attribute>-->
+ <!--<attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>-->
</gbean>
<!--Server attribute service-->
@@ -71,9 +71,9 @@
<!--<reference name="ServerInfo">-->
<!--<name>ServerInfo</name>-->
<!--</reference>-->
- <attribute name="configFile">var/config/config.xml</attribute>
- <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
- <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
+ <!--<attribute name="configFile">var/config/config.xml</attribute>-->
+ <!--<attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>-->
+ <!--<attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>-->
</gbean>
<!--Configuration Manager service-->
Modified: geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/pom.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Tue Apr 26 23:20:01 2011
@@ -94,26 +94,26 @@
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- </dependency>
-
- <!-- aries jmx integration -->
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.blueprint</artifactId>
- </dependency>
-
- <!-- aries jndi integration -->
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.aries.blueprint</groupId>-->
+ <!--<artifactId>org.apache.aries.blueprint</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<!– aries jmx integration –>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.aries.jmx</groupId>-->
+ <!--<artifactId>org.apache.aries.jmx</artifactId>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.aries.jmx</groupId>-->
+ <!--<artifactId>org.apache.aries.jmx.blueprint</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<!– aries jndi integration –>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.aries.jndi</groupId>-->
+ <!--<artifactId>org.apache.aries.jndi</artifactId>-->
+ <!--</dependency>-->
</dependencies>
Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/plan/plan.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/plan/plan.xml Tue Apr 26 23:20:01 2011
@@ -20,7 +20,7 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <!--<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>-->
+ <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.WrappingServerInfo"/>
<!--<gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">-->
<!--<attribute name="root">repository/</attribute>-->
@@ -29,7 +29,7 @@
<!--</reference>-->
<!--</gbean>-->
- <!--<gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">-->
+ <gbean name="Local" class="org.apache.geronimo.system.configuration.WrapperConfigurationStore"/>
<!--<reference name="Repository">-->
<!--<name>Repository</name>-->
<!--</reference>-->
Modified: geronimo/server/trunk/framework/features/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-security/pom.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/framework/features/j2ee-security/pom.xml Tue Apr 26 23:20:01 2011
@@ -52,11 +52,13 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-jmx-remoting</artifactId>
- <version>${project.version}</version>
- </dependency>
+
+ <!-- todo enhance karaf connector -->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>geronimo-jmx-remoting</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.components</groupId>
Modified: geronimo/server/trunk/framework/features/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-system/pom.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/features/j2ee-system/pom.xml Tue Apr 26 23:20:01 2011
@@ -166,21 +166,22 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-pax-logging</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.ops4j.pax.logging</groupId>-->
+ <!--<artifactId>pax-logging-api</artifactId>-->
+ <!--</dependency>-->
+
+ <!-- TODO figure out if this is the best way to implement what we want. Consider a fragment? -->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>geronimo-pax-logging</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.felix</groupId>-->
+ <!--<artifactId>org.apache.felix.configadmin</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.framework.config</groupId>
Modified: geronimo/server/trunk/framework/features/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/rmi-naming/pom.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/features/rmi-naming/pom.xml Tue Apr 26 23:20:01 2011
@@ -86,26 +86,26 @@
<artifactId>xbean-naming</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.aries.blueprint</groupId>-->
+ <!--<artifactId>org.apache.aries.blueprint</artifactId>-->
+ <!--</dependency>-->
<!-- aries jmx integration -->
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.blueprint</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.aries.jmx</groupId>-->
+ <!--<artifactId>org.apache.aries.jmx</artifactId>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.aries.jmx</groupId>-->
+ <!--<artifactId>org.apache.aries.jmx.blueprint</artifactId>-->
+ <!--</dependency>-->
<!-- aries jndi integration -->
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.aries.jndi</groupId>-->
+ <!--<artifactId>org.apache.aries.jndi</artifactId>-->
+ <!--</dependency>-->
</dependencies>
Modified: geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml Tue Apr 26 23:20:01 2011
@@ -35,6 +35,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml Tue Apr 26 23:20:01 2011
@@ -78,6 +78,7 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml Tue Apr 26 23:20:01 2011
@@ -48,6 +48,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Tue Apr 26 23:20:01 2011
@@ -134,6 +134,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/WrapperConfigurationStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/WrapperConfigurationStore.java?rev=1096954&r1=1096953&r2=1096954&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/WrapperConfigurationStore.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/WrapperConfigurationStore.java Tue Apr 26 23:20:01 2011
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.Set;
import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.geronimo.gbean.annotation.ParamSpecial;
import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
import org.apache.geronimo.gbean.wrapper.AbstractServiceWrapper;
@@ -44,6 +45,7 @@ import org.osgi.framework.Bundle;
/**
* @version $Rev:$ $Date:$
*/
+@GBean(j2eeType = "ConfigurationStore")
public class WrapperConfigurationStore extends AbstractServiceWrapper<ConfigurationStore> implements ConfigurationStore {
public WrapperConfigurationStore(@ParamSpecial(type = SpecialAttributeType.bundle) final Bundle bundle) {