Skip to content
This repository has been archived by the owner on Nov 22, 2017. It is now read-only.

Commit

Permalink
added all maven dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Jake Luciani committed Oct 27, 2010
1 parent e360984 commit e8bc037
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 12 deletions.
16 changes: 10 additions & 6 deletions build.xml
Expand Up @@ -18,7 +18,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<project name="lucandra" default="lucandra.jar" basedir="."
<project name="lucandra" default="dist" basedir="."
xmlns:ivy="antlib:org.apache.ivy.ant">

<description>Lucandra</description>
Expand All @@ -30,7 +30,7 @@
<property name="build.classes" location="${build}/classes"/>
<property name="build.test.classes" location="${build}/test-classes"/>
<property name="lib" location="lib" />
<property name="cassandra.base" location="../cassandra-trunk"/>
<property name="cassandra.base" location="${basedir}"/>

<property name="solr.app" location="solandra-app"/>
<property name="solr.resources" location="solr-resources"/>
Expand Down Expand Up @@ -123,9 +123,9 @@

<target name="compile" depends="init,resolve">

<exec executable="/bin/sh" failonerror="true">
<!--<exec executable="/bin/sh" failonerror="true">
<arg line="-c &quot;ant -f ${cassandra.base}/build.xml jar&quot;"/>
</exec>
</exec>-->

<javac debug="true" destdir="${build.classes}">
<src path="${src}"/>
Expand Down Expand Up @@ -165,6 +165,7 @@

<target name="clean">
<delete dir="${build}" />
<delete dir="${lib}" />
<delete dir="${solr.app}" />
<delete file="lucandra.jar" />
<delete file="lucandra-tests.jar" />
Expand All @@ -185,6 +186,9 @@
<lib dir="${cassandra.base}/build">
<include name="**/*.jar" />
</lib>
<classes dir="${solr.resources}">
<include name="*.properties"/>
</classes>
<lib file="lucandra.jar"/>
</war>
</target>
Expand All @@ -196,10 +200,10 @@
<mkdir dir="${solr.app}/lib" />
<mkdir dir="${solr.app}/work" />
<copy todir="${solr.app}/lib">
<fileset dir="lib" includes="jetty*.jar,servlet*.jar"/>
<fileset dir="lib" includes="jetty*.jar,servlet*.jar,jsp*.jar"/>
</copy>
<copy todir="${solr.app}/etc">
<fileset dir="${solr.resources}" includes="jetty.xml,webdefault.xml"/>
<fileset dir="${solr.resources}" includes="jetty.xml,jetty-logging.xml,webdefault.xml"/>
</copy>
<copy file="solr.war" tofile="${solr.app}/webapps/solr.war"/>
<copy todir="${solr.app}/solr/conf" overwrite="false">
Expand Down
19 changes: 18 additions & 1 deletion ivy.xml
Expand Up @@ -22,13 +22,30 @@
<dependencies>
<dependency org="junit" name="junit" rev="4.6" conf="* -> *,!sources,!javadoc" />
<dependency org="org.slf4j" name="slf4j-api" rev="1.5.8" conf="* -> *,!sources,!javadoc"/>
<dependency org="org.slf4j" name="slf4j-simple" rev="1.5.8" conf="* -> *,!sources,!javadoc"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.8" conf="* -> *,!sources,!javadoc"/>
<dependency org="commons-lang" name="commons-lang" rev="2.4" conf="* -> *,!sources,!javadoc"/>
<dependency org="org.apache.lucene" name="lucene-core" rev="2.9.1" conf="*"/>
<dependency org="org.apache.solr" name="solr-core" rev="1.4.0" conf="* -> *,!javadoc"/>
<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.6" conf="* -> *,!sources,!javadoc" />
<dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.6" conf="* -> *,!sources,!javadoc" />
<dependency org="org.mortbay.jetty" name="jsp-2.1" rev="6.1.6" conf="* -> *,!sources,!javadoc" />

<dependency org="redis.clients" name="jedis" rev="1.3.0" conf="* -> *,!sources,!javadoc"/>
<!--<dependency org="com.cloudera.zookeeper" name="zookeeper" rev="3.3.1-10" conf="* -> *,!sources,!javadoc"/>-->

<dependency org="libthrift" name="libthrift" rev="0.5" conf="* -> *,!sources,!javadoc" />
<dependency org="org.apache.cassandra" name="apache-cassandra" rev="0.7.0-rc1" conf="* -> *,!sources,!javadoc" />

<dependency org="com.thoughtworks.paranamer" name="paranamer-ant" rev="2.1" conf="* -> *,!sources,!javadoc"/>
<dependency org="junit" name="junit" rev="4.6" conf="* -> *,!sources,!javadoc"/>
<dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="* -> *,!sources,!javadoc"/>
<dependency org="com.reardencommerce" name="clhm-production" rev="1.0" conf="* -> *,!sources,!javadoc"/>

<!--<dependency org="com.cloudera.hadoop" name="hadoop-core" rev="0.20.2-320"/>
<dependency org="com.cloudera.hadoop" name="hadoop-streaming" rev="0.20.2-320"/>
<dependency org="net.sf.jopt-simple" name="jopt-simple" rev="3.2"/> -->

<dependency org="net.java.dev.jna" name="jna" rev="3.2.7"/>
</dependencies>
</ivy-module>

8 changes: 4 additions & 4 deletions solr-resources/cassandra.yaml
Expand Up @@ -15,7 +15,7 @@ cluster_name: 'Lucandra Cluster'
# the heaviest-loaded existing node. If there is no load information
# available, such as is the case with a new cluster, it will pick
# a random token, which will lead to hot spots.
initial_token:
initial_token: a

# Set to true to make new [non-seed] nodes automatically migrate data
# to themselves from the pre-existing nodes in the cluster. Defaults
Expand Down Expand Up @@ -47,7 +47,7 @@ data_file_directories:
# the topology of the ring. You must change this if you are running
# multiple nodes!
seeds:
- 127.0.0.1
- 67.23.43.19

# Access mode. mmapped i/o is substantially faster, but only practical on
# a 64bit machine (which notably does not include EC2 "small" instances)
Expand Down Expand Up @@ -83,7 +83,7 @@ storage_port: 7000

# Address to bind to and tell other nodes to connect to. You _must_
# change this if you want multiple nodes to be able to communicate!
listen_address: localhost
listen_address:

# The address to bind the Thrift RPC service to
rpc_address: localhost
Expand Down Expand Up @@ -289,7 +289,7 @@ keyspaces:
compare_with: BytesType
keys_cached: .9

- name: TI
- name: TI
column_type: Super
compare_with: lucandra.VIntType
read_repair_chance: 0.1
Expand Down
27 changes: 27 additions & 0 deletions solr-resources/jetty-logging.xml
@@ -0,0 +1,27 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
<!-- =============================================================== -->
<!-- Configure stderr and stdout to a Jetty rollover log file -->
<!-- this configuration file should be used in combination with -->
<!-- other configuration files. e.g. -->
<!-- java -jar start.jar etc/jetty-logging.xml etc/jetty.xml -->
<!-- =============================================================== -->
<Configure id="Server" class="org.mortbay.jetty.Server">

<New id="ServerLog" class="java.io.PrintStream">
<Arg>
<New class="org.mortbay.util.RolloverFileOutputStream">
<Arg><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.stderrout.log</Arg>
<Arg type="boolean">false</Arg>
<Arg type="int">90</Arg>
<Arg><Call class="java.util.TimeZone" name="getTimeZone"><Arg>GMT</Arg></Call></Arg>
<Get id="ServerLogName" name="datedFilename"/>
</New>
</Arg>
</New>

<Call class="org.mortbay.log.Log" name="info"><Arg>Redirecting stderr/stdout to <Ref id="ServerLogName"/></Arg></Call>
<Call class="java.lang.System" name="setErr"><Arg><Ref id="ServerLog"/></Arg></Call>
<Call class="java.lang.System" name="setOut"><Arg><Ref id="ServerLog"/></Arg></Call>

</Configure>
2 changes: 1 addition & 1 deletion solr-resources/run_server.sh
Expand Up @@ -32,4 +32,4 @@ JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=8080"
JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false"
JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false"

java $JVM_OPTS -Dlog4j.configuration=log4j.properties -Dredis.host=$REDIS_HOST -jar start.jar
java $JVM_OPTS -Dredis.host=$REDIS_HOST -jar start.jar etc/jetty-logging.xml etc/jetty.xml

0 comments on commit e8bc037

Please sign in to comment.