vayacondios-server 0.2.5 → 0.2.6

data/.gitignore

@@ -26,6 +26,7 @@ a.out
 *.o
 *.pyc
 *.so
+target/
 
 ## OTHER SCM
 .bzr

data/lib/vayacondios/client/config.rb

@@ -5,5 +5,3 @@ end
 require 'configliere'
 
 Settings.read(ENV.root_path('config/vayacondios.yaml'))
-Settings.resolve!
-

data/lib/vayacondios/version.rb

@@ -1,3 +1,3 @@
 class Vayacondios
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/pom.xml

@@ -4,84 +4,17 @@
   <groupId>com.infochimps</groupId>
   <artifactId>vayacondios</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.3-SNAPSHOT</version>
+<!-- ICSVERS --><version>1.6.2-SNAPSHOT</version>
   <name>java-common</name>
   <url>http://maven.apache.org</url>
 
   <parent>
     <groupId>com.infochimps</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+<!-- ICSVERS --><version>1.6.2-SNAPSHOT</version>
+    <relativePath></relativePath>
   </parent>
 
-  <properties>
-    <test.logLevel>info</test.logLevel>
-  </properties>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
-        <configuration>
-	  <show>public</show>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>com.infochimps.vayacondios.VCDIntegrationTest</mainClass>
-                </transformer>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-	<groupId>org.codehaus.mojo</groupId>
-	<artifactId>exec-maven-plugin</artifactId>
-	<version>1.2.1</version>
-	<configuration>
-	  <executable>java</executable>
-	  <arguments>
-	    <argument>-cp</argument>
-	    <classpath/>
-	    <argument>-Dlog4j.debug</argument>
-	    <argument>-Dlog4j.configuration=file://${project.basedir}/config/log4j.properties</argument>
-	    <argument>-jar</argument>
-	    <argument>target/${project.artifactId}-${project.version}.jar</argument>
-	  </arguments>
-	</configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.14.1</version>
-        <configuration>
-          <systemPropertyVariables>
-            <org.slf4j.simpleLogger.defaultLogLevel>${test.logLevel}</org.slf4j.simpleLogger.defaultLogLevel>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
   <repositories>
     <!-- Infochimps Repositories -->
     <repository>
@@ -111,21 +44,5 @@
       <artifactId>commons-codec</artifactId>
       <version>1.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.5</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

data/src/main/java/com/infochimps/util/HttpHelper.java

@@ -143,9 +143,9 @@ public class HttpHelper {
       new BufferedReader(
         new InputStreamReader(getStream(con, log), inputCharset));
 
-    log.info("successfully opened connection to {} with character encoding {}",
-             con.getURL().toString(),
-             inputCharset);
+    log.debug("successfully opened connection to {} with character encoding {}",
+	      con.getURL().toString(),
+	      inputCharset);
 
     return reader;
   }

data/src/main/java/com/infochimps/vayacondios/VCDIntegrationTest.java

@@ -22,9 +22,13 @@ public class VCDIntegrationTest {
   private static final Logger LOG = getLogger();
 
   public static void setUp() {
-    StandardVCDLink.forceLegacy(false);
+    // This will default to false when the property is null, which is
+    // what we happen to want.
+    boolean legacyMode =
+      Boolean.valueOf(System.getProperty("vayacondios.legacy"));
+    LOG.info("Using Vayacondios {} mode", legacyMode ? "legacy" : "standard");
+    StandardVCDLink.forceLegacy(legacyMode);
   }
-
   private static ItemSets itemSets() {
     return new VayacondiosClient("localhost", VCD_PORT).
       organization("org").

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vayacondios-server
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -279,7 +279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 530761123720877382
+      hash: 2406222611066502190
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 530761123720877382
+      hash: 2406222611066502190
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25