Index: project.xml =================================================================== --- project.xml (revision 165338) +++ project.xml (working copy) @@ -23,7 +23,7 @@ 3 maven-hibernate-plugin Maven Hibernate Plug-in - 1.3 + 1.4 Work with Hibernate classes http://maven.apache.org/reference/plugins/hibernate/ @@ -93,19 +93,13 @@ + - hibernate - hibernate - 2.1.3 - jar - - - hibernate - hibernate-tools - 2.1.3 - jar - - ant ant 1.5.3-1 Index: src/main/org/apache/maven/hibernate/HibernateEntityResolver.java =================================================================== --- src/main/org/apache/maven/hibernate/HibernateEntityResolver.java (revision 165338) +++ src/main/org/apache/maven/hibernate/HibernateEntityResolver.java (working copy) @@ -45,10 +45,12 @@ /** list of j2ee dtds that are being made available */ public static final String[] HIBERNATE_DTDS = new String[] { - "-//Hibernate/Hibernate Mapping DTD 2.0//EN" + "-//Hibernate/Hibernate Mapping DTD 2.0//EN", + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" }; public static final String[] HIBERNATE_RESOURCES = new String[] { - "/plugin-resources/hibernate-mapping-2.0.dtd" + "/plugin-resources/hibernate-mapping-2.0.dtd", + "/plugin-resources/hibernate-mapping-3.0.dtd" }; /** Creates a new instance of EntityResolver */ Index: src/main/org/apache/maven/hibernate/beans/SchemaBeanBase.java =================================================================== --- src/main/org/apache/maven/hibernate/beans/SchemaBeanBase.java (revision 165338) +++ src/main/org/apache/maven/hibernate/beans/SchemaBeanBase.java (working copy) @@ -21,8 +21,7 @@ import java.net.URL; import java.net.URLClassLoader; -import net.sf.hibernate.HibernateException; -import net.sf.hibernate.cfg.Configuration; +import org.apache.maven.hibernate.HibernateVersions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -127,64 +126,73 @@ public void execute() throws Exception { - Thread currentThread = Thread.currentThread(); - ClassLoader oldClassLoader = currentThread.getContextClassLoader(); - try - { - File [] baseDirs = getBaseDirs (); - URL [] urls = new URL [baseDirs.length]; - for (int i = 0; i < urls.length; i++) { - urls [i] = baseDirs [i].toURL (); - } - - URLClassLoader newClassLoader = - new URLClassLoader(urls, getClass().getClassLoader()); - currentThread.setContextClassLoader(newClassLoader); - - Configuration cfg = getConfiguration(); - executeSchema( cfg ); + Thread currentThread = Thread.currentThread(); + ClassLoader oldClassLoader = currentThread.getContextClassLoader(); + try + { + File[] baseDirs = getBaseDirs(); + URL[] urls = new URL[baseDirs.length]; + for (int i = 0; i < urls.length; i++) + { + urls[i] = baseDirs[i].toURL(); + } - } - finally - { - currentThread.setContextClassLoader(oldClassLoader); - } + URLClassLoader newClassLoader = + new URLClassLoader(urls, getClass().getClassLoader()); + currentThread.setContextClassLoader(newClassLoader); + + //equiv: Configuration cfg = getConfiguration(); + Object cfg = getConfiguration(); + executeSchema(cfg); + + } + finally + { + currentThread.setContextClassLoader(oldClassLoader); + } } /** * Method that does the real job */ - protected abstract void executeSchema(Configuration cfg) throws Exception; + protected abstract void executeSchema(Object cfg) throws Exception; - /** - * - */ - private Configuration getConfiguration() throws HibernateException - { - Configuration cfg = new Configuration(); - if (getConfig() != null) - { - File f = new File(getConfig()); - LOG.debug("Hibernate Configuration File: " + f.getAbsolutePath()); - cfg.configure(f); - } + /** + * + */ + private Object getConfiguration() throws RuntimeException + { + HibernateVersions hbv = HibernateVersions.getInstance(); + //equiv: Configuration cfg = new Configuration(); + Object cfg = hbv.newConfiguration(); - String[] files = getFileNames (); - for (int i = 0; i < files.length; i++) - { - String filename = files[i]; - if (filename.endsWith(".jar")) - { - cfg.addJar(filename); - } - else - { - cfg.addFile(filename); - } - } - return cfg; - } + if (getConfig() != null) + { + File f = new File(getConfig()); + LOG.debug("Hibernate Configuration File: " + f.getAbsolutePath()); + //equiv: cfg.configure(f); + hbv.configure(cfg, f); + } + String[] files = getFileNames(); + for (int i = 0; i < files.length; i++) + { + String filename = files[i]; + if (filename.endsWith(".jar")) + { + //equiv: cfg.addJar( filename | new File(filename) ); + hbv.addJar(cfg, filename); + } + else + { + //equiv: cfg.addFile(filename); + hbv.addFile(cfg, filename); + } + } + return cfg; + } + + private String schemaOutputFile = null; private String delimiter = null; Index: src/main/org/apache/maven/hibernate/beans/MappingsAggregatorBean.java =================================================================== --- src/main/org/apache/maven/hibernate/beans/MappingsAggregatorBean.java (revision 165338) +++ src/main/org/apache/maven/hibernate/beans/MappingsAggregatorBean.java (working copy) @@ -103,6 +103,8 @@ String docType = current.getDocType().getText(); if(docType == null || "".equals(docType.trim())) return ""; + if(docType.indexOf("hibernate-mapping-3.0.dtd") > 0) + return "3.0"; if(docType.indexOf("hibernate-mapping-2.0.dtd") > 0) return "2.0"; if(docType.indexOf("hibernate-mapping-1.1.dtd") > 0) Index: src/main/org/apache/maven/hibernate/beans/SchemaExportBean.java =================================================================== --- src/main/org/apache/maven/hibernate/beans/SchemaExportBean.java (revision 165338) +++ src/main/org/apache/maven/hibernate/beans/SchemaExportBean.java (working copy) @@ -20,8 +20,7 @@ import java.io.FileInputStream; import java.util.Properties; -import net.sf.hibernate.cfg.Configuration; -import net.sf.hibernate.tool.hbm2ddl.SchemaExport; +import org.apache.maven.hibernate.HibernateVersions; /** * @@ -51,30 +50,37 @@ { drop = b; } - - protected void executeSchema(Configuration cfg) throws Exception { - SchemaExport schemaExport = null; - if (getProperties() == null) - { - schemaExport = new SchemaExport(cfg); - } - else - { - Properties properties = new Properties(); - properties.load(new FileInputStream(getProperties())); - schemaExport = new SchemaExport(cfg, properties); - } - LOG.debug("Output file:" + getOutputFile()); - schemaExport.setOutputFile(getOutputFile()); - schemaExport.setDelimiter(getDelimiter()); - if (isDrop()) - { - schemaExport.drop(!getQuiet(), !getText()); - } - else - { - schemaExport.create(!getQuiet(), !getText()); - } + + protected void executeSchema(Object cfg) throws Exception + { + HibernateVersions hbv = HibernateVersions.getInstance(); + //equiv: SchemaExport schemaExport = null; + Object schemaExport = null; + if (getProperties() == null) + { + //equiv: schemaExport = new SchemaExport(cfg); + schemaExport = hbv.newSchemaExport(cfg); + } + else + { + Properties properties = new Properties(); + properties.load(new FileInputStream(getProperties())); + //equiv: schemaExport = new SchemaExport(cfg, properties); + schemaExport = hbv.newSchemaExport(cfg, properties); + } + //equiv: schemaExport.setOutputFile(getOutputFile()); + hbv.setOutputFile(schemaExport, getOutputFile()); + //equiv: schemaExport.setDelimiter(getDelimiter()); + hbv.setDelimiter(schemaExport, getDelimiter()); + if (isDrop()) + { + //equiv: schemaExport.drop(!getQuiet(), !getText()); + hbv.drop(schemaExport, !getQuiet(), !getText()); + } + else + { + //equiv: schemaExport.create(!getQuiet(), !getText()); + hbv.create(schemaExport, !getQuiet(), !getText()); + } } - } Index: src/main/org/apache/maven/hibernate/beans/SchemaUpdateBean.java =================================================================== --- src/main/org/apache/maven/hibernate/beans/SchemaUpdateBean.java (revision 165338) +++ src/main/org/apache/maven/hibernate/beans/SchemaUpdateBean.java (working copy) @@ -17,15 +17,14 @@ * ==================================================================== */ +import org.apache.maven.hibernate.HibernateVersions; + import java.io.FileInputStream; import java.util.Properties; -import net.sf.hibernate.cfg.Configuration; -import net.sf.hibernate.tool.hbm2ddl.SchemaUpdate; - /** * - * The Bean which serves as Proxy To Hibernate SchemaUpdate + * The Bean which serves as Proxy To Hibernate SchemaUpdate *
* * @author Felipe Leme @@ -33,20 +32,26 @@ */ public class SchemaUpdateBean extends SchemaBeanBase { - - protected void executeSchema(Configuration cfg) throws Exception { - SchemaUpdate schemaUpdate = null; - if (getProperties() == null) - { - schemaUpdate = new SchemaUpdate(cfg); - } - else - { - Properties properties = new Properties(); - properties.load(new FileInputStream(getProperties())); - schemaUpdate = new SchemaUpdate(cfg, properties); - } - schemaUpdate.execute( !getQuiet(), !getText() ); + + protected void executeSchema(Object cfg) throws Exception + { + HibernateVersions hbv = HibernateVersions.getInstance(); + //equiv: SchemaUpdate schemaUpdate = null; + Object schemaUpdate = null; + if (getProperties() == null) + { + //equiv: schemaUpdate = new SchemaUpdate(cfg); + schemaUpdate = hbv.newSchemaUpdate(cfg); + } + else + { + Properties properties = new Properties(); + properties.load(new FileInputStream(getProperties())); + //equiv: schemaUpdate = new SchemaUpdate(cfg, properties); + schemaUpdate = hbv.newSchemaUpdate(cfg, properties); + } + //equiv: schemaUpdate.execute( !getQuiet(), !getText() ); + hbv.execute(schemaUpdate, !getQuiet(), !getText()); } - + } Index: src/main/org/apache/maven/hibernate/beans/CodeGenerationBean.java =================================================================== --- src/main/org/apache/maven/hibernate/beans/CodeGenerationBean.java (revision 165338) +++ src/main/org/apache/maven/hibernate/beans/CodeGenerationBean.java (working copy) @@ -17,45 +17,52 @@ * ==================================================================== */ -import net.sf.hibernate.tool.hbm2java.CodeGenerator; +import org.apache.maven.hibernate.HibernateVersions; /** * @author Paul Kearney * @version $Id$ */ -public class CodeGenerationBean extends CommonOperationsBean { - +public class CodeGenerationBean extends SchemaBeanBase +{ + private static final String OUTPUT_SWITCH = "--output="; - + private String outputdir = null; - - public void execute() { - - // Construct output directory argument - StringBuffer switchArg= new StringBuffer(); + + public void executeSchema(Object cfg) + { + HibernateVersions hbv = HibernateVersions.getInstance(); + + // Construct output directory argument + StringBuffer switchArg = new StringBuffer(); switchArg.append(OUTPUT_SWITCH).append(getOutputdir()); - + // Get list of files that are to be used to generate POJOs final String[] files = getFileNames(); - + // Require new array to combine command args with hbm files array - String[] args = new String[files.length + 1]; + String[] args = new String[files.length + 1]; // Add command arg to new array args[0] = switchArg.toString(); // Copy list of hbm files to new array System.arraycopy(files, 0, args, 1, files.length); - + // Generate POJOs - CodeGenerator generator = new CodeGenerator(); - generator.main(args); - - } - - public String getOutputdir() { + //equiv: CodeGenerator generator = new CodeGenerator(); + Object generator = hbv.newCodeGenerator(); + //equiv: generator.main(args); + hbv.main(generator, args); + } + + + public String getOutputdir() + { return this.outputdir; } - - public void setOutputdir(String outputdir) { + + public void setOutputdir(String outputdir) + { this.outputdir = outputdir; - } + } } Index: src/main/org/apache/maven/hibernate/HibernateVersions.java =================================================================== --- src/main/org/apache/maven/hibernate/HibernateVersions.java (revision 0) +++ src/main/org/apache/maven/hibernate/HibernateVersions.java (revision 0) @@ -0,0 +1,464 @@ +package org.apache.maven.hibernate; + +/* ==================================================================== + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + */ + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Constructor; +import java.util.Properties; + +/** + * A class to provide all the reflection tools needed to implement + * a multi-version Hiberate plugin. + * + * @author Anthony Vito + * @version $Id$ + */ +public class HibernateVersions +{ + /** + * log for debug output + */ + private static final Log LOG = LogFactory.getLog( HibernateVersions.class ); + + public static HibernateVersions getInstance() + { + ClassLoader cctxloader = Thread.currentThread().getContextClassLoader(); + return new HibernateVersions( cctxloader ); + } + + private static final String V2PREFIX = "net.sf."; + private static final String V3PREFIX = "org."; + private boolean v3; + private String prefix; + + /* Some storage of common classes and methods for easy access */ + /* First, the configuration object */ + private Class configurationCls; + private Method configureMethod, addJarMethod, addFileMethod; + private Method getPropertiesMethod; + /* The SchemaExport object */ + private Class schemaExportCls; + private Constructor schemaExportConstr_cfg, schemaExportConstr_cfg_props; + private Method setOutputFileMethod, setDelimiterMethod, dropMethod, createMethod; + /* The SchemaUpdate object */ + private Class schemaUpdateCls; + private Constructor schemaUpdateConstr_cfg, schemaUpdateConstr_cfg_props; + private Method executeMethod; + + /* The 2.X code generator stuff */ + private Class codegeneratorCls; + private Method mainMethod; + + /** + * Determine on class load what hiberate version we have on the classpath. + * This is a maven plugin and in maven only one version per artifactId can + * be a depenedency. Therefore only one hiberate version will be in the + * class. Figure out which one, and set the version. + */ + private HibernateVersions( ClassLoader loader ) + { + boolean netsf = false; + try + { + Class.forName( "net.sf.hibernate.cfg.Configuration" ); + netsf = true; + } + catch ( Exception ignored ) { } + boolean orghb = false; + try + { + Class.forName( "org.hibernate.cfg.Configuration" ); + orghb = true; + } + catch ( Exception ignored ) { } + if ( !( netsf || orghb ) ) + { + throw new RuntimeException( "Hibernate version 2.X or 3.X Required For Hibernate Plugin!" ); + } + if ( orghb ) + { + v3 = true; + prefix = V3PREFIX; + } + else + { + v3 = false; + prefix = V2PREFIX; + } + + // set up the classes and methods we will need + try + { + // Configuration Class + configurationCls = Class.forName( prefix + "hibernate.cfg.Configuration", true, loader ); + configureMethod = configurationCls.getMethod( "configure", new Class[]{File.class} ); + if ( v3 ) + addJarMethod = configurationCls.getMethod( "addJar", new Class[]{File.class} ); + else + addJarMethod = configurationCls.getMethod( "addJar", new Class[]{String.class} ); + addFileMethod = configurationCls.getMethod( "addFile", new Class[]{String.class} ); + getPropertiesMethod = configurationCls.getMethod( "getProperties", new Class[]{} ); + + // Schema Export Class + schemaExportCls = Class.forName( prefix + "hibernate.tool.hbm2ddl.SchemaExport", true, loader ); + schemaExportConstr_cfg = schemaExportCls.getConstructor( new Class[]{configurationCls} ); + schemaExportConstr_cfg_props = schemaExportCls.getConstructor( new Class[]{configurationCls, Properties.class} ); + setOutputFileMethod = schemaExportCls.getMethod( "setOutputFile", new Class[]{String.class} ); + setDelimiterMethod = schemaExportCls.getMethod( "setDelimiter", new Class[]{String.class} ); + dropMethod = schemaExportCls.getMethod( "drop", new Class[]{Boolean.TYPE, Boolean.TYPE} ); + createMethod = schemaExportCls.getMethod( "create", new Class[]{Boolean.TYPE, Boolean.TYPE} ); + + // Schema Update Class + schemaUpdateCls = Class.forName( prefix + "hibernate.tool.hbm2ddl.SchemaUpdate", true, loader ); + schemaUpdateConstr_cfg = schemaUpdateCls.getConstructor( new Class[]{configurationCls} ); + schemaUpdateConstr_cfg_props = schemaUpdateCls.getConstructor( new Class[]{configurationCls, Properties.class} ); + executeMethod = schemaUpdateCls.getMethod( "execute", new Class[]{Boolean.TYPE, Boolean.TYPE} ); + } + catch ( NoSuchMethodException e ) + { + throw new RuntimeException( e ); + } + catch ( ClassNotFoundException e ) + { + throw new RuntimeException( e ); + } + + try + { + codegeneratorCls = Class.forName( "net.sf.hibernate.tool.hbm2java.CodeGenerator", true, loader ); + mainMethod = codegeneratorCls.getMethod( "main", new Class[]{String[].class} ); + } + catch ( ClassNotFoundException e ) + { + LOG.debug( "No version 2.X tools on classpath. No CodeGenerator Available" ); + } + catch ( NoSuchMethodException e ) + { + throw new RuntimeException( e ); + } + } + + public boolean v3() + { + return v3; + } + + public Object newConfiguration() + { + Object cfg = null; + try + { + cfg = configurationCls.newInstance(); + LOG.debug( "HBVClassLoader == " + Thread.currentThread().getContextClassLoader().toString() ); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException(); + } + catch ( InstantiationException e ) + { + throw new RuntimeException( e ); + } + return cfg; + } + + public void configure( Object configuration, File file ) + { + try + { + configureMethod.invoke( configuration, new Object[]{file} ); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + } + + public void addJar( Object configuration, String filename ) + { + try + { + if ( v3 ) + addJarMethod.invoke( configuration, new Object[]{new File( filename )} ); + else + addJarMethod.invoke( configuration, new Object[]{filename} ); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + } + + public void addFile( Object configuration, String filename ) + { + try + { + addFileMethod.invoke( configuration, new Object[]{filename} ); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + } + + public Object newSchemaExport( Object configuration, Properties props ) + { + Object schemaExport = null; + try + { + if ( props == null ) + { + schemaExport = schemaExportConstr_cfg.newInstance( new Object[]{configuration} ); + } + else + { + schemaExport = schemaExportConstr_cfg_props.newInstance( new Object[]{configuration, props} ); + } + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InstantiationException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + return schemaExport; + } + + public Object newSchemaExport( Object configuration ) + { + return newSchemaExport( configuration, null ); + } + + public void setOutputFile( Object schemaExport, String outputfile ) + { + try + { + setOutputFileMethod.invoke( schemaExport, new Object[]{outputfile} ); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + } + + public void setDelimiter( Object schemaExport, String delim ) + { + try + { + setDelimiterMethod.invoke( schemaExport, new Object[]{delim} ); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + } + + public void drop( Object schemaExport, boolean quiet, boolean text ) + { + try + { + dropMethod.invoke( schemaExport, new Object[]{new Boolean( quiet ), new Boolean( text )} ); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + } + + public void create( Object schemaExport, boolean quiet, boolean text ) + { + try + { + createMethod.invoke( schemaExport, new Object[]{new Boolean( quiet ), new Boolean( text )} ); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + } + + public Object newSchemaUpdate( Object configuration, Properties props ) + { + Object schemaUpdate = null; + try + { + if ( props == null ) + { + schemaUpdate = schemaUpdateConstr_cfg.newInstance( new Object[]{configuration} ); + } + else + { + schemaUpdate = schemaUpdateConstr_cfg_props.newInstance( new Object[]{configuration, props} ); + } + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InstantiationException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + return schemaUpdate; + } + + public void execute( Object schemaUpdate, boolean quiet, boolean text ) + { + try + { + executeMethod.invoke( schemaUpdate, new Object[]{new Boolean( quiet ), new Boolean( text )} ); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + } + + public Object newSchemaUpdate( Object configuration ) + { + return newSchemaUpdate( configuration, null ); + } + + public Object newCodeGenerator() + { + if ( codegeneratorCls == null ) return null; + Object generator = null; + try + { + generator = codegeneratorCls.newInstance(); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InstantiationException e ) + { + throw new RuntimeException( e ); + } + return generator; + } + + public void main( Object generator, String[] args ) + { + try + { + mainMethod.invoke( generator, new Object[]{args} ); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + } + + + public void printProperties( Object cfg ) + { + try + { + Object properties = getPropertiesMethod.invoke( cfg, new Object[]{} ); + Properties props = ( Properties ) properties; + System.out.println( "----Configuration Properties---" ); + props.list( System.out ); + System.out.println( "-------------------------------" ); + } + catch ( IllegalAccessException e ) + { + throw new RuntimeException( e ); + } + catch ( InvocationTargetException e ) + { + handleTargetMakeNiceMessage( e ); + throw new RuntimeException( e.getCause() ); + } + } + + private void handleTargetMakeNiceMessage( InvocationTargetException e ) + { + Throwable cause = e.getCause(); + if ( cause.getClass().getName().endsWith( "HibernateException" ) ) + { + LOG.fatal( "A Hibernate Exception Has Occurred." ); + if ( cause.getMessage().indexOf( "class not found" ) != -1 ) + { + LOG.fatal( "Are You Using The Corrected Hibernate Version? Current is " + ( v3 ? "3.X" : "2.X" ) ); + } + } + } +} Index: src/plugin-resources/hibernate-mapping-3.0.dtd =================================================================== --- src/plugin-resources/hibernate-mapping-3.0.dtd (revision 0) +++ src/plugin-resources/hibernate-mapping-3.0.dtd (revision 0) @@ -0,0 +1,911 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/plugin-test/simplev3Test/project.properties =================================================================== --- src/plugin-test/simplev3Test/project.properties (revision 0) +++ src/plugin-test/simplev3Test/project.properties (revision 0) @@ -0,0 +1,17 @@ +# ------------------------------------------------------------------- +# Copyright 2004 The Apache Software Foundation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ------------------------------------------------------------------- +maven.hibernate.quiet=false + Index: src/plugin-test/simplev3Test/maven.xml =================================================================== --- src/plugin-test/simplev3Test/maven.xml (revision 0) +++ src/plugin-test/simplev3Test/maven.xml (revision 0) @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/plugin-test/simplev3Test/project.xml =================================================================== --- src/plugin-test/simplev3Test/project.xml (revision 0) +++ src/plugin-test/simplev3Test/project.xml (revision 0) @@ -0,0 +1,120 @@ + + + + + + 3 + test-maven-hibernate-plugin-simplev3Test + Simple Test Cases for Maven Hibernate v3 compatibility + maven + 1.0-SNAPSHOT + + Apache Software Foundation + http://www.apache.org/ + http://maven.apache.org/images/jakarta-logo-blue.gif + + 2001 + org.apache.maven + http://maven.apache.org/images/maven.jpg + Test for Maven Hibernate plugin + Test for Maven Hibernate plugin + http://maven.apache.org/reference/plugins/hibernate/ + /www/maven.apache.org/reference/plugins/hibernate/ + + scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/hibernate/src/plugin-test + http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/hibernate/src/plugin-test + + + + Eric Pugh + epugh + epugh@opensourceconnections.com + OpenSource Connections + + Developer + + + + Felipe Leme + felipeal + maven@felipeal.net + Falcon Informatica + + Java Developer + + -3 + + + + + + + commons-jelly + commons-jelly-tags-xml + 20030211.142705 + http://jakarta.apache.org/commons/jelly/libs/xml/ + + + + + hsqldb + hsqldb + 1.7.3.3 + jar + + + + hibernate + hibernate + 3.0.1 + jar + + + + + jta + 1.0.1b + + + + cglib + cglib + 2.0.2 + jar + + + dom4j + dom4j + 1.4 + jar + + + + + src/main + + + src/main + + **/*.xml + + + + + Index: src/plugin-test/simplev3Test/src/main/org/apache/maven/hibernate/Item.hbm.xml =================================================================== --- src/plugin-test/simplev3Test/src/main/org/apache/maven/hibernate/Item.hbm.xml (revision 0) +++ src/plugin-test/simplev3Test/src/main/org/apache/maven/hibernate/Item.hbm.xml (revision 0) @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + \ No newline at end of file Index: src/plugin-test/simplev3Test/src/main/org/apache/maven/hibernate/Component.java =================================================================== --- src/plugin-test/simplev3Test/src/main/org/apache/maven/hibernate/Component.java (revision 0) +++ src/plugin-test/simplev3Test/src/main/org/apache/maven/hibernate/Component.java (revision 0) @@ -0,0 +1,56 @@ +package org.apache.maven.hibernate; + +/* ==================================================================== + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + */ + +/** + * Class to use with testing the plugin. + * + * @author Eric Pugh + * + * @version $Id$ + */ + +public class Component { + private int id; + private String name; + + /** + * @return Returns the id. + */ + public int getId() { + return id; + } + /** + * @param id The id to set. + */ + public void setId(int id) { + this.id = id; + } + /** + * @return Returns the name. + */ + public String getName() { + return name; + } + /** + * @param name The name to set. + */ + public void setName(String name) { + this.name = name; + } +} Index: src/plugin-test/simplev3Test/src/main/org/apache/maven/hibernate/Item.java =================================================================== --- src/plugin-test/simplev3Test/src/main/org/apache/maven/hibernate/Item.java (revision 0) +++ src/plugin-test/simplev3Test/src/main/org/apache/maven/hibernate/Item.java (revision 0) @@ -0,0 +1,56 @@ +package org.apache.maven.hibernate; + +/* ==================================================================== + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + */ + +/** + * Class to use with testing the plugin. + * + * @author Eric Pugh + * + * @version $Id$ + */ + +public class Item { + private int id; + private String name; + + /** + * @return Returns the id. + */ + public int getId() { + return id; + } + /** + * @param id The id to set. + */ + public void setId(int id) { + this.id = id; + } + /** + * @return Returns the name. + */ + public String getName() { + return name; + } + /** + * @param name The name to set. + */ + public void setName(String name) { + this.name = name; + } +} Index: src/plugin-test/simplev3Test/src/main/hibernate.properties =================================================================== --- src/plugin-test/simplev3Test/src/main/hibernate.properties (revision 0) +++ src/plugin-test/simplev3Test/src/main/hibernate.properties (revision 0) @@ -0,0 +1,5 @@ +hibernate.dialect org.hibernate.dialect.HSQLDialect +hibernate.connection.driver_class org.hsqldb.jdbcDriver +hibernate.connection.username sa +hibernate.connection.password +hibernate.connection.url jdbc:hsqldb:. \ No newline at end of file Index: src/plugin-test/simplev3Test/src/main/hibernate.cfg.xml =================================================================== --- src/plugin-test/simplev3Test/src/main/hibernate.cfg.xml (revision 0) +++ src/plugin-test/simplev3Test/src/main/hibernate.cfg.xml (revision 0) @@ -0,0 +1,26 @@ + + + + + + + + + + org.hsqldb.jdbcDriver + jdbc:hsqldb:. + sa + + 0 + false + org.hibernate.dialect.HSQLDialect + + + + + + + Index: src/plugin-test/simplev3Test/src/etc/Component.hbm.xml =================================================================== --- src/plugin-test/simplev3Test/src/etc/Component.hbm.xml (revision 0) +++ src/plugin-test/simplev3Test/src/etc/Component.hbm.xml (revision 0) @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file Index: src/plugin-test/maven.xml =================================================================== --- src/plugin-test/maven.xml (revision 165338) +++ src/plugin-test/maven.xml (working copy) @@ -20,7 +20,13 @@ default="testPlugin"> - + Index: src/plugin-test/simpleTest/project.xml =================================================================== --- src/plugin-test/simpleTest/project.xml (revision 165338) +++ src/plugin-test/simpleTest/project.xml (working copy) @@ -75,17 +75,22 @@ hsqldb hsqldb - 1.7.1 + 1.7.3.3 jar - hibernate hibernate 2.1.3 jar - + + hibernate + hibernate-tools + 2.1.3 + jar + + cglib cglib 2.0.2