Skip to content

Commit

Permalink
Remove support for iBatis2
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffgbutler committed Jul 5, 2018
1 parent da473fe commit 959170c
Show file tree
Hide file tree
Showing 176 changed files with 148 additions and 37,457 deletions.
15 changes: 15 additions & 0 deletions core/.mvn/wrapper/MavenWrapperDownloader.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright 2006-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Expand Down
9 changes: 4 additions & 5 deletions core/mybatis-generator-core/README.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
====
Copyright 2006-2016 the original author or authors.
Copyright 2006-2018 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -17,18 +17,17 @@
===============================================================================
Overview
--------
MyBatis Generator (MBG) is a code generator for the MyBatis (and iBATIS) SQL
MyBatis Generator (MBG) is a code generator for the MyBatis SQL
mapping framework. MBG will introspect database tables (through JDBC
DatabaseMetaData) and generate SQL Map XML files, Java model object (POJOs)
that match the table, and (optionally) Java client classes that use the other
generated objects.

For full documentation, please refer to the user's manual at
docs/index.html in this distribution.
For full documentation, please refer to the user's manual at http://www.mybatis.org/generator/

Dependencies
------------
There are no dependencies beyond the JRE. JRE 5.0 or above is required.
There are no dependencies beyond the JRE. Java 8 or above is required.
Also required is a JDBC driver that implements the DatabaseMetaData interface,
especially the "getColumns" and "getPrimaryKeys" methods.

Expand Down
86 changes: 0 additions & 86 deletions core/mybatis-generator-core/doc/releasing.txt

This file was deleted.

23 changes: 5 additions & 18 deletions core/mybatis-generator-core/doc/todo.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
====
Copyright 2006-2016 the original author or authors.
Copyright 2006-2018 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -18,24 +18,11 @@ Core:

Future

1. Write page explaining how to use the GENERIC DAOs
2. Change the base API to allow specifying a connection at
1. Change the base API to allow specifying a connection at
runtime, rather than requiring a connection in the
XML config.
3. Relationships?
4. Java merger with ANTLR?
5. Add a way to override default types in the JavaTypeResolver
6. <tableSet> - to allow specification of common attributes for a set of
2. Java merger with JavaParser?
3. Add a way to override default types in the JavaTypeResolver
4. <tableSet> - to allow specification of common attributes for a set of
tables



Eclipse:

Future

1. Write a launch configuration for the plugin to allow better
control of the class path.

2. Get rid of the "Generate iBATIS Artifacts" popup menu - should
only run with a launch configuration or with Ant.
4 changes: 2 additions & 2 deletions core/mybatis-generator-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator</artifactId>
<version>1.3.8-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>mybatis-generator-core</artifactId>
Expand Down Expand Up @@ -168,7 +168,7 @@
</site>
</distributionManagement>

<description>MyBatis Generator - a code generator for MyBatis and iBatis.</description>
<description>MyBatis Generator - a code generator for MyBatis.</description>
<scm>
<url>https://github.com/mybatis/generator</url>
<tag>HEAD</tag>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,26 +220,6 @@ public String getAliasedFullyQualifiedTableNameAtRuntime() {
return sb.toString();
}

/**
* Returns a string that is the fully qualified table name, with
* underscores as the separator.
*
* @return the namespace
*/
public String getIbatis2SqlMapNamespace() {
String localCatalog = stringHasValue(runtimeCatalog) ? runtimeCatalog
: introspectedCatalog;
String localSchema = stringHasValue(runtimeSchema) ? runtimeSchema
: introspectedSchema;
String localTable = stringHasValue(runtimeTableName) ? runtimeTableName
: introspectedTableName;

return composeFullyQualifiedTableName(
ignoreQualifiersAtRuntime ? null : localCatalog,
ignoreQualifiersAtRuntime ? null : localSchema,
localTable, '_');
}

/**
* Gets the domain object name.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2006-2017 the original author or authors.
* Copyright 2006-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -23,8 +23,7 @@
import org.mybatis.generator.internal.util.StringUtility;

/**
* This class holds information about an introspected column. The class has
* utility methods useful for generating iBATIS objects.
* This class holds information about an introspected column.
*
* @author Jeff Butler
*/
Expand Down
Loading

0 comments on commit 959170c

Please sign in to comment.