You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@onami.apache.org by si...@apache.org on 2013/07/15 14:42:11 UTC
svn commit: r1503205 - in /onami/sandbox/console/src/main/java/org/apache/onami/console: commands/ConsoleRunner.java modules/config/DefaultConfigurationModule.java

Author: simonetripodi
Date: Mon Jul 15 12:42:10 2013
New Revision: 1503205

URL: http://svn.apache.org/r1503205
Log:
started binding the textual configuration readers

Modified:
    onami/sandbox/console/src/main/java/org/apache/onami/console/commands/ConsoleRunner.java
    onami/sandbox/console/src/main/java/org/apache/onami/console/modules/config/DefaultConfigurationModule.java

Modified: onami/sandbox/console/src/main/java/org/apache/onami/console/commands/ConsoleRunner.java
URL: http://svn.apache.org/viewvc/onami/sandbox/console/src/main/java/org/apache/onami/console/commands/ConsoleRunner.java?rev=1503205&r1=1503204&r2=1503205&view=diff
==============================================================================
--- onami/sandbox/console/src/main/java/org/apache/onami/console/commands/ConsoleRunner.java (original)
+++ onami/sandbox/console/src/main/java/org/apache/onami/console/commands/ConsoleRunner.java Mon Jul 15 12:42:10 2013
@@ -33,6 +33,9 @@ import io.airlift.command.Option;
 import io.airlift.command.ParseArgumentsUnexpectedException;
 import jline.console.ConsoleReader;
 
+import org.apache.onami.console.descriptor.io.jackson.OnamiConsoleJacksonReader;
+import org.apache.onami.console.descriptor.io.snakeyaml.OnamiConsoleSnakeYamlReader;
+import org.apache.onami.console.descriptor.io.xpp3.OnamiConsoleXpp3Reader;
 import org.slf4j.Logger;
 
 import ch.qos.logback.classic.LoggerContext;
@@ -68,6 +71,15 @@ public final class ConsoleRunner
     @Inject
     private Injector injector;
 
+    @Inject
+    private OnamiConsoleJacksonReader jacksonReader;
+
+    @Inject
+    private OnamiConsoleSnakeYamlReader snakeYamlReader;
+
+    @Inject
+    private OnamiConsoleXpp3Reader xpp3Reader;
+
     public void run()
     {
         setupLogging();

Modified: onami/sandbox/console/src/main/java/org/apache/onami/console/modules/config/DefaultConfigurationModule.java
URL: http://svn.apache.org/viewvc/onami/sandbox/console/src/main/java/org/apache/onami/console/modules/config/DefaultConfigurationModule.java?rev=1503205&r1=1503204&r2=1503205&view=diff
==============================================================================
--- onami/sandbox/console/src/main/java/org/apache/onami/console/modules/config/DefaultConfigurationModule.java (original)
+++ onami/sandbox/console/src/main/java/org/apache/onami/console/modules/config/DefaultConfigurationModule.java Mon Jul 15 12:42:10 2013
@@ -25,6 +25,9 @@ import static com.google.inject.Scopes.S
 import java.io.File;
 
 import org.apache.onami.configuration.ConfigurationModule;
+import org.apache.onami.console.descriptor.io.jackson.OnamiConsoleJacksonReader;
+import org.apache.onami.console.descriptor.io.snakeyaml.OnamiConsoleSnakeYamlReader;
+import org.apache.onami.console.descriptor.io.xpp3.OnamiConsoleXpp3Reader;
 
 public final class DefaultConfigurationModule
     extends ConfigurationModule
@@ -45,6 +48,11 @@ public final class DefaultConfigurationM
         // OCR directories
         bind( File.class ).annotatedWith( named( "ocr.dir" ) ).toProvider( OnamiConsoleRunnerDirProvider.class ).in( SINGLETON );
         bind( File.class ).annotatedWith( named( "ocr.repo.dir" ) ).toProvider( OnamiConsoleRepoDirProvider.class ).in( SINGLETON );
+
+        // textual configurations (un)marshallers
+        bind( OnamiConsoleJacksonReader.class ).toInstance( new OnamiConsoleJacksonReader() );
+        bind( OnamiConsoleSnakeYamlReader.class ).toInstance( new OnamiConsoleSnakeYamlReader() );
+        bind( OnamiConsoleXpp3Reader.class ).toInstance( new OnamiConsoleXpp3Reader() );
     }
 
 }