Author: gnodet
Date: Wed May 6 14:40:12 2009
New Revision: 772282
URL: http://svn.apache.org/viewvc?rev=772282&view=rev
Log:
FELIX-1098: split configuration from namespace handler to ease the upgrade to
blueprint
Added:
felix/trunk/karaf/gshell/gshell-run/
felix/trunk/karaf/gshell/gshell-run/pom.xml
felix/trunk/karaf/gshell/gshell-run/src/
felix/trunk/karaf/gshell/gshell-run/src/main/
felix/trunk/karaf/gshell/gshell-run/src/main/resources/
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-commands.xml
(props changed)
- copied unchanged from r771314,
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-local.xml
(props changed)
- copied unchanged from r771314,
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-osgi.xml
(props changed)
- copied unchanged from r771314,
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-remote.xml
(props changed)
- copied unchanged from r771314,
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-vfs.xml
- copied unchanged from r771314,
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell.xml
(props changed)
- copied unchanged from r771314,
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
Removed:
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml
felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
Modified:
felix/trunk/karaf/assembly/pom.xml
felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties
felix/trunk/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/startup.properties
felix/trunk/karaf/gshell/pom.xml
felix/trunk/karaf/pom.xml
Modified: felix/trunk/karaf/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/pom.xml?rev=772282&r1=772281&r2=772282&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/pom.xml (original)
+++ felix/trunk/karaf/assembly/pom.xml Wed May 6 14:40:12 2009
@@ -64,6 +64,10 @@
</dependency>
<dependency>
<groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.run</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>org.apache.felix.karaf.gshell.admin</artifactId>
</dependency>
<dependency>
Modified: felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml?rev=772282&r1=772281&r2=772282&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml Wed May 6
14:40:12 2009
@@ -234,6 +234,7 @@
<outputFileNameMapping>org/apache/felix/karaf/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.core</include>
+
<include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.run</include>
<include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.admin</include>
<include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.osgi</include>
<include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.log</include>
Modified: felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml?rev=772282&r1=772281&r2=772282&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml Wed May 6
14:40:12 2009
@@ -226,6 +226,7 @@
<outputFileNameMapping>org/apache/felix/karaf/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.core</include>
+
<include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.run</include>
<include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.admin</include>
<include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.osgi</include>
<include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.log</include>
Modified:
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties?rev=772282&r1=772281&r2=772282&view=diff
==============================================================================
---
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties
Wed May 6 14:40:12 2009
@@ -39,6 +39,7 @@
#
# The rest of the services..
#
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.core/${pom.version}/org.apache.felix.karaf.gshell.core-${pom.version}.jar=30
org/apache/servicemix/bundles/org.apache.servicemix.bundles.jline/${jline.version}/org.apache.servicemix.bundles.jline-${jline.version}.jar=30
org/apache/servicemix/bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}/org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=30
org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/${cglib.version}/org.apache.servicemix.bundles.cglib-${cglib.version}.jar=30
@@ -74,5 +75,5 @@
#
# Start console last
#
-org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.core/${pom.version}/org.apache.felix.karaf.gshell.core-${pom.version}.jar=40
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.run/${pom.version}/org.apache.felix.karaf.gshell.run-${pom.version}.jar=40
Modified:
felix/trunk/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/startup.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/startup.properties?rev=772282&r1=772281&r2=772282&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/startup.properties
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/startup.properties
Wed May 6 14:40:12 2009
@@ -39,6 +39,7 @@
#
# The rest of the services..
#
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.core/${pom.version}/org.apache.felix.karaf.gshell.core-${pom.version}.jar=30
org/apache/servicemix/bundles/org.apache.servicemix.bundles.jline/${jline.version}/org.apache.servicemix.bundles.jline-${jline.version}.jar=30
org/apache/servicemix/bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}/org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=30
org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/${cglib.version}/org.apache.servicemix.bundles.cglib-${cglib.version}.jar=30
@@ -74,5 +75,5 @@
#
# Start console last
#
-org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.core/${pom.version}/org.apache.felix.karaf.gshell.core-${pom.version}.jar=40
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.run/${pom.version}/org.apache.felix.karaf.gshell.run-${pom.version}.jar=40
Added: felix/trunk/karaf/gshell/gshell-run/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-run/pom.xml?rev=772282&view=auto
==============================================================================
--- felix/trunk/karaf/gshell/gshell-run/pom.xml (added)
+++ felix/trunk/karaf/gshell/gshell-run/pom.xml Wed May 6 14:40:12 2009
@@ -0,0 +1,94 @@
+<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";>
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>gshell</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.run</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.2.0-SNAPSHOT</version>
+ <name>Apache Felix Karaf :: GShell Run</name>
+
+ <description>
+ GShell configuration
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Import-Package>
+ org.apache.commons.vfs,
+ org.apache.commons.vfs.cache,
+ org.apache.commons.vfs.impl,
+ org.apache.commons.vfs.provider.url,
+ org.apache.commons.vfs.provider.temp,
+ org.apache.commons.vfs.provider.ram,
+ org.apache.commons.vfs.provider.local,
+ org.apache.sshd,
+ org.apache.sshd.server.keyprovider,
+ org.apache.sshd.server.jaas,
+ org.springframework.beans.factory.config,
+ *
+ </Import-Package>
+
<Require-Bundle>org.apache.felix.karaf.gshell.core</Require-Bundle>
+
<Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
+ <_versionpolicy>${bnd.version.policy}</_versionpolicy>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-commands.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-local.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-osgi.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-remote.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
felix/trunk/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: felix/trunk/karaf/gshell/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/pom.xml?rev=772282&r1=772281&r2=772282&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/pom.xml (original)
+++ felix/trunk/karaf/gshell/pom.xml Wed May 6 14:40:12 2009
@@ -35,6 +35,7 @@
<modules>
<module>gshell-core</module>
+ <module>gshell-run</module>
<module>gshell-osgi</module>
<module>gshell-admin</module>
<module>gshell-features</module>
Modified: felix/trunk/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=772282&r1=772281&r2=772282&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Wed May 6 14:40:12 2009
@@ -231,6 +231,11 @@
</dependency>
<dependency>
<groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.run</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>org.apache.felix.karaf.gshell.admin</artifactId>
<version>${pom.version}</version>
</dependency>
