Skip to content
Browse files

cleanup

  • Loading branch information...
1 parent 22f4c3c commit 0504d23071398901c142b6833df0872a29c77c14 Burt Beckwith committed
View
12 .classpath
@@ -1,16 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/main/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 exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry kind="con" path="com.springsource.sts.grails.core.CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="web-app/WEB-INF/classes"/>
+ <classpathentry kind="output" path="target/eclipseclasses"/>
</classpath>
View
2 .gitignore
@@ -2,4 +2,4 @@ plugin.xml
target
web-app
*.zip
-
+.settings
View
8 .project
@@ -6,14 +6,20 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>com.springsource.sts.grails.core.nature</nature>
+ <nature>com.springsource.sts.grails.core.nature</nature>
<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
View
19 TomcatGrailsPlugin.groovy
@@ -13,27 +13,12 @@
* limitations under the License.
*/
class TomcatGrailsPlugin {
- // the plugin version
def version = "2.1.0.BUILD-SNAPSHOT"
- // the version or versions of Grails the plugin is designed for
def grailsVersion = "2.1 > *"
- // resources that are excluded from plugin packaging
- def pluginExcludes = [
- "grails-app/views/error.gsp",
- "grails-app/domain/*.groovy",
- "grails-app/controllers/*.groovy"
- ]
- // don't package in war
- def scopes = [excludes:'war']
-
+ def scopes = [excludes: 'war']
def author = "Graeme Rocher"
def authorEmail = "graeme.rocher@springsource.com"
def title = "Apache Tomcat plugin for Grails"
- def description = '''
-Makes Tomcat 7.0 the default servlet container for Grails at development time.
-'''
-
- // URL to the plugin's documentation
+ def description = 'Makes Tomcat 7.0 the default servlet container for Grails at development time.'
def documentation = "http://grails.org/plugin/tomcat"
-
}
View
9 application.properties
@@ -1,7 +1,2 @@
-#Grails Metadata file
-#Wed Sep 07 15:34:36 CEST 2011
-app.grails.version=2.1.0.BUILD-SNAPSHOT
-app.name=tomcat
-app.servlet.version=2.4
-app.version=0.1
-plugins.svn=1.0.0.M1
+app.grails.version=2.0.0
+plugins.svn=1.0.1
View
47 grails-app/conf/BuildConfig.groovy
@@ -1,33 +1,34 @@
tomcatVersion = "7.0.16"
-grails.project.class.dir = "target/classes"
-grails.project.test.class.dir = "target/test-classes"
-grails.project.test.reports.dir = "target/test-reports"
+grails.project.work.dir = 'target'
+
grails.project.dependency.resolution = {
- inherits "global" // inherit Grails' default dependencies
- log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
- repositories {
- grailsCentral()
- }
+
+ inherits "global"
+ log "warn"
+
+ repositories {
+ grailsCentral()
+ }
+
dependencies {
- // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
- build( "org.apache.tomcat:tomcat-catalina-ant:$tomcatVersion" ) {
- transitive = false
- }
- build "org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion"
- build "org.apache.tomcat.embed:tomcat-embed-jasper:$tomcatVersion"
- build "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatVersion"
-
- // needed for JSP compilation
- runtime "org.eclipse.jdt.core.compiler:ecj:3.6.2"
+ build("org.apache.tomcat:tomcat-catalina-ant:$tomcatVersion") {
+ transitive = false
+ }
+ build "org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion"
+ build "org.apache.tomcat.embed:tomcat-embed-jasper:$tomcatVersion"
+ build "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatVersion"
+
+ // needed for JSP compilation
+ runtime "org.eclipse.jdt.core.compiler:ecj:3.6.2"
build "org.grails:grails-plugin-tomcat:${grailsVersion}"
}
- plugins {
- build( ":release:1.0.0.RC3" ) {
- export = false
- }
- }
+ plugins {
+ build(":release:1.0.0") {
+ export = false
+ }
+ }
}
View
80 scripts/Tomcat.groovy
@@ -1,12 +1,10 @@
scriptScope=grails.util.BuildScope.WAR
includeTargets << grailsScript("_GrailsWar" )
-
-ant.taskdef(name:"deploy",classname:"org.apache.catalina.ant.DeployTask")
-ant.taskdef(name:"list",classname:"org.apache.catalina.ant.ListTask")
-ant.taskdef(name:"undeploy",classname:"org.apache.catalina.ant.UndeployTask")
-
+ant.taskdef(name:"deploy", classname:"org.apache.catalina.ant.DeployTask")
+ant.taskdef(name:"list", classname:"org.apache.catalina.ant.ListTask")
+ant.taskdef(name:"undeploy", classname:"org.apache.catalina.ant.UndeployTask")
target(main: '''\
Script used to interact with remote Tomcat. The following subcommands are available:
@@ -16,49 +14,47 @@ grails tomcat undeploy - Undeploy from a tomcat server
''') {
depends(parseArguments, compile,createConfig)
- def cmd = argsMap.params ? argsMap.params[0] : 'deploy'
- argsMap.params.clear()
- def user = config.tomcat.deploy.username ?: 'manager'
- def pass = config.tomcat.deploy.password ?: 'secret'
- def url = config.tomcat.deploy.url ?: 'http://localhost:8080/manager'
-
- switch(cmd) {
- case 'deploy':
- war()
- println "Deploying application $serverContextPath to Tomcat"
- deploy(war:warName,
- url:url,
- path:serverContextPath,
- username:user,
- password:pass)
-
- break
- case 'list':
- list(
- url:url,
- username:user,
- password:pass)
-
- break
- case 'undeploy':
- configureServerContextPath()
- println "Undeploying application $serverContextPath from Tomcat"
- println '''\
-NOTE: If you experience a classloading error during undeployment you need to take the following steps:
+ def cmd = argsMap.params ? argsMap.params[0] : 'deploy'
+ argsMap.params.clear()
+ def user = config.tomcat.deploy.username ?: 'manager'
+ def pass = config.tomcat.deploy.password ?: 'secret'
+ def url = config.tomcat.deploy.url ?: 'http://localhost:8080/manager'
+
+ switch(cmd) {
+ case 'deploy':
+ war()
+ println "Deploying application $serverContextPath to Tomcat"
+ deploy(war:warName,
+ url:url,
+ path:serverContextPath,
+ username:user,
+ password:pass)
+
+ break
+ case 'list':
+ list(
+ url:url,
+ username:user,
+ password:pass)
+
+ break
+ case 'undeploy':
+ configureServerContextPath()
+ println "Undeploying application $serverContextPath from Tomcat"
+ println '''\
+NOTE: If you experience a classloading error during undeployment you need to take the following steps:
* Upgrade to Tomcat 6.0.20 or above
* Pass this system argument to Tomcat: -Dorg.apache.catalina.loader.WebappClassLoader.ENABLE_CLEAR_REFERENCES=false
See http://tomcat.apache.org/tomcat-6.0-doc/config/systemprops.html for more information
'''
- undeploy(
- url:url,
- path:serverContextPath,
- username:user,
- password:pass)
-
- }
-
+ undeploy(
+ url:url,
+ path:serverContextPath,
+ username:user,
+ password:pass)
+ }
}
setDefaultTarget("main")
View
4 scripts/_Events.groovy
@@ -1,4 +1,4 @@
// No programmable web.xml path yet, so put it in the right place automatically
eventGenerateWebXmlEnd = {
- System.setProperty("grails.server.factory", "org.grails.plugins.tomcat.TomcatServerFactory")
-}
+ System.setProperty("grails.server.factory", "org.grails.plugins.tomcat.TomcatServerFactory")
+}
View
10 scripts/_Install.groovy
@@ -1,10 +0,0 @@
-//
-// This script is executed by Grails after plugin was installed to project.
-// This script is a Gant script so you can use all special variables provided
-// by Gant (such as 'baseDir' which points on project base dir). You can
-// use 'ant' to access a global instance of AntBuilder
-//
-// For example you can create directory under project tree:
-//
-// ant.mkdir(dir:"${basedir}/grails-app/jobs")
-//
View
5 scripts/_Uninstall.groovy
@@ -1,5 +0,0 @@
-//
-// This script is executed by Grails when the plugin is uninstalled from project.
-// Use this script if you intend to do any additional clean-up on uninstall, but
-// beware of messing up SVN directories!
-//
View
10 scripts/_Upgrade.groovy
@@ -1,10 +0,0 @@
-//
-// This script is executed by Grails during application upgrade ('grails upgrade'
-// command). This script is a Gant script so you can use all special variables
-// provided by Gant (such as 'baseDir' which points on project base dir). You can
-// use 'ant' to access a global instance of AntBuilder
-//
-// For example you can create directory under project tree:
-//
-// ant.mkdir(dir:"${basedir}/grails-app/jobs")
-//

0 comments on commit 0504d23

Please sign in to comment.
Something went wrong with that request. Please try again.