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/14 22:48:34 UTC
svn commit: r997088 - in /karaf/trunk: ./ shell/config/
shell/config/src/main/java/org/apache/karaf/shell/config/
shell/config/src/test/java/org/apache/karaf/shell/config/ shell/dev/
shell/dev/src/main/java/org/apache/karaf/shell/dev/ shell/dev/src/mai...
Author: gnodet
Date: Tue Sep 14 20:48:34 2010
New Revision: 997088
URL: http://svn.apache.org/viewvc?rev=997088&view=rev
Log:
KARAF-191: use the Properties in various places
Removed:
karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/Properties.java
karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/PropertiesTest.java
karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/util/Properties.java
Modified:
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
karaf/trunk/util/src/test/java/org/apache/karaf/util/PropertiesTest.java
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=997088&r1=997087&r2=997088&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Sep 14 20:48:34 2010
@@ -210,6 +210,11 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.exception</artifactId>
<version>${project.version}</version>
</dependency>
Modified: karaf/trunk/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/pom.xml?rev=997088&r1=997087&r2=997088&view=diff
==============================================================================
--- karaf/trunk/shell/config/pom.xml (original)
+++ karaf/trunk/shell/config/pom.xml Tue Sep 14 20:48:34 2010
@@ -46,6 +46,10 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.util</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
@@ -80,7 +84,10 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
+ <Private-Package>
+ org.apache.karaf.util,
+ !*
+ </Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
</configuration>
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=997088&r1=997087&r2=997088&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 Sep 14 20:48:34 2010
@@ -21,6 +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.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=997088&r1=997087&r2=997088&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Tue Sep 14 20:48:34 2010
@@ -37,6 +37,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.util</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
</dependency>
@@ -78,6 +83,7 @@
</Import-Package>
<Private-Package>
org.apache.felix.utils.version,
+ org.apache.karaf.util,
!*
</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
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=997088&r1=997087&r2=997088&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 Sep 14 20:48:34 2010
@@ -25,7 +25,7 @@ import org.apache.karaf.shell.console.Os
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.shell.dev.util.Properties;
+import org.apache.karaf.util.Properties;
/**
* Command for enabling/disabling debug logging on the OSGi framework
Modified: karaf/trunk/util/src/test/java/org/apache/karaf/util/PropertiesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/util/src/test/java/org/apache/karaf/util/PropertiesTest.java?rev=997088&r1=997087&r2=997088&view=diff
==============================================================================
--- karaf/trunk/util/src/test/java/org/apache/karaf/util/PropertiesTest.java (original)
+++ karaf/trunk/util/src/test/java/org/apache/karaf/util/PropertiesTest.java Tue Sep 14 20:48:34 2010
@@ -16,6 +16,11 @@
*/
package org.apache.karaf.util;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+
import junit.framework.TestCase;
/**
@@ -51,4 +56,36 @@ public class PropertiesTest extends Test
assertEquals("test", properties.get("test"));
}
+ public void testLoadSave() throws IOException {
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ pw.println("# ");
+ pw.println("# The Main ");
+ pw.println("# ");
+ pw.println("# Comment ");
+ pw.println("# ");
+ pw.println("");
+ pw.println("# Another comment");
+ pw.println("");
+ pw.println("# A value comment");
+ pw.println("key1 = val1");
+ pw.println("");
+ pw.println("# Another value comment");
+ pw.println("key2 = ${key1}/foo");
+ pw.println("");
+ pw.println("# A third comment");
+ pw.println("key3 = val3");
+ pw.println("");
+
+
+ Properties props = new Properties();
+ props.load(new StringReader(sw.toString()));
+ props.save(System.err);
+ System.err.println("=====");
+
+ props.put("key2", props.get("key2"));
+ props.put("key3", "foo");
+ props.save(System.err);
+ System.err.println("=====");
+ }
}