Nate, Any chance you can fix the commented out code as I'd like to have cql-exec in for a 0.8.5 release
On 12 September 2011 17:33, <[email protected]> wrote: > Revision 14676 Author stephenconnolly Date 2011-09-12 11:33:18 -0500 (Mon, > 12 Sep 2011) > > Log Message > > prepare for a 0.8.5 release > > * Needed to comment out some functionality from the cql-exec pending zznate > fixing for the 0.8.5 api. > > Modified Paths > > trunk/mojo/cassandra-maven-plugin/pom.xml > trunk/mojo/cassandra-maven-plugin/src/main/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojo.java > > Diff > > Modified: trunk/mojo/cassandra-maven-plugin/pom.xml (14675 => 14676) > > --- trunk/mojo/cassandra-maven-plugin/pom.xml 2011-09-12 12:21:12 UTC (rev > 14675) > +++ trunk/mojo/cassandra-maven-plugin/pom.xml 2011-09-12 16:33:18 UTC (rev > 14676) > @@ -30,7 +30,7 @@ > </parent> > > <artifactId>cassandra-maven-plugin</artifactId> > - <version>0.8.0-2-SNAPSHOT</version> > + <version>0.8.5-1-SNAPSHOT</version> > <packaging>maven-plugin</packaging> > > <name>Mojo's Cassandra Maven Plugin</name> > @@ -79,7 +79,7 @@ > > <properties> > <mavenVersion>2.2.1</mavenVersion> > - <cassandraVersion>0.8.0</cassandraVersion> > + <cassandraVersion>0.8.5</cassandraVersion> > </properties> > > <dependencies> > @@ -193,7 +193,7 @@ > <plugins> > <plugin> > <artifactId>maven-clean-plugin</artifactId> > - <version>2.4</version> > + <version>2.4.1</version> > </plugin> > <plugin> > <artifactId>maven-compiler-plugin</artifactId> > @@ -205,11 +205,11 @@ > </plugin> > <plugin> > <artifactId>maven-deploy-plugin</artifactId> > - <version>2.5</version> > + <version>2.7</version> > </plugin> > <plugin> > <artifactId>maven-failsafe-plugin</artifactId> > - <version>2.7.1</version> > + <version>2.8.1</version> > <executions> > <execution> > <goals> > @@ -221,7 +221,7 @@ > </plugin> > <plugin> > <artifactId>maven-install-plugin</artifactId> > - <version>2.3</version> > + <version>2.3.1</version> > </plugin> > <plugin> > <groupId>org.apache.maven.plugins</groupId> > @@ -252,22 +252,17 @@ > </plugin> > <plugin> > <artifactId>maven-jar-plugin</artifactId> > - <version>2.3</version> > + <version>2.3.1</version> > </plugin> > <plugin> > <artifactId>maven-resources-plugin</artifactId> > - <version>2.4.2</version> > + <version>2.5</version> > </plugin> > <plugin> > <artifactId>maven-surefire-plugin</artifactId> > - <version>2.7.1</version> > + <version>2.8.1</version> > </plugin> > - <plugin> > - <artifactId>maven-failsafe-plugin</artifactId> > - <version>2.7.1</version> > - </plugin> > </plugins> > </build> > > - > </project> > > Modified: > trunk/mojo/cassandra-maven-plugin/src/main/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojo.java > (14675 => 14676) > > --- > trunk/mojo/cassandra-maven-plugin/src/main/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojo.java > 2011-09-12 > 12:21:12 UTC (rev 14675) > +++ > trunk/mojo/cassandra-maven-plugin/src/main/java/org/codehaus/mojo/cassandra/CqlExecCassandraMojo.java > 2011-09-12 > 16:33:18 UTC (rev 14676) > @@ -64,9 +64,9 @@ > */ > protected String comparator = "BytesType"; > > - private AbstractType<?> comparatorVal; > - private AbstractType<?> keyValidatorVal; > - private AbstractType<?> defaultValidatorVal; > +// private AbstractType<?> comparatorVal; > +// private AbstractType<?> keyValidatorVal; > +// private AbstractType<?> defaultValidatorVal; > > @Override > public void execute() throws MojoExecutionException, MojoFailureException > { > @@ -75,15 +75,15 @@ > getLog().info("Skipping cassandra: cassandra.skip==true"); > return; > } > - try > - { > - comparatorVal = DatabaseDescriptor.getComparator(comparator); > - keyValidatorVal = DatabaseDescriptor.getComparator(keyValidator); > - defaultValidatorVal = > DatabaseDescriptor.getComparator(defaultValidator); > - > - } catch (ConfigurationException e) { > - throw new MojoExecutionException("Could not parse comparator value: > " + comparator, e); > - } > +// try > +// { > +// comparatorVal = DatabaseDescriptor.getComparator(comparator); > +// keyValidatorVal = DatabaseDescriptor.getComparator(keyValidator); > +// defaultValidatorVal = > DatabaseDescriptor.getComparator(defaultValidator); > +// > +// } catch (ConfigurationException e) { > +// throw new MojoExecutionException("Could not parse comparator > value: " + comparator, e); > +// } > List<CqlExecOperation> cqlOps = new ArrayList<CqlExecOperation>(); > // file vs. statement switch > if ( cqlScript != null && cqlScript.isFile() ) > @@ -102,7 +102,7 @@ > } > } else > { > - // TODO aiccept keyFormat, columnFormat, valueFormat > + // TODO accept keyFormat, columnFormat, valueFormat > // ^ are these relevant on file load? > if ( cqlStatement.contains(";") ) > { > @@ -132,14 +132,14 @@ > while ( cqlExecOperation.hasNext() ) > { > CqlRow cqlRow = cqlExecOperation.next(); > - getLog().info("Row key: > "+keyValidatorVal.getString(cqlRow.key)); > - > getLog().info("-----------------------------------------------"); > - for (Column column : cqlRow.getColumns() ) > - { > - getLog().info(" name: > "+comparatorVal.getString(column.name)); > - getLog().info(" value: > "+defaultValidatorVal.getString(column.value)); > - > getLog().info("-----------------------------------------------"); > - } > +// getLog().info("Row key: > "+keyValidatorVal.getString(cqlRow.key)); > +// > getLog().info("-----------------------------------------------"); > +// for (Column column : cqlRow.getColumns() ) > +// { > +// getLog().info(" name: > "+comparatorVal.getString(column.name)); > +// getLog().info(" value: > "+defaultValidatorVal.getString(column.value)); > +// > getLog().info("-----------------------------------------------"); > +// } > > } > > > ________________________________ > > To unsubscribe from this list please visit: > > http://xircles.codehaus.org/manage_email --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email
