Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 12019 invoked from network); 2 Apr 2010 13:39:11 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Apr 2010 13:39:11 -0000 Received: (qmail 69112 invoked by uid 500); 2 Apr 2010 09:39:11 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 69089 invoked by uid 500); 2 Apr 2010 09:39:10 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 69073 invoked by uid 99); 2 Apr 2010 09:39:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Apr 2010 09:39:10 +0000 X-ASF-Spam-Status: No, hits=-1307.4 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Apr 2010 09:39:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2C72923888CC; Fri, 2 Apr 2010 09:38:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r930206 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq: store/jdbc/Statements.java store/jdbc/adapter/DefaultJDBCAdapter.java util/GenerateJDBCStatements.java Date: Fri, 02 Apr 2010 09:38:47 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100402093847.2C72923888CC@eris.apache.org> Author: dejanb Date: Fri Apr 2 09:38:46 2010 New Revision: 930206 URL: http://svn.apache.org/viewvc?rev=930206&view=rev Log: https://issues.apache.org/activemq/browse/AMQ-2681 - typo fixed and generate jdbc statements class Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/GenerateJDBCStatements.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/Statements.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/Statements.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/Statements.java?rev=930206&r1=930205&r2=930206&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/Statements.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/Statements.java Fri Apr 2 09:38:46 2010 @@ -38,7 +38,7 @@ public class Statements { private String tablePrefix = ""; private String addMessageStatement; private String updateMessageStatement; - private String removeMessageStatment; + private String removeMessageStatement; private String findMessageSequenceIdStatement; private String findMessageStatement; private String findMessageByIdStatement; @@ -118,11 +118,11 @@ public class Statements { return updateMessageStatement; } - public String getRemoveMessageStatment() { - if (removeMessageStatment == null) { - removeMessageStatment = "DELETE FROM " + getFullMessageTableName() + " WHERE ID=?"; + public String getRemoveMessageStatement() { + if (removeMessageStatement == null) { + removeMessageStatement = "DELETE FROM " + getFullMessageTableName() + " WHERE ID=?"; } - return removeMessageStatment; + return removeMessageStatement; } public String getFindMessageSequenceIdStatement() { @@ -584,8 +584,8 @@ public class Statements { this.removeAllSubscriptionsStatement = removeAllSubscriptionsStatment; } - public void setRemoveMessageStatment(String removeMessageStatment) { - this.removeMessageStatment = removeMessageStatment; + public void setRemoveMessageStatment(String removeMessageStatement) { + this.removeMessageStatement = removeMessageStatement; } public void setUpdateLastAckOfDurableSubStatement(String updateLastAckOfDurableSub) { Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java?rev=930206&r1=930205&r2=930206&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java Fri Apr 2 09:38:46 2010 @@ -298,7 +298,7 @@ public class DefaultJDBCAdapter implemen PreparedStatement s = c.getRemovedMessageStatement(); try { if (s == null) { - s = c.getConnection().prepareStatement(this.statements.getRemoveMessageStatment()); + s = c.getConnection().prepareStatement(this.statements.getRemoveMessageStatement()); if (this.batchStatments) { c.setRemovedMessageStatement(s); } Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/GenerateJDBCStatements.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/GenerateJDBCStatements.java?rev=930206&view=auto ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/GenerateJDBCStatements.java (added) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/GenerateJDBCStatements.java Fri Apr 2 09:38:46 2010 @@ -0,0 +1,67 @@ +package org.apache.activemq.util; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.regex.Pattern; + +import org.apache.activemq.store.jdbc.Statements; + + +public class GenerateJDBCStatements { + public static String returnStatement(Object statement){ + return ((String)statement).replace("<", "<").replace(">", ">"); + + } + /** + * @param args + */ + public static void main(String[] args) throws Exception{ + Statements s=new Statements(); + s.setTablePrefix("ACTIVEMQ."); + String[] stats=s.getCreateSchemaStatements(); + System.out.println(""); + System.out.println(""); + System.out.println(""); + for(int i=0; i"+stats[i]+""); + } + System.out.println(""); + System.out.println(""); + + + Method[] methods=Statements.class.getMethods(); + Pattern sPattern= Pattern.compile("get.*Statement$"); + Pattern setPattern= Pattern.compile("set.*Statement$"); + ArrayList setMethods=new ArrayList(); + for(int i=0; i"); + } + } + //for a typo is not needed if removeMessageStatment typo is corrected + Pattern sPattern2= Pattern.compile("get.*Statment$"); + for(int i=0; i"); + } + } + //end of generating because of typo + + String[] statsDrop=s.getDropSchemaStatements(); + System.out.println(""); + System.out.println(""); + for(int i=0; i"+statsDrop[i]+""); + } + System.out.println(""); + System.out.println(""); + System.out.println(""); + + + } + +}