Author: jbonofre
Date: Wed Sep 12 19:16:39 2012
New Revision: 1384094
URL: http://svn.apache.org/viewvc?rev=1384094&view=rev
Log:
[KARAF-1812] Remove Karaf Util Properties and use Felix Utils Properties instead
Removed:
karaf/branches/karaf-2.3.x/util/src/main/java/org/apache/karaf/util/Properties.java
karaf/branches/karaf-2.3.x/util/src/test/java/org/apache/karaf/util/PropertiesTest.java
karaf/branches/karaf-2.3.x/util/src/test/resources/test.properties
Modified:
karaf/branches/karaf-2.3.x/jaas/modules/pom.xml
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
karaf/branches/karaf-2.3.x/shell/config/pom.xml
karaf/branches/karaf-2.3.x/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java
karaf/branches/karaf-2.3.x/shell/dev/pom.xml
karaf/branches/karaf-2.3.x/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
Modified: karaf/branches/karaf-2.3.x/jaas/modules/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/pom.xml?rev=1384094&r1=1384093&r2=1384094&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/pom.xml Wed Sep 12 19:16:39 2012
@@ -48,8 +48,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*
</Private-Package>
</instructions>
</configuration>
Modified:
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java?rev=1384094&r1=1384093&r2=1384094&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
Wed Sep 12 19:16:39 2012
@@ -15,11 +15,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/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java?rev=1384094&r1=1384093&r2=1384094&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java
Wed Sep 12 19:16:39 2012
@@ -15,10 +15,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/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java?rev=1384094&r1=1384093&r2=1384094&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
Wed Sep 12 19:16:39 2012
@@ -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/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java?rev=1384094&r1=1384093&r2=1384094&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
Wed Sep 12 19:16:39 2012
@@ -35,10 +35,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/branches/karaf-2.3.x/shell/config/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/config/pom.xml?rev=1384094&r1=1384093&r2=1384094&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/config/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/config/pom.xml Wed Sep 12 19:16:39 2012
@@ -42,9 +42,10 @@
<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>
@@ -106,7 +107,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.util;-split-package:=merge-first,
+
org.apache.felix.utils*;-split-package:=merge-first,
!*
</Private-Package>
</instructions>
Modified:
karaf/branches/karaf-2.3.x/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java?rev=1384094&r1=1384093&r2=1384094&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java
(original)
+++
karaf/branches/karaf-2.3.x/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java
Wed Sep 12 19:16:39 2012
@@ -26,8 +26,8 @@ import java.util.Enumeration;
import java.util.List;
import org.apache.felix.fileinstall.ArtifactInstaller;
+import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.apache.karaf.util.Properties;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
Modified: karaf/branches/karaf-2.3.x/shell/dev/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/dev/pom.xml?rev=1384094&r1=1384093&r2=1384094&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/dev/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/dev/pom.xml Wed Sep 12 19:16:39 2012
@@ -40,8 +40,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,9 +111,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.felix.utils.properties,
- org.apache.felix.utils.version,
- org.apache.karaf.util;-split-package:=merge-first,
+
org.apache.felix.utils*;-split-package:=merge-first,
org.ops4j.pax.url.mvn,
!*
</Private-Package>
Modified:
karaf/branches/karaf-2.3.x/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java?rev=1384094&r1=1384093&r2=1384094&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
(original)
+++
karaf/branches/karaf-2.3.x/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
Wed Sep 12 19:16:39 2012
@@ -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
