Permalink
Browse files

Merge pull request #5 from burtbeckwith/master

limpieza
  • Loading branch information...
2 parents 1be4d16 + 5efa015 commit ec6be0c372093610c6390cac85aec1ed0cfc5bed Álvaro Sánchez-Mariscal committed Dec 13, 2013
View
@@ -1,18 +1,13 @@
*.iws
-*Db.properties
-*Db.script
.settings
-stacktrace.log
+*.log
/*.zip
/plugin.xml
-/*.log
-/*DB.*
/cobertura.ser
.DS_Store
/target/
/out/
-/web-app/plugins
-/web-app/WEB-INF/classes
+/web-app/WEB-INF
/.link_to_grails_plugins/
/target-eclipse/
*.iml
View
@@ -1,38 +1,21 @@
class SwaggerGrailsPlugin {
- // the plugin version
def version = "0.1"
- // the version or versions of Grails the plugin is designed for
def grailsVersion = "2.3 > *"
- // resources that are excluded from plugin packaging
def pluginExcludes = [
- "grails-app/views/error.gsp"
]
- // TODO Fill in these fields
- def title = "Swagger Plugin" // Headline display name of the plugin
+ def title = "Swagger Plugin"
def author = "Alvaro Sanchez-Mariscal"
def authorEmail = "alvaro.sanchezmariscal@gmail.com"
- def description = '''\
-A Grails 2.3+ plugin to generate REST API documentation for your endpoints.
-'''
-
- // URL to the plugin's documentation
+ def description = 'A Grails 2.3+ plugin to generate REST API documentation for your endpoints'
def documentation = "https://github.com/alvarosanchez/grails-swagger"
- // License: one of 'APACHE', 'GPL2', 'GPL3'
def license = "APACHE"
-
def developers = [
[ name: "Mario Garcia", email: "TODO" ],
[ name: "Alonso Torres", email: "TODO" ],
[ name: "Giovanni", email: "TODO" ]
]
-
- // Location of the plugin's issue tracker.
def issueManagement = [ system: "GitHub", url: "https://github.com/alvarosanchez/grails-swagger/issues" ]
-
- // Online location of the plugin's browseable source code.
def scm = [ url: "https://github.com/alvarosanchez/grails-swagger" ]
-
-
}
View
@@ -1,4 +1,2 @@
-#Grails Metadata file
-#Thu Dec 12 17:21:41 GMT 2013
app.grails.version=2.3.4
app.name=swagger
@@ -1,45 +1,29 @@
-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.fork = [
- // configure settings for compilation JVM, note that if you alter the Groovy version forked compilation is required
- // compile: [maxMemory: 256, minMemory: 64, debug: false, maxPerm: 256, daemon:true],
-
- // configure settings for the test-app JVM, uses the daemon by default
- test: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, daemon:true],
- // configure settings for the run-app JVM
- run: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, forkReserve:false],
- // configure settings for the run-war JVM
- war: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, forkReserve:false],
- // configure settings for the Console UI JVM
- console: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256]
-]
-
-grails.project.dependency.resolver = "maven" // or ivy
grails.project.dependency.resolution = {
- // inherit Grails' default dependencies
- inherits("global") {
- }
- log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
+ inherits 'global'
+ log 'warn'
repositories {
grailsCentral()
mavenLocal()
mavenCentral()
}
+
dependencies {
compile 'com.wordnik:swagger-core_2.10:1.3.1'
- test "org.spockframework:spock-grails-support:0.7-groovy-2.0"
+ test "org.spockframework:spock-grails-support:0.7-groovy-2.0", {
+ export = false
+ }
}
plugins {
test(":spock:0.7") {
exclude("spock-grails-support")
+ export = false
}
- build(":release:3.0.1",
- ":rest-client-builder:1.0.3") {
+ build ':release:3.0.1', ':rest-client-builder:1.0.3', {
export = false
}
runtime(":hibernate:3.6.10.6") {
@@ -1,24 +1,8 @@
-// configuration for plugin testing - will not be included in the plugin zip
-
swaggerVersion = '1.2'
log4j = {
- // Example of changing the log pattern for the default console
- // appender:
- //
- //appenders {
- // console name:'stdout', layout:pattern(conversionPattern: '%c{2} %m%n')
- //}
-
- error 'org.codehaus.groovy.grails.web.servlet', // controllers
- 'org.codehaus.groovy.grails.web.pages', // GSP
- 'org.codehaus.groovy.grails.web.sitemesh', // layouts
- 'org.codehaus.groovy.grails.web.mapping.filter', // URL mapping
- 'org.codehaus.groovy.grails.web.mapping', // URL mapping
- 'org.codehaus.groovy.grails.commons', // core / classloading
- 'org.codehaus.groovy.grails.plugins', // plugins
- 'org.codehaus.groovy.grails.orm.hibernate', // hibernate integration
- 'org.springframework',
- 'org.hibernate',
- 'net.sf.ehcache.hibernate'
+ error 'org.codehaus.groovy.grails',
+ 'org.springframework',
+ 'org.hibernate',
+ 'net.sf.ehcache.hibernate'
}
@@ -1,45 +1,14 @@
dataSource {
pooled = true
- driverClassName = "org.h2.Driver"
- username = "sa"
- password = ""
+ driverClassName = 'org.h2.Driver'
+ username = 'sa'
+ password = ''
+ dbCreate = 'update'
+ url = 'jdbc:h2:mem:testDb'
}
+
hibernate {
- cache.use_second_level_cache = true
+ cache.use_second_level_cache = false
cache.use_query_cache = false
- cache.region.factory_class = 'net.sf.ehcache.hibernate.EhCacheRegionFactory' // Hibernate 3
-// cache.region.factory_class = 'org.hibernate.cache.ehcache.EhCacheRegionFactory' // Hibernate 4
-}
-
-// environment specific settings
-environments {
- development {
- dataSource {
- dbCreate = "create-drop" // one of 'create', 'create-drop', 'update', 'validate', ''
- url = "jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
- }
- }
- test {
- dataSource {
- dbCreate = "update"
- url = "jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
- }
- }
- production {
- dataSource {
- dbCreate = "update"
- url = "jdbc:h2:prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
- properties {
- maxActive = -1
- minEvictableIdleTimeMillis=1800000
- timeBetweenEvictionRunsMillis=1800000
- numTestsPerEvictionRun=3
- testOnBorrow=true
- testWhileIdle=true
- testOnReturn=false
- validationQuery="SELECT 1"
- jdbcInterceptors="ConnectionState"
- }
- }
- }
+ cache.region.factory_class = 'net.sf.ehcache.hibernate.EhCacheRegionFactory'
}
@@ -4,6 +4,8 @@ import grails.converters.JSON
class ResourcesListService {
+ static transactional = false
+
def grailsApplication
def grailsUrlMappingsHolder
View
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title><g:if env="development">Grails Runtime Exception</g:if><g:else>Error</g:else></title>
- <meta name="layout" content="main">
- <g:if env="development"><link rel="stylesheet" href="${resource(dir: 'css', file: 'errors.css')}" type="text/css"></g:if>
- </head>
- <body>
- <g:if env="development">
- <g:renderException exception="${exception}" />
- </g:if>
- <g:else>
- <ul class="errors">
- <li>An error has occurred</li>
- </ul>
- </g:else>
- </body>
-</html>
@@ -1,10 +1,8 @@
package org.grails.plugins.swagger
-import spock.lang.Specification
+import grails.plugin.spock.IntegrationSpec
-class ResourcesListServiceIntegrationSpec extends Specification {
-
- static transactional = false
+class ResourcesListServiceIntegrationSpec extends IntegrationSpec {
def resourcesListService
def grailsApplication
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean">
- <description>Grails application factory bean</description>
- <property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
- <property name="grailsResourceLoader" ref="grailsResourceLoader" />
- </bean>
-
- <bean id="pluginManager" class="org.codehaus.groovy.grails.plugins.GrailsPluginManagerFactoryBean">
- <description>A bean that manages Grails plugins</description>
- <property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
- <property name="application" ref="grailsApplication" />
- </bean>
-
- <bean id="grailsConfigurator" class="org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator">
- <constructor-arg>
- <ref bean="grailsApplication" />
- </constructor-arg>
- <property name="pluginManager" ref="pluginManager" />
- </bean>
-
- <bean id="grailsResourceLoader" class="org.codehaus.groovy.grails.commons.GrailsResourceLoaderFactoryBean" />
-
- <bean id="characterEncodingFilter" class="org.springframework.web.filter.CharacterEncodingFilter">
- <property name="encoding">
- <value>utf-8</value>
- </property>
- </bean>
-
- <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean" />
-</beans>
@@ -1,14 +0,0 @@
-<sitemesh>
- <page-parsers>
- <parser content-type="text/html"
- class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />
- <parser content-type="text/html;charset=ISO-8859-1"
- class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />
- <parser content-type="text/html;charset=UTF-8"
- class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />
- </page-parsers>
-
- <decorator-mappers>
- <mapper class="org.codehaus.groovy.grails.web.sitemesh.GrailsLayoutDecoratorMapper" />
- </decorator-mappers>
-</sitemesh>
Oops, something went wrong.

0 comments on commit ec6be0c

Please sign in to comment.