Merge branch 'master' of local repository into rows_and_start_parameters

Conflicts: solrdf/src/dev/eclipse/start-SolRDF.launch
spaziocodice · Mar 11, 2015 · cb05291 · cb05291
2 parents d60fa3b + a956674
commit cb05291
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Checkout the project Open a new shell and type the following:
 Build and run SolrRDF
 
 > cd solrdf-download/solrdf  
-> mvn clean install cargo:run  
+> mvn clean package cargo:run  
 
 The very first time you run this command a lot of things will be downloaded, Solr included. At the end you should see sheomething like this:
 

diff --git a/solrdf/src/dev/eclipse/run-integration-test-suite.launch b/solrdf/src/dev/eclipse/run-integration-test-suite.launch
@@ -8,7 +8,9 @@
 <listAttribute key="M2_PROPERTIES"/>
 <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
 <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_67"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/solrdf}"/>

diff --git a/solrdf/src/dev/eclipse/start-SolRDF.launch b/solrdf/src/dev/eclipse/start-SolRDF.launch
@@ -13,6 +13,5 @@
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>
 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.m2e.launching.MavenSourceLocator"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;true&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;workspace/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.workspace&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/solrdf}"/>
 </launchConfiguration>
diff --git a/solrdf/src/test/java/org/gazzax/labs/solrdf/MisteryGuest.java b/solrdf/src/test/java/org/gazzax/labs/solrdf/MisteryGuest.java
@@ -4,7 +4,7 @@
  * A simple value object encapsulating data (i.e. filenames) for a given test.
  * 
  * @author Andrea Gazzarini
- * @since 1.0 
+ * @since 1.0  
  */     
 public final class MisteryGuest {
 	public final String [] datasets;

diff --git a/solrdf/src/test/java/org/gazzax/labs/solrdf/StringsTestCase.java b/solrdf/src/test/java/org/gazzax/labs/solrdf/StringsTestCase.java
@@ -6,7 +6,7 @@
 
 /**
  * {@link Strings} test case.
- * 
+ *  
  * @author Andrea Gazzarini
  * @since 1.0
  */

diff --git a/solrdf/src/test/java/org/gazzax/labs/solrdf/TestUtility.java b/solrdf/src/test/java/org/gazzax/labs/solrdf/TestUtility.java
@@ -7,7 +7,7 @@
  * 
  * @author Andrea Gazzarini
  * @since 1.0
- */       
+ */        
 public abstract class TestUtility {
 	public static final Random RANDOMIZER = new Random();
 	public static final String DUMMY_BASE_URI = "http://example.org/";