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:48:26 UTC
svn commit: r1503209 - in /onami/sandbox/console/src/main:
java/org/apache/onami/console/modules/config/
java/org/apache/onami/console/modules/descriptor/
resources/META-INF/services/
Author: simonetripodi
Date: Mon Jul 15 12:48:26 2013
New Revision: 1503209
URL: http://svn.apache.org/r1503209
Log:
clear separation of concerns inside each module, avoid to mix stuff in a single module
Added:
onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/
onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/IoDescriptorsModule.java (with props)
onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/package-info.java (with props)
Modified:
onami/sandbox/console/src/main/java/org/apache/onami/console/modules/config/DefaultConfigurationModule.java
onami/sandbox/console/src/main/resources/META-INF/services/com.google.inject.Module
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=1503209&r1=1503208&r2=1503209&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:48:26 2013
@@ -19,15 +19,12 @@ package org.apache.onami.console.modules
* under the License.
*/
-import static com.google.inject.name.Names.named;
import static com.google.inject.Scopes.SINGLETON;
+import static com.google.inject.name.Names.named;
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
@@ -48,11 +45,6 @@ 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() );
}
}
Added: onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/IoDescriptorsModule.java
URL: http://svn.apache.org/viewvc/onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/IoDescriptorsModule.java?rev=1503209&view=auto
==============================================================================
--- onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/IoDescriptorsModule.java (added)
+++ onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/IoDescriptorsModule.java Mon Jul 15 12:48:26 2013
@@ -0,0 +1,41 @@
+package org.apache.onami.console.modules.descriptor;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+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 com.google.inject.AbstractModule;
+
+public final class IoDescriptorsModule
+ extends AbstractModule
+{
+
+ @Override
+ protected void configure()
+ {
+ // textual configurations unmarshallers
+ bind( OnamiConsoleJacksonReader.class ).toInstance( new OnamiConsoleJacksonReader() );
+ bind( OnamiConsoleSnakeYamlReader.class ).toInstance( new OnamiConsoleSnakeYamlReader() );
+ bind( OnamiConsoleXpp3Reader.class ).toInstance( new OnamiConsoleXpp3Reader() );
+ }
+
+}
Propchange: onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/IoDescriptorsModule.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/IoDescriptorsModule.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/IoDescriptorsModule.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/package-info.java
URL: http://svn.apache.org/viewvc/onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/package-info.java?rev=1503209&view=auto
==============================================================================
--- onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/package-info.java (added)
+++ onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/package-info.java Mon Jul 15 12:48:26 2013
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ *
+ */
+package org.apache.onami.console.modules.descriptor;
Propchange: onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: onami/sandbox/console/src/main/java/org/apache/onami/console/modules/descriptor/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: onami/sandbox/console/src/main/resources/META-INF/services/com.google.inject.Module
URL: http://svn.apache.org/viewvc/onami/sandbox/console/src/main/resources/META-INF/services/com.google.inject.Module?rev=1503209&r1=1503208&r2=1503209&view=diff
==============================================================================
--- onami/sandbox/console/src/main/resources/META-INF/services/com.google.inject.Module (original)
+++ onami/sandbox/console/src/main/resources/META-INF/services/com.google.inject.Module Mon Jul 15 12:48:26 2013
@@ -20,6 +20,7 @@
org.apache.onami.console.modules.cli.CliParserModule
org.apache.onami.console.modules.config.DefaultConfigurationModule
org.apache.onami.console.modules.console.ConsoleReaderModule
+org.apache.onami.console.modules.descriptor.IoDescriptorsModule
# 3rd parts modules