You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/05/15 12:26:19 UTC
svn commit: r1338628 - in /karaf/trunk: instance/core/pom.xml
instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.url.mvn.cfg
shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
Author: cschneider
Date: Tue May 15 10:26:19 2012
New Revision: 1338628
URL: http://svn.apache.org/viewvc?rev=1338628&view=rev
Log:
KARAF-1206 Fixed maven repo settings and ssh startup
Removed:
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.url.mvn.cfg
Modified:
karaf/trunk/instance/core/pom.xml
karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
Modified: karaf/trunk/instance/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/pom.xml?rev=1338628&r1=1338627&r2=1338628&view=diff
==============================================================================
--- karaf/trunk/instance/core/pom.xml (original)
+++ karaf/trunk/instance/core/pom.xml Tue May 15 10:26:19 2012
@@ -115,7 +115,6 @@
<excludes>
<exclude>**/org.apache.karaf.management.cfg</exclude>
<exclude>**/org.apache.karaf.shell.cfg</exclude>
- <exclude>**/org.ops4j.pax.url.mvn.cfg</exclude>
<exclude>**/system.properties</exclude>
</excludes>
</resource>
Modified: karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml?rev=1338628&r1=1338627&r2=1338628&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml (original)
+++ karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml Tue May 15 10:26:19 2012
@@ -34,7 +34,7 @@
<ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]">
<ext:default-properties>
- <ext:property name="startRemoteShell" value="true" />
+ <ext:property name="karaf.startRemoteShell" value="true" />
<ext:property name="karaf.admin.role" value="admin" />
</ext:default-properties>
</ext:property-placeholder>