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/01/02 22:08:49 UTC

svn commit: r1428050 - in /incubator/onami/trunk/configuration/src: main/java/org/apache/onami/configuration/ main/java/org/apache/onami/configuration/binder/ main/java/org/apache/onami/configuration/configuration/ test/java/org/apache/onami/configurat...

Author: simonetripodi
Date: Wed Jan  2 21:08:48 2013
New Revision: 1428050

URL: http://svn.apache.org/viewvc?rev=1428050&view=rev
Log:
ONAMI-33 org.apache.onami.configuration.configuration package has to be collapsed to org.apache.onami.configuration

Added:
    incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/ConfigurationModule.java
      - copied, changed from r1428026, incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/ConfigurationModule.java
    incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/KeyValue.java
      - copied, changed from r1427904, incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/KeyValue.java
    incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/PropertiesIterator.java
      - copied, changed from r1427904, incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/PropertiesIterator.java
    incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/PropertiesURLReader.java
      - copied, changed from r1428026, incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/PropertiesURLReader.java
    incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/
      - copied from r1427904, incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/binder/
    incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ConfigurationModuleTestCase.java
      - copied, changed from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ConfigurationModuleTestCase.java
    incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ConfigurationRunner.java
      - copied, changed from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ConfigurationRunner.java
    incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/JDBCConfiguration.java
      - copied, changed from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/JDBCConfiguration.java
    incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/LdapConfiguration.java
      - copied, changed from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/LdapConfiguration.java
    incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/MemcachedConfiguration.java
      - copied, changed from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/MemcachedConfiguration.java
    incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/MyBatisConfiguration.java
      - copied, changed from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/MyBatisConfiguration.java
    incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ProxyConfiguration.java
      - copied, changed from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ProxyConfiguration.java
Removed:
    incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/
    incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/
Modified:
    incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/PropertyValueBindingBuilder.java
    incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/XMLPropertiesFormatBindingBuilder.java
    incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/package-info.java
    incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/mixed/ConfigurationConverterTestCase.java

Copied: incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/ConfigurationModule.java (from r1428026, incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/ConfigurationModule.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/ConfigurationModule.java?p2=incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/ConfigurationModule.java&p1=incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/ConfigurationModule.java&r1=1428026&r2=1428050&rev=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/ConfigurationModule.java (original)
+++ incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/ConfigurationModule.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration;
+package org.apache.onami.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.onami.configuration.c
 
 import static com.google.inject.name.Names.named;
 import static java.lang.String.format;
-import static org.apache.onami.configuration.configuration.PropertiesIterator.newPropertiesIterator;
+import static org.apache.onami.configuration.PropertiesIterator.newPropertiesIterator;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -34,8 +34,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 
-import org.apache.onami.configuration.configuration.binder.PropertyValueBindingBuilder;
-import org.apache.onami.configuration.configuration.binder.XMLPropertiesFormatBindingBuilder;
+import org.apache.onami.configuration.binder.PropertyValueBindingBuilder;
+import org.apache.onami.configuration.binder.XMLPropertiesFormatBindingBuilder;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.ProvisionException;

Copied: incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/KeyValue.java (from r1427904, incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/KeyValue.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/KeyValue.java?p2=incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/KeyValue.java&p1=incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/KeyValue.java&r1=1427904&r2=1428050&rev=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/KeyValue.java (original)
+++ incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/KeyValue.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration;
+package org.apache.onami.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/PropertiesIterator.java (from r1427904, incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/PropertiesIterator.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/PropertiesIterator.java?p2=incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/PropertiesIterator.java&p1=incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/PropertiesIterator.java&r1=1427904&r2=1428050&rev=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/PropertiesIterator.java (original)
+++ incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/PropertiesIterator.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration;
+package org.apache.onami.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/PropertiesURLReader.java (from r1428026, incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/PropertiesURLReader.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/PropertiesURLReader.java?p2=incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/PropertiesURLReader.java&p1=incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/PropertiesURLReader.java&r1=1428026&r2=1428050&rev=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/configuration/PropertiesURLReader.java (original)
+++ incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/PropertiesURLReader.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration;
+package org.apache.onami.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,7 +26,7 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.Properties;
 
-import org.apache.onami.configuration.configuration.binder.XMLPropertiesFormatBindingBuilder;
+import org.apache.onami.configuration.binder.XMLPropertiesFormatBindingBuilder;
 
 /**
  * {@link Properties} reader implementation able to read configuration files from classpath, file system or URLs.

Modified: incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/PropertyValueBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/PropertyValueBindingBuilder.java?rev=1428050&r1=1427904&r2=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/PropertyValueBindingBuilder.java (original)
+++ incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/PropertyValueBindingBuilder.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration.binder;
+package org.apache.onami.configuration.binder;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/XMLPropertiesFormatBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/XMLPropertiesFormatBindingBuilder.java?rev=1428050&r1=1427904&r2=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/XMLPropertiesFormatBindingBuilder.java (original)
+++ incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/XMLPropertiesFormatBindingBuilder.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration.binder;
+package org.apache.onami.configuration.binder;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/package-info.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/package-info.java?rev=1428050&r1=1427904&r2=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/package-info.java (original)
+++ incubator/onami/trunk/configuration/src/main/java/org/apache/onami/configuration/binder/package-info.java Wed Jan  2 21:08:48 2013
@@ -22,4 +22,4 @@
  *
  * @since 5.0
  */
-package org.apache.onami.configuration.configuration.binder;
+package org.apache.onami.configuration.binder;

Copied: incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ConfigurationModuleTestCase.java (from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ConfigurationModuleTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ConfigurationModuleTestCase.java?p2=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ConfigurationModuleTestCase.java&p1=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ConfigurationModuleTestCase.java&r1=1427904&r2=1428050&rev=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ConfigurationModuleTestCase.java (original)
+++ incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ConfigurationModuleTestCase.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration;
+package org.apache.onami.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ConfigurationRunner.java (from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ConfigurationRunner.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ConfigurationRunner.java?p2=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ConfigurationRunner.java&p1=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ConfigurationRunner.java&r1=1427904&r2=1428050&rev=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ConfigurationRunner.java (original)
+++ incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ConfigurationRunner.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration;
+package org.apache.onami.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@ import static org.apache.onami.configura
 import java.io.File;
 import java.net.URI;
 
-import org.apache.onami.configuration.configuration.ConfigurationModule;
+import org.apache.onami.configuration.ConfigurationModule;
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.model.InitializationError;
 

Copied: incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/JDBCConfiguration.java (from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/JDBCConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/JDBCConfiguration.java?p2=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/JDBCConfiguration.java&p1=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/JDBCConfiguration.java&r1=1427904&r2=1428050&rev=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/JDBCConfiguration.java (original)
+++ incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/JDBCConfiguration.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration;
+package org.apache.onami.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/LdapConfiguration.java (from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/LdapConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/LdapConfiguration.java?p2=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/LdapConfiguration.java&p1=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/LdapConfiguration.java&r1=1427904&r2=1428050&rev=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/LdapConfiguration.java (original)
+++ incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/LdapConfiguration.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration;
+package org.apache.onami.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/MemcachedConfiguration.java (from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/MemcachedConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/MemcachedConfiguration.java?p2=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/MemcachedConfiguration.java&p1=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/MemcachedConfiguration.java&r1=1427904&r2=1428050&rev=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/MemcachedConfiguration.java (original)
+++ incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/MemcachedConfiguration.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration;
+package org.apache.onami.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/MyBatisConfiguration.java (from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/MyBatisConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/MyBatisConfiguration.java?p2=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/MyBatisConfiguration.java&p1=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/MyBatisConfiguration.java&r1=1427904&r2=1428050&rev=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/MyBatisConfiguration.java (original)
+++ incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/MyBatisConfiguration.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration;
+package org.apache.onami.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ProxyConfiguration.java (from r1427904, incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ProxyConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ProxyConfiguration.java?p2=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ProxyConfiguration.java&p1=incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ProxyConfiguration.java&r1=1427904&r2=1428050&rev=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/configuration/ProxyConfiguration.java (original)
+++ incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/ProxyConfiguration.java Wed Jan  2 21:08:48 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.configuration.configuration;
+package org.apache.onami.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/mixed/ConfigurationConverterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/mixed/ConfigurationConverterTestCase.java?rev=1428050&r1=1428049&r2=1428050&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/mixed/ConfigurationConverterTestCase.java (original)
+++ incubator/onami/trunk/configuration/src/test/java/org/apache/onami/configuration/mixed/ConfigurationConverterTestCase.java Wed Jan  2 21:08:48 2013
@@ -30,7 +30,7 @@ import java.util.Properties;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.apache.onami.configuration.configuration.ConfigurationModule;
+import org.apache.onami.configuration.ConfigurationModule;
 import org.apache.onami.configuration.converters.FileConverter;
 import org.junit.Before;
 import org.junit.Test;