Moved config examples to config folder. Moved development.xml and pac…

…kage.xml to use variables. Updated docs to changes.
jcustenborder · Mar 21, 2016 · 6203797 · 6203797
1 parent 7691766
commit 6203797
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -107,10 +107,12 @@ solr0.column.mappings.text.field=text
 
 # Running in development
 
+There is also a docker-compose script with configuration for zookeeper, solr cloud, and solr standalone. This can be used with `docker-compose up`
+
 ```
 mvn clean package
 export CLASSPATH="$(find `pwd`/target/kafka-connect-solr-1.0.0-SNAPSHOT-package/share/java/kafka-connect-solr -type f | tr '\n' ':')"
-$CONFLUENT_HOME/bin/connect-standalone $CONFLUENT_HOME/etc/schema-registry/connect-avro-standalone.properties httpsolr.properties
+$CONFLUENT_HOME/bin/connect-standalone $CONFLUENT_HOME/etc/schema-registry/connect-avro-standalone.properties config/httpsolr.properties
 ```
 
 

diff --git a/cloudsolr.properties → config/cloudsolr.properties b/cloudsolr.properties → config/cloudsolr.properties
diff --git a/httpsolr.properties → config/httpsolr.properties b/httpsolr.properties → config/httpsolr.properties
diff --git a/src/assembly/development.xml b/src/assembly/development.xml
@@ -11,7 +11,7 @@
     <includeBaseDirectory>false</includeBaseDirectory>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>share/java/kafka-connect-solr/</outputDirectory>
+            <outputDirectory>share/java/${project.name}/</outputDirectory>
         </dependencySet>
     </dependencySets>
 </assembly>
diff --git a/src/assembly/package.xml b/src/assembly/package.xml
@@ -11,7 +11,7 @@
     <fileSets>
         <fileSet>
             <directory>${project.basedir}</directory>
-            <outputDirectory>share/doc/kafka-connect-solr/</outputDirectory>
+            <outputDirectory>share/doc/${project.name}/</outputDirectory>
             <includes>
                 <include>README*</include>
                 <include>LICENSE*</include>
@@ -21,15 +21,15 @@
         </fileSet>
         <fileSet>
             <directory>${project.basedir}/config</directory>
-            <outputDirectory>etc/kafka-connect-solr</outputDirectory>
+            <outputDirectory>etc/${project.name}</outputDirectory>
             <includes>
                 <include>*</include>
             </includes>
         </fileSet>
     </fileSets>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>share/java/kafka-connect-solr</outputDirectory>
+            <outputDirectory>share/java/${project.name}</outputDirectory>
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <excludes>