You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/12/03 23:06:40 UTC
svn commit: r723096 - in /servicemix/smx4/kernel/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/distribution/text/etc/
assembly/src/main/filtered-resources/etc/
gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell...
Author: gnodet
Date: Wed Dec 3 14:06:39 2008
New Revision: 723096
URL: http://svn.apache.org/viewvc?rev=723096&view=rev
Log:
SMX4KNL-156, SMX4KNL-157: include JMX in the kernel, add a JAAS realm for JMX / SSH authentication
Added:
servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.users.cfg
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/org.apache.servicemix.users.cfg
servicemix/smx4/kernel/trunk/jaas/jaas-modules/ (with props)
servicemix/smx4/kernel/trunk/jaas/jaas-modules/pom.xml
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/RolePrincipal.java
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/UserPrincipal.java
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/ConfigAdminHolder.java
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/resources/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/resources/META-INF/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/resources/META-INF/spring/
servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml
servicemix/smx4/kernel/trunk/management/ (props changed)
- copied from r721701, servicemix/smx4/features/trunk/management/core/
servicemix/smx4/kernel/trunk/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java
Removed:
servicemix/smx4/kernel/trunk/jaas/jaas-keystore/
servicemix/smx4/kernel/trunk/management/src/main/java/org/apache/servicemix/management/SimpleAuthenticationManager.java
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
servicemix/smx4/kernel/trunk/jaas/pom.xml
servicemix/smx4/kernel/trunk/management/pom.xml
servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml
servicemix/smx4/kernel/trunk/pom.xml
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=723096&r1=723095&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Wed Dec 3 14:06:39 2008
@@ -92,7 +92,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.keystore</artifactId>
+ <artifactId>org.apache.servicemix.kernel.jaas.modules</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>org.apache.servicemix.kernel.management</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=723096&r1=723095&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Dec 3 14:06:39 2008
@@ -194,6 +194,7 @@
<includes>
<include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
<include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.spring</include>
+ <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.management</include>
</includes>
</dependencySet>
<dependencySet>
@@ -216,7 +217,7 @@
<outputFileNameMapping>org/apache/servicemix/kernel/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
- <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.keystore</include>
+ <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.modules</include>
</includes>
</dependencySet>
<dependencySet>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=723096&r1=723095&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Dec 3 14:06:39 2008
@@ -186,6 +186,7 @@
<includes>
<include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
<include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.spring</include>
+ <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.management</include>
</includes>
</dependencySet>
<dependencySet>
@@ -208,7 +209,7 @@
<outputFileNameMapping>org/apache/servicemix/kernel/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
- <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.keystore</include>
+ <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.modules</include>
</includes>
</dependencySet>
<dependencySet>
Added: servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.users.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.users.cfg?rev=723096&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.users.cfg (added)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.users.cfg Wed Dec 3 14:06:39 2008
@@ -0,0 +1,21 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+user.smx=smx
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=723096&r1=723095&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties Wed Dec 3 14:06:39 2008
@@ -54,6 +54,7 @@
org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar=50
org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar=50
org/apache/servicemix/kernel/org.apache.servicemix.kernel.spring/${pom.version}/org.apache.servicemix.kernel.spring-${pom.version}.jar=50
+org/apache/servicemix/kernel/org.apache.servicemix.kernel.management/${pom.version}/org.apache.servicemix.kernel.management-${pom.version}.jar=50
org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.admin/${pom.version}/org.apache.servicemix.kernel.gshell.admin-${pom.version}.jar=50
org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.osgi/${pom.version}/org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=50
org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.features/${pom.version}/org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=50
@@ -61,7 +62,7 @@
org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.config/${pom.version}/org.apache.servicemix.kernel.gshell.config-${pom.version}.jar=50
org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.packages/${pom.version}/org.apache.servicemix.kernel.gshell.packages-${pom.version}.jar=50
org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.config/${pom.version}/org.apache.servicemix.kernel.jaas.config-${pom.version}.jar=50
-org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.keystore/${pom.version}/org.apache.servicemix.kernel.jaas.keystore-${pom.version}.jar=50
+org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.modules/${pom.version}/org.apache.servicemix.kernel.jaas.modules-${pom.version}.jar=50
org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}.jar=5
com/google/code/sshd/sshd/${sshd.version}/sshd-${sshd.version}.jar=50
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java?rev=723096&r1=723095&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java Wed Dec 3 14:06:39 2008
@@ -119,6 +119,7 @@
copyResourceToDir(serviceMixBase, "etc/config.properties", true);
copyResourceToDir(serviceMixBase, "etc/org.apache.servicemix.features.cfg", true);
+ copyResourceToDir(serviceMixBase, "etc/org.apache.servicemix.users.cfg", true);
copyResourceToDir(serviceMixBase, "etc/org.ops4j.pax.logging.cfg", true);
copyResourceToDir(serviceMixBase, "etc/org.ops4j.pax.url.mvn.cfg", true);
copyResourceToDir(serviceMixBase, "etc/startup.properties", true);
Added: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/org.apache.servicemix.users.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/org.apache.servicemix.users.cfg?rev=723096&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/org.apache.servicemix.users.cfg (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/org.apache.servicemix.users.cfg Wed Dec 3 14:06:39 2008
@@ -0,0 +1,21 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+user.smx=smx
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml?rev=723096&r1=723095&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml Wed Dec 3 14:06:39 2008
@@ -58,6 +58,7 @@
org.bouncycastle*;resolution:=optional,
com.sun*;resolution:=optional,
com.google.code.sshd.server.keyprovider,
+ com.google.code.sshd.server.jaas,
org.jsecurity*;resolution:=optional,
*
</gshell.osgi.import>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml?rev=723096&r1=723095&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml Wed Dec 3 14:06:39 2008
@@ -64,12 +64,7 @@
<prop key="startLocalConsole">true</prop>
<prop key="startRemoteShell">true</prop>
<prop key="sshPort">8101</prop>
- <prop key="clientKeyAlias">servicemix</prop>
- <prop key="clientKeystore">RshKeystore</prop>
- <prop key="clientTruststore">RshTruststore</prop>
- <prop key="serverKeyAlias">servicemix</prop>
- <prop key="serverKeystore">RshKeystore</prop>
- <prop key="serverTruststore">RshTruststore</prop>
+ <prop key="sshRealm">servicemix</prop>
<prop key="hostKey">${servicemix.base}/etc/host.key</prop>
</osgix:default-properties>
</osgix:property-placeholder>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml?rev=723096&r1=723095&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml Wed Dec 3 14:06:39 2008
@@ -72,12 +72,9 @@
<bean name="keyPairProvider" class="com.google.code.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider">
<property name="path" value="${hostKey}" />
</bean>
- <!--
<bean name="passwordAuthenticator" class="com.google.code.sshd.server.jaas.JaasPasswordAuthenticator">
- <property name="domain" value="SshServer" />
+ <property name="domain" value="${sshRealm}" />
</bean>
- -->
- <bean name="passwordAuthenticator" class="org.apache.servicemix.kernel.gshell.core.sshd.BogusPasswordAuthenticator" />
<bean id="sshServerFactory" class="org.apache.servicemix.kernel.gshell.core.sshd.SshServerFactory" init-method="start" destroy-method="stop">
<constructor-arg ref="sshServer" />
Propchange: servicemix/smx4/kernel/trunk/jaas/jaas-modules/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 3 14:06:39 2008
@@ -0,0 +1,8 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+eclipse-classes
Added: servicemix/smx4/kernel/trunk/jaas/jaas-modules/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-modules/pom.xml?rev=723096&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-modules/pom.xml (added)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-modules/pom.xml Wed Dec 3 14:06:39 2008
@@ -0,0 +1,92 @@
+<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.servicemix.kernel.jaas</groupId>
+ <artifactId>jaas</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.kernel.jaas</groupId>
+ <artifactId>org.apache.servicemix.kernel.jaas.modules</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.1.0-SNAPSHOT</version>
+ <name>Apache ServiceMix Kernel :: JAAS Modules</name>
+
+ <description>
+ Provides the JAAS Config
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.kernel.jaas</groupId>
+ <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Export-Package>
+ org.apache.servicemix.kernel.jaas.modules*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ org.apache.servicemix.kernel.jaas.config,
+ *
+ </Import-Package>
+ <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Added: servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/RolePrincipal.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/RolePrincipal.java?rev=723096&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/RolePrincipal.java (added)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/RolePrincipal.java Wed Dec 3 14:06:39 2008
@@ -0,0 +1,39 @@
+package org.apache.servicemix.kernel.jaas.modules;
+
+import java.security.Principal;
+
+public class RolePrincipal implements Principal {
+
+ private final String name;
+
+ public RolePrincipal(String name) {
+ assert name != null;
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof RolePrincipal)) return false;
+
+ RolePrincipal that = (RolePrincipal) o;
+
+ if (name != null ? !name.equals(that.name) : that.name != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return name != null ? name.hashCode() : 0;
+ }
+
+ @Override
+ public String toString() {
+ return "RolePrincipal[" + name + "]";
+ }
+}
Added: servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/UserPrincipal.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/UserPrincipal.java?rev=723096&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/UserPrincipal.java (added)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/UserPrincipal.java Wed Dec 3 14:06:39 2008
@@ -0,0 +1,39 @@
+package org.apache.servicemix.kernel.jaas.modules;
+
+import java.security.Principal;
+
+public class UserPrincipal implements Principal {
+
+ private final String name;
+
+ public UserPrincipal(String name) {
+ assert name != null;
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof UserPrincipal)) return false;
+
+ UserPrincipal that = (UserPrincipal) o;
+
+ if (name != null ? !name.equals(that.name) : that.name != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return name != null ? name.hashCode() : 0;
+ }
+
+ @Override
+ public String toString() {
+ return "UserPrincipal[" + name + "]";
+ }
+}
Added: servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/ConfigAdminHolder.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/ConfigAdminHolder.java?rev=723096&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/ConfigAdminHolder.java (added)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/ConfigAdminHolder.java Wed Dec 3 14:06:39 2008
@@ -0,0 +1,17 @@
+package org.apache.servicemix.kernel.jaas.modules.osgi;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+
+public class ConfigAdminHolder {
+
+ private static ConfigurationAdmin configAdmin;
+
+ public static ConfigurationAdmin getService() {
+ return configAdmin;
+ }
+
+ public void setService(ConfigurationAdmin configAdmin) {
+ ConfigAdminHolder.configAdmin = configAdmin;
+ }
+
+}
Added: servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java?rev=723096&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java (added)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java Wed Dec 3 14:06:39 2008
@@ -0,0 +1,113 @@
+package org.apache.servicemix.kernel.jaas.modules.osgi;
+
+import java.util.Map;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Set;
+import java.util.HashSet;
+import java.io.IOException;
+import java.security.Principal;
+
+import javax.security.auth.spi.LoginModule;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.login.FailedLoginException;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.osgi.service.cm.Configuration;
+import org.apache.servicemix.kernel.jaas.modules.UserPrincipal;
+import org.apache.servicemix.kernel.jaas.modules.RolePrincipal;
+
+public class OsgiConfigLoginModule implements LoginModule {
+
+ public static final String PID = "pid";
+ public static final String USER_PREFIX = "user.";
+
+ private Subject subject;
+ private CallbackHandler callbackHandler;
+ private Map<String, ?> options;
+
+ private Set<Principal> principals;
+
+ public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState, Map<String, ?> options) {
+ this.subject = subject;
+ this.callbackHandler = callbackHandler;
+ this.options = options;
+ }
+
+ public boolean login() throws LoginException {
+ try {
+ String pid = (String) options.get(PID);
+ Configuration config = ConfigAdminHolder.getService().getConfiguration(pid);
+ Dictionary properties = config.getProperties();
+
+ Callback[] callbacks = new Callback[2];
+
+ callbacks[0] = new NameCallback("Username: ");
+ callbacks[1] = new PasswordCallback("Password: ", false);
+ try {
+ callbackHandler.handle(callbacks);
+ } catch (IOException ioe) {
+ throw new LoginException(ioe.getMessage());
+ } catch (UnsupportedCallbackException uce) {
+ throw new LoginException(uce.getMessage() + " not available to obtain information from user");
+ }
+ String user = ((NameCallback) callbacks[0]).getName();
+ char[] tmpPassword = ((PasswordCallback) callbacks[1]).getPassword();
+ if (tmpPassword == null) {
+ tmpPassword = new char[0];
+ }
+
+ String userInfos = (String) properties.get(USER_PREFIX + user);
+ if (userInfos == null) {
+ throw new FailedLoginException("User does not exist");
+ }
+ String[] infos = userInfos.split(",");
+ if (!new String(tmpPassword).equals(infos[0])) {
+ throw new FailedLoginException("Password does not match");
+ }
+
+ principals = new HashSet<Principal>();
+ principals.add(new UserPrincipal(user));
+ for (int i = 1; i < infos.length; i++) {
+ principals.add(new RolePrincipal(infos[i]));
+ }
+
+ return true;
+ } catch (LoginException e) {
+ throw e;
+ } catch (Exception e) {
+ throw (LoginException) new LoginException("Unable to authenticate user").initCause(e);
+ } finally {
+ callbackHandler = null;
+ options = null;
+ }
+ }
+
+ public boolean commit() throws LoginException {
+ subject.getPrincipals().addAll(principals);
+ return true;
+ }
+
+ public boolean abort() throws LoginException {
+ subject = null;
+ principals = null;
+ return true;
+ }
+
+ public boolean logout() throws LoginException {
+ try {
+ subject.getPrincipals().removeAll(principals);
+ principals.clear();
+ return true;
+ } finally {
+ subject = null;
+ principals = null;
+ }
+ }
+
+}
Added: servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml?rev=723096&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml (added)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml Wed Dec 3 14:06:39 2008
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xmlns:jaas="http://servicemix.apache.org/jaas"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/osgi
+ http://www.springframework.org/schema/osgi/spring-osgi.xsd
+ http://servicemix.apache.org/jaas
+ http://servicemix.apache.org/schema/servicemix-jaas.xsd">
+
+ <bean id="configAdminHolder" class="org.apache.servicemix.kernel.jaas.modules.osgi.ConfigAdminHolder">
+ <property name="service" ref="configAdmin" />
+ </bean>
+
+ <osgi:reference id="configAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" />
+
+ <jaas:config id="servicemix">
+ <jaas:module className="org.apache.servicemix.kernel.jaas.modules.osgi.OsgiConfigLoginModule" flags="required">
+ pid = org.apache.servicemix.users
+ </jaas:module>
+ </jaas:config>
+
+</beans>
\ No newline at end of file
Modified: servicemix/smx4/kernel/trunk/jaas/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/pom.xml?rev=723096&r1=723095&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/jaas/pom.xml Wed Dec 3 14:06:39 2008
@@ -36,7 +36,7 @@
<modules>
<module>jaas-boot</module>
<module>jaas-config</module>
- <module>jaas-keystore</module>
+ <module>jaas-modules</module>
</modules>
</project>
\ No newline at end of file
Propchange: servicemix/smx4/kernel/trunk/management/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 3 14:06:39 2008
@@ -0,0 +1,9 @@
+bin
+target
+runner
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
Propchange: servicemix/smx4/kernel/trunk/management/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: servicemix/smx4/kernel/trunk/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/management/pom.xml?rev=723096&r1=721701&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/management/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/management/pom.xml Wed Dec 3 14:06:39 2008
@@ -22,50 +22,44 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.management</groupId>
- <artifactId>management</artifactId>
- <version>4.0-m2-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>kernel</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.management</groupId>
- <artifactId>org.apache.servicemix.management.core</artifactId>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>org.apache.servicemix.kernel.management</artifactId>
<packaging>bundle</packaging>
- <version>4.0-m2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>Apache ServiceMix Management Core</name>
<dependencies>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
- <version>${spring.osgi.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${felix.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${felix.compendium.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -87,47 +81,7 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <configuration>
- <includeProjectDependencies>false</includeProjectDependencies>
- <includePluginDependencies>true</includePluginDependencies>
- <executableDependency>
- <groupId>org.ops4j.pax.runner</groupId>
- <artifactId>pax-runner</artifactId>
- </executableDependency>
- <mainClass>org.ops4j.pax.runner.Run</mainClass>
- <arguments>
- <argument>--vmOptions=-Dbundles.configuration.location=${basedir}/src/test/configs</argument>
- <argument>--console</argument>
- <argument>mvn:org.apache.felix/org.apache.felix.configadmin/0.9.0-SNAPSHOT</argument>
- <argument>mvn:org.ops4j.pax.confman/pax-confman-propsloader/0.3.0-SNAPSHOT</argument>
- <argument>mvn:org.ops4j.pax.logging/pax-logging-api/0.9.7-SNAPSHOT</argument>
- <argument>mvn:org.ops4j.pax.logging/pax-logging-service/0.9.7-SNAPSHOT</argument>
- <argument>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</argument>
- <argument>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</argument>
- <argument>mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</argument>
- <argument>mvn:org.springframework/spring-aop/${spring.version}</argument>
- <argument>mvn:org.springframework/spring-beans/${spring.version}</argument>
- <argument>mvn:org.springframework/spring-context/${spring.version}</argument>
- <argument>mvn:org.springframework/spring-core/${spring.version}</argument>
- <argument>
- mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0-${project.version}
- </argument>
- <argument>mvn:org.apache.servicemix/org.apache.servicemix.management/${project.version}
- </argument>
- </arguments>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.ops4j.pax.runner</groupId>
- <artifactId>pax-runner</artifactId>
- <version>0.5.1</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
+ </plugins>
</build>
Added: servicemix/smx4/kernel/trunk/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java?rev=723096&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java (added)
+++ servicemix/smx4/kernel/trunk/management/src/main/java/org/apache/servicemix/management/JaasAuthenticator.java Wed Dec 3 14:06:39 2008
@@ -0,0 +1,72 @@
+/*
+ * 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.servicemix.management;
+
+import java.io.IOException;
+
+import javax.management.remote.JMXAuthenticator;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.PasswordCallback;
+
+public class JaasAuthenticator implements JMXAuthenticator {
+
+ private String realm;
+
+ public String getRealm() {
+ return realm;
+ }
+
+ public void setRealm(String realm) {
+ this.realm = realm;
+ }
+
+ public Subject authenticate(Object credentials) throws SecurityException {
+ if (!(credentials instanceof String[])) {
+ throw new IllegalArgumentException("Expected String[2], got "
+ + (credentials != null ? credentials.getClass().getName() : null));
+ }
+ final String[] params = (String[]) credentials;
+ if (params.length != 2) {
+ throw new IllegalArgumentException("Expected String[2] but length was " + params.length);
+ }
+ try {
+ LoginContext loginContext = new LoginContext(realm, new CallbackHandler() {
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (int i = 0; i < callbacks.length; i++) {
+ if (callbacks[i] instanceof NameCallback) {
+ ((NameCallback) callbacks[i]).setName(params[0]);
+ } else if (callbacks[i] instanceof PasswordCallback) {
+ ((PasswordCallback) callbacks[i]).setPassword((params[1].toCharArray()));
+ } else {
+ throw new UnsupportedCallbackException(callbacks[i]);
+ }
+ }
+ }
+ });
+ loginContext.login();
+ return loginContext.getSubject();
+ } catch (LoginException e) {
+ throw new SecurityException("Authentication failed", e);
+ }
+ }
+}
Modified: servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml?rev=723096&r1=721701&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml (original)
+++ servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml Wed Dec 3 14:06:39 2008
@@ -63,24 +63,13 @@
<!-- Environment map for connectors -->
<util:map id="jmxConnectorEnvironment">
- <entry key="jmx.remote.authenticator" value-ref="jmxAuthenticator" />
+ <entry key="jmx.remote.authenticator" value-ref="jaasAuthenticator" />
</util:map>
- <!-- The JMXAuthenticator OSGi reference -->
- <!-- By default, it will point to the simple authenticator below, unless
- another one is exported by a bundle with a higher ranking -->
- <osgi:reference id="jmxAuthenticator" interface="javax.management.remote.JMXAuthenticator" cardinality="0..1"/>
-
<!-- Simple authenticator -->
- <bean id="simpleAuthenticator" class="org.apache.servicemix.management.SimpleAuthenticationManager">
- <property name="login" value="${jmxLogin}" />
- <property name="password" value="${jmxPassword}" />
+ <bean id="jaasAuthenticator" class="org.apache.servicemix.management.JaasAuthenticator">
+ <property name="realm" value="${jmxRealm}" />
</bean>
- <osgi:service ref="simpleAuthenticator">
- <osgi:interfaces>
- <value>javax.management.remote.JMXAuthenticator</value>
- </osgi:interfaces>
- </osgi:service>
<!-- OSGI framework helper -->
<bean id="framework" class="org.apache.servicemix.management.osgi.OSGIFramework">
@@ -106,8 +95,7 @@
<osgix:property-placeholder persistent-id="org.apache.servicemix.management">
<osgix:default-properties>
<prop key="rmiRegistryPort">1099</prop>
- <prop key="jmxLogin">smx</prop>
- <prop key="jmxPassword">smx</prop>
+ <prop key="jmxRealm">servicemix</prop>
<prop key="serviceUrl">service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</prop>
<prop key="daemon">true</prop>
<prop key="threaded">true</prop>
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=723096&r1=723095&r2=723096&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Wed Dec 3 14:06:39 2008
@@ -42,6 +42,7 @@
<module>testing</module>
<module>jaas</module>
<module>client</module>
+ <module>management</module>
<module>assembly</module>
</modules>
@@ -195,6 +196,11 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>org.apache.servicemix.kernel.management</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.kernel.gshell</groupId>
<artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
<version>${pom.version}</version>
@@ -246,7 +252,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.keystore</artifactId>
+ <artifactId>org.apache.servicemix.kernel.jaas.modules</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>