You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/09/29 12:33:43 UTC
svn commit: r1002569 - in /karaf/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/etc/
jaas/modules/src/main/resources/OSGI-INF/blueprint/
management/src/main/resources/OSGI-INF/blueprint/ shell/log/src/main/resou...
Author: gnodet
Date: Wed Sep 29 10:33:42 2010
New Revision: 1002569
URL: http://svn.apache.org/viewvc?rev=1002569&view=rev
Log:
[KARAF-235][KARAF-195][KARAF-197] Upgrade to latest aries blueprint/jmx, revert the use of cade and use the new update-strategy='reload' attribute for ConfigAdmin property-placeholder
Removed:
karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshConfig.java
Modified:
karaf/trunk/assembly/pom.xml
karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
karaf/trunk/assembly/src/main/descriptors/windows-bin.xml
karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml
karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
karaf/trunk/pom.xml
karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml
karaf/trunk/shell/ssh/pom.xml
karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerFactory.java
karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
Modified: karaf/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=1002569&r1=1002568&r2=1002569&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Wed Sep 29 10:33:42 2010
@@ -277,10 +277,6 @@
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
</dependency>
<dependency>
- <groupId>org.fusesource.cade</groupId>
- <artifactId>cade-bundle</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<optional>true</optional>
Modified: karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1002569&r1=1002568&r2=1002569&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Sep 29 10:33:42 2010
@@ -287,15 +287,6 @@
<include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/fusesource/cade/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.fusesource.cade:cade-bundle</include>
- </includes>
- </dependencySet>
</dependencySets>
Modified: karaf/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1002569&r1=1002568&r2=1002569&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Sep 29 10:33:42 2010
@@ -274,15 +274,6 @@
<include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/fusesource/cade/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.fusesource.cade:cade-bundle</include>
- </includes>
- </dependencySet>
</dependencySets>
Modified: karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=1002569&r1=1002568&r2=1002569&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties Wed Sep 29 10:33:42 2010
@@ -34,7 +34,6 @@ org/apache/felix/org.apache.felix.filein
# The rest of the services..
#
org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20
-org/fusesource/cade/cade-bundle/${cade.version}/cade-bundle-${cade.version}.jar=21
org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.osgi/${project.version}/org.apache.karaf.shell.osgi-${project.version}.jar=30
Modified: karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml?rev=1002569&r1=1002568&r2=1002569&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml (original)
+++ karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml Wed Sep 29 10:33:42 2010
@@ -19,7 +19,7 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:jaas="http://karaf.apache.org/xmlns/jaas/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
<type-converters>
@@ -30,7 +30,7 @@
<ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]"/>
<!-- AdminConfig property place holder for the org.apache.karaf.jaas -->
- <cm:property-placeholder persistent-id="org.apache.karaf.jaas">
+ <cm:property-placeholder persistent-id="org.apache.karaf.jaas" update-strategy="reload">
<cm:default-properties>
<cm:property name="encryption.name" value="" />
<cm:property name="encryption.enabled" value="false" />
Modified: karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml?rev=1002569&r1=1002568&r2=1002569&view=diff
==============================================================================
--- karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml (original)
+++ karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml Wed Sep 29 10:33:42 2010
@@ -18,14 +18,14 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
<!-- Allow the use of system properties -->
<ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]"/>
<!-- Property place holder -->
- <cm:property-placeholder persistent-id="org.apache.karaf.management">
+ <cm:property-placeholder persistent-id="org.apache.karaf.management" update-strategy="reload">
<cm:default-properties>
<cm:property name="rmiRegistryPort" value="1099"/>
<cm:property name="jmxRealm" value="karaf"/>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1002569&r1=1002568&r2=1002569&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Sep 29 10:33:42 2010
@@ -109,7 +109,6 @@
<jetty.bundle.version>6.1.22_2</jetty.bundle.version>
<junit.bundle.version>4.7_1</junit.bundle.version>
- <cade.version>0.1-SNAPSHOT</cade.version>
<commons.logging.version>1.1.1</commons.logging.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<depends.maven.plugin.version>1.0</depends.maven.plugin.version>
@@ -126,8 +125,8 @@
<felix.utils.version>1.0.0</felix.utils.version>
<felix.webconsole.version>3.1.2</felix.webconsole.version>
<felix.metatype.version>1.0.4</felix.metatype.version>
- <aries.blueprint.version>0.2-incubating</aries.blueprint.version>
- <aries.jmx.version>0.2-incubating</aries.jmx.version>
+ <aries.blueprint.version>0.3-incubating-SNAPSHOT</aries.blueprint.version>
+ <aries.jmx.version>0.3-incubating-SNAPSHOT</aries.jmx.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<jansi.version>1.4</jansi.version>
<jline.version>2.4-SNAPSHOT</jline.version>
@@ -623,11 +622,6 @@
<version>${jansi.version}</version>
</dependency>
<dependency>
- <groupId>org.fusesource.cade</groupId>
- <artifactId>cade-bundle</artifactId>
- <version>${cade.version}</version>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
Modified: karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml?rev=1002569&r1=1002568&r2=1002569&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml (original)
+++ karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml Wed Sep 29 10:33:42 2010
@@ -18,11 +18,11 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
<!-- TODO: use dynamic CM config -->
- <cm:property-placeholder persistent-id="org.apache.karaf.log">
+ <cm:property-placeholder persistent-id="org.apache.karaf.log" update-strategy="reload">
<cm:default-properties>
<cm:property name="size" value="500"/>
<cm:property name="pattern" value="%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n"/>
Modified: karaf/trunk/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1002569&r1=1002568&r2=1002569&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Wed Sep 29 10:33:42 2010
@@ -68,11 +68,6 @@
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.fusesource.cade</groupId>
- <artifactId>cade-bundle</artifactId>
- </dependency>
</dependencies>
<build>
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerFactory.java?rev=1002569&r1=1002568&r2=1002569&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerFactory.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerFactory.java Wed Sep 29 10:33:42 2010
@@ -18,44 +18,20 @@
*/
package org.apache.karaf.shell.ssh;
-import java.util.Map;
-
import org.apache.sshd.SshServer;
-import org.apache.sshd.server.jaas.JaasPasswordAuthenticator;
-import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
-import org.fusesource.cade.Configurable;
-import org.osgi.service.blueprint.container.BlueprintContainer;
-import org.osgi.service.cm.ConfigurationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SshServerFactory implements Configurable<SshConfig> {
+public class SshServerFactory {
private static final Logger LOGGER = LoggerFactory.getLogger(SshServerFactory.class);
- private String serverId;
- private BlueprintContainer blueprintContainer;
private boolean start;
private SshServer server;
- public SshServerFactory() {
- }
-
- public String getServerId() {
- return serverId;
- }
-
- public void setServerId(String serverId) {
- this.serverId = serverId;
- }
-
- public BlueprintContainer getBlueprintContainer() {
- return blueprintContainer;
- }
-
- public void setBlueprintContainer(BlueprintContainer blueprintContainer) {
- this.blueprintContainer = blueprintContainer;
+ public SshServerFactory(SshServer server) {
+ this.server = server;
}
public boolean isStart() {
@@ -66,14 +42,9 @@ public class SshServerFactory implements
this.start = start;
}
- public void start(final SshConfig config) {
+ public void start() {
if (start) {
try {
- server = (SshServer) blueprintContainer.getComponentInstance(serverId);
- server.setPort(config.sshPort());
- server.setHost(config.sshHost());
- server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(config.hostKey()));
- server.setPasswordAuthenticator(newJaasPasswordAuthenticator((config.sshRealm())));
server.start();
} catch (Exception e) {
LOGGER.info("Error updating SSH server", e);
@@ -81,12 +52,6 @@ public class SshServerFactory implements
}
}
- private JaasPasswordAuthenticator newJaasPasswordAuthenticator(String domain) {
- JaasPasswordAuthenticator auth = new JaasPasswordAuthenticator();
- auth.setDomain(domain);
- return auth;
- }
-
public void stop() {
if (start && server != null) {
try {
@@ -99,13 +64,4 @@ public class SshServerFactory implements
}
}
- public void setup(SshConfig sshConfig) {
- stop();
- start(sshConfig);
- }
-
- public void deleted() {
- stop();
- }
-
}
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=1002569&r1=1002568&r2=1002569&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 Wed Sep 29 10:33:42 2010
@@ -19,7 +19,7 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
default-activation="lazy">
@@ -33,16 +33,14 @@
</ext:default-properties>
</ext:property-placeholder>
- <!--
- <cm:property-placeholder persistent-id="org.apache.karaf.shell">
+ <cm:property-placeholder persistent-id="org.apache.karaf.shell" update-strategy="reload">
<cm:default-properties>
<cm:property name="sshPort" value="8101"/>
<cm:property name="sshHost" value="0.0.0.0"/>
<cm:property name="sshRealm" value="karaf"/>
- <cm:property name="hostKey" value="$[karaf.base]/etc/host.key"/>
+ <cm:property name="hostKey" value="${karaf.base}/etc/host.key"/>
</cm:default-properties>
</cm:property-placeholder>
- -->
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
<command name="ssh/ssh">
@@ -65,6 +63,8 @@
</bean>
<bean id="sshServer" class="org.apache.sshd.SshServer" factory-method="setUpDefaultServer" scope="prototype">
+ <property name="port" value="${sshPort}"/>
+ <property name="host" value="${sshHost}"/>
<property name="shellFactory">
<bean class="org.apache.karaf.shell.ssh.ShellFactoryImpl">
<property name="commandProcessor" ref="commandProcessor"/>
@@ -75,33 +75,24 @@
<property name="commandProcessor" ref="commandProcessor"/>
</bean>
</property>
- <!--
<property name="keyPairProvider" ref="keyPairProvider"/>
<property name="passwordAuthenticator" ref="passwordAuthenticator"/>
- -->
</bean>
- <!--
- <bean id="keyPairProvider" class="org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider" scope="prototype">
+ <bean id="keyPairProvider" class="org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider">
<property name="path" value="${hostKey}"/>
</bean>
- <bean id="passwordAuthenticator" class="org.apache.sshd.server.jaas.JaasPasswordAuthenticator" scope="prototype">
+ <bean id="passwordAuthenticator" class="org.apache.sshd.server.jaas.JaasPasswordAuthenticator">
<property name="domain" value="${sshRealm}"/>
</bean>
- -->
- <bean id="sshServerFactory" class="org.apache.karaf.shell.ssh.SshServerFactory" activation="eager">
- <property name="blueprintContainer" ref="blueprintContainer"/>
- <property name="serverId">
- <idref component-id="sshServer"/>
- </property>
+ <bean id="sshServerFactory" class="org.apache.karaf.shell.ssh.SshServerFactory" init-method="start"
+ destroy-method="stop" activation="eager">
+ <argument ref="sshServer"/>
<property name="start" value="$[karaf.startRemoteShell]"/>
- <cm:managed-properties persistent-id="org.apache.karaf.shell" update-strategy="component-managed" update-method="updated" />
</bean>
- <service ref="sshServerFactory" interface="org.fusesource.cade.Configurable"/>
-
<reference id="commandProcessor" interface="org.apache.felix.service.command.CommandProcessor">
</reference>
-</blueprint>
+</blueprint>
\ No newline at end of file