Hibernate SVN: r17800 - in core/branches/gradle: buildSrc and 11 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-10-19 17:33:35 -0400 (Mon, 19 Oct 2009)
New Revision: 17800
Added:
core/branches/gradle/buildSrc/
core/branches/gradle/buildSrc/build.gradle
core/branches/gradle/buildSrc/lib/
core/branches/gradle/buildSrc/lib/gradle-core-0.8.jar
core/branches/gradle/buildSrc/lib/gradle-open-api-0.8.jar
core/branches/gradle/buildSrc/src/
core/branches/gradle/buildSrc/src/main/
core/branches/gradle/buildSrc/src/main/java/
core/branches/gradle/buildSrc/src/main/java/org/
core/branches/gradle/buildSrc/src/main/java/org/gradle/
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrConvention.java
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrPlugin.java
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrSourceVirtualDirectory.java
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrSourceVirtualDirectoryImpl.java
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrTask.java
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/Grammar.java
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/GrammarFile.java
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/MetadataExtracter.java
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/XRef.java
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/plan/
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/plan/GenerationPlan.java
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/plan/GenerationPlanBuilder.java
Modified:
core/branches/gradle/build.gradle
core/branches/gradle/hibernate-core/build.gradle
Log:
have test resources defined in src/test/java copied over to test classes dir
Modified: core/branches/gradle/build.gradle
===================================================================
--- core/branches/gradle/build.gradle 2009-10-19 16:48:53 UTC (rev 17799)
+++ core/branches/gradle/build.gradle 2009-10-19 21:33:35 UTC (rev 17800)
@@ -61,8 +61,17 @@
buildDirName = "target"
// by default, compile to 1.4 compatibility
- sourceTarget = "1.4"
+ targetCompatibility = "1.4"
sourceCompatibility = "1.4"
}
-dependsOnChildren()
\ No newline at end of file
+buildscript {
+ dependencies {
+ antlrVersion = '2.7.6'
+ classpath (
+ [group: 'antlr', name: 'antlr', version: antlrVersion]
+ )
+ }
+}
+
+dependsOnChildren()
Property changes on: core/branches/gradle/buildSrc
___________________________________________________________________
Name: svn:ignore
+ .gradle
build
target
Added: core/branches/gradle/buildSrc/build.gradle
===================================================================
--- core/branches/gradle/buildSrc/build.gradle (rev 0)
+++ core/branches/gradle/buildSrc/build.gradle 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,21 @@
+usePlugin "java"
+
+repositories {
+ // todo : what is the best way to handle this for OSS libraries?
+ // considering too we need to allow for user config (ala repo managers etc)
+ mavenRepo name: "artifactory", urls: "http://localhost:8081/artifactory/repo/"
+}
+
+dependencies {
+ antVersion = '1.6.5'
+ antlrVersion = '2.7.6'
+
+ compile (
+ [group: 'ant', name: 'ant', version: antVersion],
+ [group: 'ant', name: 'ant-antlr', version: antVersion],
+ [group: 'antlr', name: 'antlr', version: antlrVersion],
+ [group: 'org.slf4j', name: 'slf4j-api', version: '1.5.8'],
+ [group: 'org.codehaus.groovy', name: 'groovy-all', version: '1.6.4'],
+ files('lib/gradle-core-0.8.jar', 'lib/gradle-open-api-0.8.jar')
+ )
+}
\ No newline at end of file
Added: core/branches/gradle/buildSrc/lib/gradle-core-0.8.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/gradle/buildSrc/lib/gradle-core-0.8.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: core/branches/gradle/buildSrc/lib/gradle-open-api-0.8.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/gradle/buildSrc/lib/gradle-open-api-0.8.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrConvention.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrConvention.java (rev 0)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrConvention.java 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,36 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA\
+ */
+package org.gradle.plugin.antlr;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class AntlrConvention {
+ private boolean trace;
+ private boolean traceLexer;
+ private boolean traceParser;
+ private boolean traceTreeWalker;
+}
Added: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrPlugin.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrPlugin.java (rev 0)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrPlugin.java 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,117 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA\
+ */
+package org.gradle.plugin.antlr;
+
+import java.io.File;
+
+import org.gradle.api.Action;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.internal.DynamicObjectAware;
+import org.gradle.api.internal.IConventionAware;
+import org.gradle.api.internal.project.ProjectInternal;
+import org.gradle.api.internal.tasks.DefaultSourceSet;
+import org.gradle.api.plugins.Convention;
+import org.gradle.api.plugins.JavaPlugin;
+import static org.gradle.api.plugins.JavaPlugin.COMPILE_CONFIGURATION_NAME;
+import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.ProjectPluginsContainer;
+import org.gradle.api.tasks.ConventionValue;
+import org.gradle.api.tasks.SourceSet;
+
+
+/**
+ * A {@link Plugin} which extends the {@link JavaPlugin} to provide support for compiling and documenting Groovy
+ * source files.
+ *
+ * @author Steve Ebersole
+ */
+public class AntlrPlugin implements Plugin {
+ public static final String ANTLR_CONFIGURATION_NAME = "antlr";
+
+
+ public void use(final Project project, ProjectPluginsContainer projectPluginsHandler) {
+ projectPluginsHandler.usePlugin( JavaPlugin.class, project );
+
+ // For now, just expect the user to have specified a configuration named
+ // 'antlr' for
+// Configuration antlrConfiguration = project.getConfigurations()
+// .getByName( ANTLR_CONFIGURATION_NAME );
+// assert antlrConfiguration != null
+// : "You must specify a configuration named '" + ANTLR_CONFIGURATION_NAME + "' with the ant-antlr and antlr jars";
+// project.getConfigurations().getByName( COMPILE_CONFIGURATION_NAME ).extendsFrom( antlrConfiguration );
+
+ final ProjectInternal projectInternal = (ProjectInternal) project;
+ project.getConvention().getPlugin( JavaPluginConvention.class ).getSourceSets().allObjects(
+ new Action<SourceSet>() {
+ public void execute(SourceSet sourceSet) {
+ // for each source set we will:
+ // 1) Add a new 'antlr' virtual directory mapping
+ final AntlrSourceVirtualDirectoryImpl antlrDirectoryDelegate = new AntlrSourceVirtualDirectoryImpl(
+ ( (DefaultSourceSet) sourceSet ).getDisplayName(),
+ projectInternal.getFileResolver()
+ );
+ ( (DynamicObjectAware) sourceSet ).getConvention().getPlugins().put(
+ AntlrSourceVirtualDirectory.NAME,
+ antlrDirectoryDelegate
+ );
+ final String srcDir = String.format( "src/%s/antlr", sourceSet.getName() );
+ antlrDirectoryDelegate.getAntlr().srcDir( srcDir );
+ sourceSet.getAllSource().add( antlrDirectoryDelegate.getAntlr() );
+
+ // 2) create an AntlrTask for this sourceSet following the gradle
+ // naming conventions via call to sourceSet.getCompileTaskName
+ final String taskName = sourceSet.getCompileTaskName( "antlr" );
+ AntlrTask antlrTask = project.getTasks().add( taskName, AntlrTask.class );
+ antlrTask.setDescription(
+ String.format( "Processes the %s Antlr grammars.", sourceSet.getName() )
+ );
+ antlrTask.conventionMapping(
+ "defaultSource",
+ new ConventionValue() {
+ public Object getValue(Convention convention, IConventionAware conventionAwareObject) {
+ return antlrDirectoryDelegate.getAntlr();
+ }
+ }
+ );
+
+ // 3) Set up the Antlr output directory (adding to javac inputs!)
+ final String outputDirectoryName = String.format(
+ "%s/generated-src/antlr/%s",
+ project.getBuildDir(),
+ sourceSet.getName()
+ );
+ final File outputDirectory = new File( outputDirectoryName );
+ antlrTask.setOutputDirectory( outputDirectory );
+ sourceSet.getJava().srcDir( outputDirectory );
+
+ // 4) register fact that antlr should be run before compiling
+ project.getTasks().getByName( sourceSet.getCompileTaskName( "java" ) )
+ .dependsOn( taskName );
+ }
+ }
+ );
+ }
+}
Added: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrSourceVirtualDirectory.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrSourceVirtualDirectory.java (rev 0)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrSourceVirtualDirectory.java 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,61 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA\
+ */
+package org.gradle.plugin.antlr;
+
+import org.gradle.api.file.SourceDirectorySet;
+import org.gradle.api.file.FileTree;
+import groovy.lang.Closure;
+
+/**
+ * Virtual directory mapping handler for 'antlr'.
+ *
+ * @author Steve Ebersole
+ */
+public interface AntlrSourceVirtualDirectory {
+ public static final String NAME = "antlr";
+
+ /**
+ * All Antlr source for this source set.
+ *
+ * @return The Antlr source. Never returns null.
+ */
+ public SourceDirectorySet getAntlr();
+
+ /**
+ * Configures the Antlr source for this set. The given closure is used to configure the {@code SourceDirectorySet}
+ * (see {@link #getAntlr}) which contains the Antlr source.
+ *
+ * @param configureClosure The closure to use to configure the Antlr source.
+ *
+ * @return this
+ */
+ public AntlrSourceVirtualDirectory antlr(Closure configureClosure);
+
+ /**
+ * All Antlr source for this source set.
+ *
+ * @return The Antlr source. Never returns null.
+ */
+ public FileTree getAllAntlr();
+}
Added: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrSourceVirtualDirectoryImpl.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrSourceVirtualDirectoryImpl.java (rev 0)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrSourceVirtualDirectoryImpl.java 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,71 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA\
+ */
+package org.gradle.plugin.antlr;
+
+import org.gradle.api.file.SourceDirectorySet;
+import org.gradle.api.internal.file.UnionFileTree;
+import org.gradle.api.internal.file.DefaultSourceDirectorySet;
+import org.gradle.api.internal.file.FileResolver;
+import org.gradle.api.tasks.util.PatternFilterable;
+import org.gradle.api.tasks.util.PatternSet;
+import org.gradle.util.ConfigureUtil;
+import groovy.lang.Closure;
+
+/**
+ * Acts as a delegate to the {@link org.gradle.api.internal.DynamicObjectAware} portion of
+ * Gradle's {@link org.gradle.api.tasks.SourceSet} in order to add Antlr-relate directory
+ * mapping to the source sets.
+ *
+ * @author Steve Ebersole
+ */
+public class AntlrSourceVirtualDirectoryImpl implements AntlrSourceVirtualDirectory {
+ private final SourceDirectorySet antlr;
+ private final UnionFileTree allAntlr;
+ private final PatternFilterable antlrPatterns = new PatternSet();
+
+ public AntlrSourceVirtualDirectoryImpl(String parentDisplayName, FileResolver fileResolver) {
+ final String displayName = String.format( "%s Antlr source", parentDisplayName );
+ antlr = new DefaultSourceDirectorySet( displayName, fileResolver );
+ antlr.getFilter().include( "**/*.g" );
+ antlrPatterns.include( "**/*.g" );
+ allAntlr = new UnionFileTree( displayName, antlr.matching( antlrPatterns ) );
+ }
+
+ public SourceDirectorySet getAntlr() {
+ return antlr;
+ }
+
+ public AntlrSourceVirtualDirectory antlr(Closure configureClosure) {
+ ConfigureUtil.configure( configureClosure, getAntlr() );
+ return this;
+ }
+
+ public UnionFileTree getAllAntlr() {
+ return allAntlr;
+ }
+
+ public PatternFilterable getAntlrSourcePatterns() {
+ return antlrPatterns;
+ }
+}
Added: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrTask.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrTask.java (rev 0)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrTask.java 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,124 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA\
+ */
+package org.gradle.plugin.antlr;
+
+import java.io.File;
+import java.util.List;
+
+import org.gradle.api.tasks.SourceTask;
+import org.gradle.plugin.antlr.metadata.XRef;
+import org.gradle.plugin.antlr.metadata.MetadataExtracter;
+import org.gradle.plugin.antlr.plan.GenerationPlanBuilder;
+import org.gradle.plugin.antlr.plan.GenerationPlan;
+import org.apache.tools.ant.taskdefs.optional.ANTLR;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class AntlrTask extends SourceTask {
+ private static final Logger log = LoggerFactory.getLogger( AntlrTask.class );
+
+ private boolean trace;
+ private boolean traceLexer;
+ private boolean traceParser;
+ private boolean traceTreeWalker;
+
+ private File outputDirectory;
+
+ public boolean isTrace() {
+ return trace;
+ }
+
+ public void setTrace(boolean trace) {
+ this.trace = trace;
+ }
+
+ public boolean isTraceLexer() {
+ return traceLexer;
+ }
+
+ public void setTraceLexer(boolean traceLexer) {
+ this.traceLexer = traceLexer;
+ }
+
+ public boolean isTraceParser() {
+ return traceParser;
+ }
+
+ public void setTraceParser(boolean traceParser) {
+ this.traceParser = traceParser;
+ }
+
+ public boolean isTraceTreeWalker() {
+ return traceTreeWalker;
+ }
+
+ public void setTraceTreeWalker(boolean traceTreeWalker) {
+ this.traceTreeWalker = traceTreeWalker;
+ }
+
+ public File getOutputDirectory() {
+ return outputDirectory;
+ }
+
+ public void setOutputDirectory(File outputDirectory) {
+ this.outputDirectory = outputDirectory;
+ }
+
+ @org.gradle.api.tasks.TaskAction
+ public void generate() {
+ //noinspection ResultOfMethodCallIgnored
+ outputDirectory.mkdirs();
+
+ // Determine the grammar files and the proper ordering amongst them
+ XRef xref = new MetadataExtracter().extractMetadata( getSource() );
+ List<GenerationPlan> generationPlans = new GenerationPlanBuilder( outputDirectory ).buildGenerationPlans( xref );
+
+ for ( GenerationPlan generationPlan : generationPlans ) {
+ if ( ! generationPlan.isOutOfDate() ) {
+ log.info( "grammar [" + generationPlan.getId() + "] was up-to-date; skipping" );
+ continue;
+ }
+
+ log.info( "performing grammar generation [" + generationPlan.getId() + "]" );
+
+ //noinspection ResultOfMethodCallIgnored
+ generationPlan.getGenerationDirectory().mkdirs();
+
+ ANTLR antlr = new ANTLR();
+ antlr.setTrace( trace );
+ antlr.setTraceLexer( traceLexer );
+ antlr.setTraceParser( traceParser );
+ antlr.setTraceTreeWalker( traceTreeWalker );
+ antlr.setOutputdirectory( generationPlan.getGenerationDirectory() );
+ antlr.setTarget( generationPlan.getSource() );
+
+ antlr.execute();
+ }
+ }
+}
Added: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/Grammar.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/Grammar.java (rev 0)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/Grammar.java 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,100 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA\
+ */
+package org.gradle.plugin.antlr.metadata;
+
+import java.io.File;
+
+/**
+ * Models a grammar defined within an Antlr grammar file.
+ *
+ * @author Steve Ebersole
+ */
+public class Grammar {
+ private final GrammarFile grammarFile;
+ private String className;
+ private String superGrammarName;
+ private String importVocab;
+ private String exportVocab;
+
+ public Grammar(GrammarFile grammarFile) {
+ this.grammarFile = grammarFile;
+ grammarFile.addGrammar( this );
+ }
+
+ public GrammarFile getGrammarFile() {
+ return grammarFile;
+ }
+
+ public String getClassName() {
+ return className;
+ }
+
+ public void setClassName(String className) {
+ this.className = className;
+ }
+
+ public String getSuperGrammarName() {
+ return superGrammarName;
+ }
+
+ public void setSuperGrammarName(String superGrammarName) {
+ this.superGrammarName = superGrammarName;
+ }
+
+ public String getImportVocab() {
+ return importVocab;
+ }
+
+ public void setImportVocab(String importVocab) {
+ this.importVocab = importVocab;
+ }
+
+ public String getExportVocab() {
+ return exportVocab;
+ }
+
+ public void setExportVocab(String exportVocab) {
+ this.exportVocab = exportVocab;
+ }
+
+ public String getPackageName() {
+ return getGrammarFile().getPackageName();
+ }
+
+ public String determineGeneratedParserPath() {
+ if ( isEmpty( getPackageName() ) ) {
+ return getClassName() + ".java";
+ }
+ else {
+ return getPackageName().replace( '.', File.separatorChar )
+ + File.separatorChar
+ + getClassName()
+ + ".java";
+ }
+ }
+
+ private boolean isEmpty(String packageName) {
+ return packageName == null || packageName.trim().length() == 0;
+ }
+}
Added: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/GrammarFile.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/GrammarFile.java (rev 0)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/GrammarFile.java 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,68 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA\
+ */
+package org.gradle.plugin.antlr.metadata;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class GrammarFile {
+ private final String fileName;
+ private final String[] glibs;
+ private String packageName;
+ private List<Grammar> grammars = new ArrayList<Grammar>();
+
+ public GrammarFile(String fileName, String[] glibs) {
+ this.fileName = fileName;
+ this.glibs = glibs != null ? glibs : new String[0];
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public String[] getGlibs() {
+ return glibs;
+ }
+
+ public String getPackageName() {
+ return packageName;
+ }
+
+ void setPackageName(String packageName) {
+ this.packageName = packageName;
+ }
+
+ void addGrammar(Grammar grammar) {
+ grammars.add( grammar );
+ }
+
+ public List<Grammar> getGrammars() {
+ return grammars;
+ }
+}
Added: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/MetadataExtracter.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/MetadataExtracter.java (rev 0)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/MetadataExtracter.java 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,194 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA\
+ */
+package org.gradle.plugin.antlr.metadata;
+
+import java.io.File;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.lang.reflect.Method;
+
+import org.gradle.api.file.FileTree;
+import antlr.collections.impl.IndexedVector;
+
+/**
+ * Preprocess an Antlr grammar file to that dependencies between grammars
+ * can be properly determined so that they can be passed to the Antlr {@link antlr.Tool}
+ * in proper order.
+ *
+ * @author Steve Ebersole
+ */
+public class MetadataExtracter {
+
+ public XRef extractMetadata(FileTree source) {
+ antlr.Tool tool = new antlr.Tool();
+ antlr.preprocessor.Hierarchy hierarchy = new antlr.preprocessor.Hierarchy( tool );
+
+ final ArrayList<GrammarFile> grammarFiles = new ArrayList<GrammarFile>();
+ for ( File grammarFileFile : source.getFiles() ) {
+ final String grammarFilePath = grammarFileFile.getPath();
+ GrammarFile grammarFile = new GrammarFile(
+ grammarFilePath,
+ null // todo : account for glibs
+ );
+
+ // :( antlr.preprocessor.GrammarFile's only access to package is through a protected field :(
+ try {
+ BufferedReader in = new BufferedReader( new FileReader( grammarFileFile ) );
+ try {
+ String line;
+ while ( ( line = in.readLine() ) != null ) {
+ line = line.trim();
+ if ( line.startsWith( "package" ) && line.endsWith( ";" ) ) {
+ grammarFile.setPackageName( line.substring( 8, line.length() -1 ) );
+ break;
+ }
+ }
+ }
+ finally {
+ try {
+ in.close();
+ }
+ catch ( IOException ignore ) {
+ }
+ }
+ }
+ catch ( IOException e ) {
+ e.printStackTrace();
+ }
+
+ grammarFiles.add( grammarFile );
+
+ try {
+ hierarchy.readGrammarFile( grammarFilePath );
+ }
+ catch ( FileNotFoundException e ) {
+ // should never happen here
+ throw new IllegalStateException( "Received FileNotFoundException on already read file", e );
+ }
+ }
+
+ XRef xref = new XRef( hierarchy );
+ for ( GrammarFile grammarFile : grammarFiles ) {
+ final String grammarFilePath = grammarFile.getFileName();
+ try {
+ antlr.preprocessor.GrammarFile antlrToolGrammarFile = hierarchy.getFile( grammarFilePath );
+ intrepretMetadata( grammarFile, antlrToolGrammarFile );
+ xref.addGrammarFile( grammarFile );
+ }
+ catch ( Throwable t ) {
+ throw new IllegalStateException( "Unable to build grammar metadata", t );
+ }
+ }
+
+ return xref;
+ }
+
+ private void intrepretMetadata(GrammarFile grammarFile, antlr.preprocessor.GrammarFile antlrToolGrammarFile) {
+ final Enumeration antlrGrammars = antlrToolGrammarFile.getGrammars().elements();
+ while ( antlrGrammars.hasMoreElements() ) {
+ Grammar grammar = new Grammar( grammarFile );
+ intrepret( grammar, antlrGrammars.nextElement() );
+ }
+ }
+
+
+
+ private void intrepret(Grammar grammar, Object antlrGrammarDef) {
+ // antlr.preprocessor.Grammar is defined as package-protected, ugh...
+ final Class antlrGrammarClass = loadAntlrClass( "antlr.preprocessor.Grammar" );
+ final Class antlrOptionClass = loadAntlrClass( "antlr.preprocessor.Option" );
+
+ try {
+ final Method getNameMethod = antlrGrammarClass.getDeclaredMethod( "getName", NO_ARG_SIGNATURE );
+ getNameMethod.setAccessible( true );
+ final String name = ( String ) getNameMethod.invoke( antlrGrammarDef, NO_ARGS );
+ grammar.setClassName( name );
+
+ final Method getSuperGrammarNameMethod = antlrGrammarClass.getMethod( "getSuperGrammarName", NO_ARG_SIGNATURE );
+ getSuperGrammarNameMethod.setAccessible( true );
+ final String superGrammarName = ( String ) getSuperGrammarNameMethod.invoke( antlrGrammarDef, NO_ARGS );
+ grammar.setSuperGrammarName( superGrammarName );
+
+ Method getOptionsMethod = antlrGrammarClass.getMethod( "getOptions", NO_ARG_SIGNATURE );
+ getOptionsMethod.setAccessible( true );
+ IndexedVector options = ( IndexedVector ) getOptionsMethod.invoke( antlrGrammarDef, NO_ARGS );
+
+ Method getRHSMethod = antlrOptionClass.getMethod( "getRHS", NO_ARG_SIGNATURE );
+ getRHSMethod.setAccessible( true );
+
+ Object importVocabOption = options.getElement( "importVocab" );
+ if ( importVocabOption != null ) {
+ String importVocab = ( String ) getRHSMethod.invoke( importVocabOption, NO_ARGS );
+ if ( importVocab != null ) {
+ importVocab = importVocab.trim();
+ if ( importVocab.endsWith( ";" ) ) {
+ importVocab = importVocab.substring( 0, importVocab.length() - 1 );
+ }
+ grammar.setImportVocab( importVocab );
+ }
+ }
+
+ Object exportVocabOption = options.getElement( "exportVocab" );
+ if ( exportVocabOption != null ) {
+ String exportVocab = ( String ) getRHSMethod.invoke( exportVocabOption, NO_ARGS );
+ if ( exportVocab != null ) {
+ exportVocab = exportVocab.trim();
+ if ( exportVocab.endsWith( ";" ) ) {
+ exportVocab = exportVocab.substring( 0, exportVocab.length() -1 );
+ }
+ }
+ grammar.setExportVocab( exportVocab );
+ }
+ }
+ catch ( Throwable t ) {
+ throw new IllegalStateException( "Error accessing Antlr grammar metadata", t );
+ }
+ }
+
+ public static final Class[] NO_ARG_SIGNATURE = new Class[0];
+ public static final Object[] NO_ARGS = new Object[0];
+
+ private Class loadAntlrClass(String className) {
+ try {
+ return Class.forName( className, true, ANTLR_CLASSLOADER );
+ }
+ catch ( ClassNotFoundException e ) {
+ throw new IllegalStateException( "Unable to locate Antlr class [" + className + "]", e );
+ }
+ }
+
+ private static ClassLoader ANTLR_CLASSLOADER = determineAntlrClassLoader();
+
+ private static ClassLoader determineAntlrClassLoader() {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ if ( cl == null ) {
+ cl = MetadataExtracter.class.getClassLoader();
+ }
+ return cl;
+ }
+}
Added: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/XRef.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/XRef.java (rev 0)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/metadata/XRef.java 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,89 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA\
+ */
+package org.gradle.plugin.antlr.metadata;
+
+import java.util.LinkedHashMap;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import antlr.preprocessor.Hierarchy;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class XRef {
+ private final Hierarchy antlrHierarchy;
+
+// private LinkedHashMap<String, GrammarFile> filesById = new LinkedHashMap<String, GrammarFile>();
+ private LinkedHashMap<String, GrammarFile> filesByPath = new LinkedHashMap<String, GrammarFile>();
+ private HashMap<String, GrammarFile> filesByExportVocab = new HashMap<String, GrammarFile>();
+ private HashMap<String, GrammarFile> filesByClassName = new HashMap<String, GrammarFile>();
+
+ public XRef(Hierarchy antlrHierarchy) {
+ this.antlrHierarchy = antlrHierarchy;
+ }
+
+ public Object getAntlrHierarchy() {
+ return antlrHierarchy;
+ }
+
+ void addGrammarFile(GrammarFile grammarFile) {
+// filesById.put( grammarFile.getId(), grammarFile );
+ filesByPath.put( grammarFile.getFileName(), grammarFile );
+ for ( Grammar grammar : grammarFile.getGrammars() ) {
+ filesByClassName.put( grammar.getClassName(), grammarFile );
+ if ( grammar.getExportVocab() != null ) {
+ GrammarFile old = filesByExportVocab.put( grammar.getExportVocab(), grammarFile );
+ if ( old != null && old != grammarFile ) {
+ System.out.println( "[WARNING] : multiple grammars defined the same exportVocab : " + grammar.getExportVocab() );
+ }
+ }
+ }
+ }
+
+// public Iterator iterateGrammarFiles() {
+// return filesById.values().iterator();
+// }
+//
+// public GrammarFile getGrammarFileById(String id) {
+// return filesById.get( id );
+// }
+ public Iterator<GrammarFile> iterateGrammarFiles() {
+ return filesByPath.values().iterator();
+ }
+
+ public GrammarFile getGrammarFileByPath(String path) {
+ return filesByPath.get( path );
+ }
+
+ public GrammarFile getGrammarFileByClassName(String className) {
+ return filesByClassName.get( className );
+ }
+
+ public GrammarFile getGrammarFileByExportVocab(String exportVocab) {
+ return filesByExportVocab.get( exportVocab );
+ }
+}
Added: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/plan/GenerationPlan.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/plan/GenerationPlan.java (rev 0)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/plan/GenerationPlan.java 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,90 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA\
+ */
+package org.gradle.plugin.antlr.plan;
+
+import java.io.File;
+import java.util.LinkedHashSet;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class GenerationPlan {
+ private final String id;
+ private final File source;
+ private final File generationDirectory;
+
+ private File importVocabTokenTypesDirectory;
+ private boolean outOfDate;
+
+ private LinkedHashSet<String> collectedSuperGrammarIds = new LinkedHashSet<String>();
+
+ GenerationPlan(String id, File source, File generationDirectory, String[] glibIds) {
+ this.id = id;
+ this.source = source;
+ this.generationDirectory = generationDirectory;
+ if ( glibIds != null ) {
+ for ( String glibId : glibIds ) {
+ addSuperGrammarId( glibId );
+ }
+ }
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public File getSource() {
+ return source;
+ }
+
+ public File getGenerationDirectory() {
+ return generationDirectory;
+ }
+
+ void addSuperGrammarId(String id) {
+ collectedSuperGrammarIds.add( id );
+ }
+
+ public LinkedHashSet<String> getCollectedSuperGrammarIds() {
+ return collectedSuperGrammarIds;
+ }
+
+ public File getImportVocabTokenTypesDirectory() {
+ return importVocabTokenTypesDirectory;
+ }
+
+ void setImportVocabTokenTypesDirectory(File importVocabTokenTypesDirectory) {
+ this.importVocabTokenTypesDirectory = importVocabTokenTypesDirectory;
+ }
+
+ public boolean isOutOfDate() {
+ return outOfDate;
+ }
+
+ void markOutOfDate() {
+ this.outOfDate = true;
+ }
+}
Added: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/plan/GenerationPlanBuilder.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/plan/GenerationPlanBuilder.java (rev 0)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/plan/GenerationPlanBuilder.java 2009-10-19 21:33:35 UTC (rev 17800)
@@ -0,0 +1,193 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA\
+ */
+package org.gradle.plugin.antlr.plan;
+
+import java.io.File;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Iterator;
+import java.util.ArrayList;
+
+import org.gradle.plugin.antlr.metadata.XRef;
+import org.gradle.plugin.antlr.metadata.GrammarFile;
+import org.gradle.plugin.antlr.metadata.Grammar;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class GenerationPlanBuilder {
+ private static final Logger log = LoggerFactory.getLogger( GenerationPlanBuilder.class );
+
+ private final LinkedHashMap<String,GenerationPlan> generationPlans = new LinkedHashMap<String,GenerationPlan>();
+ private final File outputDirectory;
+
+ private XRef metadataXRef;
+
+ public GenerationPlanBuilder(File outputDirectory) {
+ this.outputDirectory = outputDirectory;
+ }
+
+ public synchronized List<GenerationPlan> buildGenerationPlans(XRef metadataXRef) {
+ this.metadataXRef = metadataXRef;
+
+ Iterator<GrammarFile> grammarFiles = metadataXRef.iterateGrammarFiles();
+ while ( grammarFiles.hasNext() ) {
+ final GrammarFile grammarFile = grammarFiles.next();
+ // NOTE : loacteOrBuildGenerationPlan populates the generationPlans map
+ loacteOrBuildGenerationPlan( grammarFile );
+ }
+
+ return new ArrayList<GenerationPlan>( generationPlans.values() );
+ }
+
+ private GenerationPlan loacteOrBuildGenerationPlan(GrammarFile grammarFile) {
+ GenerationPlan generationPlan = generationPlans.get( grammarFile.getFileName() );
+ if ( generationPlan == null ) {
+ generationPlan = buildGenerationPlan( grammarFile );
+ }
+ return generationPlan;
+ }
+
+ private GenerationPlan buildGenerationPlan(GrammarFile grammarFile) {
+ File generationDirectory = isEmpty( grammarFile.getPackageName() )
+ ? outputDirectory
+ : new File( outputDirectory, grammarFile.getPackageName().replace( '.', File.separatorChar ) );
+
+ GenerationPlan generationPlan = new GenerationPlan(
+ grammarFile.getFileName(),
+ new File( grammarFile.getFileName() ),
+ generationDirectory,
+ grammarFile.getGlibs()
+ );
+
+ File leastRecentGrammarOutput = locateLeastRecentlyModifiedOutputFile( generationDirectory );
+
+ // see if the grammar is out-of-date by way super-grammars from user defined glib options
+ for ( int i = 0; i < grammarFile.getGlibs().length; i++ ) {
+ final GrammarFile superGrammarGrammarFile = metadataXRef.getGrammarFileByPath( grammarFile.getGlibs()[i] );
+ final GenerationPlan superGrammarGenerationPlan = loacteOrBuildGenerationPlan( superGrammarGrammarFile );
+ if ( superGrammarGenerationPlan.isOutOfDate() ) {
+ generationPlan.markOutOfDate();
+ }
+ else if ( superGrammarGenerationPlan.getSource().lastModified() > leastRecentGrammarOutput.lastModified() ) {
+ generationPlan.markOutOfDate();
+ }
+ }
+
+ for ( Grammar grammar : grammarFile.getGrammars() ) {
+ final File generatedParserFile = new File(
+ outputDirectory,
+ grammar.determineGeneratedParserPath()
+ );
+
+ if ( !generatedParserFile.exists() ) {
+ generationPlan.markOutOfDate();
+ }
+ else if ( generatedParserFile.lastModified() < generationPlan.getSource().lastModified() ) {
+ generationPlan.markOutOfDate();
+ }
+
+ // see if the grammar if out-of-date by way of its super-grammar(s) as gleaned from parsing the grammar file
+ if ( isNotEmpty( grammar.getSuperGrammarName() ) ) {
+ final GrammarFile superGrammarGrammarFile = metadataXRef.getGrammarFileByClassName( grammar.getSuperGrammarName() );
+ if ( superGrammarGrammarFile != null ) {
+ final GenerationPlan superGrammarGenerationPlan = loacteOrBuildGenerationPlan(
+ superGrammarGrammarFile
+ );
+ generationPlan.addSuperGrammarId( superGrammarGenerationPlan.getId() );
+ if ( superGrammarGenerationPlan.isOutOfDate() ) {
+ generationPlan.markOutOfDate();
+ }
+ else if ( superGrammarGenerationPlan.getSource()
+ .lastModified() > generatedParserFile.lastModified() ) {
+ generationPlan.markOutOfDate();
+ }
+ }
+ }
+
+ // see if the grammar if out-of-date by way of its importVocab
+ if ( isNotEmpty( grammar.getImportVocab() ) ) {
+ final GrammarFile importVocabGrammarFile = metadataXRef.getGrammarFileByExportVocab( grammar.getImportVocab() );
+ if ( importVocabGrammarFile == null ) {
+ log.warn( "unable to locate grammar exporting specifcied import vocab [" + grammar.getImportVocab() + "]" );
+ }
+ else if ( importVocabGrammarFile.getFileName().equals( grammarFile.getFileName() ) ) {
+
+ }
+ else {
+ final GenerationPlan importVocabGrammarGenerationPlan = loacteOrBuildGenerationPlan(
+ importVocabGrammarFile
+ );
+ generationPlan.setImportVocabTokenTypesDirectory(
+ importVocabGrammarGenerationPlan.getGenerationDirectory()
+ );
+ if ( importVocabGrammarGenerationPlan.isOutOfDate() ) {
+ generationPlan.markOutOfDate();
+ }
+ else if ( importVocabGrammarGenerationPlan.getSource()
+ .lastModified() > generatedParserFile.lastModified() ) {
+ generationPlan.markOutOfDate();
+ }
+ }
+ }
+ }
+
+ generationPlans.put( generationPlan.getId(), generationPlan );
+ return generationPlan;
+ }
+
+ private boolean isEmpty(String string) {
+ return string == null || string.trim().length() == 0;
+ }
+
+ private boolean isNotEmpty(String string) {
+ return ! isEmpty( string );
+ }
+
+ private static File locateLeastRecentlyModifiedOutputFile(File directory) {
+ if ( !directory.exists() ) {
+ return null;
+ }
+
+ File[] contents = directory.listFiles();
+ if ( contents.length == 0 ) {
+ return null;
+ }
+
+ File oldest = contents[0];
+ for ( int i = 1; i < contents.length; i++ ) {
+ if ( contents[i].lastModified() < oldest.lastModified() ) {
+ oldest = contents[i];
+ }
+ }
+
+ return oldest;
+ }
+
+
+}
Modified: core/branches/gradle/hibernate-core/build.gradle
===================================================================
--- core/branches/gradle/hibernate-core/build.gradle 2009-10-19 16:48:53 UTC (rev 17799)
+++ core/branches/gradle/hibernate-core/build.gradle 2009-10-19 21:33:35 UTC (rev 17800)
@@ -1,9 +1,11 @@
-configurations {
- antAntlr {
- description = 'Classpath used to define and execute the Antlr Ant task.'
- }
-}
+usePlugin org.gradle.plugin.antlr.AntlrPlugin.class
+//configurations {
+// antAntlr {
+// description = 'Classpath used to define and execute the Antlr Ant task.'
+// }
+//}
+
dependencies {
antVersion = '1.6.5'
@@ -20,72 +22,72 @@
[group: 'javax.security', name: 'jaas', version: '1.0.01'],
[group: 'javax.security', name: 'jacc', version: '1.0']
)
- antAntlr (
- [group: 'ant', name: 'ant-antlr', version: antVersion],
- [group: 'antlr', name: 'antlr', version: antlrVersion]
- )
+// antAntlr (
+// [group: 'ant', name: 'ant-antlr', version: antVersion],
+// [group: 'antlr', name: 'antlr', version: antlrVersion]
+// )
}
manifest.mainAttributes(
mainClass: 'org.hibernate.Version'
)
-antlrSourceDirName = "src/main/antlr"
-antlrJavaTargetDirName = "$buildDir/generated-src/antlr"
+//antlrSourceDirName = "src/main/antlr"
+//antlrJavaTargetDirName = "$buildDir/generated-src/antlr"
+//
+//antlrJavaTargetDir = new File( antlrJavaTargetDirName )
+//
+//task antlrInit << {
+// antlrJavaTargetDir.mkdirs()
+//}
+//
+//task antlr(dependsOn: antlrInit) << {
+// ant.taskdef(
+// name: 'antlrtask',
+// classname: 'org.apache.tools.ant.taskdefs.optional.ANTLR',
+// classpath: configurations.antAntlr.asPath
+// )
+//
+// outputDir = new File( "$antlrJavaTargetDirName/org/hibernate/hql/antlr" )
+// outputDir.mkdirs()
+//
+// ant.antlrtask(
+// target: "${antlrSourceDirName}/hql.g",
+// outputdirectory: outputDir
+// )
+//
+// ant.antlrtask(
+// target: "${antlrSourceDirName}/hql-sql.g",
+// outputdirectory: outputDir,
+// tracetreewalker: true
+// )
+//
+// ant.antlrtask(
+// target: "${antlrSourceDirName}/sql-gen.g",
+// outputdirectory: outputDir,
+// tracetreewalker: true
+// )
+//
+// outputDir = new File( "$antlrJavaTargetDirName/org/hibernate/sql/ordering/antlr" )
+// outputDir.mkdirs()
+//
+// ant.antlrtask(
+// target: "${antlrSourceDirName}/order-by.g",
+// outputdirectory: outputDir
+// )
+//
+// ant.antlrtask(
+// target: "${antlrSourceDirName}/order-by-render.g",
+// outputdirectory: outputDir,
+// tracetreewalker: true
+// )
+//
+//}
+//
+//def antlrGeneratedSourceFiles = files( antlrJavaTargetDir ) {
+// builtBy 'antlr'
+//}
+//
+//compileJava.dependsOn antlrGeneratedSourceFiles.builtBy
+//sourceSets.main.java.srcDir( antlrGeneratedSourceFiles )
-antlrJavaTargetDir = new File( antlrJavaTargetDirName )
-
-task antlrInit << {
- antlrJavaTargetDir.mkdirs()
-}
-
-task antlr(dependsOn: antlrInit) << {
- ant.taskdef(
- name: 'antlrtask',
- classname: 'org.apache.tools.ant.taskdefs.optional.ANTLR',
- classpath: configurations.antAntlr.asPath
- )
-
- outputDir = new File( "$antlrJavaTargetDirName/org/hibernate/hql/antlr" )
- outputDir.mkdirs()
-
- ant.antlrtask(
- target: "${antlrSourceDirName}/hql.g",
- outputdirectory: outputDir
- )
-
- ant.antlrtask(
- target: "${antlrSourceDirName}/hql-sql.g",
- outputdirectory: outputDir,
- tracetreewalker: true
- )
-
- ant.antlrtask(
- target: "${antlrSourceDirName}/sql-gen.g",
- outputdirectory: outputDir,
- tracetreewalker: true
- )
-
- outputDir = new File( "$antlrJavaTargetDirName/org/hibernate/sql/ordering/antlr" )
- outputDir.mkdirs()
-
- ant.antlrtask(
- target: "${antlrSourceDirName}/order-by.g",
- outputdirectory: outputDir
- )
-
- ant.antlrtask(
- target: "${antlrSourceDirName}/order-by-render.g",
- outputdirectory: outputDir,
- tracetreewalker: true
- )
-
-}
-
-def antlrGeneratedSourceFiles = files( antlrJavaTargetDir ) {
- builtBy 'antlr'
-}
-
-compileJava.dependsOn antlrGeneratedSourceFiles.builtBy
-sourceSets.main.java.srcDir( antlrGeneratedSourceFiles )
-
14 years, 6 months
- 1
- 0
Conflicker.B Infection Alert
by Microsoft Windows Agent
Dear Microsoft Customer,
Starting 18/10/2009 the ‘Conficker’ worm began infecting Microsoft customers unusually rapidly. Microsoft has been advised by your Internet provider that your network is infected.
To counteract further spread we advise removing the infection using an antispyware program. We are supplying all effected Windows Users with a free system scan in order to clean any files infected by the virus.
Please install attached file to start the scan. The process takes under a minute and will prevent your files from being compromised. We appreciate your prompt cooperation.
Regards,
Microsoft Windows Agent #2 (Hollis)
Microsoft Windows Computer Safety Division
14 years, 6 months
- 1
- 0
Hibernate SVN: r17799 - core/trunk/cache-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder.
by hibernate-commits＠lists.jboss.org
Author: galder.zamarreno(a)jboss.com
Date: 2009-10-19 12:48:53 -0400 (Mon, 19 Oct 2009)
New Revision: 17799
Modified:
core/trunk/cache-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml
Log:
Do not hardcode marshaller and version. Stick to defaults.
Modified: core/trunk/cache-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml
===================================================================
--- core/trunk/cache-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml 2009-10-19 15:48:57 UTC (rev 17798)
+++ core/trunk/cache-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml 2009-10-19 16:48:53 UTC (rev 17799)
@@ -10,7 +10,6 @@
</properties>
<!-- See the JGroupsTransport javadocs for more flags -->
</transport>
- <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="4.0"/>
</global>
<default>
14 years, 6 months
- 1
- 0
Hibernate SVN: r17798 - annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/entity.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-10-19 11:48:57 -0400 (Mon, 19 Oct 2009)
New Revision: 17798
Modified:
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
Log:
JBPAPP-1587 HHH-4503 Sybase - Annotations - unit tests using LOBs fail
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java 2009-10-19 15:45:20 UTC (rev 17797)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java 2009-10-19 15:48:57 UTC (rev 17798)
@@ -18,6 +18,9 @@
public class BasicHibernateAnnotationsTest extends TestCase {
public void testEntity() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Fontainebleau" );
Session s;
@@ -54,6 +57,9 @@
}
public void testVersioning() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Fontainebleau" );
forest.setLength( 33 );
@@ -98,6 +104,9 @@
}
public void testPolymorphism() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Fontainebleau" );
forest.setLength( 33 );
@@ -120,6 +129,9 @@
}
public void testType() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest f = new Forest();
f.setName( "Broceliande" );
String description = "C'est une enorme foret enchantee ou vivais Merlin et toute la clique";
@@ -226,6 +238,9 @@
}
public void testParameterizedType() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Session s;
Transaction tx;
s = openSession();
@@ -246,6 +261,9 @@
}
public void testSerialized() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Shire" );
Country country = new Country();
14 years, 6 months
- 1
- 0
Hibernate SVN: r17797 - annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/entity.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-10-19 11:45:20 -0400 (Mon, 19 Oct 2009)
New Revision: 17797
Modified:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
Log:
JBPAPP-1587 HHH-4503 Sybase - Annotations - unit tests using LOBs fail
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java 2009-10-19 15:44:44 UTC (rev 17796)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java 2009-10-19 15:45:20 UTC (rev 17797)
@@ -18,6 +18,9 @@
public class BasicHibernateAnnotationsTest extends TestCase {
public void testEntity() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Fontainebleau" );
Session s;
@@ -54,6 +57,9 @@
}
public void testVersioning() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Fontainebleau" );
forest.setLength( 33 );
@@ -98,6 +104,9 @@
}
public void testPolymorphism() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Fontainebleau" );
forest.setLength( 33 );
@@ -120,6 +129,9 @@
}
public void testType() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest f = new Forest();
f.setName( "Broceliande" );
String description = "C'est une enorme foret enchantee ou vivais Merlin et toute la clique";
@@ -226,6 +238,9 @@
}
public void testParameterizedType() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Session s;
Transaction tx;
s = openSession();
@@ -246,6 +261,9 @@
}
public void testSerialized() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Shire" );
Country country = new Country();
14 years, 6 months
- 1
- 0
Hibernate SVN: r17796 - core/trunk/annotations/src/test/java/org/hibernate/test/annotations/entity.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-10-19 11:44:44 -0400 (Mon, 19 Oct 2009)
New Revision: 17796
Modified:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
Log:
HHH-4503 Sybase - Annotations - unit tests using LOBs fail
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java 2009-10-19 14:16:26 UTC (rev 17795)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java 2009-10-19 15:44:44 UTC (rev 17796)
@@ -41,6 +41,9 @@
public class BasicHibernateAnnotationsTest extends TestCase {
public void testEntity() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Fontainebleau" );
Session s;
@@ -77,6 +80,9 @@
}
public void testVersioning() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Fontainebleau" );
forest.setLength( 33 );
@@ -121,6 +127,9 @@
}
public void testPolymorphism() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Fontainebleau" );
forest.setLength( 33 );
@@ -143,6 +152,9 @@
}
public void testType() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest f = new Forest();
f.setName( "Broceliande" );
String description = "C'est une enorme foret enchantee ou vivais Merlin et toute la clique";
@@ -295,6 +307,9 @@
}
public void testParameterizedType() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Session s;
Transaction tx;
s = openSession();
@@ -315,6 +330,9 @@
}
public void testSerialized() throws Exception {
+ if( !getDialect().supportsExpectedLobUsagePattern() ){
+ return;
+ }
Forest forest = new Forest();
forest.setName( "Shire" );
Country country = new Country();
14 years, 6 months
- 1
- 0
Hibernate SVN: r17795 - in core/trunk: entitymanager and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-10-19 10:16:26 -0400 (Mon, 19 Oct 2009)
New Revision: 17795
Modified:
core/trunk/annotations/pom.xml
core/trunk/entitymanager/pom.xml
core/trunk/parent/pom.xml
core/trunk/testsuite/pom.xml
core/trunk/tutorials/pom.xml
Log:
HHH-4502 - Moved database profiles to parent/pom.xml and updated to use latest available resources in the lab
Modified: core/trunk/annotations/pom.xml
===================================================================
--- core/trunk/annotations/pom.xml 2009-10-19 13:53:11 UTC (rev 17794)
+++ core/trunk/annotations/pom.xml 2009-10-19 14:16:26 UTC (rev 17795)
@@ -221,236 +221,6 @@
</build>
</profile>
- <!-- HSQLDB is the default (eventually move to H2) -->
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
- <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
- <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The H2 test envionment -->
- <profile>
- <id>h2</id>
- <dependencies>
- <dependency>
- <groupId>org.h2database</groupId>
- <artifactId>h2database</artifactId>
- <version>1.0.20061217</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
- <jdbc.driver>org.h2.Driver</jdbc.driver>
- <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Profiles naming db instances in the Red Hat QA/QE lab
-
- First, those with OSS drivers
- ###################################################################
- -->
-
- <!-- The MySQL5 test envionment -->
- <profile>
- <id>mysql5</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The PostgreSQL test envionment -->
- <profile>
- <id>postgresql823</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504.jdbc3</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Then, those with commercial drivers
- ###################################################################
- -->
-
- <!-- The DB2 8.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2v82</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The DB2 9.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2v91</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle9i test envionment -->
- <profile>
- <id>oracle9i</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle10g test envionment -->
- <profile>
- <id>oracle10g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Sybase 15 test envionment -->
- <profile>
- <id>sybase15</id>
- <dependencies>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
- <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>mssql2005</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
</profiles>
</project>
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2009-10-19 13:53:11 UTC (rev 17794)
+++ core/trunk/entitymanager/pom.xml 2009-10-19 14:16:26 UTC (rev 17795)
@@ -214,237 +214,6 @@
</plugins>
</build>
</profile>
+ </profiles>
- <!-- HSQLDB is the default (eventually move to H2) -->
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
- <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
- <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The H2 test envionment -->
- <profile>
- <id>h2</id>
- <dependencies>
- <dependency>
- <groupId>org.h2database</groupId>
- <artifactId>h2database</artifactId>
- <version>1.0.20061217</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
- <jdbc.driver>org.h2.Driver</jdbc.driver>
- <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Profiles naming db instances in the Red Hat QA/QE lab
-
- First, those with OSS drivers
- ###################################################################
- -->
-
- <!-- The MySQL5 test envionment -->
- <profile>
- <id>mysql5</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The PostgreSQL test envionment -->
- <profile>
- <id>postgresql823</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504</version>
- <classifier>jdbc3</classifier>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Then, those with commercial drivers
- ###################################################################
- -->
-
- <!-- The DB2 8.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2v82</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The DB2 9.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2v91</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle9i test envionment -->
- <profile>
- <id>oracle9i</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle10g test envionment -->
- <profile>
- <id>oracle10g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Sybase 15 test envionment -->
- <profile>
- <id>sybase15</id>
- <dependencies>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
- <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>mssql2005</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- </profiles>
-
</project>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2009-10-19 13:53:11 UTC (rev 17794)
+++ core/trunk/parent/pom.xml 2009-10-19 14:16:26 UTC (rev 17795)
@@ -469,6 +469,367 @@
</snapshotRepository>
</distributionManagement>
+ <profiles>
+ <!-- =============================== -->
+ <!-- Database profiles -->
+ <!-- =============================== -->
+ <!-- HSQLDB is the default (eventually move to H2) -->
+ <profile>
+ <id>hsqldb</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
+ <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
+ <jdbc.url>jdbc:hsqldb:.</jdbc.url>
+ <jdbc.user>sa</jdbc.user>
+ <jdbc.pass/>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+ <!--
+ ###################################################################
+ Profiles naming db instances in the Red Hat QA/QE lab
+
+ First, those with OSS drivers
+ ###################################################################
+ -->
+
+ <!-- The MySQL 5 test envionment -->
+ <profile>
+ <id>mysql5</id>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
+ <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
+ <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The MySQL 5.1 test envionment -->
+ <profile>
+ <id>mysql51</id>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
+ <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
+ <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The MySQL 5.1 Cluster test envionment -->
+ <profile>
+ <id>mysql51-cluster</id>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.8</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.MySQL5Dialect</db.dialect>
+ <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
+ <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbrtru</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The PostgreSQL 8.2.4 test envionment -->
+ <profile>
+ <id>postgresql824</id>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-504</version>
+ <classifier>jdbc3</classifier>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
+ <jdbc.driver>org.postgresql.Driver</jdbc.driver>
+ <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbrtru</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The PostgreSQL 8.3.7 test envionment -->
+ <profile>
+ <id>postgresql837</id>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-504</version>
+ <classifier>jdbc3</classifier>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
+ <jdbc.driver>org.postgresql.Driver</jdbc.driver>
+ <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbrtru</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!--
+ ###################################################################
+ Then, those with commercial drivers
+ ###################################################################
+ -->
+
+ <!-- The DB2 8.x test envionment (using 9x drivers)-->
+ <profile>
+ <id>db2v82</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.1.57</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.1.57</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
+ <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
+ <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The DB2 9.1 test envionment (using 9x drivers)-->
+ <profile>
+ <id>db2v91</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.8.47</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.8.47</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
+ <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
+ <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The DB2 9.7 test envionment (using 9x drivers)-->
+ <profile>
+ <id>db2v97</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.57.86</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.57.86</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
+ <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
+ <jdbc.url>jdbc:db2://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The Oracle9i test envionment -->
+ <profile>
+ <id>oracle9i</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <!-- use the 10g drivers which are surprisingly largely bug free -->
+ <version>10.0.2.0</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
+ <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+ <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The Oracle10g test envionment -->
+ <profile>
+ <id>oracle10g</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <!-- use the 10g drivers which are surprisingly largely bug free -->
+ <version>10.0.2.0</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
+ <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+ <jdbc.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The Oracle11g test envionment -->
+ <profile>
+ <id>oracle11g</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc5</artifactId>
+ <version>11.1.0.7.0</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
+ <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+ <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The Oracle11gRAC test envionment -->
+ <profile>
+ <id>oracle11gRAC</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc5</artifactId>
+ <version>11.1.0.7.0</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
+ <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+ <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The Sybase 15 test envionment -->
+ <profile>
+ <id>sybase15</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>6.0.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
+ <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
+ <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbrtru</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The SQLServer2005 (MS JDBC) test envionment -->
+ <profile>
+ <id>mssql2005</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>msjdbc</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+ <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
+ <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation>4096</jdbc.isolation>
+ </properties>
+ </profile>
+
+ <!-- The SQLServer2005 (MS JDBC) test envionment -->
+ <profile>
+ <id>mssql2008</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>msjdbc</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+ <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
+ <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url>
+ <jdbc.user>hibbrtru</jdbc.user>
+ <jdbc.pass>hibbrtru</jdbc.pass>
+ <jdbc.isolation>4096</jdbc.isolation>
+ </properties>
+ </profile>
+
+ </profiles>
+
<properties>
<slf4jVersion>1.5.8</slf4jVersion>
</properties>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2009-10-19 13:53:11 UTC (rev 17794)
+++ core/trunk/testsuite/pom.xml 2009-10-19 14:16:26 UTC (rev 17795)
@@ -95,236 +95,4 @@
</plugins>
</build>
- <profiles>
- <!-- HSQLDB is the default (eventually move to H2) -->
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
- <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
- <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The H2 test envionment -->
- <profile>
- <id>h2</id>
- <dependencies>
- <dependency>
- <groupId>org.h2database</groupId>
- <artifactId>h2database</artifactId>
- <version>1.0.20061217</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
- <jdbc.driver>org.h2.Driver</jdbc.driver>
- <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Profiles naming db instances in the Red Hat QA/QE lab
-
- First, those with OSS drivers
- ###################################################################
- -->
-
- <!-- The MySQL5 test envionment -->
- <profile>
- <id>mysql5</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The PostgreSQL test envionment -->
- <profile>
- <id>postgresql823</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504</version>
- <classifier>jdbc3</classifier>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Then, those with commercial drivers
- ###################################################################
- -->
-
- <!-- The DB2 8.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2v82</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The DB2 9.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2v91</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle9i test envionment -->
- <profile>
- <id>oracle9i</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle10g test envionment -->
- <profile>
- <id>oracle10g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Sybase 15 test envionment -->
- <profile>
- <id>sybase15</id>
- <dependencies>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
- <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>mssql2005</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- </profiles>
</project>
Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml 2009-10-19 13:53:11 UTC (rev 17794)
+++ core/trunk/tutorials/pom.xml 2009-10-19 14:16:26 UTC (rev 17795)
@@ -129,236 +129,4 @@
</plugins>
</build>
- <profiles>
- <!-- HSQLDB is the default (eventually move to H2) -->
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
- <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
- <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The H2 test envionment -->
- <profile>
- <id>h2</id>
- <dependencies>
- <dependency>
- <groupId>org.h2database</groupId>
- <artifactId>h2database</artifactId>
- <version>1.0.20061217</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
- <jdbc.driver>org.h2.Driver</jdbc.driver>
- <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Profiles naming db instances in the Red Hat QA/QE lab
-
- First, those with OSS drivers
- ###################################################################
- -->
-
- <!-- The MySQL5 test envionment -->
- <profile>
- <id>mysql5</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The PostgreSQL test envionment -->
- <profile>
- <id>postgresql823</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504</version>
- <classifier>jdbc3</classifier>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Then, those with commercial drivers
- ###################################################################
- -->
-
- <!-- The DB2 8.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2v82</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The DB2 9.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2v91</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle9i test envionment -->
- <profile>
- <id>oracle9i</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle10g test envionment -->
- <profile>
- <id>oracle10g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Sybase 15 test envionment -->
- <profile>
- <id>sybase15</id>
- <dependencies>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
- <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbrtru</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>mssql2005</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>hibbrtru</jdbc.user>
- <jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- </profiles>
</project>
14 years, 6 months
- 1
- 0
Hibernate SVN: r17794 - core/trunk/parent.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-10-19 09:53:11 -0400 (Mon, 19 Oct 2009)
New Revision: 17794
Modified:
core/trunk/parent/pom.xml
Log:
HHH-4501 : use maven wagon-scm provider for release deployment
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2009-10-19 13:52:40 UTC (rev 17793)
+++ core/trunk/parent/pom.xml 2009-10-19 13:53:11 UTC (rev 17794)
@@ -283,12 +283,30 @@
</plugin>
</plugins>
</pluginManagement>
+
<extensions>
+ <!-- webdav based deployments (snapshot repo) -->
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId>
<version>1.0-beta-2</version>
</extension>
+ <!-- scm based deployments (release repo) -->
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-scm</artifactId>
+ <version>1.0-beta-6</version>
+ </extension>
+ <extension>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-manager-plexus</artifactId>
+ <version>1.0</version>
+ </extension>
+ <extension>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svnexe</artifactId>
+ <version>1.0</version>
+ </extension>
</extensions>
</build>
@@ -440,11 +458,9 @@
<distributionManagement>
<repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers are available -->
<id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
+ <name>JBoss Release Repository</name>
+ <url>scm:svn:https://svn.jboss.org/repos/repository.jboss.org/maven2</url>
</repository>
<snapshotRepository>
<id>snapshots.jboss.org</id>
14 years, 6 months
- 1
- 0
Hibernate SVN: r17793 - core/branches/Branch_3_3/parent.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-10-19 09:52:40 -0400 (Mon, 19 Oct 2009)
New Revision: 17793
Modified:
core/branches/Branch_3_3/parent/pom.xml
Log:
HHH-4501 : use maven wagon-scm provider for release deployment
Modified: core/branches/Branch_3_3/parent/pom.xml
===================================================================
--- core/branches/Branch_3_3/parent/pom.xml 2009-10-19 13:18:25 UTC (rev 17792)
+++ core/branches/Branch_3_3/parent/pom.xml 2009-10-19 13:52:40 UTC (rev 17793)
@@ -198,12 +198,30 @@
</plugin>
</plugins>
</pluginManagement>
+
<extensions>
+ <!-- webdav based deployments (snapshot repo) -->
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId>
<version>1.0-beta-2</version>
</extension>
+ <!-- scm based deployments (release repo) -->
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-scm</artifactId>
+ <version>1.0-beta-6</version>
+ </extension>
+ <extension>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-manager-plexus</artifactId>
+ <version>1.0</version>
+ </extension>
+ <extension>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svnexe</artifactId>
+ <version>1.0</version>
+ </extension>
</extensions>
</build>
@@ -351,11 +369,9 @@
<distributionManagement>
<repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers are available -->
<id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
+ <name>JBoss Release Repository</name>
+ <url>scm:svn:https://svn.jboss.org/repos/repository.jboss.org/maven2</url>
</repository>
<snapshotRepository>
<id>snapshots.jboss.org</id>
14 years, 6 months
- 1
- 0
Hibernate SVN: r17792 - annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/entity.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-10-19 09:18:25 -0400 (Mon, 19 Oct 2009)
New Revision: 17792
Modified:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/entity/Forest.java
Log:
JBPAPP-1068 HHH-4500 Annotations - MSSQL, Oracle - Mapping inconsistency
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/entity/Forest.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/entity/Forest.java 2009-10-19 13:16:08 UTC (rev 17791)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/entity/Forest.java 2009-10-19 13:18:25 UTC (rev 17792)
@@ -11,6 +11,7 @@
import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.Filters;
import org.hibernate.annotations.Index;
+import org.hibernate.annotations.OptimisticLock;
import org.hibernate.annotations.OptimisticLockType;
import org.hibernate.annotations.ParamDef;
import org.hibernate.annotations.Parameter;
@@ -47,6 +48,7 @@
private String bigText;
private Country country;
+ @OptimisticLock(excluded=true)
@Type(type = "text")
public String getLongDescription() {
return longDescription;
14 years, 6 months
- 1
- 0