Browse files

Split the project into submodules. Currently only hector-core but now…

… there's room for more
  • Loading branch information...
1 parent ed10a68 commit d76da58380c0f34ba9ced621ef6680e4da1b63bd @rantav committed Dec 5, 2010
Showing with 332 additions and 307 deletions.
  1. +1 −0 CHANGELOG
  2. +289 −0 core/pom.xml
  3. 0 { → core}/src/main/java/me/prettyprint/cassandra/connection/BackgroundCassandraHostService.java
  4. 0 { → core}/src/main/java/me/prettyprint/cassandra/connection/CassandraHostRetryService.java
  5. 0 { → core}/src/main/java/me/prettyprint/cassandra/connection/ConcurrentHClientPool.java
  6. 0 { → core}/src/main/java/me/prettyprint/cassandra/connection/HConnectionManager.java
  7. 0 { → core}/src/main/java/me/prettyprint/cassandra/connection/HThriftClient.java
  8. 0 { → core}/src/main/java/me/prettyprint/cassandra/connection/LeastActiveBalancingPolicy.java
  9. 0 { → core}/src/main/java/me/prettyprint/cassandra/connection/LoadBalancingPolicy.java
  10. 0 { → core}/src/main/java/me/prettyprint/cassandra/connection/NodeAutoDiscoverService.java
  11. 0 { → core}/src/main/java/me/prettyprint/cassandra/connection/PoolMetric.java
  12. 0 { → core}/src/main/java/me/prettyprint/cassandra/connection/RoundRobinBalancingPolicy.java
  13. 0 { → core}/src/main/java/me/prettyprint/cassandra/dao/SimpleCassandraDao.java
  14. 0 { → core}/src/main/java/me/prettyprint/cassandra/examples/ExampleClient.java
  15. 0 { → core}/src/main/java/me/prettyprint/cassandra/examples/ExampleDaoV2.java
  16. 0 { → core}/src/main/java/me/prettyprint/cassandra/jndi/CassandraClientJndiResourceFactory.java
  17. 0 { → core}/src/main/java/me/prettyprint/cassandra/jndi/CassandraClientJndiResourcePool.java
  18. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/AbstractColumnQuery.java
  19. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/AbstractQuery.java
  20. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/AbstractSliceQuery.java
  21. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/AbstractSubColumnQuery.java
  22. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/AbstractSuperColumnQuery.java
  23. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/AllOneConsistencyLevelPolicy.java
  24. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/BasicColumnDefinition.java
  25. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/BasicColumnFamilyDefinition.java
  26. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/BasicKeyspaceDefinition.java
  27. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/ColumnSliceImpl.java
  28. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/ConfigurableConsistencyLevel.java
  29. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/ExecutingKeyspace.java
  30. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/ExecutionResult.java
  31. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/HColumnImpl.java
  32. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/HKeyRange.java
  33. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/HSlicePredicate.java
  34. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/HSuperColumnImpl.java
  35. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/IndexedSlicesQuery.java
  36. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/KeyspaceOperationCallback.java
  37. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/MultigetCountQuery.java
  38. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/MultigetSubCountQuery.java
  39. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/MutationResultImpl.java
  40. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/MutatorImpl.java
  41. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/OrderedRowsImpl.java
  42. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/OrderedSuperRowsImpl.java
  43. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/QueryResultImpl.java
  44. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/QuorumAllConsistencyLevelPolicy.java
  45. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/RowImpl.java
  46. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/RowsImpl.java
  47. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/SuperRowImpl.java
  48. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/SuperRowsImpl.java
  49. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/SuperSliceImpl.java
  50. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/avro/AvroColumnQuery.java
  51. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/avro/AvroSubColumnQuery.java
  52. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/avro/AvroSuperColumnQuery.java
  53. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/package.html
  54. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/AbstractThriftCountQuery.java
  55. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftColumnQuery.java
  56. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftConverter.java
  57. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftCountQuery.java
  58. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftFactory.java
  59. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftMultigetSliceQuery.java
  60. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftMultigetSubSliceQuery.java
  61. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftMultigetSuperSliceQuery.java
  62. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftRangeSlicesQuery.java
  63. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftRangeSubSlicesQuery.java
  64. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftRangeSuperSlicesQuery.java
  65. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftSliceQuery.java
  66. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftSubColumnQuery.java
  67. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftSubCountQuery.java
  68. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftSubSliceQuery.java
  69. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftSuperColumnQuery.java
  70. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftSuperCountQuery.java
  71. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftSuperSliceQuery.java
  72. 0 { → core}/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftTypeInferringColumnQuery.java
  73. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/AbstractSerializer.java
  74. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/BooleanSerializer.java
  75. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/ByteBufferSerializer.java
  76. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/BytesArraySerializer.java
  77. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/DateSerializer.java
  78. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/DoubleSerializer.java
  79. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/IntegerSerializer.java
  80. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/LongSerializer.java
  81. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/ObjectSerializer.java
  82. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/SerializerTypeInferer.java
  83. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/StringSerializer.java
  84. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/TypeInferringSerializer.java
  85. 0 { → core}/src/main/java/me/prettyprint/cassandra/serializers/UUIDSerializer.java
  86. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/AbstractCluster.java
  87. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/BatchMutation.java
  88. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/CassandraClientMonitor.java
  89. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/CassandraClientMonitorMBean.java
  90. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/CassandraHost.java
  91. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/CassandraHostConfigurator.java
  92. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/ClockResolution.java
  93. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/ExceptionsTranslator.java
  94. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/ExceptionsTranslatorImpl.java
  95. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/ExhaustedPolicy.java
  96. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/FailoverPolicy.java
  97. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/JmxMonitor.java
  98. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/JndiCassandraClientFactory.java
  99. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/KeyspaceService.java
  100. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/KeyspaceServiceFactory.java
  101. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/KeyspaceServiceImpl.java
  102. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/Operation.java
  103. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/OperationType.java
  104. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/SystemProperties.java
  105. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/ThriftCfDef.java
  106. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/ThriftCluster.java
  107. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/ThriftColumnDef.java
  108. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/ThriftKsDef.java
  109. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/spring/HectorTemplate.java
  110. 0 { → core}/src/main/java/me/prettyprint/cassandra/service/spring/HectorTemplateImpl.java
  111. 0 { → core}/src/main/java/me/prettyprint/cassandra/testutils/EmbeddedServerHelper.java
  112. 0 { → core}/src/main/java/me/prettyprint/cassandra/utils/Assert.java
  113. 0 { → core}/src/main/java/me/prettyprint/cassandra/utils/StringUtils.java
  114. 0 { → core}/src/main/java/me/prettyprint/hector/api/Cluster.java
  115. 0 { → core}/src/main/java/me/prettyprint/hector/api/ConsistencyLevelPolicy.java
  116. 0 { → core}/src/main/java/me/prettyprint/hector/api/HConsistencyLevel.java
  117. 0 { → core}/src/main/java/me/prettyprint/hector/api/Keyspace.java
  118. 0 { → core}/src/main/java/me/prettyprint/hector/api/Serializer.java
  119. 0 { → core}/src/main/java/me/prettyprint/hector/api/beans/ColumnSlice.java
  120. 0 { → core}/src/main/java/me/prettyprint/hector/api/beans/HColumn.java
  121. 0 { → core}/src/main/java/me/prettyprint/hector/api/beans/HSuperColumn.java
  122. 0 { → core}/src/main/java/me/prettyprint/hector/api/beans/OrderedRows.java
  123. 0 { → core}/src/main/java/me/prettyprint/hector/api/beans/OrderedSuperRows.java
  124. 0 { → core}/src/main/java/me/prettyprint/hector/api/beans/Row.java
  125. 0 { → core}/src/main/java/me/prettyprint/hector/api/beans/Rows.java
  126. 0 { → core}/src/main/java/me/prettyprint/hector/api/beans/SuperRow.java
  127. 0 { → core}/src/main/java/me/prettyprint/hector/api/beans/SuperRows.java
  128. 0 { → core}/src/main/java/me/prettyprint/hector/api/beans/SuperSlice.java
  129. 0 { → core}/src/main/java/me/prettyprint/hector/api/ddl/ColumnDefinition.java
  130. 0 { → core}/src/main/java/me/prettyprint/hector/api/ddl/ColumnFamilyDefinition.java
  131. 0 { → core}/src/main/java/me/prettyprint/hector/api/ddl/ColumnIndexType.java
  132. 0 { → core}/src/main/java/me/prettyprint/hector/api/ddl/ColumnType.java
  133. 0 { → core}/src/main/java/me/prettyprint/hector/api/ddl/ComparatorType.java
  134. 0 { → core}/src/main/java/me/prettyprint/hector/api/ddl/KeyspaceDefinition.java
  135. 0 { → core}/src/main/java/me/prettyprint/hector/api/ddl/package.html
  136. 0 { → core}/src/main/java/me/prettyprint/hector/api/exceptions/HCassandraInternalException.java
  137. 0 { → core}/src/main/java/me/prettyprint/hector/api/exceptions/HInvalidRequestException.java
  138. 0 { → core}/src/main/java/me/prettyprint/hector/api/exceptions/HNotFoundException.java
  139. 0 { → core}/src/main/java/me/prettyprint/hector/api/exceptions/HTimedOutException.java
  140. 0 { → core}/src/main/java/me/prettyprint/hector/api/exceptions/HUnavailableException.java
  141. 0 { → core}/src/main/java/me/prettyprint/hector/api/exceptions/HectorException.java
  142. 0 { → core}/src/main/java/me/prettyprint/hector/api/exceptions/HectorPoolException.java
  143. 0 { → core}/src/main/java/me/prettyprint/hector/api/exceptions/HectorSerializationException.java
  144. 0 { → core}/src/main/java/me/prettyprint/hector/api/exceptions/HectorTransportException.java
  145. 0 { → core}/src/main/java/me/prettyprint/hector/api/exceptions/PoolExhaustedException.java
  146. 0 { → core}/src/main/java/me/prettyprint/hector/api/exceptions/PoolIllegalStateException.java
  147. 0 { → core}/src/main/java/me/prettyprint/hector/api/factory/HFactory.java
  148. 0 { → core}/src/main/java/me/prettyprint/hector/api/mutation/MutationResult.java
  149. 0 { → core}/src/main/java/me/prettyprint/hector/api/mutation/Mutator.java
  150. 0 { → core}/src/main/java/me/prettyprint/hector/api/package.html
  151. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/ColumnQuery.java
  152. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/CountQuery.java
  153. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/MultigetSliceQuery.java
  154. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/MultigetSubSliceQuery.java
  155. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/MultigetSuperSliceQuery.java
  156. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/Query.java
  157. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/QueryResult.java
  158. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/RangeSlicesQuery.java
  159. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/RangeSubSlicesQuery.java
  160. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/RangeSuperSlicesQuery.java
  161. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/SliceQuery.java
  162. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/SubColumnQuery.java
  163. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/SubCountQuery.java
  164. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/SubSliceQuery.java
  165. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/SuperColumnQuery.java
  166. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/SuperCountQuery.java
  167. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/SuperSliceQuery.java
  168. 0 { → core}/src/main/java/me/prettyprint/hector/api/query/package.html
  169. 0 { → core}/src/main/resources/hectorLog4j.xml
  170. 0 { → core}/src/test/java/me/prettyprint/cassandra/BaseEmbededServerSetupTest.java
  171. 0 { → core}/src/test/java/me/prettyprint/cassandra/connection/ConcurrentHClientPoolTest.java
  172. 0 { → core}/src/test/java/me/prettyprint/cassandra/connection/HThriftClientTest.java
  173. 0 { → core}/src/test/java/me/prettyprint/cassandra/dao/SimpleCassandraDaoTest.java
  174. 0 { → core}/src/test/java/me/prettyprint/cassandra/examples/ExampleDaoV2Test.java
  175. 0 { → core}/src/test/java/me/prettyprint/cassandra/jndi/CassandraClientJndiResourceFactoryTest.java
  176. 0 { → core}/src/test/java/me/prettyprint/cassandra/model/AbstractSliceQueryTest.java
  177. 0 { → core}/src/test/java/me/prettyprint/cassandra/model/ColumnSliceTest.java
  178. 0 { → core}/src/test/java/me/prettyprint/cassandra/model/ConfigurableConsistencyLevelTest.java
  179. 0 { → core}/src/test/java/me/prettyprint/cassandra/model/IndexedSlicesQueryTest.java
  180. 0 { → core}/src/test/java/me/prettyprint/cassandra/model/MultigetCountQueryTest.java
  181. 0 { → core}/src/test/java/me/prettyprint/cassandra/model/MutatorTest.java
  182. 0 { → core}/src/test/java/me/prettyprint/cassandra/model/SuperColumnSliceTest.java
  183. 0 { → core}/src/test/java/me/prettyprint/cassandra/serializers/BooleanSerializerTest.java
  184. 0 { → core}/src/test/java/me/prettyprint/cassandra/serializers/BytesArraySerializerTest.java
  185. 0 { → core}/src/test/java/me/prettyprint/cassandra/serializers/DateSerializerTest.java
  186. 0 { → core}/src/test/java/me/prettyprint/cassandra/serializers/IntegerSerializerTest.java
  187. 0 { → core}/src/test/java/me/prettyprint/cassandra/serializers/LongSerializerTest.java
  188. 0 { → core}/src/test/java/me/prettyprint/cassandra/serializers/ObjectSerializerTest.java
  189. 0 { → core}/src/test/java/me/prettyprint/cassandra/serializers/StringSerializerTest.java
  190. 0 { → core}/src/test/java/me/prettyprint/cassandra/serializers/TypeInferringSerializerTest.java
  191. 0 { → core}/src/test/java/me/prettyprint/cassandra/serializers/UUIDSerializerTest.java
  192. 0 { → core}/src/test/java/me/prettyprint/cassandra/service/BatchMutationTest.java
  193. 0 { → core}/src/test/java/me/prettyprint/cassandra/service/CassandraAuthTest.java
  194. 0 { → core}/src/test/java/me/prettyprint/cassandra/service/CassandraClusterTest.java
  195. 0 { → core}/src/test/java/me/prettyprint/cassandra/service/CassandraHostConfiguratorTest.java
  196. 0 { → core}/src/test/java/me/prettyprint/cassandra/service/ClockResolutionTest.java
  197. 0 { → core}/src/test/java/me/prettyprint/cassandra/service/KeyspaceTest.java
  198. 0 { → core}/src/test/java/me/prettyprint/hector/api/ApiV2SystemTest.java
  199. 0 { → core}/src/test/resources/access.properties
  200. 0 { → core}/src/test/resources/cassandra-auth.yaml
  201. 0 { → core}/src/test/resources/cassandra-context-test-v2-new.xml
  202. 0 { → core}/src/test/resources/cassandra-context-test-v2.xml
  203. 0 { → core}/src/test/resources/cassandra-context-test.xml
  204. 0 { → core}/src/test/resources/cassandra.yaml
  205. 0 { → core}/src/test/resources/log4j.properties
  206. 0 { → core}/src/test/resources/log4j.xml
  207. 0 { → core}/src/test/resources/passwd.properties
  208. +35 −300 pom.xml
  209. +7 −7 release.sh
View
1 CHANGELOG
@@ -8,6 +8,7 @@ Changes by version:
0.7.0-21
========
CassandraHostConfigurator is now serializable
+Split the project to hector-core
0.7.0-20
========
View
289 core/pom.xml
@@ -0,0 +1,289 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>me.prettyprint</groupId>
+ <artifactId>hector-core</artifactId>
+ <packaging>bundle</packaging>
+ <version>${hector.version}</version>
+ <name>hector-core</name>
+ <parent>
+ <groupId>me.prettyprint</groupId>
+ <artifactId>hector</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <!-- OSGi bundle properties -->
+ <bundle.symbolicName>me.prettyprint.hector</bundle.symbolicName>
+ <bundle.namespace>me.prettyprint</bundle.namespace>
+ </properties>
+ <build>
+ <plugins>
+ <!--
+ run examples thusly: mvn exec:java
+ -Dexec.mainClass="me.prettyprint.cassandra.examples.ExampleDao"
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.ops4j</groupId>
+ <artifactId>maven-pax-plugin</artifactId>
+ <version>1.4</version>
+ <configuration>
+ <provision>
+ <param>--platform=equinox</param>
+ </provision>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Embed-Dependency>
+ libthrift;scope=compile|runtime;type=!pom;inline=false,
+ cassandra;scope=compile|runtime;type=!pom;inline=false,
+ <!-- *;scope=compile|runtime;type=!pom;inline=false -->
+ </Embed-Dependency>
+
+ <Export-Package>
+ <!-- !${bundle.namespace}.internal.*, -->
+ ${bundle.namespace}.*;version="${pom.version}"
+ </Export-Package>
+
+ <Import-Package>
+ !org.apache.avro.*,
+ !javax.jms.*,
+ !javax.mail.*,
+ !javax.servlet.*,
+ !com.sun.*,
+ !org.antlr.*,
+ !jline.*,
+ !sun.misc.*,
+ *;resolution:=optional
+ </Import-Package>
+ <Private-Package>
+ <!-- ${bundle.namespace}.internal.* -->
+ </Private-Package>
+ <_include>-osgi.bnd</_include>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>always</forkMode>
+ <argLine>-Xmx1G</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>libthrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>apache-cassandra</artifactId>
+ <version>0.7.0-rc1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>runtime</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.perf4j</groupId>
+ <artifactId>perf4j</artifactId>
+ <version>0.9.12</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.safehaus.jug</groupId>
+ <artifactId>jug-asl</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <!-- OSGi deps -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_core</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_compendium</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- Testing Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.reardencommerce</groupId>
+ <artifactId>clhm-production</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cliffc.high_scale_lib</groupId>
+ <artifactId>high-scale-lib</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-javautils</artifactId>
+ <version>0.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${org.springframework.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${org.springframework.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${org.springframework.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r06</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.4.0-rc4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.4.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.4.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.21</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.21</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>snakeyaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.6</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
View
0 ...ction/BackgroundCassandraHostService.java → ...ction/BackgroundCassandraHostService.java
File renamed without changes.
View
0 ...connection/CassandraHostRetryService.java → ...connection/CassandraHostRetryService.java
File renamed without changes.
View
0 ...dra/connection/ConcurrentHClientPool.java → ...dra/connection/ConcurrentHClientPool.java
File renamed without changes.
View
0 ...sandra/connection/HConnectionManager.java → ...sandra/connection/HConnectionManager.java
File renamed without changes.
View
0 ...t/cassandra/connection/HThriftClient.java → ...t/cassandra/connection/HThriftClient.java
File renamed without changes.
View
0 ...onnection/LeastActiveBalancingPolicy.java → ...onnection/LeastActiveBalancingPolicy.java
File renamed without changes.
View
0 ...andra/connection/LoadBalancingPolicy.java → ...andra/connection/LoadBalancingPolicy.java
File renamed without changes.
View
0 ...a/connection/NodeAutoDiscoverService.java → ...a/connection/NodeAutoDiscoverService.java
File renamed without changes.
View
0 ...rint/cassandra/connection/PoolMetric.java → ...rint/cassandra/connection/PoolMetric.java
File renamed without changes.
View
0 ...connection/RoundRobinBalancingPolicy.java → ...connection/RoundRobinBalancingPolicy.java
File renamed without changes.
View
0 ...int/cassandra/dao/SimpleCassandraDao.java → ...int/cassandra/dao/SimpleCassandraDao.java
File renamed without changes.
View
0 ...int/cassandra/examples/ExampleClient.java → ...int/cassandra/examples/ExampleClient.java
File renamed without changes.
View
0 ...rint/cassandra/examples/ExampleDaoV2.java → ...rint/cassandra/examples/ExampleDaoV2.java
File renamed without changes.
View
0 ...i/CassandraClientJndiResourceFactory.java → ...i/CassandraClientJndiResourceFactory.java
File renamed without changes.
View
0 ...jndi/CassandraClientJndiResourcePool.java → ...jndi/CassandraClientJndiResourcePool.java
File renamed without changes.
View
0 .../cassandra/model/AbstractColumnQuery.java → .../cassandra/model/AbstractColumnQuery.java
File renamed without changes.
View
0 ...yprint/cassandra/model/AbstractQuery.java → ...yprint/cassandra/model/AbstractQuery.java
File renamed without changes.
View
0 ...t/cassandra/model/AbstractSliceQuery.java → ...t/cassandra/model/AbstractSliceQuery.java
File renamed without changes.
View
0 ...ssandra/model/AbstractSubColumnQuery.java → ...ssandra/model/AbstractSubColumnQuery.java
File renamed without changes.
View
0 ...andra/model/AbstractSuperColumnQuery.java → ...andra/model/AbstractSuperColumnQuery.java
File renamed without changes.
View
0 ...a/model/AllOneConsistencyLevelPolicy.java → ...a/model/AllOneConsistencyLevelPolicy.java
File renamed without changes.
View
0 ...assandra/model/BasicColumnDefinition.java → ...assandra/model/BasicColumnDefinition.java
File renamed without changes.
View
0 ...ra/model/BasicColumnFamilyDefinition.java → ...ra/model/BasicColumnFamilyDefinition.java
File renamed without changes.
View
0 ...sandra/model/BasicKeyspaceDefinition.java → ...sandra/model/BasicKeyspaceDefinition.java
File renamed without changes.
View
0 ...rint/cassandra/model/ColumnSliceImpl.java → ...rint/cassandra/model/ColumnSliceImpl.java
File renamed without changes.
View
0 ...a/model/ConfigurableConsistencyLevel.java → ...a/model/ConfigurableConsistencyLevel.java
File renamed without changes.
View
0 ...nt/cassandra/model/ExecutingKeyspace.java → ...nt/cassandra/model/ExecutingKeyspace.java
File renamed without changes.
View
0 ...rint/cassandra/model/ExecutionResult.java → ...rint/cassandra/model/ExecutionResult.java
File renamed without changes.
View
0 ...ttyprint/cassandra/model/HColumnImpl.java → ...ttyprint/cassandra/model/HColumnImpl.java
File renamed without changes.
View
0 ...rettyprint/cassandra/model/HKeyRange.java → ...rettyprint/cassandra/model/HKeyRange.java
File renamed without changes.
View
0 ...rint/cassandra/model/HSlicePredicate.java → ...rint/cassandra/model/HSlicePredicate.java
File renamed without changes.
View
0 ...int/cassandra/model/HSuperColumnImpl.java → ...int/cassandra/model/HSuperColumnImpl.java
File renamed without changes.
View
0 ...t/cassandra/model/IndexedSlicesQuery.java → ...t/cassandra/model/IndexedSlicesQuery.java
File renamed without changes.
View
0 ...ndra/model/KeyspaceOperationCallback.java → ...ndra/model/KeyspaceOperationCallback.java
File renamed without changes.
View
0 ...t/cassandra/model/MultigetCountQuery.java → ...t/cassandra/model/MultigetCountQuery.java
File renamed without changes.
View
0 ...assandra/model/MultigetSubCountQuery.java → ...assandra/model/MultigetSubCountQuery.java
File renamed without changes.
View
0 ...t/cassandra/model/MutationResultImpl.java → ...t/cassandra/model/MutationResultImpl.java
File renamed without changes.
View
0 ...ttyprint/cassandra/model/MutatorImpl.java → ...ttyprint/cassandra/model/MutatorImpl.java
File renamed without changes.
View
0 ...rint/cassandra/model/OrderedRowsImpl.java → ...rint/cassandra/model/OrderedRowsImpl.java
File renamed without changes.
View
0 ...cassandra/model/OrderedSuperRowsImpl.java → ...cassandra/model/OrderedSuperRowsImpl.java
File renamed without changes.
View
0 ...rint/cassandra/model/QueryResultImpl.java → ...rint/cassandra/model/QueryResultImpl.java
File renamed without changes.
View
0 ...odel/QuorumAllConsistencyLevelPolicy.java → ...odel/QuorumAllConsistencyLevelPolicy.java
File renamed without changes.
View
0 .../prettyprint/cassandra/model/RowImpl.java → .../prettyprint/cassandra/model/RowImpl.java
File renamed without changes.
View
0 ...prettyprint/cassandra/model/RowsImpl.java → ...prettyprint/cassandra/model/RowsImpl.java
File renamed without changes.
View
0 ...typrint/cassandra/model/SuperRowImpl.java → ...typrint/cassandra/model/SuperRowImpl.java
File renamed without changes.
View
0 ...yprint/cassandra/model/SuperRowsImpl.java → ...yprint/cassandra/model/SuperRowsImpl.java
File renamed without changes.
View
0 ...print/cassandra/model/SuperSliceImpl.java → ...print/cassandra/model/SuperSliceImpl.java
File renamed without changes.
View
0 ...cassandra/model/avro/AvroColumnQuery.java → ...cassandra/model/avro/AvroColumnQuery.java
File renamed without changes.
View
0 ...sandra/model/avro/AvroSubColumnQuery.java → ...sandra/model/avro/AvroSubColumnQuery.java
File renamed without changes.
View
0 ...ndra/model/avro/AvroSuperColumnQuery.java → ...ndra/model/avro/AvroSuperColumnQuery.java
File renamed without changes.
View
0 .../prettyprint/cassandra/model/package.html → .../prettyprint/cassandra/model/package.html
File renamed without changes.
View
0 ...odel/thrift/AbstractThriftCountQuery.java → ...odel/thrift/AbstractThriftCountQuery.java
File renamed without changes.
View
0 ...andra/model/thrift/ThriftColumnQuery.java → ...andra/model/thrift/ThriftColumnQuery.java
File renamed without changes.
View
0 ...ssandra/model/thrift/ThriftConverter.java → ...ssandra/model/thrift/ThriftConverter.java
File renamed without changes.
View
0 ...sandra/model/thrift/ThriftCountQuery.java → ...sandra/model/thrift/ThriftCountQuery.java
File renamed without changes.
View
0 ...cassandra/model/thrift/ThriftFactory.java → ...cassandra/model/thrift/ThriftFactory.java
File renamed without changes.
View
0 ...odel/thrift/ThriftMultigetSliceQuery.java → ...odel/thrift/ThriftMultigetSliceQuery.java
File renamed without changes.
View
0 ...l/thrift/ThriftMultigetSubSliceQuery.java → ...l/thrift/ThriftMultigetSubSliceQuery.java
File renamed without changes.
View
0 ...thrift/ThriftMultigetSuperSliceQuery.java → ...thrift/ThriftMultigetSuperSliceQuery.java
File renamed without changes.
View
0 .../model/thrift/ThriftRangeSlicesQuery.java → .../model/thrift/ThriftRangeSlicesQuery.java
File renamed without changes.
View
0 ...del/thrift/ThriftRangeSubSlicesQuery.java → ...del/thrift/ThriftRangeSubSlicesQuery.java
File renamed without changes.
View
0 ...l/thrift/ThriftRangeSuperSlicesQuery.java → ...l/thrift/ThriftRangeSuperSlicesQuery.java
File renamed without changes.
View
0 ...sandra/model/thrift/ThriftSliceQuery.java → ...sandra/model/thrift/ThriftSliceQuery.java
File renamed without changes.
View
0 ...ra/model/thrift/ThriftSubColumnQuery.java → ...ra/model/thrift/ThriftSubColumnQuery.java
File renamed without changes.
View
0 ...dra/model/thrift/ThriftSubCountQuery.java → ...dra/model/thrift/ThriftSubCountQuery.java
File renamed without changes.
View
0 ...dra/model/thrift/ThriftSubSliceQuery.java → ...dra/model/thrift/ThriftSubSliceQuery.java
File renamed without changes.
View
0 .../model/thrift/ThriftSuperColumnQuery.java → .../model/thrift/ThriftSuperColumnQuery.java
File renamed without changes.
View
0 ...a/model/thrift/ThriftSuperCountQuery.java → ...a/model/thrift/ThriftSuperCountQuery.java
File renamed without changes.
View
0 ...a/model/thrift/ThriftSuperSliceQuery.java → ...a/model/thrift/ThriftSuperSliceQuery.java
File renamed without changes.
View
0 ...hrift/ThriftTypeInferringColumnQuery.java → ...hrift/ThriftTypeInferringColumnQuery.java
File renamed without changes.
View
0 ...andra/serializers/AbstractSerializer.java → ...andra/serializers/AbstractSerializer.java
File renamed without changes.
View
0 ...sandra/serializers/BooleanSerializer.java → ...sandra/serializers/BooleanSerializer.java
File renamed without changes.
View
0 ...dra/serializers/ByteBufferSerializer.java → ...dra/serializers/ByteBufferSerializer.java
File renamed without changes.
View
0 ...dra/serializers/BytesArraySerializer.java → ...dra/serializers/BytesArraySerializer.java
File renamed without changes.
View
0 ...cassandra/serializers/DateSerializer.java → ...cassandra/serializers/DateSerializer.java
File renamed without changes.
View
0 ...ssandra/serializers/DoubleSerializer.java → ...ssandra/serializers/DoubleSerializer.java
File renamed without changes.
View
0 ...sandra/serializers/IntegerSerializer.java → ...sandra/serializers/IntegerSerializer.java
File renamed without changes.
View
0 ...cassandra/serializers/LongSerializer.java → ...cassandra/serializers/LongSerializer.java
File renamed without changes.
View
0 ...ssandra/serializers/ObjectSerializer.java → ...ssandra/serializers/ObjectSerializer.java
File renamed without changes.
View
0 ...ra/serializers/SerializerTypeInferer.java → ...ra/serializers/SerializerTypeInferer.java
File renamed without changes.
View
0 ...ssandra/serializers/StringSerializer.java → ...ssandra/serializers/StringSerializer.java
File renamed without changes.
View
0 .../serializers/TypeInferringSerializer.java → .../serializers/TypeInferringSerializer.java
File renamed without changes.
View
0 ...cassandra/serializers/UUIDSerializer.java → ...cassandra/serializers/UUIDSerializer.java
File renamed without changes.
View
0 ...nt/cassandra/service/AbstractCluster.java → ...nt/cassandra/service/AbstractCluster.java
File renamed without changes.
View
0 ...rint/cassandra/service/BatchMutation.java → ...rint/cassandra/service/BatchMutation.java
File renamed without changes.
View
0 ...andra/service/CassandraClientMonitor.java → ...andra/service/CassandraClientMonitor.java
File renamed without changes.
View
0 .../service/CassandraClientMonitorMBean.java → .../service/CassandraClientMonitorMBean.java
File renamed without changes.
View
0 ...rint/cassandra/service/CassandraHost.java → ...rint/cassandra/service/CassandraHost.java
File renamed without changes.
View
0 ...ra/service/CassandraHostConfigurator.java → ...ra/service/CassandraHostConfigurator.java
File renamed without changes.
View
0 ...nt/cassandra/service/ClockResolution.java → ...nt/cassandra/service/ClockResolution.java
File renamed without changes.
View
0 ...ssandra/service/ExceptionsTranslator.java → ...ssandra/service/ExceptionsTranslator.java
File renamed without changes.
View
0 ...dra/service/ExceptionsTranslatorImpl.java → ...dra/service/ExceptionsTranslatorImpl.java
File renamed without changes.
View
0 ...nt/cassandra/service/ExhaustedPolicy.java → ...nt/cassandra/service/ExhaustedPolicy.java
File renamed without changes.
View
0 ...int/cassandra/service/FailoverPolicy.java → ...int/cassandra/service/FailoverPolicy.java
File renamed without changes.
View
0 ...typrint/cassandra/service/JmxMonitor.java → ...typrint/cassandra/service/JmxMonitor.java
File renamed without changes.
View
0 ...a/service/JndiCassandraClientFactory.java → ...a/service/JndiCassandraClientFactory.java
File renamed without changes.
View
0 ...nt/cassandra/service/KeyspaceService.java → ...nt/cassandra/service/KeyspaceService.java
File renamed without changes.
View
0 ...andra/service/KeyspaceServiceFactory.java → ...andra/service/KeyspaceServiceFactory.java
File renamed without changes.
View
0 ...assandra/service/KeyspaceServiceImpl.java → ...assandra/service/KeyspaceServiceImpl.java
File renamed without changes.
View
0 ...ttyprint/cassandra/service/Operation.java → ...ttyprint/cassandra/service/Operation.java
File renamed without changes.
View
0 ...rint/cassandra/service/OperationType.java → ...rint/cassandra/service/OperationType.java
File renamed without changes.
View
0 ...t/cassandra/service/SystemProperties.java → ...t/cassandra/service/SystemProperties.java
File renamed without changes.
View
0 ...yprint/cassandra/service/ThriftCfDef.java → ...yprint/cassandra/service/ThriftCfDef.java
File renamed without changes.
View
0 ...rint/cassandra/service/ThriftCluster.java → ...rint/cassandra/service/ThriftCluster.java
File renamed without changes.
View
0 ...nt/cassandra/service/ThriftColumnDef.java → ...nt/cassandra/service/ThriftColumnDef.java
File renamed without changes.
View
0 ...yprint/cassandra/service/ThriftKsDef.java → ...yprint/cassandra/service/ThriftKsDef.java
File renamed without changes.
View
0 ...sandra/service/spring/HectorTemplate.java → ...sandra/service/spring/HectorTemplate.java
File renamed without changes.
View
0 ...ra/service/spring/HectorTemplateImpl.java → ...ra/service/spring/HectorTemplateImpl.java
File renamed without changes.
View
0 ...andra/testutils/EmbeddedServerHelper.java → ...andra/testutils/EmbeddedServerHelper.java
File renamed without changes.
View
0 ...e/prettyprint/cassandra/utils/Assert.java → ...e/prettyprint/cassandra/utils/Assert.java
File renamed without changes.
View
0 ...ttyprint/cassandra/utils/StringUtils.java → ...ttyprint/cassandra/utils/StringUtils.java
File renamed without changes.
View
0 ...va/me/prettyprint/hector/api/Cluster.java → ...va/me/prettyprint/hector/api/Cluster.java
File renamed without changes.
View
0 ...nt/hector/api/ConsistencyLevelPolicy.java → ...nt/hector/api/ConsistencyLevelPolicy.java
File renamed without changes.
View
0 ...typrint/hector/api/HConsistencyLevel.java → ...typrint/hector/api/HConsistencyLevel.java
File renamed without changes.
View
0 ...a/me/prettyprint/hector/api/Keyspace.java → ...a/me/prettyprint/hector/api/Keyspace.java
File renamed without changes.
View
0 ...me/prettyprint/hector/api/Serializer.java → ...me/prettyprint/hector/api/Serializer.java
File renamed without changes.
View
0 ...typrint/hector/api/beans/ColumnSlice.java → ...typrint/hector/api/beans/ColumnSlice.java
File renamed without changes.
View
0 ...prettyprint/hector/api/beans/HColumn.java → ...prettyprint/hector/api/beans/HColumn.java
File renamed without changes.
View
0 ...yprint/hector/api/beans/HSuperColumn.java → ...yprint/hector/api/beans/HSuperColumn.java
File renamed without changes.
View
0 ...typrint/hector/api/beans/OrderedRows.java → ...typrint/hector/api/beans/OrderedRows.java
File renamed without changes.
View
0 ...nt/hector/api/beans/OrderedSuperRows.java → ...nt/hector/api/beans/OrderedSuperRows.java
File renamed without changes.
View
0 .../me/prettyprint/hector/api/beans/Row.java → .../me/prettyprint/hector/api/beans/Row.java
File renamed without changes.
View
0 ...me/prettyprint/hector/api/beans/Rows.java → ...me/prettyprint/hector/api/beans/Rows.java
File renamed without changes.
View
0 ...rettyprint/hector/api/beans/SuperRow.java → ...rettyprint/hector/api/beans/SuperRow.java
File renamed without changes.
View
0 ...ettyprint/hector/api/beans/SuperRows.java → ...ettyprint/hector/api/beans/SuperRows.java
File renamed without changes.
View
0 ...ttyprint/hector/api/beans/SuperSlice.java → ...ttyprint/hector/api/beans/SuperSlice.java
File renamed without changes.
View
0 ...rint/hector/api/ddl/ColumnDefinition.java → ...rint/hector/api/ddl/ColumnDefinition.java
File renamed without changes.
View
0 ...ector/api/ddl/ColumnFamilyDefinition.java → ...ector/api/ddl/ColumnFamilyDefinition.java
File renamed without changes.
View
0 ...print/hector/api/ddl/ColumnIndexType.java → ...print/hector/api/ddl/ColumnIndexType.java
File renamed without changes.
View
0 ...rettyprint/hector/api/ddl/ColumnType.java → ...rettyprint/hector/api/ddl/ColumnType.java
File renamed without changes.
View
0 ...yprint/hector/api/ddl/ComparatorType.java → ...yprint/hector/api/ddl/ComparatorType.java
File renamed without changes.
View
0 ...nt/hector/api/ddl/KeyspaceDefinition.java → ...nt/hector/api/ddl/KeyspaceDefinition.java
File renamed without changes.
View
0 ...e/prettyprint/hector/api/ddl/package.html → ...e/prettyprint/hector/api/ddl/package.html
File renamed without changes.
View
0 ...ceptions/HCassandraInternalException.java → ...ceptions/HCassandraInternalException.java
File renamed without changes.
View
0 .../exceptions/HInvalidRequestException.java → .../exceptions/HInvalidRequestException.java
File renamed without changes.
View
0 ...or/api/exceptions/HNotFoundException.java → ...or/api/exceptions/HNotFoundException.java
File renamed without changes.
View
0 ...or/api/exceptions/HTimedOutException.java → ...or/api/exceptions/HTimedOutException.java
File renamed without changes.
View
0 ...api/exceptions/HUnavailableException.java → ...api/exceptions/HUnavailableException.java
File renamed without changes.
View
0 ...ector/api/exceptions/HectorException.java → ...ector/api/exceptions/HectorException.java
File renamed without changes.
View
0 ...r/api/exceptions/HectorPoolException.java → ...r/api/exceptions/HectorPoolException.java
File renamed without changes.
View
0 ...eptions/HectorSerializationException.java → ...eptions/HectorSerializationException.java
File renamed without changes.
View
0 .../exceptions/HectorTransportException.java → .../exceptions/HectorTransportException.java
File renamed without changes.
View
0 ...pi/exceptions/PoolExhaustedException.java → ...pi/exceptions/PoolExhaustedException.java
File renamed without changes.
View
0 ...exceptions/PoolIllegalStateException.java → ...exceptions/PoolIllegalStateException.java
File renamed without changes.
View
0 ...ttyprint/hector/api/factory/HFactory.java → ...ttyprint/hector/api/factory/HFactory.java
File renamed without changes.
View
0 ...t/hector/api/mutation/MutationResult.java → ...t/hector/api/mutation/MutationResult.java
File renamed without changes.
View
0 ...ttyprint/hector/api/mutation/Mutator.java → ...ttyprint/hector/api/mutation/Mutator.java
File renamed without changes.
View
0 ...va/me/prettyprint/hector/api/package.html → ...va/me/prettyprint/hector/api/package.html
File renamed without changes.
View
0 ...typrint/hector/api/query/ColumnQuery.java → ...typrint/hector/api/query/ColumnQuery.java
File renamed without changes.
View
0 ...ttyprint/hector/api/query/CountQuery.java → ...ttyprint/hector/api/query/CountQuery.java
File renamed without changes.
View
0 .../hector/api/query/MultigetSliceQuery.java → .../hector/api/query/MultigetSliceQuery.java
File renamed without changes.
View
0 ...ctor/api/query/MultigetSubSliceQuery.java → ...ctor/api/query/MultigetSubSliceQuery.java
File renamed without changes.
View
0 ...or/api/query/MultigetSuperSliceQuery.java → ...or/api/query/MultigetSuperSliceQuery.java
File renamed without changes.
View
0 ...e/prettyprint/hector/api/query/Query.java → ...e/prettyprint/hector/api/query/Query.java
File renamed without changes.
View
0 ...typrint/hector/api/query/QueryResult.java → ...typrint/hector/api/query/QueryResult.java
File renamed without changes.
View
0 ...nt/hector/api/query/RangeSlicesQuery.java → ...nt/hector/api/query/RangeSlicesQuery.java
File renamed without changes.
View
0 ...hector/api/query/RangeSubSlicesQuery.java → ...hector/api/query/RangeSubSlicesQuery.java
File renamed without changes.
View
0 ...ctor/api/query/RangeSuperSlicesQuery.java → ...ctor/api/query/RangeSuperSlicesQuery.java
File renamed without changes.
View
0 ...ttyprint/hector/api/query/SliceQuery.java → ...ttyprint/hector/api/query/SliceQuery.java
File renamed without changes.
View
0 ...rint/hector/api/query/SubColumnQuery.java → ...rint/hector/api/query/SubColumnQuery.java
File renamed without changes.
View
0 ...print/hector/api/query/SubCountQuery.java → ...print/hector/api/query/SubCountQuery.java
File renamed without changes.
View
0 ...print/hector/api/query/SubSliceQuery.java → ...print/hector/api/query/SubSliceQuery.java
File renamed without changes.
View
0 ...nt/hector/api/query/SuperColumnQuery.java → ...nt/hector/api/query/SuperColumnQuery.java
File renamed without changes.
View
0 ...int/hector/api/query/SuperCountQuery.java → ...int/hector/api/query/SuperCountQuery.java
File renamed without changes.
View
0 ...int/hector/api/query/SuperSliceQuery.java → ...int/hector/api/query/SuperSliceQuery.java
File renamed without changes.
View
0 ...prettyprint/hector/api/query/package.html → ...prettyprint/hector/api/query/package.html
File renamed without changes.
View
0 src/main/resources/hectorLog4j.xml → core/src/main/resources/hectorLog4j.xml
File renamed without changes.
View
0 ...cassandra/BaseEmbededServerSetupTest.java → ...cassandra/BaseEmbededServerSetupTest.java
File renamed without changes.
View
0 ...connection/ConcurrentHClientPoolTest.java → ...connection/ConcurrentHClientPoolTest.java
File renamed without changes.
View
0 ...ssandra/connection/HThriftClientTest.java → ...ssandra/connection/HThriftClientTest.java
File renamed without changes.
View
0 ...cassandra/dao/SimpleCassandraDaoTest.java → ...cassandra/dao/SimpleCassandraDaoTest.java
File renamed without changes.
View
0 .../cassandra/examples/ExampleDaoV2Test.java → .../cassandra/examples/ExampleDaoV2Test.java
File renamed without changes.
View
0 ...ssandraClientJndiResourceFactoryTest.java → ...ssandraClientJndiResourceFactoryTest.java
File renamed without changes.
View
0 ...ssandra/model/AbstractSliceQueryTest.java → ...ssandra/model/AbstractSliceQueryTest.java
File renamed without changes.
View
0 ...rint/cassandra/model/ColumnSliceTest.java → ...rint/cassandra/model/ColumnSliceTest.java
File renamed without changes.
View
0 ...del/ConfigurableConsistencyLevelTest.java → ...del/ConfigurableConsistencyLevelTest.java
File renamed without changes.
View
0 ...ssandra/model/IndexedSlicesQueryTest.java → ...ssandra/model/IndexedSlicesQueryTest.java
File renamed without changes.
View
0 ...ssandra/model/MultigetCountQueryTest.java → ...ssandra/model/MultigetCountQueryTest.java
File renamed without changes.
View
0 ...ttyprint/cassandra/model/MutatorTest.java → ...ttyprint/cassandra/model/MutatorTest.java
File renamed without changes.
View
0 ...cassandra/model/SuperColumnSliceTest.java → ...cassandra/model/SuperColumnSliceTest.java
File renamed without changes.
View
0 ...ra/serializers/BooleanSerializerTest.java → ...ra/serializers/BooleanSerializerTest.java
File renamed without changes.
View
0 ...serializers/BytesArraySerializerTest.java → ...serializers/BytesArraySerializerTest.java
File renamed without changes.
View
0 ...andra/serializers/DateSerializerTest.java → ...andra/serializers/DateSerializerTest.java
File renamed without changes.
View
0 ...ra/serializers/IntegerSerializerTest.java → ...ra/serializers/IntegerSerializerTest.java
File renamed without changes.
View
0 ...andra/serializers/LongSerializerTest.java → ...andra/serializers/LongSerializerTest.java
File renamed without changes.
View
0 ...dra/serializers/ObjectSerializerTest.java → ...dra/serializers/ObjectSerializerTest.java
File renamed without changes.
View
0 ...dra/serializers/StringSerializerTest.java → ...dra/serializers/StringSerializerTest.java
File renamed without changes.
View
0 ...ializers/TypeInferringSerializerTest.java → ...ializers/TypeInferringSerializerTest.java
File renamed without changes.
View
0 ...andra/serializers/UUIDSerializerTest.java → ...andra/serializers/UUIDSerializerTest.java
File renamed without changes.
View
0 .../cassandra/service/BatchMutationTest.java → .../cassandra/service/BatchMutationTest.java
File renamed without changes.
View
0 .../cassandra/service/CassandraAuthTest.java → .../cassandra/service/CassandraAuthTest.java
File renamed without changes.
View
0 ...ssandra/service/CassandraClusterTest.java → ...ssandra/service/CassandraClusterTest.java
File renamed without changes.
View
0 ...ervice/CassandraHostConfiguratorTest.java → ...ervice/CassandraHostConfiguratorTest.java
File renamed without changes.
View
0 ...assandra/service/ClockResolutionTest.java → ...assandra/service/ClockResolutionTest.java
File renamed without changes.
View
0 ...print/cassandra/service/KeyspaceTest.java → ...print/cassandra/service/KeyspaceTest.java
File renamed without changes.
View
0 ...ettyprint/hector/api/ApiV2SystemTest.java → ...ettyprint/hector/api/ApiV2SystemTest.java
File renamed without changes.
View
0 src/test/resources/access.properties → core/src/test/resources/access.properties
File renamed without changes.
View
0 src/test/resources/cassandra-auth.yaml → core/src/test/resources/cassandra-auth.yaml
File renamed without changes.
View
0 ...sources/cassandra-context-test-v2-new.xml → ...sources/cassandra-context-test-v2-new.xml
File renamed without changes.
View
0 ...t/resources/cassandra-context-test-v2.xml → ...t/resources/cassandra-context-test-v2.xml
File renamed without changes.
View
0 ...test/resources/cassandra-context-test.xml → ...test/resources/cassandra-context-test.xml
File renamed without changes.
View
0 src/test/resources/cassandra.yaml → core/src/test/resources/cassandra.yaml
File renamed without changes.
View
0 src/test/resources/log4j.properties → core/src/test/resources/log4j.properties
File renamed without changes.
View
0 src/test/resources/log4j.xml → core/src/test/resources/log4j.xml
File renamed without changes.
View
0 src/test/resources/passwd.properties → core/src/test/resources/passwd.properties
File renamed without changes.
View
335 pom.xml
@@ -3,121 +3,63 @@
<modelVersion>4.0.0</modelVersion>
<groupId>me.prettyprint</groupId>
<artifactId>hector</artifactId>
- <packaging>bundle</packaging>
- <!-- The version follows Cassandra's major version changes, e.g. 0.5.1 goes with the 0.5.1 cassandra release-->
- <version>0.7.0-21</version>
+ <packaging>pom</packaging>
+ <!-- this version number is not important. The version is at ${hector.version} -->
+ <version>1.0-SNAPSHOT</version>
<name>hector</name>
<description>Cassandra Java Client Library</description>
<url>http://github.com/rantav/hector</url>
-
<properties>
- <!-- Set default encoding to UTF-8 -->
+ <!-- The version follows Cassandra's major version changes, e.g. 0.5.1 goes with the 0.5.1 cassandra release-->
+ <hector.version>0.7.0-21</hector.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <!-- OSGi bundle properties -->
- <bundle.symbolicName>me.prettyprint.hector</bundle.symbolicName>
- <bundle.namespace>me.prettyprint</bundle.namespace>
<org.springframework.version>3.0.0.RELEASE</org.springframework.version>
<slf4j.version>1.5.11</slf4j.version>
</properties>
-
<issueManagement>
<system>github</system>
<url>http://github.com/rantav/hector/issues</url>
</issueManagement>
-
<developers>
<developer>
<name>Ran Tavory</name>
<id>rantav</id>
<email>rantav@gmail.com</email>
</developer>
+ <developer>
+ <name>Nate McCall</name>
+ <id>zznate</id>
+ <email>nate@riptano.com</email>
+ </developer>
+ <developer>
+ <name>Ed Anuff</name>
+ <id>edanuff</id>
+ <email>ed.anuff@gmail.com</email>
+ </developer>
+ <developer>
+ <name>Patricio Echague</name>
+ <id>patricioe</id>
+ <email>patricioe@gmail.com</email>
+ </developer>
+ <developer>
+ <name>Arin Sarkissian</name>
+ <id>phatduckk</id>
+ <email>arin.sarkissian@gmail.com</email>
+ </developer>
+ <developer>
+ <name>Bozhidar Bozhanov</name>
+ <id>Glamdring</id>
+ <email>bozhidar.bozhanov@gmail.com</email>
+ </developer>
</developers>
+ <!-- Hector submodules -->
+ <modules>
+ <module>core</module>
+ </modules>
+
<build>
<plugins>
- <!--
- run examples thusly: mvn exec:java
- -Dexec.mainClass="me.prettyprint.cassandra.examples.ExampleDao"
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.ops4j</groupId>
- <artifactId>maven-pax-plugin</artifactId>
- <version>1.4</version>
- <configuration>
- <provision>
- <param>--platform=equinox</param>
- </provision>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
-
- <Embed-Dependency>
- libthrift;scope=compile|runtime;type=!pom;inline=false,
- cassandra;scope=compile|runtime;type=!pom;inline=false,
- <!-- *;scope=compile|runtime;type=!pom;inline=false -->
- </Embed-Dependency>
-
- <Export-Package>
- <!-- !${bundle.namespace}.internal.*, -->
- ${bundle.namespace}.*;version="${pom.version}"
- </Export-Package>
-
- <Import-Package>
- !org.apache.avro.*,
- !javax.jms.*,
- !javax.mail.*,
- !javax.servlet.*,
- !com.sun.*,
- !org.antlr.*,
- !jline.*,
- !sun.misc.*,
- *;resolution:=optional
- </Import-Package>
-
- <Private-Package>
- <!-- ${bundle.namespace}.internal.* -->
- </Private-Package>
-
- <_include>-osgi.bnd</_include>
- </instructions>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>always</forkMode>
- <additionalClasspathElements>
- <additionalClasspathElement>${basedir}/testlib/flexjson-1.7.jar</additionalClasspathElement>
- </additionalClasspathElements>
- <argLine>-Xmx1G</argLine>
- </configuration>
- </plugin>
-
-
<!-- Setup the build for JAVA 1.6 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -126,7 +68,6 @@
<source>1.6</source>
<target>1.6</target>
<optimize>true</optimize>
- <debug>true</debug>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
@@ -166,204 +107,8 @@
</execution>
</executions>
</plugin>
- <!-- install various artifacts -->
-
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>libthrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>apache-cassandra</artifactId>
- <version>0.7.0-rc1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.perf4j</groupId>
- <artifactId>perf4j</artifactId>
- <version>0.9.12</version>
- </dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.safehaus.jug</groupId>
- <artifactId>jug-asl</artifactId>
- <version>2.0.0</version>
- </dependency>
- <!-- OSGi deps -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
- <!-- Testing Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.reardencommerce</groupId>
- <artifactId>clhm-production</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cliffc.high_scale_lib</groupId>
- <artifactId>high-scale-lib</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-javautils</artifactId>
- <version>0.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${org.springframework.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${org.springframework.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${org.springframework.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>r06</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>avro</artifactId>
- <version>1.4.0-rc4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.4.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.4.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.21</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>6.1.21</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>snakeyaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.6</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<reporting>
<plugins>
@@ -411,16 +156,6 @@
</reporting>
<profiles>
<profile>
- <id>outbrain</id>
- <distributionManagement>
- <repository>
- <id>nexus</id>
- <name>nexus</name>
- <url>http://obweb.il.outbrain.com:8081/nexus/content/repositories/releases/</url>
- </repository>
- </distributionManagement>
- </profile>
- <profile>
<id>riptano</id>
<distributionManagement>
<repository>
View
14 release.sh
@@ -10,7 +10,7 @@ set -e
set -u
# read the version from pom.xml
-version=$(sed -n "s/<version>\(.*\)<\/version>/\1/p" pom.xml | head -1)
+version=$(sed -n "s/<hector.version>\(.*\)<\/hector.version>/\1/p" pom.xml | head -1)
# remove whitespace
version=$(echo $version)
echo Version is: $version
@@ -19,9 +19,9 @@ rm -rf $target*
mkdir -p $target
echo Running mvn install and copy-dependencies
-mvn clean install -DskipTests dependency:copy-dependencies -DincludeScope=runtime -DexcludeTransitive=true -DexcludeArtifactIds=properties-maven-plugin -DoutputDirectory=$target
+mvn clean install -DskipTests dependency:copy-dependencies -DincludeScope=runtime -DexcludeTransitive=true -DexcludeArtifactIds=properties-maven-plugin -DoutputDirectory=../$target
-cp target/hector-$version* $target
+cp core/target/hector-core-$version* $target
echo Copying CHANGELOG
cp CHANGELOG $target
@@ -31,10 +31,10 @@ pushd releases
zip -Tr hector-$version.zip hector-$version/
popd
if [ "$1" = "tag" ]; then
- vstr="v$version"
- echo "Dropping tag $vstr"
- git tag -a $vstr -m "Tagged as $vstr from release script"
- git push origin $vstr
+ vstr="v$version"
+ echo "Dropping tag $vstr"
+ git tag -a $vstr -m "Tagged as $vstr from release script"
+ git push origin $vstr
fi
echo DONE

0 comments on commit d76da58

Please sign in to comment.