geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r941993 - in /geronimo/server/trunk/framework/configs/karaf-framework: ./ src/main/distribution/text/etc/ src/main/filtered-resources/etc/ src/main/history/
Date Fri, 07 May 2010 03:43:53 GMT
Author: gawor
Date: Fri May  7 03:43:53 2010
New Revision: 941993

URL: http://svn.apache.org/viewvc?rev=941993&view=rev
Log:
geronimo controls login modules so no need for karaf.jaas.modules

Removed:
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.management.cfg
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/users.properties
Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.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=941993&r1=941992&r2=941993&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Fri May  7 03:43:53 2010
@@ -197,22 +197,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.felix.karaf.jaas</groupId>
-                <artifactId>org.apache.felix.karaf.jaas.modules</artifactId>
-                <version>${felix.karaf.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework.osgi</groupId>
-                        <artifactId>spring-osgi-core</artifactId>
-                    </exclusion>
-               </exclusions>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-core</artifactId>
                 <version>${mina.version}</version>
@@ -327,10 +311,6 @@
             <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix.karaf.jaas</groupId>
-            <artifactId>org.apache.felix.karaf.jaas.modules</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.felix.karaf</groupId>
             <artifactId>org.apache.felix.karaf.management</artifactId>
         </dependency>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=941993&r1=941992&r2=941993&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
Fri May  7 03:43:53 2010
@@ -27,7 +27,6 @@ org/ops4j/pax/url/pax-url-mvn/${pax.url.
 org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}.jar=5
 org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar=8
 org/apache/geronimo/framework/geronimo-pax-logging/${pom.version}/geronimo-pax-logging-${pom.version}.jar=9
-#org/ops4j/pax/logging/pax-logging-service/${pax.logging.version}/pax-logging-service-${pax.logging.version}.jar=9
 org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=8
 org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
 org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=11
@@ -51,14 +50,11 @@ org/apache/felix/karaf/shell/org.apache.
 org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.commands/${felix.karaf.version}/org.apache.felix.karaf.shell.commands-${felix.karaf.version}.jar=30
 org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.obr/${felix.karaf.version}/org.apache.felix.karaf.shell.obr-${felix.karaf.version}.jar=30
 org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.config/${felix.karaf.version}/org.apache.felix.karaf.jaas.config-${felix.karaf.version}.jar=30
-org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.modules/${felix.karaf.version}/org.apache.felix.karaf.jaas.modules-${felix.karaf.version}.jar=30
 
 #org/apache/felix/karaf/features/org.apache.felix.karaf.features.core/${felix.karaf.version}/org.apache.felix.karaf.features.core-${felix.karaf.version}.jar=30
 #org/apache/felix/karaf/features/org.apache.felix.karaf.features.command/${felix.karaf.version}/org.apache.felix.karaf.features.command-${felix.karaf.version}.jar=30
 #org/apache/felix/karaf/features/org.apache.felix.karaf.features.management/${felix.karaf.version}/org.apache.felix.karaf.features.management-${felix.karaf.version}.jar=30
 
-#org/apache/felix/karaf/org.apache.felix.karaf.management/${felix.karaf.version}/org.apache.felix.karaf.management-${felix.karaf.version}.jar=30
-
 org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
 org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
 org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.ssh/${felix.karaf.version}/org.apache.felix.karaf.shell.ssh-${felix.karaf.version}.jar=30

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=941993&r1=941992&r2=941993&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
Fri May  7 03:43:53 2010
@@ -117,11 +117,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix.karaf.jaas</groupId>
-        <artifactId>org.apache.felix.karaf.jaas.modules</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.felix.karaf.shell</groupId>
         <artifactId>org.apache.felix.karaf.shell.commands</artifactId>
         <type>jar</type>



Mime
View raw message