In addition to the new command-line options, the generate-dto also

accepts package transformations via a build setting: dto.package.transforms = [ "from.pkg": "to.pkg" ] Just put it in your BuildConfig.groovy file. You can have as many package transforms as you like!
pledbrook · Oct 8, 2009 · a16260f · a16260f
1 parent 0648c05
commit a16260f
Show file tree

Hide file tree

Showing 81 changed files with 15,210 additions and 0 deletions.
diff --git a/scripts/GenerateDto.groovy b/scripts/GenerateDto.groovy
@@ -16,6 +16,12 @@ where
 
 target(default: "Generates DTO classes for one or more domain classes.") {
     depends(parseArguments, bootstrap)
+
+    // Check that the "dto.package.transforms" setting is the correct type.
+    if (!buildConfig.dto.package.transform instanceof Map) {
+        println "The 'dto.package.transform' build setting must be a map."
+        exit(1)
+    }
 
     // Check the arguments.
     def replacePackage = "*"
@@ -80,6 +86,9 @@ target(default: "Generates DTO classes for one or more domain classes.") {
     if (targetPackage) {
         generator.packageTransforms = [ (replacePackage): targetPackage ]
     }
+    else if (buildConfig.dto.package.transforms) {
+        generator.packageTransforms = buildConfig.dto.package.transforms
+    }
 
     // Use the generator on each of the specified domain classes.
     domainClasses.each { dc ->

diff --git a/test/projects/appWithConfig/.classpath b/test/projects/appWithConfig/.classpath
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="src" path="src/groovy"/>
+	<classpathentry kind="src" path="grails-app/conf"/>
+	<classpathentry kind="src" path="grails-app/controllers"/>
+	<classpathentry kind="src" path="grails-app/domain"/>
+	<classpathentry kind="src" path="grails-app/services"/>
+	<classpathentry kind="src" path="grails-app/taglib"/>
+	<classpathentry kind="src" path="test/integration"/>
+	<classpathentry kind="src" path="test/unit"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="GRAILS_HOME/ant/lib/ant.jar"/>
+    <classpathentry kind="var" path="GRAILS_HOME/lib/aspectjweaver-1.6.2.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/backport-util-concurrent-3.0.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-pool-1.5.3.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/aopalliance-1.0.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/oscache-2.4.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-codec-1.3.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/jasper-compiler-jdt-5.5.15.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/jsp-api-2.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-dbcp-1.2.2.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/ognl-2.6.9.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.expression-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/cglib-nodep-2.1_3.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps-1.7.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/GParallelizer-0.8.3.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/hsqldb-1.8.0.10.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.jms-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.context.support-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-el-1.0.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/jul-to-slf4j-1.5.6.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/jasper-compiler-5.5.15.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.6.4.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.web.servlet-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.core-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/ehcache-1.6.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/jline-0.9.91.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/servlet-api-2.5.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/junit-3.8.2.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/svnkit-1.2.0.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.test-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/jta-1.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.context-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.webflow-2.0.8.RELEASE.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-io-1.4.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/xpp3_min-1.1.3.4.O.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/antlr-2.7.6.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.jdbc-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-beanutils-1.8.0.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/gant_groovy1.6-1.6.0.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/standard-1.1.2.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/jsr107cache-1.0.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/javassist-3.4.GA.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.asm-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/jstl-1.1.2.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.aspects-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/ejb3-persistence-3.3.0.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.orm-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/ognl-2.7.3.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.instrument-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/aspectjrt-1.6.2.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.binding-2.0.8.RELEASE.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.js-2.0.8.RELEASE.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.transaction-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/radeox-1.0-b2.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.web-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/hibernate-annotations-3.4.0.GA.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/hibernate-core-3.3.1.GA.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/hibernate-commons-annotations-3.3.0.ga.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/oro-2.0.8.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-cli-1.0.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/sitemesh-2.4.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-validator-1.3.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.oxm-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-fileupload-1.2.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/ant-1.7.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/jsp-api-2.0.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/hibernate-ehcache-3.3.1.GA.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/ant-trax-1.7.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-collections-3.2.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/slf4j-api-1.5.6.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/slf4j-log4j12-1.5.6.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.beans-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/serializer-2.7.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/dom4j-1.6.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.integration-tests-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/ant-launcher-1.7.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-lang-2.4.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/ivy-2.0.0.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/log4j-1.2.15.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/jcl-over-slf4j-1.5.6.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.aop-3.0.0.RC1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/ant-junit-1.7.1.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/lib/jasper-runtime-5.5.15.jar" />
+
+
+	<classpathentry kind="var" path="GRAILS_HOME/dist/grails-bootstrap-1.2-SNAPSHOT.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-1.2-SNAPSHOT.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-test-1.2-SNAPSHOT.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-1.2-SNAPSHOT.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-docs-1.2-SNAPSHOT.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-1.2-SNAPSHOT.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-spring-1.2-SNAPSHOT.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-resources-1.2-SNAPSHOT.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-scripts-1.2-SNAPSHOT.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-1.2-SNAPSHOT.jar" />
+
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-webflow-1.2-SNAPSHOT.jar" />
+
+
+	<classpathentry kind="output" path="web-app/WEB-INF/classes"/>
+</classpath>
diff --git a/test/projects/appWithConfig/.gitignore b/test/projects/appWithConfig/.gitignore
@@ -0,0 +1,3 @@
+cli-tests/
+src/
+work/
diff --git a/test/projects/appWithConfig/.project b/test/projects/appWithConfig/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>default</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.codehaus.groovy.eclipse.groovyBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.codehaus.groovy.eclipse.groovyNature</nature>
+	</natures>
+</projectDescription>
diff --git a/test/projects/appWithConfig/appWithConfig-test.launch b/test/projects/appWithConfig/appWithConfig-test.launch
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="grails.test.GrailsAwareGroovyTestSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="appWithConfig"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dtest=${resource_loc}"/>
+</launchConfiguration>
diff --git a/test/projects/appWithConfig/appWithConfig.iml b/test/projects/appWithConfig/appWithConfig.iml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="GRAILS_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Grails" name="Grails">
+      <configuration />
+    </facet>
+    <facet type="web" name="GrailsWeb">
+      <configuration>
+        <webroots>
+          <root url="file://$MODULE_DIR$/web-app" relative="/" />
+        </webroots>
+        <sourceRoots />
+        <building>
+          <setting name="EXPLODED_URL" value="file://" />
+          <setting name="EXPLODED_ENABLED" value="false" />
+          <setting name="JAR_URL" value="file://" />
+          <setting name="JAR_ENABLED" value="false" />
+          <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+        </building>
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration>
+        <fileset id="Grails" name="Grails" removed="false">
+          <file>file://$MODULE_DIR$/web-app/WEB-INF/applicationContext.xml</file>
+        </fileset>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/conf/hibernate" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/controllers" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/domain" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/services" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/taglib" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/groovy" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test/integration" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test/unit" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Grails 1.2-SNAPSHOT" level="project" />
+    <orderEntry type="module-library">
+      <library name="Grails User Library">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
+      </library>
+    </orderEntry>
+  </component>
+</module>