You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/02/22 12:01:57 UTC
svn commit: r1073295 - in /karaf/trunk: ./ jaas/modules/
jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/
shell/config/ shell/config/src/main/java/org/apache/karaf/shell/config/
shell/dev/ shell/dev/src/main/java/org/apache/karaf/sh...
Author: jbonofre
Date: Tue Feb 22 11:01:56 2011
New Revision: 1073295
URL: http://svn.apache.org/viewvc?rev=1073295&view=rev
Log:
[KARAF-469] Remove duplicate code by using Felix Utils.
Removed:
karaf/trunk/util/src/main/java/org/apache/karaf/util/Properties.java
karaf/trunk/util/src/test/java/org/apache/karaf/util/PropertiesTest.java
Modified:
karaf/trunk/jaas/modules/pom.xml
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
karaf/trunk/pom.xml
karaf/trunk/shell/config/pom.xml
karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java
karaf/trunk/shell/dev/pom.xml
karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
Modified: karaf/trunk/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/pom.xml?rev=1073295&r1=1073294&r2=1073295&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/pom.xml (original)
+++ karaf/trunk/jaas/modules/pom.xml Tue Feb 22 11:01:56 2011
@@ -47,8 +47,8 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.util</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
</dependency>
<dependency>
@@ -111,7 +111,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.util
+ org.apache.felix.utils.properties
</Private-Package>
</instructions>
</configuration>
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java?rev=1073295&r1=1073294&r2=1073295&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java Tue Feb 22 11:01:56 2011
@@ -16,11 +16,11 @@
package org.apache.karaf.jaas.modules.properties;
+import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.jaas.modules.BackingEngine;
import org.apache.karaf.jaas.modules.RolePrincipal;
import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
-import org.apache.karaf.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java?rev=1073295&r1=1073294&r2=1073295&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java Tue Feb 22 11:01:56 2011
@@ -16,10 +16,10 @@
package org.apache.karaf.jaas.modules.properties;
+import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.jaas.modules.BackingEngine;
import org.apache.karaf.jaas.modules.BackingEngineFactory;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
-import org.apache.karaf.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java?rev=1073295&r1=1073294&r2=1073295&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java Tue Feb 22 11:01:56 2011
@@ -30,10 +30,10 @@ import javax.security.auth.callback.Unsu
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
+import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
import org.apache.karaf.jaas.modules.RolePrincipal;
import org.apache.karaf.jaas.modules.UserPrincipal;
-import org.apache.karaf.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1073295&r1=1073294&r2=1073295&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Feb 22 11:01:56 2011
@@ -557,6 +557,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: karaf/trunk/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/pom.xml?rev=1073295&r1=1073294&r2=1073295&view=diff
==============================================================================
--- karaf/trunk/shell/config/pom.xml (original)
+++ karaf/trunk/shell/config/pom.xml Tue Feb 22 11:01:56 2011
@@ -41,10 +41,12 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
+
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.util</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
</dependency>
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -94,7 +96,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.util,
+ org.apache.felix.utils.properties,
!*
</Private-Package>
</instructions>
Modified: karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java?rev=1073295&r1=1073294&r2=1073295&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java (original)
+++ karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java Tue Feb 22 11:01:56 2011
@@ -21,7 +21,7 @@ import java.util.Dictionary;
import java.util.Enumeration;
import org.apache.felix.gogo.commands.Option;
-import org.apache.karaf.util.Properties;
+import org.apache.felix.utils.properties.Properties;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.apache.felix.gogo.commands.Command;
Modified: karaf/trunk/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1073295&r1=1073294&r2=1073295&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Tue Feb 22 11:01:56 2011
@@ -39,8 +39,8 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.util</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
</dependency>
<dependency>
@@ -106,7 +106,7 @@
</Import-Package>
<Private-Package>
org.apache.felix.utils.version,
- org.apache.karaf.util,
+ org.apache.felix.utils.properties,
org.ops4j.pax.url.mvn,
!*
</Private-Package>
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java?rev=1073295&r1=1073294&r2=1073295&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java Tue Feb 22 11:01:56 2011
@@ -21,11 +21,11 @@ import java.io.File;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.karaf.shell.dev.framework.Equinox;
import org.apache.karaf.shell.dev.framework.Felix;
import org.apache.karaf.shell.dev.framework.Framework;
-import org.apache.karaf.util.Properties;
/**
* Command for enabling/disabling debug logging on the OSGi framework