Author: gawor
Date: Wed May 5 20:41:52 2010
New Revision: 941478
URL: http://svn.apache.org/viewvc?rev=941478&view=rev
Log:
no need for karaf.main or karaf.client
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
geronimo/server/trunk/framework/pom.xml
Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=941478&r1=941477&r2=941478&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Wed May 5 20:41:52 2010
@@ -137,26 +137,6 @@
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.client</artifactId>
- <version>${felix.karaf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
<artifactId>org.apache.felix.karaf.shell.log</artifactId>
<version>${felix.karaf.version}</version>
@@ -270,14 +250,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.main</artifactId>
- </dependency>
- <dependency>
- <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.blueprint</artifactId>
<exclusions>
@@ -586,18 +558,6 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.main</artifactId>
- <outputDirectory>target/dependencies/lib</outputDirectory>
- <destFileName>karaf.jar</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.client</artifactId>
- <outputDirectory>target/dependencies/lib</outputDirectory>
- <destFileName>karaf-client.jar</destFileName>
- </artifactItem>
- <artifactItem>
<groupId>org.apache.felix.karaf.jaas</groupId>
<artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
<outputDirectory>target/dependencies/lib</outputDirectory>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg?rev=941478&r1=941477&r2=941478&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
Wed May 5 20:41:52 2010
@@ -19,5 +19,6 @@
#
sshPort=8101
+sshHost=0.0.0.0
sshRealm=karaf
hostKey=${karaf.base}/etc/host.key
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=941478&r1=941477&r2=941478&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
Wed May 5 20:41:52 2010
@@ -68,21 +68,11 @@
</dependency>
<dependency>
<groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.client</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.commons</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.management</artifactId>
<type>jar</type>
</dependency>
@@ -382,11 +372,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.fusesource.jansi</groupId>
- <artifactId>jansi</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=941478&r1=941477&r2=941478&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Wed May 5 20:41:52 2010
@@ -80,12 +80,6 @@
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.main</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
<version>1.0.0</version>
|