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 2009/10/14 02:11:35 UTC
svn commit: r824982 [1/2] - in /geronimo/sandbox/djencks/osgi/framework: ./
buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
bundles/log4j/ bundles/slf4j/ bundles/wstx-asl/ configs/client-system/
configs/client-system/s...
Author: djencks
Date: Wed Oct 14 00:11:33 2009
New Revision: 824982
URL: http://svn.apache.org/viewvc?rev=824982&view=rev
Log:
try to clean up dependencies. I appear to be starting 3 out of 5 plugins
Added:
geronimo/sandbox/djencks/osgi/framework/bundles/log4j/
- copied from r824410, geronimo/sandbox/djencks/osgi/framework/bundles/commons-cli/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/pom.xml (with props)
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/ConfigurationManagerCommandSupport.java (with props)
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/KernelCommandSupport.java (with props)
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/test/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/test/java/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/test/java/org/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/test/java/org/apache/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/test/java/org/apache/geronimo/
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/test/java/org/apache/geronimo/shell/
Removed:
geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/
geronimo/sandbox/djencks/osgi/framework/bundles/wstx-asl/
Modified:
geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
geronimo/sandbox/djencks/osgi/framework/bundles/log4j/pom.xml
geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml
geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml
geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml
geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/plan/plan.xml
geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml
geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml
geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/pom.xml
geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/configs/upgrade/src/main/history/dependencies.xml
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/pom.xml
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/pom.xml
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
geronimo/sandbox/djencks/osgi/framework/modules/pom.xml
geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml
geronimo/sandbox/djencks/osgi/framework/pom.xml
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Wed Oct 14 00:11:33 2009
@@ -637,9 +637,10 @@
"net.sf.cglib.core," +
"net.sf.cglib.proxy," +
"net.sf.cglib.reflect," +
- "org.apache.commons.jexl," +
- "org.apache.commons.jexl.context," +
- "org.apache.commons.jexl.resolver," +
+ "org.apache.commons.jexl;version=\"1.1\"," +
+ "org.apache.commons.jexl.context;version=\"1.1\"," +
+ "org.apache.commons.jexl.resolver;version=\"1.1\"," +
+ "org.apache.commons.logging;version=\"1.1.1\"," +
"org.apache.geronimo.cli," +
"org.apache.geronimo.cli.client," +
"org.apache.geronimo.cli.daemon," +
@@ -681,13 +682,10 @@
"org.apache.geronimo.system.sharedlib," +
"org.apache.geronimo.system.threads," +
"org.apache.geronimo.system.util," +
- "org.apache.log4j," +
- "org.apache.log4j.helpers," +
- "org.apache.log4j.spi," +
- "org.apache.log4j.xml," +
- "org.osgi.framework;version=\"1.4\"," +
- "org.slf4j;version=\"1.5\"," +
- "org.slf4j.bridge," +
+ "org.apache.log4j;version=\"1.2.12\"," +
+ "org.apache.log4j.helpers;version=\"1.2.12\"," +
+ "org.apache.log4j.spi;version=\"1.2.12\"," +
+ "org.apache.log4j.xml;version=\"1.2.12\"," +
"org.apache.geronimo.mavenplugins.car," +
"org.codehaus.classworlds," +
@@ -754,7 +752,9 @@
"org.objectweb.asm," +
"org.objectweb.asm.commons," +
"org.osgi.framework;version=\"1.4\"," +
- "org.slf4j;version=\"1.5\"," +
+ "org.slf4j;version=\"1.5.6\"," +
+ "org.slf4j.impl;version=\"1.5.6\"," +
+ "org.slf4j.bridge;version=\"1.5.6\"," +
"org.w3c.dom," +
"org.xml.sax," +
"org.xml.sax.helpers," +
Modified: geronimo/sandbox/djencks/osgi/framework/bundles/log4j/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/log4j/pom.xml?rev=824982&r1=824410&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/log4j/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/log4j/pom.xml Wed Oct 14 00:11:33 2009
@@ -29,8 +29,8 @@
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.0_1-SNAPSHOT</version>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
@@ -38,9 +38,9 @@
</description>
<properties>
- <pkgGroupId>commons-cli</pkgGroupId>
- <pkgArtifactId>commons-cli</pkgArtifactId>
- <pkgVersion>1.0</pkgVersion>
+ <pkgGroupId>log4j</pkgGroupId>
+ <pkgArtifactId>log4j</pkgArtifactId>
+ <pkgVersion>1.2.15</pkgVersion>
</properties>
<dependencies>
<dependency>
@@ -59,8 +59,8 @@
<!--<version>2.0.1-SNAPSHOT</version>-->
<configuration>
<instructions>
- <Export-Package>org.apache.commons.cli*;version="1.0",*</Export-Package>
- <!--<Import-Package>com.envoisolutions.sxc.builder*;resolution:=optional,com.envoisolutions.sxc.compiler*;resolution:=optional,com.sun.codemodel*;resolution:=optional,com.sun.xml.fastinfoset*;resolution:=optional,com.sun.xml.txw2*;resolution:=optional,org.jvnet.fastinfoset*;resolution:=optional,org.jvnet.staxex*;resolution:=optional,sun.misc*;resolution:=optional,*</Import-Package>-->
+ <Export-Package>org.apache.log4j*;version="1.2.15",*</Export-Package>
+ <Import-Package>org*;resolution:=optional,com*;resolution:=optional,javax*;resolution:=optional,*</Import-Package>
<!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
</instructions>
</configuration>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml Wed Oct 14 00:11:33 2009
@@ -105,10 +105,10 @@
<!--<artifactId>jul-to-slf4j</artifactId>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-api</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,31 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<type>jar</type>
@@ -57,11 +32,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<type>jar</type>
@@ -83,20 +53,10 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
<type>jar</type>
@@ -156,9 +116,4 @@
<artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml Wed Oct 14 00:11:33 2009
@@ -70,10 +70,10 @@
<!--<groupId>org.slf4j</groupId>-->
<!--<artifactId>slf4j-api</artifactId>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-log4j12</artifactId>-->
+ <!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.slf4j</groupId>-->
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,31 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<type>jar</type>
@@ -52,11 +27,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<type>jar</type>
@@ -88,11 +58,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
<type>jar</type>
</dependency>
@@ -103,11 +68,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
<type>jar</type>
</dependency>
@@ -176,14 +136,4 @@
<artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,31 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<type>jar</type>
@@ -47,11 +22,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<type>jar</type>
@@ -68,11 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
<type>jar</type>
</dependency>
@@ -88,11 +53,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
<type>jar</type>
</dependency>
@@ -121,14 +81,4 @@
<artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,31 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<type>jar</type>
@@ -67,11 +42,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<type>jar</type>
@@ -118,11 +88,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-plugin</artifactId>
<type>jar</type>
</dependency>
@@ -153,11 +118,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
<type>jar</type>
</dependency>
@@ -236,29 +196,4 @@
<artifactId>groovy-all-minimal</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,26 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>com.envoisolutions.sxc</groupId>
- <artifactId>sxc-jaxb</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.envoisolutions.sxc</groupId>
- <artifactId>sxc-runtime</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
<type>jar</type>
@@ -73,20 +53,10 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
<type>jar</type>
@@ -96,9 +66,4 @@
<artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml Wed Oct 14 00:11:33 2009
@@ -152,10 +152,10 @@
<artifactId>sxc-runtime</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-api</artifactId>-->
+ <!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.slf4j</groupId>-->
<!--<artifactId>slf4j-log4j12</artifactId>-->
Modified: geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,31 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<type>jar</type>
@@ -58,11 +33,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>sxc-jaxb</artifactId>
<type>jar</type>
</dependency>
@@ -98,11 +68,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
<type>jar</type>
</dependency>
@@ -112,11 +77,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
<type>jar</type>
@@ -181,9 +141,4 @@
<artifactId>groovy-all-minimal</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/plan/plan.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/plan/plan.xml Wed Oct 14 00:11:33 2009
@@ -113,15 +113,15 @@
</gbean>
<!-- Logging service -->
- <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
- <attribute name="configFileName">var/log/server-log4j.properties</attribute>
- <attribute name="refreshPeriodSeconds">60</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
+ <!--<gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">-->
+ <!--<attribute name="configFileName">var/log/server-log4j.properties</attribute>-->
+ <!--<attribute name="refreshPeriodSeconds">60</attribute>-->
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<!-- JUL-to-SLF4j bridge -->
- <gbean name="JULBridge" class="org.apache.geronimo.system.logging.jul.JULBridgeGBean"/>
+ <!--<gbean name="JULBridge" class="org.apache.geronimo.system.logging.jul.JULBridgeGBean"/>-->
</module>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -12,11 +12,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-jdbc</artifactId>
<type>jar</type>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,31 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<type>jar</type>
@@ -57,11 +32,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<type>jar</type>
@@ -103,11 +73,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-plugin</artifactId>
<type>jar</type>
</dependency>
@@ -123,11 +88,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
<type>jar</type>
</dependency>
@@ -201,34 +161,4 @@
<artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,31 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<type>jar</type>
@@ -52,11 +27,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<type>jar</type>
@@ -93,11 +63,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-plugin</artifactId>
<type>jar</type>
</dependency>
@@ -108,11 +73,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
<type>jar</type>
</dependency>
@@ -171,29 +131,4 @@
<artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml Wed Oct 14 00:11:33 2009
@@ -108,10 +108,10 @@
<groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.client</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.felix.karaf.deployer</groupId>
- <artifactId>org.apache.felix.karaf.deployer.spring</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.felix.karaf.deployer</groupId>-->
+ <!--<artifactId>org.apache.felix.karaf.deployer.spring</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.felix.karaf.deployer</groupId>
<artifactId>org.apache.felix.karaf.deployer.blueprint</artifactId>
@@ -288,6 +288,26 @@
<groupId>org.apache.geronimo.blueprint</groupId>
<artifactId>geronimo-blueprint</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ </dependency>
</dependencies>
<build>
<!--<resources>-->
Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties Wed Oct 14 00:11:33 2009
@@ -31,6 +31,13 @@
org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=10
+org/apache/geronimo/bundles/log4j/1.2.15_1-SNAPSHOT/log4j-1.2.15_1-SNAPSHOT.jar=10
+org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar=10
+org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6.jar=10
+#org/slf4j/jul-to-slf4j/1.5.6/jul-to-slf4j-1.5.6.jar=10 not a bundle!
+org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar=10
+
+
#
# The rest of the services..
#
@@ -38,9 +45,9 @@
org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar=30
org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${felix.karaf.version}/org.apache.felix.karaf.shell.console-${felix.karaf.version}.jar=30
-org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.spring/${felix.karaf.version}/org.apache.felix.karaf.deployer.spring-${felix.karaf.version}.jar=30
+#org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.spring/${felix.karaf.version}/org.apache.felix.karaf.deployer.spring-${felix.karaf.version}.jar=30
org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/${felix.karaf.version}/org.apache.felix.karaf.deployer.blueprint-${felix.karaf.version}.jar=30
-org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.features/${felix.karaf.version}/org.apache.felix.karaf.deployer.features-${felix.karaf.version}.jar=30
+#org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.features/${felix.karaf.version}/org.apache.felix.karaf.deployer.features-${felix.karaf.version}.jar=30
org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.admin/${felix.karaf.version}/org.apache.felix.karaf.shell.admin-${felix.karaf.version}.jar=30
org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.osgi/${felix.karaf.version}/org.apache.felix.karaf.shell.osgi-${felix.karaf.version}.jar=30
org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.log/${felix.karaf.version}/org.apache.felix.karaf.shell.log-${felix.karaf.version}.jar=30
@@ -68,6 +75,7 @@
org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/2.1_3_3-SNAPSHOT/org.apache.servicemix.bundles.cglib-2.1_3_3-SNAPSHOT.jar=40
org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/1.1_2-SNAPSHOT/org.apache.servicemix.bundles.commons-jexl-1.1_2-SNAPSHOT.jar=40
org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-lang/2.4_2-SNAPSHOT/org.apache.servicemix.bundles.commons-lang-2.4_2-SNAPSHOT.jar=40
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl/2.1.6_1/org.apache.servicemix.bundles.jaxb-impl-2.1.6_1.jar=40
org/apache/servicemix/specs/org.apache.servicemix.specs.activation-api-1.1/1.4-SNAPSHOT/org.apache.servicemix.specs.activation-api-1.1-1.4-SNAPSHOT.jar=40
org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.1/1.2.0/org.apache.servicemix.specs.jaxb-api-2.1-1.2.0.jar=40
org/apache/servicemix/specs/org.apache.servicemix.specs.stax-api-1.0/1.3.0/org.apache.servicemix.specs.stax-api-1.0-1.3.0.jar=40
@@ -75,11 +83,10 @@
org/apache/geronimo/bundles/asm/3.1_1-SNAPSHOT/asm-3.1_1-SNAPSHOT.jar=40
org/apache/geronimo/bundles/asm-commons/3.1_1-SNAPSHOT/asm-commons-3.1_1-SNAPSHOT.jar=40
org/apache/geronimo/bundles/commons-cli/1.0_1-SNAPSHOT/commons-cli-1.0_1-SNAPSHOT.jar=40
-org/apache/geronimo/bundles/slf4j/1.5.5_1-SNAPSHOT/slf4j-1.5.5_1-SNAPSHOT.jar=40
org/apache/geronimo/bundles/sxc-jaxb/0.7.2_1-SNAPSHOT/sxc-jaxb-0.7.2_1-SNAPSHOT.jar=40
org/apache/geronimo/bundles/sxc-runtime/0.7.2_1-SNAPSHOT/sxc-runtime-0.7.2_1-SNAPSHOT.jar=40
org/apache/xbean/xbean-reflect/3.6/xbean-reflect-3.6.jar=40
-org/apache/geronimo/framework/geronimo-logging/${pom.version}/geronimo-logging-${pom.version}.jar=40
+#org/apache/geronimo/framework/geronimo-logging/${pom.version}/geronimo-logging-${pom.version}.jar=40
org/apache/geronimo/framework/geronimo-cli/${pom.version}/geronimo-cli-${pom.version}.jar=40
org/apache/geronimo/framework/geronimo-common/${pom.version}/geronimo-common-${pom.version}.jar=40
org/apache/geronimo/framework/geronimo-crypto/${pom.version}/geronimo-crypto-${pom.version}.jar=40
Modified: geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,31 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<type>jar</type>
@@ -57,11 +32,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<type>jar</type>
@@ -83,11 +53,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-plugin</artifactId>
<type>jar</type>
</dependency>
@@ -97,11 +62,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
<type>jar</type>
@@ -161,9 +121,4 @@
<artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,11 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-plugin</artifactId>
<type>jar</type>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml Wed Oct 14 00:11:33 2009
@@ -92,6 +92,10 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-naming</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,11 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-core</artifactId>
<type>jar</type>
@@ -61,4 +56,9 @@
<artifactId>xbean-naming</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,31 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<type>jar</type>
@@ -57,11 +32,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<type>jar</type>
@@ -103,11 +73,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-plugin</artifactId>
<type>jar</type>
</dependency>
@@ -123,11 +88,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
<type>jar</type>
</dependency>
@@ -201,34 +161,4 @@
<artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/pom.xml Wed Oct 14 00:11:33 2009
@@ -46,7 +46,7 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -17,13 +17,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
+ <artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/upgrade/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/upgrade/src/main/history/dependencies.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/upgrade/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/upgrade/src/main/history/dependencies.xml Wed Oct 14 00:11:33 2009
@@ -7,11 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<type>car</type>
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml Wed Oct 14 00:11:33 2009
@@ -54,13 +54,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-api</artifactId>-->
- <!--</dependency>-->
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/pom.xml Wed Oct 14 00:11:33 2009
@@ -56,10 +56,10 @@
<artifactId>geronimo-deploy-config</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.codehaus.plexus</groupId>-->
+ <!--<artifactId>plexus-archiver</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml Wed Oct 14 00:11:33 2009
@@ -61,7 +61,7 @@
<Implementation-Title>${project.name}</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
- <Import-Package>org.apache.xbean.naming.context,org.apache.xbean.naming.global,*</Import-Package>
+ <Import-Package>org.apache.xbean.naming.context,org.apache.xbean.naming.global;version=3.6,*</Import-Package>
</instructions>
</configuration>
</plugin>
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml Wed Oct 14 00:11:33 2009
@@ -37,20 +37,17 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-log4j12</artifactId>-->
- <!--</dependency>-->
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-logging</artifactId>
- <version>${version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>geronimo-logging</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
<!--<groupId>asm</groupId>-->
<!--<artifactId>asm</artifactId>-->
<!--</dependency>-->
Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/pom.xml?rev=824982&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/pom.xml (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/pom.xml Wed Oct 14 00:11:33 2009
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>modules</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-shell-base</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <name>geronimo-shell-base</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/ConfigurationManagerCommandSupport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/ConfigurationManagerCommandSupport.java?rev=824982&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/ConfigurationManagerCommandSupport.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/ConfigurationManagerCommandSupport.java Wed Oct 14 00:11:33 2009
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.shell;
+
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public abstract class ConfigurationManagerCommandSupport extends KernelCommandSupport {
+ protected void doExecute(Kernel kernel) throws Exception {
+ ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+ doExecute(configurationManager);
+ }
+
+ protected abstract void doExecute(ConfigurationManager configurationManager);
+
+}
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/ConfigurationManagerCommandSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/ConfigurationManagerCommandSupport.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/ConfigurationManagerCommandSupport.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/KernelCommandSupport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/KernelCommandSupport.java?rev=824982&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/KernelCommandSupport.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/KernelCommandSupport.java Wed Oct 14 00:11:33 2009
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.shell;
+
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.geronimo.kernel.Kernel;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public abstract class KernelCommandSupport extends OsgiCommandSupport {
+ protected Object doExecute() throws Exception {
+
+ ServiceReference ref = getBundleContext().getServiceReference(Kernel.class.getName());
+ if (ref == null) {
+ System.out.println("FeaturesService service is unavailable.");
+ return null;
+ }
+ try {
+ Kernel kernel = (Kernel) getBundleContext().getService(ref);
+ if (kernel == null) {
+ System.out.println("FeaturesService service is unavailable.");
+ return null;
+ }
+
+ doExecute(kernel);
+ }
+ finally {
+ getBundleContext().ungetService(ref);
+ }
+ return null;
+ }
+
+ protected abstract void doExecute(Kernel kernel) throws Exception;
+
+}
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/KernelCommandSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/KernelCommandSupport.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/KernelCommandSupport.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/pom.xml Wed Oct 14 00:11:33 2009
@@ -74,23 +74,38 @@
<artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!--<dependency>-->
- <!--<groupId>log4j</groupId>-->
- <!--<artifactId>log4j</artifactId>-->
+ <!--<groupId>org.ops4j.pax.logging</groupId>-->
+ <!--<artifactId>pax-logging-service</artifactId>-->
<!--</dependency>-->
<!-- todo move jul logging install gbean to where it's needed such as tomcat and/or jasper plugins -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- for jexl -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+
<!--<dependency>-->
<!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>jul-to-slf4j</artifactId>-->
+ <!--<artifactId>slf4j-api</artifactId>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-log4j12</artifactId>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- </dependency>
-
<!-- plugin management -->
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
@@ -183,6 +198,16 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+ <Import-Package>org.slf4j.bridge;resolution:=optional,org.apache.log4j.helpers;resolution:=optional,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
<!--<plugin>-->
<!--<groupId>org.codehaus.mojo</groupId>-->
<!--<artifactId>jaxb2-maven-plugin</artifactId>-->
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java Wed Oct 14 00:11:33 2009
@@ -86,6 +86,11 @@
log.info("installing artifact: " + dependencyType);
Artifact artifact = dependencyType.toArtifact();
String location = locateBundle(artifact);
+ for (Bundle test: bundleContext.getBundles()) {
+ if (location.equals(test.getLocation())) {
+ continue;
+ }
+ }
try {
bundles.add(bundleContext.installBundle(location));
} catch (BundleException e) {
@@ -114,7 +119,7 @@
private String locateBundle(Artifact configurationId) throws NoSuchConfigException, IOException, InvalidConfigException {
if (System.getProperty("geronimo.build.car") == null) {
- return "mvn:" + configurationId.getGroupId() + "/" + configurationId.getArtifactId() + "/" + configurationId.getVersion() + "/" + configurationId.getType();
+ return "mvn:" + configurationId.getGroupId() + "/" + configurationId.getArtifactId() + "/" + configurationId.getVersion() + ("jar".equals(configurationId.getType())? "": "/" + configurationId.getType());
}
for (Repository repo : repositories) {
if (repo.contains(configurationId)) {
Modified: geronimo/sandbox/djencks/osgi/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/pom.xml Wed Oct 14 00:11:33 2009
@@ -14,11 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+--><!-- $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -33,16 +29,23 @@
<packaging>pom</packaging>
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-api</artifactId>-->
- <!--</dependency>-->
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-log4j12</artifactId>-->
+ <!--<scope>provided</scope>-->
+ <!--</dependency>-->
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
@@ -53,11 +56,12 @@
<module>testsupport-common</module>
<module>geronimo-common</module>
<module>geronimo-system</module>
- <module>geronimo-logging</module>
+ <!--<module>geronimo-logging</module>-->
<module>geronimo-kernel</module>
<module>geronimo-plugin</module>
<module>geronimo-deploy-tool</module>
- </modules>
+ <module>geronimo-shell-base</module>
+ </modules>
<profiles>
<profile>
<id>default</id>
@@ -69,7 +73,7 @@
<module>testsupport-common</module>
<module>geronimo-common</module>
<module>geronimo-system</module>
- <module>geronimo-logging</module>
+ <!--<module>geronimo-logging</module>-->
<module>geronimo-kernel</module>
<module>geronimo-plugin</module>
<module>geronimo-deploy-tool</module>
@@ -110,7 +114,7 @@
<module>testsupport-common</module>
<module>geronimo-common</module>
<module>geronimo-system</module>
- <module>geronimo-logging</module>
+ <!--<module>geronimo-logging</module>-->
<module>geronimo-kernel</module>
<module>geronimo-plugin</module>
<module>geronimo-deploy-tool</module>
@@ -150,4 +154,4 @@
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
Modified: geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml Wed Oct 14 00:11:33 2009
@@ -35,13 +35,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-api</artifactId>-->
- <!--</dependency>-->
<dependency>
<groupId>junit</groupId>