Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 73273 invoked from network); 19 Sep 2010 15:36:47 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 19 Sep 2010 15:36:47 -0000 Received: (qmail 68014 invoked by uid 500); 19 Sep 2010 15:36:47 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 67960 invoked by uid 500); 19 Sep 2010 15:36:45 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 67953 invoked by uid 99); 19 Sep 2010 15:36:45 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Sep 2010 15:36:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Sun, 19 Sep 2010 15:36:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 62C3A23889E7; Sun, 19 Sep 2010 15:36:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r998683 - in /directory/sandbox/studio-persistence-tooling: persistence-core/src/main/java/org/apache/directory/studio/persistence/core/ persistence-core/src/main/resources/ persistence-ui/src/main/java/org/apache/directory/studio/persisten... Date: Sun, 19 Sep 2010 15:36:05 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100919153605.62C3A23889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Sun Sep 19 15:36:04 2010 New Revision: 998683 URL: http://svn.apache.org/viewvc?rev=998683&view=rev Log: Applied patch from Kasun Lakpriya for DIRSTUDIO-693 (Persistence Tooling should create full maven project) Added: directory/sandbox/studio-persistence-tooling/persistence-core/src/main/resources/pom.vm Modified: directory/sandbox/studio-persistence-tooling/persistence-core/src/main/java/org/apache/directory/studio/persistence/core/CodeGenerator.java directory/sandbox/studio-persistence-tooling/persistence-ui/src/main/java/org/apache/directory/studio/persistence/view/wizards/NewPersistenceCodeWizard.java directory/sandbox/studio-persistence-tooling/persistence-ui/src/main/java/org/apache/directory/studio/persistence/view/wizards/NewPersistenceCodeWizardPage.java Modified: directory/sandbox/studio-persistence-tooling/persistence-core/src/main/java/org/apache/directory/studio/persistence/core/CodeGenerator.java URL: http://svn.apache.org/viewvc/directory/sandbox/studio-persistence-tooling/persistence-core/src/main/java/org/apache/directory/studio/persistence/core/CodeGenerator.java?rev=998683&r1=998682&r2=998683&view=diff ============================================================================== --- directory/sandbox/studio-persistence-tooling/persistence-core/src/main/java/org/apache/directory/studio/persistence/core/CodeGenerator.java (original) +++ directory/sandbox/studio-persistence-tooling/persistence-core/src/main/java/org/apache/directory/studio/persistence/core/CodeGenerator.java Sun Sep 19 15:36:04 2010 @@ -78,7 +78,7 @@ public class CodeGenerator { System.out.println( "CodeGenerator : Syntax error in template " + templateFile ); } - String path = generatorContext.getProjectFolderPath() + "/" + String path = generatorContext.getProjectFolderPath() + "/src/main/java/" + generatorContext.getPackageName().replace( ".", "/" ); new File( path ).mkdirs(); File javaFile = new File( path + "/" + generatorContext.getClassName() + ".java" ); @@ -129,7 +129,7 @@ public class CodeGenerator { System.out.println( "CodeGenerator : Syntax error in template " + templateFile ); } - String path = generatorContext.getProjectFolderPath() + "/" + String path = generatorContext.getProjectFolderPath() + "/src/main/java/" + generatorContext.getPackageName().replace( ".", "/" ); new File( path + "/dao" ).mkdirs(); File javaFile = new File( path + "/dao/" + generatorContext.getClassName() + "Dao.java" ); @@ -146,6 +146,51 @@ public class CodeGenerator /** + * This generates the pom.xml for the generated source + * + * @param generatorContext + * + * @param templateFile the Apache Velocity template to be used to generate + * pom.xml class + */ + public void generatePom( CodeGeneratorContext generatorContext, String templateFile ) + { + try + { + Properties properties = new Properties(); + properties.load( getClass().getResourceAsStream( "/velocity.properties" ) ); + Velocity.init( properties ); + VelocityContext context = new VelocityContext(); + context.put( "package", generatorContext.getPackageName() ); + Template template = null; + try + { + template = Velocity.getTemplate( templateFile ); + } + catch ( ResourceNotFoundException rnfe ) + { + System.out.println( "CodeGenerator : error : cannot find template " + templateFile ); + } + catch ( ParseErrorException pee ) + { + System.out.println( "CodeGenerator : Syntax error in template " + templateFile ); + } + String path = generatorContext.getProjectFolderPath() + "/"; + new File( path ).mkdirs(); + File pomFile = new File( path + "pom.xml" ); + BufferedWriter writer = new BufferedWriter( new FileWriter( pomFile ) ); + if ( template != null ) + template.merge( context, writer ); + writer.flush(); + } + catch ( Exception e ) + { + System.out.println( e ); + } + } + + + /** * This generates the GenericLdapDao abstract class and all the Dao classes generated * are inherited from this one * @@ -180,7 +225,7 @@ public class CodeGenerator { System.out.println( "CodeGenerator : Syntax error in template " + templateFile ); } - String path = generatorContext.getProjectFolderPath() + "/" + String path = generatorContext.getProjectFolderPath() + "/src/main/java/" + generatorContext.getPackageName().replace( ".", "/" ); new File( path + "/dao" ).mkdirs(); File javaFile = new File( path + "/dao/" + "GenericLdapDao.java" ); Added: directory/sandbox/studio-persistence-tooling/persistence-core/src/main/resources/pom.vm URL: http://svn.apache.org/viewvc/directory/sandbox/studio-persistence-tooling/persistence-core/src/main/resources/pom.vm?rev=998683&view=auto ============================================================================== --- directory/sandbox/studio-persistence-tooling/persistence-core/src/main/resources/pom.vm (added) +++ directory/sandbox/studio-persistence-tooling/persistence-core/src/main/resources/pom.vm Sun Sep 19 15:36:04 2010 @@ -0,0 +1,110 @@ + + + + + 4.0.0 + + $package + example + 0.0.1-SNAPSHOT + Apache Directory Studio LDAP Persistence Tooling Example + + + + + + maven-eclipse-plugin + 2.8 + + true + true + + + + maven-compiler-plugin + 2.1 + + 1.5 + 1.5 + true + true + ISO-8859-1 + + + + + + + + org.apache.directory.client.ldap + ldap-client-api + 0.1 + + + + org.apache.directory.server + apacheds-core-annotations + 1.5.6 + test + + + + org.apache.directory.server + apacheds-core-api + 1.5.6 + test + + + + org.apache.directory.server + apacheds-protocol-ldap + 1.5.6 + test + + + + org.apache.directory.server + apacheds-server-annotations + 1.5.6 + test + + + + org.apache.directory.server + apacheds-test-framework + 1.5.6 + test + + + + log4j + log4j + 1.2.16 + test + + + + org.slf4j + slf4j-log4j12 + 1.5.10 + test + + + + junit + junit + 4.8.1 + test + + + Modified: directory/sandbox/studio-persistence-tooling/persistence-ui/src/main/java/org/apache/directory/studio/persistence/view/wizards/NewPersistenceCodeWizard.java URL: http://svn.apache.org/viewvc/directory/sandbox/studio-persistence-tooling/persistence-ui/src/main/java/org/apache/directory/studio/persistence/view/wizards/NewPersistenceCodeWizard.java?rev=998683&r1=998682&r2=998683&view=diff ============================================================================== --- directory/sandbox/studio-persistence-tooling/persistence-ui/src/main/java/org/apache/directory/studio/persistence/view/wizards/NewPersistenceCodeWizard.java (original) +++ directory/sandbox/studio-persistence-tooling/persistence-ui/src/main/java/org/apache/directory/studio/persistence/view/wizards/NewPersistenceCodeWizard.java Sun Sep 19 15:36:04 2010 @@ -66,6 +66,7 @@ public class NewPersistenceCodeWizard ex codeGenerator.generateCode( codeGeneratorContext, "java_template.vm" ); codeGenerator.generateGenericDaoCode( codeGeneratorContext, "genericLdapDao_template.vm" ); codeGenerator.generateDaoCode( codeGeneratorContext, "dao_template.vm" ); + codeGenerator.generatePom( codeGeneratorContext, "pom.vm" ); return true; } Modified: directory/sandbox/studio-persistence-tooling/persistence-ui/src/main/java/org/apache/directory/studio/persistence/view/wizards/NewPersistenceCodeWizardPage.java URL: http://svn.apache.org/viewvc/directory/sandbox/studio-persistence-tooling/persistence-ui/src/main/java/org/apache/directory/studio/persistence/view/wizards/NewPersistenceCodeWizardPage.java?rev=998683&r1=998682&r2=998683&view=diff ============================================================================== --- directory/sandbox/studio-persistence-tooling/persistence-ui/src/main/java/org/apache/directory/studio/persistence/view/wizards/NewPersistenceCodeWizardPage.java (original) +++ directory/sandbox/studio-persistence-tooling/persistence-ui/src/main/java/org/apache/directory/studio/persistence/view/wizards/NewPersistenceCodeWizardPage.java Sun Sep 19 15:36:04 2010 @@ -195,7 +195,7 @@ public class NewPersistenceCodeWizardPag if ( selectedDirectory != null ) { projectFolderText.setText( selectedDirectory ); - codeGenContext.setProjectFolderPath( selectedDirectory + "/src/main/java" ); + codeGenContext.setProjectFolderPath( selectedDirectory ); } }