Author: jgbutler Date: Sat Mar 13 04:06:16 2010 New Revision: 922480 URL: http://svn.apache.org/viewvc?rev=922480&view=rev Log: [Ibator] many updates to build and documentation
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt ibatis/java/ibator/trunk/core/ibator-core/pom.xml ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/CommentGenerator.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml ibatis/java/ibator/trunk/core/pom.xml ibatis/java/ibator/trunk/eclipse/IbatorUpdateSite/site.xml ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/ExistingJavaFileVisitor.java ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/JavaFileMerger.java ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/META-INF/MANIFEST.MF ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/importWizard.gif ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/META-INF/MANIFEST.MF ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original) +++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Sat Mar 13 04:06:16 2010 @@ -43,6 +43,7 @@ Enhancements: 18. Addedd support for "distinct" on select by example methods 19. Added new "or" method to example classes 20. Added new "useCompoundPropertyNames" property on <table> +21. Further improved extensibility of the example classes ------------------------------------------------------------------------------- Modified: ibatis/java/ibator/trunk/core/ibator-core/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/pom.xml?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-core/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-core/pom.xml Sat Mar 13 04:06:16 2010 @@ -1,10 +1,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.ibatis.ibator</groupId> + + <parent> + <groupId>org.apache.ibatis.ibator</groupId> + <artifactId>ibator</artifactId> + <version>1.2.2-SNAPSHOT</version> + </parent> + <artifactId>ibator-core</artifactId> <packaging>jar</packaging> - <version>1.2.2-SNAPSHOT</version> <name>Apache iBATIS Ibator</name> <url>http://ibatis.apache.org/ibator.html</url> @@ -58,7 +63,6 @@ </execution> </executions> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> @@ -69,7 +73,6 @@ </descriptors> </configuration> </plugin> - </plugins> </build> @@ -126,4 +129,5 @@ <scope>test</scope> </dependency> </dependencies> + </project> Modified: ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/CommentGenerator.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/CommentGenerator.java?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/CommentGenerator.java (original) +++ ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/CommentGenerator.java Sat Mar 13 04:06:16 2010 @@ -62,6 +62,8 @@ public interface CommentGenerator { public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable); + public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable, boolean markAsDoNotDelete); + public void addEnumComment(InnerEnum innerEnum, IntrospectedTable introspectedTable); public void addGetterComment(Method method, IntrospectedTable introspectedTable, IntrospectedColumn introspectedColumn); Modified: ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java (original) +++ ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java Sat Mar 13 04:06:16 2010 @@ -259,15 +259,10 @@ public class ExampleGenerator extends Ab answer.setVisibility(JavaVisibility.PUBLIC); answer.setStatic(true); answer.setSuperClass(FullyQualifiedJavaType.getGeneratedCriteriaInstance()); - - answer.addJavaDocLine("/**"); //$NON-NLS-1$ - answer.addJavaDocLine(" * This class was generated by Apache iBATIS Ibator."); //$NON-NLS-1$ - answer.addJavaDocLine(" * This class exists to make extending the example classes easier."); //$NON-NLS-1$ - answer.addJavaDocLine(" * You may add any custom where clause method to this class, and"); //$NON-NLS-1$ - answer.addJavaDocLine(" * the method will survive a Java merge (Ibator will never delete"); //$NON-NLS-1$ - answer.addJavaDocLine(" * this class)."); //$NON-NLS-1$ - answer.addJavaDocLine(" */"); //$NON-NLS-1$ + ibatorContext.getCommentGenerator().addClassComment(answer, + introspectedTable, true); + method = new Method(); method.setVisibility(JavaVisibility.PROTECTED); method.setName("Criteria"); //$NON-NLS-1$ Modified: ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java (original) +++ ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java Sat Mar 13 04:06:16 2010 @@ -313,14 +313,9 @@ public class ExampleGenerator extends Ab answer.setStatic(true); answer.setSuperClass(FullyQualifiedJavaType.getGeneratedCriteriaInstance()); - answer.addJavaDocLine("/**"); //$NON-NLS-1$ - answer.addJavaDocLine(" * This class was generated by Apache iBATIS Ibator."); //$NON-NLS-1$ - answer.addJavaDocLine(" * This class exists to make extending the example classes easier."); //$NON-NLS-1$ - answer.addJavaDocLine(" * You may add any custom where clause method to this class, and"); //$NON-NLS-1$ - answer.addJavaDocLine(" * the method will survive a Java merge (Ibator will never delete"); //$NON-NLS-1$ - answer.addJavaDocLine(" * this class)."); //$NON-NLS-1$ - answer.addJavaDocLine(" */"); //$NON-NLS-1$ - + ibatorContext.getCommentGenerator().addClassComment(answer, + introspectedTable, true); + method = new Method(); method.setVisibility(JavaVisibility.PROTECTED); method.setName("Criteria"); //$NON-NLS-1$ Modified: ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java (original) +++ ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java Sat Mar 13 04:06:16 2010 @@ -71,7 +71,7 @@ public class DefaultCommentGenerator imp sb.append(columnName); field.addJavaDocLine(sb.toString()); - addIbatorJavadocTag(field); + addIbatorJavadocTag(field, false); field.addJavaDocLine(" */"); //$NON-NLS-1$ } @@ -94,7 +94,7 @@ public class DefaultCommentGenerator imp sb.append(table); field.addJavaDocLine(sb.toString()); - addIbatorJavadocTag(field); + addIbatorJavadocTag(field, false); field.addJavaDocLine(" */"); //$NON-NLS-1$ } @@ -107,7 +107,7 @@ public class DefaultCommentGenerator imp * @deprecated as of version 1.2.2. * @see DefaultCommentGenerator#addClassComment(InnerClass, IntrospectedTable) */ - public void addClassComment(InnerClass innerClass, FullyQualifiedTable table) { + public void addClassComment(InnerClass innerClass, FullyQualifiedTable table, boolean markAsDoNotDelete) { StringBuilder sb = new StringBuilder(); innerClass.addJavaDocLine("/**"); //$NON-NLS-1$ @@ -117,7 +117,7 @@ public class DefaultCommentGenerator imp sb.append(table); innerClass.addJavaDocLine(sb.toString()); - addIbatorJavadocTag(innerClass); + addIbatorJavadocTag(innerClass, markAsDoNotDelete); innerClass.addJavaDocLine(" */"); //$NON-NLS-1$ } @@ -140,7 +140,7 @@ public class DefaultCommentGenerator imp sb.append(table); innerEnum.addJavaDocLine(sb.toString()); - addIbatorJavadocTag(innerEnum); + addIbatorJavadocTag(innerEnum, false); innerEnum.addJavaDocLine(" */"); //$NON-NLS-1$ } @@ -174,7 +174,7 @@ public class DefaultCommentGenerator imp sb.append(columnName); method.addJavaDocLine(sb.toString()); - addIbatorJavadocTag(method); + addIbatorJavadocTag(method, false); method.addJavaDocLine(" */"); //$NON-NLS-1$ } @@ -211,7 +211,7 @@ public class DefaultCommentGenerator imp sb.append(columnName); method.addJavaDocLine(sb.toString()); - addIbatorJavadocTag(method); + addIbatorJavadocTag(method, false); method.addJavaDocLine(" */"); //$NON-NLS-1$ } @@ -234,7 +234,7 @@ public class DefaultCommentGenerator imp sb.append(table); method.addJavaDocLine(sb.toString()); - addIbatorJavadocTag(method); + addIbatorJavadocTag(method, false); method.addJavaDocLine(" */"); //$NON-NLS-1$ } @@ -291,11 +291,14 @@ public class DefaultCommentGenerator imp * * @param javaElement the java element */ - protected void addIbatorJavadocTag(JavaElement javaElement) { + protected void addIbatorJavadocTag(JavaElement javaElement, boolean markAsDoNotDelete) { javaElement.addJavaDocLine(" *"); //$NON-NLS-1$ StringBuilder sb = new StringBuilder(); sb.append(" * "); //$NON-NLS-1$ sb.append(MergeConstants.NEW_JAVA_ELEMENT_TAG); + if (markAsDoNotDelete) { + sb.append(" do_not_delete_during_merge"); //$NON-NLS-1$ + } String s = getDateString(); if (s != null) { sb.append(' '); @@ -321,7 +324,7 @@ public class DefaultCommentGenerator imp public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable) { - addClassComment(innerClass, introspectedTable.getFullyQualifiedTable()); + addClassComment(innerClass, introspectedTable.getFullyQualifiedTable(), false); } public void addEnumComment(InnerEnum innerEnum, @@ -358,4 +361,9 @@ public class DefaultCommentGenerator imp addSetterComment(method, introspectedTable.getFullyQualifiedTable(), introspectedColumn.getActualColumnName()); } + + public void addClassComment(InnerClass innerClass, + IntrospectedTable introspectedTable, boolean markAsDoNotDelete) { + addClassComment(innerClass, introspectedTable.getFullyQualifiedTable(), markAsDoNotDelete); + } } Modified: ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml Sat Mar 13 04:06:16 2010 @@ -1,10 +1,14 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.ibatis.ibator</groupId> + <parent> + <groupId>org.apache.ibatis.ibator</groupId> + <artifactId>ibator</artifactId> + <version>1.2.2-SNAPSHOT</version> + </parent> + <artifactId>ibator-maven-plugin</artifactId> <packaging>maven-plugin</packaging> - <version>1.2.2-SNAPSHOT</version> <name>Apache iBATIS Ibator - Maven Plugin</name> <url>http://ibatis.apache.org/ibator.html</url> <build> @@ -18,6 +22,28 @@ <target>1.5</target> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.5</version> + <configuration> + <updateReleaseInfo>true</updateReleaseInfo> + </configuration> + </plugin> </plugins> </build> <dependencies> Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml Sat Mar 13 04:06:16 2010 @@ -1,9 +1,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.ibatis.ibator</groupId> + <artifactId>ibator</artifactId> + <version>1.2.2-SNAPSHOT</version> + </parent> <groupId>org.apache.ibatis.ibator</groupId> <artifactId>ibator-systests-ibatis2-java2</artifactId> - <version>1.2.2-SNAPSHOT</version> <packaging>jar</packaging> <name>ibator-systests-ibatis2-java2</name> <url>http://ibatis.apache.org/ibator.html</url> @@ -53,6 +57,14 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.5</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> <dependencies> Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml Sat Mar 13 04:06:16 2010 @@ -1,9 +1,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.ibatis.ibator</groupId> + <artifactId>ibator</artifactId> + <version>1.2.2-SNAPSHOT</version> + </parent> <groupId>org.apache.ibatis.ibator</groupId> <artifactId>ibator-systests-ibatis2-java5</artifactId> - <version>1.2.2-SNAPSHOT</version> <packaging>jar</packaging> <name>ibator-systests-ibatis2-java5</name> <url>http://ibatis.apache.org/ibator.html</url> @@ -53,6 +57,14 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.5</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> <dependencies> Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml Sat Mar 13 04:06:16 2010 @@ -1,9 +1,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.ibatis.ibator</groupId> + <artifactId>ibator</artifactId> + <version>1.2.2-SNAPSHOT</version> + </parent> <groupId>org.apache.ibatis.ibator</groupId> <artifactId>ibator-systests-ibatis3</artifactId> - <version>1.2.2-SNAPSHOT</version> <packaging>jar</packaging> <name>ibator-systests-ibatis3</name> <url>http://ibatis.apache.org/ibator.html</url> @@ -53,6 +57,14 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.5</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> <dependencies> @@ -72,7 +84,7 @@ <dependency> <groupId>org.apache.ibatis</groupId> <artifactId>ibatis-sqlmap</artifactId> - <version>3.0-beta-9</version> + <version>3.0-beta-10</version> </dependency> <dependency> <groupId>org.hsqldb</groupId> Modified: ibatis/java/ibator/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/pom.xml?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/pom.xml (original) +++ ibatis/java/ibator/trunk/core/pom.xml Sat Mar 13 04:06:16 2010 @@ -14,22 +14,28 @@ <module>ibator-systests-ibatis3</module> </modules> +<!-- <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0</version> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.5</version> + <configuration> + <skip>true</skip> + </configuration> </plugin> </plugins> </build> +--> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/ibatis/java/ibator/trunk/core/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ibatis/java/ibator/trunk/core</developerConnection> - <tag>HEAD</tag> - <url>http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/</url> - </scm> - + <distributionManagement> + <repository> + <uniqueVersion>false</uniqueVersion> + <id>local</id> + <name>Local Repository</name> + <url>file:/Temp/IbatorDeploy</url> + <layout>default</layout> + </repository> + </distributionManagement> </project> \ No newline at end of file Modified: ibatis/java/ibator/trunk/eclipse/IbatorUpdateSite/site.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/IbatorUpdateSite/site.xml?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/eclipse/IbatorUpdateSite/site.xml (original) +++ ibatis/java/ibator/trunk/eclipse/IbatorUpdateSite/site.xml Sat Mar 13 04:06:16 2010 @@ -6,9 +6,6 @@ <feature url="features/org.apache.ibatis.ibator_1.2.1.jar" id="org.apache.ibatis.ibator" version="1.2.1"> <category name="Ibator Version 1.2"/> </feature> - <feature url="features/org.apache.ibatis.ibator_1.2.2.jar" id="org.apache.ibatis.ibator" version="1.2.2"> - <category name="Ibator Version 1.2"/> - </feature> <category-def name="Ibator Version 1.2" label="Ibator Version 1.2"> <description> Versions of the Ibator featured based on Ibator version 1.2 and Eclipse version 3.4.1 Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties Sat Mar 13 04:06:16 2010 @@ -18,12 +18,6 @@ # Of course any of the settings here can be overridden by spec'ing # them on the command line (e.g., -DbaseLocation=d:/eclipse -# Install specific properties -baseLocation=C:/JavaTools/eclipse_galileo - pdeBuildPluginVersion=3.5.1.R35x_20090820 - equinoxLauncherPluginVersion=1.0.201.R35x_v20090715 - buildDirectory=C:/Temp/ibator.build - #The type of the top level element we are building, generally "feature" topLevelElementType = feature #The id of the top level element we are building Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml Sat Mar 13 04:06:16 2010 @@ -1,4 +1,14 @@ <project name="org.apache.ibatis.ibator.build" default="build"> + + <!-- + IMPORTANT NOTE: the following four properties may need to + be changed in your local build environment + --> + <property name="baseLocation" value="/JavaTools/eclipse_galileo"/> + <property name="pdeBuildPluginVersion" value="3.5.1.R35x_20090820"/> + <property name="equinoxLauncherPluginVersion" value="1.0.201.R35x_v20090715"/> + <property name="buildDirectory" value="/temp/ibator.build"/> + <property file="build.properties" /> <property name="callbacks.file" value="devBuildCallbacks.xml" /> @@ -47,6 +57,8 @@ <arg value="${baseLocation}/plugins/org.eclipse.pde.build_${pdeBuildPluginVersion}/scripts/build.xml" /> <arg value="-Dtimestamp=${timestamp}" /> <arg value="-Dbuilder=${builder}" /> + <arg value="-DbaseLocation=${baseLocation}" /> + <arg value="-DbuildDirectory=${buildDirectory}" /> <classpath> <pathelement location="${baseLocation}/plugins/org.eclipse.equinox.launcher_${equinoxLauncherPluginVersion}.jar" /> </classpath> Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF Sat Mar 13 04:06:16 2010 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache iBATIS Ibator Core Plug-in Bundle-SymbolicName: org.apache.ibatis.ibator.core -Bundle-Version: 1.2.2 +Bundle-Version: 1.2.2.qualifier Bundle-Vendor: ibatis.apache.org Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.apache.ant;bundle-version="1.7.1";resolution:=optional, Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF Sat Mar 13 04:06:16 2010 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache iBATIS Ibator Eclipse Core Support Plug-in Bundle-SymbolicName: org.apache.ibatis.ibator.eclipse.core -Bundle-Version: 1.2.2 +Bundle-Version: 1.2.2.qualifier Bundle-Vendor: ibatis.apache.org Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.apache.ibatis.ibator.eclipse.core.callback, Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/ExistingJavaFileVisitor.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/ExistingJavaFileVisitor.java?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/ExistingJavaFileVisitor.java (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/ExistingJavaFileVisitor.java Sat Mar 13 04:06:16 2010 @@ -16,6 +16,7 @@ package org.apache.ibatis.ibator.eclipse.core.merge; +import java.util.ArrayList; import java.util.List; import org.eclipse.jdt.core.dom.ASTNode; @@ -34,6 +35,7 @@ import org.eclipse.jdt.core.dom.TypeDecl public class ExistingJavaFileVisitor extends ASTVisitor { private TypeDeclaration typeDeclaration; private String[] javadocTags; + private List<String> generatedInnerClassesToKeep; /** * @@ -41,6 +43,7 @@ public class ExistingJavaFileVisitor ext public ExistingJavaFileVisitor(String[] javadocTags) { super(); this.javadocTags = javadocTags; + generatedInnerClassesToKeep = new ArrayList<String>(); } /** @@ -51,7 +54,7 @@ public class ExistingJavaFileVisitor ext if (isIbatorGenerated(node)) { node.delete(); } - + return false; } @@ -77,7 +80,7 @@ public class ExistingJavaFileVisitor ext typeDeclaration = node; return true; } else { - // is this an iBATOR generated inner class? If so, then delete + // is this an Ibator generated inner class? If so, then delete if (isIbatorGenerated(node)) { node.delete(); } @@ -103,13 +106,25 @@ public class ExistingJavaFileVisitor ext } for (String javadocTag : javadocTags) { if (tagName.equals(javadocTag)) { - rc = true; + String string = tag.toString(); + if (string.contains("do_not_delete_during_merge")) { + if (node.getNodeType() == ASTNode.TYPE_DECLARATION) { + String name = ((TypeDeclaration) node).getName().getFullyQualifiedName(); + generatedInnerClassesToKeep.add(name); + } + } else { + rc = true; + } break; } } } } - + return rc; } + + public boolean containsInnerClass(String name) { + return generatedInnerClassesToKeep.contains(name); + } } Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/JavaFileMerger.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/JavaFileMerger.java?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/JavaFileMerger.java (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/JavaFileMerger.java Sat Mar 13 04:06:16 2010 @@ -175,7 +175,16 @@ public class JavaFileMerger { Iterator<ASTNode> astIter = newJavaFileVisitor.getNewNodes().iterator(); int i = 0; while (astIter.hasNext()) { - listRewrite.insertAt(astIter.next(), i++, null); + ASTNode node = astIter.next(); + + if (node.getNodeType() == ASTNode.TYPE_DECLARATION) { + String name = ((TypeDeclaration) node).getName().getFullyQualifiedName(); + if (visitor.containsInnerClass(name)) { + continue; + } + } + + listRewrite.insertAt(node, i++, null); } textEdit = rewrite.rewriteAST(document, JavaCore.getOptions()); Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/META-INF/MANIFEST.MF?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/META-INF/MANIFEST.MF (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/META-INF/MANIFEST.MF Sat Mar 13 04:06:16 2010 @@ -2,5 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache iBATIS Ibator Documentation Plug-in Bundle-SymbolicName: org.apache.ibatis.ibator.eclipse.doc; singleton:=true -Bundle-Version: 1.2.2 +Bundle-Version: 1.2.2.qualifier Bundle-Vendor: ibatis.apache.org Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html Sat Mar 13 04:06:16 2010 @@ -25,16 +25,13 @@ follows:</p> </tr> <tr> <td><code>org.apache.ibatis.ibator.core</code></td> - <td>This plugin is an Eclipse library plugin for the standard Ibator JAR file. - The purpose of this plug-in is to package the standard JAR and make it available to the - other plugins. There is a build file in this plug-in (buildIbator.xml) that - will compile the core Ibator JAR file and update the wrapped JAR files. This makes - it easy to keep the plugin up to date as the core functionality is developed.</td> + <td>This plugin holds the Java source for the core Ibator library. The project for + this plugin contains linked folders to the Ibator source tree.</td> </tr> <tr> <td><code>org.apache.ibatis.ibator.eclipse.core</code></td> <td>This plugin holds Java support classes for the other plugins. This plugin does not contribute - to the Eclipse user interface. Currently, this plugin includes classes for Java file + to the Eclipse user interface. This plugin includes classes for Java file merging, and Eclipse implementations of the Ibator callback interfaces.</td> </tr> <tr> @@ -52,13 +49,34 @@ follows:</p> </tr> </table> +<h2>Other Projects</h2> +<p>There are three other Eclipse projects that complete the feature:</p> +<table cellspacing="0" cellpadding="5" border="1"> + <tr> + <th>Project</th> + <th>Description</th> + </tr> + <tr> + <td><code>IbatorUpdateSite</code></td> + <td>This project holds the artifacts for the Ibator update site. The artifacts in this project are used + a new version of the feature is published at Apache. Most users will not need to access the + artifacts in this project.</td> + </tr> + <tr> + <td><code>org.apache.ibatis.ibator</code></td> + <td>This project is the Eclipse feature project for Ibator.</td> + </tr> + <tr> + <td><code>org.apache.ibatis.ibator.build</code></td> + <td>This project holds the build script and properties for the Ibator build.</td> + </tr> +</table> -<h2>Building the Feature and Plug-ins from Source</h2> -<p>The following instructions show how to build the Ibator feature and plug-ins from the -latest source -in the Subversion repository. We assume that you are somewhat familiar with Subversion -and the Eclipse plug-in development environment (PDE). These instructions also assume -you are using Eclipse version 3.5.1.</p> +<h2>Eclipse Workspace Setup</h2> +<p>The following instructions show how to setup an Eclipse workspace for building the Ibator feature +and plug-ins from the latest source in the Subversion repository. We assume that you are somewhat +familiar with Subversion and the Eclipse plug-in development environment (PDE). These instructions +also assume you are using Eclipse version 3.5.1 (Galileo).</p> <ol> <li>Checkout the latest source code from Subversion <ol type="a"> @@ -88,10 +106,10 @@ you are using Eclipse version 3.5.1.</p> </li> <li>Set the root directory to the "eclipse" sub-directory of the directory where you did the SVN checkout (for example, /Apache/Ibator/eclipse)</li> - <li>Select the five projects under the directory, do not copy the projects into - your workspace. Note that there is one other project - the Ibator Update Site - project. You do not need to import this project unless you want to build a - local copy of the Eclipse Update site for Ibator. + <li>Select all projects except the <code>IbatorUpdateSite</code> project, + do not copy the projects into + your workspace. Note that the Ibator Update Site is not needed unless you + intending to release a new version of the the project at Apache. The filled out wizard looks like this: <br /> <p><img src="importWizard.gif" alt="Eclipse Project Import Wizard"/></p> </li> @@ -148,5 +166,54 @@ This full documentation set is not in Su like to rebuild the documentation, simply execute the <code>buildDoc.xml</code> file in the <code>org.apache.ibatis.ibator.eclipse.doc</code> project (an Ant build file).</p> +<h2>Building the Feature for Distribution</h2> +<p>If you want to build an updated version of the feature and distribute it locally, then +follow these steps:</p> +<ol> + <li>Open the file <code>build.xml</code> in the <code>org.apache.ibatis.ibator.build</code> + project. There are four properties at the beginning of the file that may need to + change for your local environment. + <p/> + <table cellspacing="0" border="1"> + <tr> + <th>Property</th> + <th>Description</th> + </tr> + <tr> + <td>baseLocation</td> + <td>This should be set to the location on disk of an eclipse distribution that + includes the plug in development environment. + </td> + </tr> + <tr> + <td>pdeBuildPluginVersion</td> + <td>This is the version of the <code>org.eclipse.pde.build</code> plugin. + The value in the file is the correct version for Eclipse 3.5.1 + </td> + </tr> + <tr> + <td>equinoxLauncherPluginVersion</td> + <td>This is the version of the <code>org.eclipse.equinox.launcher</code> plugin. + The value in the file is the correct version for Eclipse 3.5.1 + </td> + </tr> + <tr> + <td>buildDirectory</td> + <td>This is the target directory for the build.</td> + </tr> + </table> + <p/> + </li> + <li>Once you have verified or updated the properties, you can close the + <code>build.xml</code> file. + <li>Execute the <code>build.xml</code> file (right click, Run As>Ant Build)</li> +</ol> + +<p>Once the build executes successfully, the new feature will be available +on your local drive at +<code>\Temp\ibator.build\I.TestBuild\org.apache.ibatis.ibator-TestBuild.zip</code> +unless you change the <code>buildDirectory</code> property above. +</p> + </body> </html> Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/importWizard.gif URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/importWizard.gif?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== Binary files - no diff available. Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/META-INF/MANIFEST.MF?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/META-INF/MANIFEST.MF (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/META-INF/MANIFEST.MF Sat Mar 13 04:06:16 2010 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache iBATIS Ibator Ui Plug-in Bundle-SymbolicName: org.apache.ibatis.ibator.eclipse.ui;singleton:=true -Bundle-Version: 1.2.2 +Bundle-Version: 1.2.2.qualifier Bundle-Activator: org.apache.ibatis.ibator.eclipse.ui.IbatorUIPlugin Bundle-Vendor: ibatis.apache.org Require-Bundle: org.eclipse.ui;bundle-version="3.4.1", Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml?rev=922480&r1=922479&r2=922480&view=diff ============================================================================== --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml Sat Mar 13 04:06:16 2010 @@ -2,7 +2,7 @@ <feature id="org.apache.ibatis.ibator" label="%featureName" - version="1.2.2" + version="1.2.2.qualifier" provider-name="%providerName"> <description>