You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by fe...@apache.org on 2012/05/03 14:52:37 UTC

svn commit: r1333435 - in /nutch/branches/nutchgora: ./ conf/ ivy/ src/java/org/apache/nutch/storage/ src/test/ src/test/org/apache/nutch/storage/ src/test/org/apache/nutch/util/ src/testprocess/

Author: ferdy
Date: Thu May  3 12:52:37 2012
New Revision: 1333435

URL: http://svn.apache.org/viewvc?rev=1333435&view=rev
Log:
NUTCH-1205 Upgrade gora modules to 0.2 in ivy/ivy.xml

Added:
    nutch/branches/nutchgora/src/test/gora.properties   (with props)
    nutch/branches/nutchgora/src/testprocess/
    nutch/branches/nutchgora/src/testprocess/gora.properties   (with props)
Modified:
    nutch/branches/nutchgora/CHANGES.txt
    nutch/branches/nutchgora/build.xml
    nutch/branches/nutchgora/conf/gora.properties
    nutch/branches/nutchgora/ivy/ivy.xml
    nutch/branches/nutchgora/src/java/org/apache/nutch/storage/StorageUtils.java
    nutch/branches/nutchgora/src/test/org/apache/nutch/storage/TestGoraStorage.java
    nutch/branches/nutchgora/src/test/org/apache/nutch/util/AbstractNutchTest.java

Modified: nutch/branches/nutchgora/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/CHANGES.txt?rev=1333435&r1=1333434&r2=1333435&view=diff
==============================================================================
--- nutch/branches/nutchgora/CHANGES.txt (original)
+++ nutch/branches/nutchgora/CHANGES.txt Thu May  3 12:52:37 2012
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Release nutchgora - Current Development
 
+* NUTCH-1205 Upgrade gora modules to 0.2 in ivy/ivy.xml (lewismc, ferdy)
+
 * NUTCH-882 Design a Host table in GORA (jnioche, ab, dogacan, Mathijs Homminga, ferdy)
 
 * NUTCH-1340 Increase scalability by only removing markers when they actually exist for DbUpdaterReducer (ferdy)

Modified: nutch/branches/nutchgora/build.xml
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/build.xml?rev=1333435&r1=1333434&r2=1333435&view=diff
==============================================================================
--- nutch/branches/nutchgora/build.xml (original)
+++ nutch/branches/nutchgora/build.xml Thu May  3 12:52:37 2012
@@ -378,6 +378,9 @@
 
   <copy file="${test.src.dir}/log4j.properties" 
   	todir="${test.build.classes}" />
+  	
+  <copy file="${test.src.dir}/gora.properties" 
+  	todir="${test.build.classes}" />
 
   <junit printsummary="yes" haltonfailure="no" fork="yes" dir="${basedir}"
    errorProperty="tests.failed" failureProperty="tests.failed" maxmemory="1000m">

Modified: nutch/branches/nutchgora/conf/gora.properties
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/conf/gora.properties?rev=1333435&r1=1333434&r2=1333435&view=diff
==============================================================================
--- nutch/branches/nutchgora/conf/gora.properties (original)
+++ nutch/branches/nutchgora/conf/gora.properties Thu May  3 12:52:37 2012
@@ -20,9 +20,9 @@
 # Default SqlStore properties #
 ###############################
 
-gora.sqlstore.jdbc.driver=org.hsqldb.jdbcDriver
+gora.sqlstore.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
 gora.sqlstore.jdbc.url=jdbc:hsqldb:hsql://localhost/nutchtest
-gora.sqlstore.jdbc.user=SA
+gora.sqlstore.jdbc.user=sa
 gora.sqlstore.jdbc.password=
 
 ################################

Modified: nutch/branches/nutchgora/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/ivy/ivy.xml?rev=1333435&r1=1333434&r2=1333435&view=diff
==============================================================================
--- nutch/branches/nutchgora/ivy/ivy.xml (original)
+++ nutch/branches/nutchgora/ivy/ivy.xml Thu May  3 12:52:37 2012
@@ -1,136 +1,132 @@
 <?xml version="1.0" ?>
 
 <!-- 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. -->
+  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. -->
 
 <ivy-module version="1.0">
-	<info organisation="org.apache.nutch" module="nutch">
-		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt/"/>
-		<ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org" />
-		<description homepage="http://nutch.apache.org">Nutch is an open source web-search software. It builds on 
-		Hadoop, Tika and Solr, adding web-specifics, such as a crawler, a link-graph database etc.
-		</description>
-	</info>
-
-	<configurations>
-		<include file="${basedir}/ivy/ivy-configurations.xml" />
-	</configurations>
-
-	<publications>
-		<!--get the artifact from our module name -->
-		<artifact conf="master" />
-	</publications>
-
-	<dependencies>
-		<dependency org="org.apache.solr" name="solr-solrj" rev="3.4.0"
-			conf="*->default" />
-		<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" conf="*->master" />
-
-		<dependency org="commons-lang" name="commons-lang" rev="2.4"
-			conf="*->default" />
-		<dependency org="commons-collections" name="commons-collections"
-			rev="3.1" conf="*->default" />
-		<dependency org="commons-httpclient" name="commons-httpclient"
-			rev="3.1" conf="*->master" />
-		<dependency org="commons-codec" name="commons-codec" rev="1.3"
-			conf="*->default" />
-
-		<dependency org="org.apache.hadoop" name="hadoop-core" rev="1.0.0"
-			conf="*->default">
-			<exclude org="hsqldb" name="hsqldb" />
-			<exclude org="net.sf.kosmosfs" name="kfs" />
-			<exclude org="net.java.dev.jets3t" name="jets3t" />
-			<exclude org="org.eclipse.jdt" name="core" />
-			<exclude org="org.mortbay.jetty" name="jsp-*" />
-		</dependency>
-
-		<dependency org="com.ibm.icu" name="icu4j" rev="4.0.1" />
-		<dependency org="org.apache.tika" name="tika-core" rev="0.10" />
-		<!--
-		  <dependency org="org.apache.tika" name="tika-parsers" rev="0.10" />
-		-->
-		
-		<dependency org="org.apache.gora" name="gora-core" rev="0.1.1-incubating" conf="*->compile"/>
-
-		<dependency org="log4j" name="log4j" rev="1.2.15" conf="*->master" />
-
-		<dependency org="xerces" name="xercesImpl" rev="2.9.1" />
-		<dependency org="xerces" name="xmlParserAPIs" rev="2.6.2" />
-		<dependency org="oro" name="oro" rev="2.0.8" />
-
-		<dependency org="org.jdom" name="jdom" rev="1.1" conf="*->default"/>
-
-  <dependency org="com.google.guava" name="guava" rev="11.0.2" />
-
-		<!--Configuration: test -->
-
-		<!--artifacts needed for testing -->
-		<dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />
-
-		<dependency org="org.apache.hadoop" name="hadoop-test" rev="0.20.205.0"
-			conf="test->default">
-			<exclude org="hsqldb" name="hsqldb" />
-			<exclude org="net.sf.kosmosfs" name="kfs" />
-			<exclude org="net.java.dev.jets3t" name="jets3t" />
-			<exclude org="org.eclipse.jdt" name="core" />
-			<exclude org="org.mortbay.jetty" name="jsp-*" />
-		</dependency>
-
-		<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.22"
-			conf="test->default" />
-		<dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.22"
-			conf="test->default" />
-		<dependency org="org.mortbay.jetty" name="jetty-client" rev="6.1.22" />
-
-		<dependency org="org.hsqldb" name="hsqldb" rev="2.2.8" conf="*->default"/>
-		<dependency org="org.jdom" name="jdom" rev="1.1" conf="test->default"/>
-
-		<dependency org="org.apache.gora" name="gora-sql" rev="0.1.1-incubating" conf="*->default"/>				
-                <dependency org="org.restlet.jse" name="org.restlet" rev="2.0.5" conf="*->default"/>
-                <dependency org="org.restlet.jse" name="org.restlet.ext.jackson" rev="2.0.5" conf="*->default"/>
-
-<!--
-       Uncomment this to use MySQL as database with SQL as Gora store.
--->
-<!--
-       <dependency org="mysql" name="mysql-connector-java" rev="5.1.13" conf="*->default"/>
--->
-
-<!--
-       Uncomment this to use HBase as Gora backend.
--->
-<!--
-       <dependency org="org.apache.gora" name="gora-hbase" rev="0.1.1-incubating" conf="*->default">
-          <exclude org="hsqldb" name="hsqldb" />
-       </dependency>
--->
-<!--
-       Uncomment this to use Accumulo as Gora backend.
--->
-<!--
-       <dependency org="org.apache.gora" name="gora-accumulo" rev="0.1.1-incubating" conf="*->default" />
--->
-<!--
-    	Uncomment this to use Cassandra as Gora backend. 
--->
-<!--
-		<dependency org="org.apache.gora" name="gora-cassandra" rev="0.1.1-incubating" conf="*->default" />
--->
-
-             <!--global exclusion-->
-             <exclude module="ant" />
-             <exclude module="jmxtools" />
-             <exclude module="jms" />
-             <exclude module="jmxri" />
-             <exclude module="thrift" />
-	</dependencies>
+  <info organisation="org.apache.nutch" module="nutch">
+    <license name="Apache 2.0"
+      url="http://www.apache.org/licenses/LICENSE-2.0.txt/" />
+    <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org" />
+    <description homepage="http://nutch.apache.org">Nutch is an open source web-search
+      software. It builds on Hadoop, Tika and Solr, adding web-specifics, such as a crawler, 
+      a link-graph database etc.
+    </description>
+  </info>
+
+  <configurations>
+    <include file="${basedir}/ivy/ivy-configurations.xml" />
+  </configurations>
+
+  <publications>
+    <!--get the artifact from our module name -->
+    <artifact conf="master" />
+  </publications>
+
+  <dependencies>
+    <dependency org="org.apache.solr" name="solr-solrj" rev="3.4.0"
+      conf="*->default" />
+    <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1"
+      conf="*->master" />
+
+    <dependency org="commons-lang" name="commons-lang" rev="2.4"
+      conf="*->default" />
+    <dependency org="commons-collections" name="commons-collections"
+      rev="3.1" conf="*->default" />
+    <dependency org="commons-httpclient" name="commons-httpclient"
+      rev="3.1" conf="*->master" />
+    <dependency org="commons-codec" name="commons-codec" rev="1.3"
+      conf="*->default" />
+
+    <dependency org="org.apache.hadoop" name="hadoop-core"
+      rev="1.0.0" conf="*->default">
+      <exclude org="net.sf.kosmosfs" name="kfs" />
+      <exclude org="net.java.dev.jets3t" name="jets3t" />
+      <exclude org="org.eclipse.jdt" name="core" />
+      <exclude org="org.mortbay.jetty" name="jsp-*" />
+    </dependency>
+
+    <dependency org="com.ibm.icu" name="icu4j" rev="4.0.1" />
+    <dependency org="org.apache.tika" name="tika-core" rev="0.10" />
+    <!-- 
+    <dependency org="org.apache.tika" name="tika-parsers" rev="0.10"/> 
+    -->
+
+    <dependency org="org.apache.gora" name="gora-core" rev="0.2" conf="*->compile"/>
+
+    <dependency org="log4j" name="log4j" rev="1.2.15" conf="*->master" />
+
+    <dependency org="xerces" name="xercesImpl" rev="2.9.1" />
+    <dependency org="xerces" name="xmlParserAPIs" rev="2.6.2" />
+    <dependency org="oro" name="oro" rev="2.0.8" />
+
+    <dependency org="org.jdom" name="jdom" rev="1.1" conf="*->default" />
+
+    <dependency org="com.google.guava" name="guava" rev="11.0.2" />
+
+    <!--Configuration: test -->
+
+    <!--artifacts needed for testing -->
+    <dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />
+
+    <dependency org="org.apache.hadoop" name="hadoop-test" rev="1.0.0" conf="test->default">
+      <exclude org="net.sf.kosmosfs" name="kfs" />
+      <exclude org="net.java.dev.jets3t" name="jets3t" />
+      <exclude org="org.eclipse.jdt" name="core" />
+      <exclude org="org.mortbay.jetty" name="jsp-*" />
+    </dependency>
+
+    <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26" conf="test->default" />
+    <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" conf="test->default" />
+    <dependency org="org.mortbay.jetty" name="jetty-client" rev="6.1.26" />
+
+    <dependency org="org.hsqldb" name="hsqldb" rev="2.2.8" conf="*->default" />
+    <dependency org="org.jdom" name="jdom" rev="1.1" conf="test->default"/>
+
+    <dependency org="org.apache.gora" name="gora-sql" rev="0.1.1-incubating"
+      conf="*->default" />
+
+    <dependency org="org.restlet.jse" name="org.restlet" rev="2.0.5" conf="*->default" />
+    <dependency org="org.restlet.jse" name="org.restlet.ext.jackson" rev="2.0.5" 
+      conf="*->default" />
+
+    <!-- Uncomment this to use MySQL as database with SQL as Gora store. -->
+    <!-- 
+    <dependency org="mysql" name="mysql-connector-java" rev="5.1.18" conf="*->default"/> 
+    -->
+
+    <!-- Uncomment this to use HBase as Gora backend. -->
+    <!-- 
+    <dependency org="org.apache.gora" name="gora-hbase" rev="0.2" conf="*->default" /> 
+    -->
+
+    <!-- Uncomment this to use Accumulo as Gora backend. -->
+    <!-- 
+    <dependency org="org.apache.gora" name="gora-accumulo" rev="0.2" conf="*->default" />
+    -->
+
+    <!-- Uncomment this to use Cassandra as Gora backend. -->
+    <!-- 
+    <dependency org="org.apache.gora" name="gora-cassandra" rev="0.2" conf="*->default" >
+    -->
+
+    <!--global exclusion -->
+    <exclude module="ant" />
+    <exclude module="slf4j-jdk14" />
+    <exclude module="slf4j-simple" />
+    <exclude org="hsqldb"/>
+    <exclude module="jmxtools" />
+    <exclude module="jms" />
+    <exclude module="jmxri" />
+    <exclude module="thrift" />
+  </dependencies>
 
 </ivy-module>

Modified: nutch/branches/nutchgora/src/java/org/apache/nutch/storage/StorageUtils.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/storage/StorageUtils.java?rev=1333435&r1=1333434&r2=1333435&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/storage/StorageUtils.java (original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/storage/StorageUtils.java Thu May  3 12:52:37 2012
@@ -66,11 +66,8 @@ public class StorageUtils {
 
     Class<? extends DataStore<K, V>> dataStoreClass =
       (Class<? extends DataStore<K, V>>) getDataStoreClass(conf);
-    //Following line gets a compile error during upgrade to newer Gora,
-    //Simply add 'conf' as an additional argument to fix this. 
-    //(between persistentClass and schema)
     return DataStoreFactory.createDataStore(dataStoreClass,
-            keyClass, persistentClass, schema);
+            keyClass, persistentClass, conf, schema);
   }
 
   @SuppressWarnings("unchecked")

Added: nutch/branches/nutchgora/src/test/gora.properties
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/test/gora.properties?rev=1333435&view=auto
==============================================================================
--- nutch/branches/nutchgora/src/test/gora.properties (added)
+++ nutch/branches/nutchgora/src/test/gora.properties Thu May  3 12:52:37 2012
@@ -0,0 +1,25 @@
+# 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.
+
+
+###############################
+# Default SqlStore properties #
+###############################
+
+gora.sqlstore.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+gora.sqlstore.jdbc.url=jdbc:hsqldb:mem:test
+gora.sqlstore.jdbc.user=sa
+gora.sqlstore.jdbc.password=
+

Propchange: nutch/branches/nutchgora/src/test/gora.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: nutch/branches/nutchgora/src/test/org/apache/nutch/storage/TestGoraStorage.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/test/org/apache/nutch/storage/TestGoraStorage.java?rev=1333435&r1=1333434&r2=1333435&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/test/org/apache/nutch/storage/TestGoraStorage.java (original)
+++ nutch/branches/nutchgora/src/test/org/apache/nutch/storage/TestGoraStorage.java Thu May  3 12:52:37 2012
@@ -30,7 +30,6 @@ import org.apache.avro.util.Utf8;
 import org.apache.commons.io.IOUtils;
 import org.apache.gora.query.Result;
 import org.apache.gora.store.DataStore;
-import org.apache.gora.store.DataStoreFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.nutch.util.AbstractNutchTest;
 import org.apache.nutch.util.CrawlTestUtil;
@@ -136,10 +135,14 @@ public class TestGoraStorage extends Abs
     server.setDaemon(true);
     server.setSilent(true); // disables LOTS of trace
     final String className = getClass().getName();
-    server.setDatabasePath(0, "mem:" + className);
-    server.setDatabaseName(0, className);
+    String dbName = "test";
+    server.setDatabasePath(0, "mem:"+dbName);
+    server.setDatabaseName(0, dbName);
     server.start();
     
+    //create the store so that the tests can start right away
+    StorageUtils.createWebStore(conf, String.class, WebPage.class);
+    
     // create a fixed thread pool
     int numThreads = 4;
     ExecutorService pool = Executors.newFixedThreadPool(numThreads);
@@ -153,6 +156,9 @@ public class TestGoraStorage extends Abs
           try {
             String separator = System.getProperty("file.separator");
             String classpath = System.getProperty("java.class.path");
+            String pathSeparator = System.getProperty("path.separator");
+            // connect local sql service
+            classpath = "./src/testprocess" + pathSeparator + classpath;
             String path = System.getProperty("java.home") + separator + "bin"
                 + separator + "java";
             ProcessBuilder processBuilder = new ProcessBuilder(path, "-cp", 
@@ -195,13 +201,6 @@ public class TestGoraStorage extends Abs
     Configuration localConf = CrawlTestUtil.createConfiguration();
     localConf.set("storage.data.store.class", "org.apache.gora.sql.store.SqlStore");
 
-    //connect to local sql service
-    DataStoreFactory.properties.setProperty("gora.sqlstore.jdbc.driver","org.hsqldb.jdbcDriver");
-    DataStoreFactory.properties.setProperty("gora.sqlstore.jdbc.url",
-        "jdbc:hsqldb:hsql://localhost/"+TestGoraStorage.class.getName());
-    DataStoreFactory.properties.setProperty("gora.sqlstore.jdbc.user","sa");
-    DataStoreFactory.properties.setProperty("gora.sqlstore.jdbc.password","");
-
     DataStore<String, WebPage> store = StorageUtils.createWebStore(localConf,
         String.class, WebPage.class);
     readWrite("single_id", store);

Modified: nutch/branches/nutchgora/src/test/org/apache/nutch/util/AbstractNutchTest.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/test/org/apache/nutch/util/AbstractNutchTest.java?rev=1333435&r1=1333434&r2=1333435&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/test/org/apache/nutch/util/AbstractNutchTest.java (original)
+++ nutch/branches/nutchgora/src/test/org/apache/nutch/util/AbstractNutchTest.java Thu May  3 12:52:37 2012
@@ -18,13 +18,12 @@ package org.apache.nutch.util;
 
 import junit.framework.TestCase;
 
+import org.apache.gora.store.DataStore;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.nutch.storage.StorageUtils;
 import org.apache.nutch.storage.WebPage;
-import org.apache.gora.store.DataStore;
-import org.apache.gora.store.DataStoreFactory;
 
 /**
  * This class provides common routines for setup/teardown of an in-memory data
@@ -44,12 +43,6 @@ public class AbstractNutchTest extends T
     conf = CrawlTestUtil.createConfiguration();
     conf.set("storage.data.store.class", "org.apache.gora.sql.store.SqlStore");
     fs = FileSystem.get(conf);
-    // using hsqldb in memory
-    DataStoreFactory.properties.setProperty("gora.sqlstore.jdbc.driver","org.hsqldb.jdbcDriver");
-    // use separate in-memory db-s for tests
-    DataStoreFactory.properties.setProperty("gora.sqlstore.jdbc.url","jdbc:hsqldb:mem:" + getClass().getName());
-    DataStoreFactory.properties.setProperty("gora.sqlstore.jdbc.user","sa");
-    DataStoreFactory.properties.setProperty("gora.sqlstore.jdbc.password","");
     webPageStore = StorageUtils.createWebStore(conf, String.class,
         WebPage.class);
   }

Added: nutch/branches/nutchgora/src/testprocess/gora.properties
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/testprocess/gora.properties?rev=1333435&view=auto
==============================================================================
--- nutch/branches/nutchgora/src/testprocess/gora.properties (added)
+++ nutch/branches/nutchgora/src/testprocess/gora.properties Thu May  3 12:52:37 2012
@@ -0,0 +1,25 @@
+# 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.
+
+
+###############################
+# Default SqlStore properties #
+###############################
+
+gora.sqlstore.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+gora.sqlstore.jdbc.url=jdbc:hsqldb:hsql://localhost/test
+gora.sqlstore.jdbc.user=sa
+gora.sqlstore.jdbc.password=
+

Propchange: nutch/branches/nutchgora/src/testprocess/gora.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain