Permalink
Browse files

Remove most deprecated methods/classes (#10124)

* Remove most deprecated apis

* Fix tests

* Move tests out of org.codehaus package

* Fix errors

* Attempt to fix travis build
1 parent e78d1ed commit a454a0c8ac95dd364563c8b00ac79955517cdc14 @jameskleeh jameskleeh committed with graemerocher Aug 30, 2016
Showing 303 changed files with 261 additions and 7,087 deletions.
@@ -1,23 +0,0 @@
-/*
- * Copyright 2013 SpringSource
- *
- * 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.
- */
-package org.grails.async.decorator
-
-/**
- * @author Graeme Rocher
- * @deprecated Use {@link grails.async.decorator.PromiseDecorator} instead
- */
-interface PromiseDecorator extends grails.async.decorator.PromiseDecorator{
-}
@@ -1,26 +0,0 @@
-/*
- * Copyright 2013 SpringSource
- *
- * 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.
- */
-package org.grails.async.decorator
-
-/**
- *
- * @author Graeme Rocher
- * @deprecated Use {@link grails.async.decorator.PromiseDecoratorLookupStrategy} instead
- */
-public interface PromiseDecoratorLookupStrategy extends grails.async.decorator.PromiseDecoratorLookupStrategy {
- @Override
- List<PromiseDecorator> findDecorators()
-}
@@ -1,25 +0,0 @@
-/*
- * Copyright 2013 SpringSource
- *
- * 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.
- */
-package org.grails.async.decorator
-
-/**
- * @author Graeme Rocher
- * @deprecated Use {@link grails.async.decorator.PromiseDecoratorProvider} instead
- */
-interface PromiseDecoratorProvider extends grails.async.decorator.PromiseDecoratorProvider{
- @Override
- List<PromiseDecorator> getDecorators()
-}
@@ -1,23 +0,0 @@
-/*
- * Copyright 2013 SpringSource
- *
- * 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.
- */
-package org.grails.async.factory
-
-/**
- * @author Graeme Rocher
- * @deprecated Use {@link grails.async.factory.AbstractPromiseFactory} instead
- */
-abstract class AbstractPromiseFactory extends grails.async.factory.AbstractPromiseFactory{
-}
@@ -88,14 +88,6 @@ class BuildSettings {
public static final String COMPILER_SOURCE_LEVEL = "grails.project.source.level"
/**
- * The dependency resolver to use
- *
- * @deprecated Use Gradle dependency resolution instead
- */
- @Deprecated
- public static final String DEPENDENCY_RESOLVER = "grails.project.dependency.resolver"
-
- /**
* The compiler source level to use
*/
public static final String COMPILER_TARGET_LEVEL = "grails.project.target.level"
@@ -120,46 +112,6 @@ class BuildSettings {
public static final String OFFLINE_MODE= "grails.offline.mode"
/**
- * The name of the system property for WAR exploded directory
- *
- * @deprecated Exploded WAR directory no longer supported
- */
- @Deprecated
- public static final String PROJECT_WAR_EXPLODED_DIR = "grails.project.war.exploded.dir"
-
- /**
- * The name of the system property for plugin staging directory
- *
- * @deprecated Source plugins no longer supported
- */
- @Deprecated
- public static final String PLUGIN_STAGING_DIR = "grails.project.plugin.staging.dir"
-
- /**
- * The name of the system property for plugin include source
- *
- * @deprecated Source plugins no longer supported
- */
- @Deprecated
- public static final String PLUGIN_INCLUDE_SOURCE = "grails.project.plugin.includeSource"
-
- /**
- * The name of the system property for the project plugins directory
- *
- * @deprecated Source plugins no longer supported
- */
- @Deprecated
- public static final String PLUGINS_DIR = "grails.project.plugins.dir"
-
- /**
- * The name of the system property for global plugins directory
- *
- * @deprecated Source plugins no longer supported
- */
- @Deprecated
- public static final String GLOBAL_PLUGINS_DIR = "grails.global.plugins.dir"
-
- /**
* The name of the system property for {@link #}.
*/
public static final String PROJECT_RESOURCES_DIR = "grails.project.resource.dir"
@@ -170,39 +122,9 @@ class BuildSettings {
public static final String PROJECT_SOURCE_DIR = "grails.project.source.dir"
/**
- * The name of the system property for for the web.xml location
- *
- * @deprecated A web.xml is no longer supported
- */
- @Deprecated
- public static final String PROJECT_WEB_XML_FILE = "grails.project.web.xml"
- /**
* The name of the system property for the project classes directory. Must be set if changed from build/main/classes.
*/
public static final String PROJECT_CLASSES_DIR = "grails.project.class.dir"
- /**
- * The name of the system property for the plugin classes directory
- *
- * @deprecated Source plugins no longer supported
- */
- @Deprecated
- public static final String PROJECT_PLUGIN_CLASSES_DIR = "grails.project.plugin.class.dir"
-
- /**
- * The name of the system property for project build classes directory.
- *
- * @deprecated Source plugins no longer supported
- */
- @Deprecated
- public static final String PROJECT_PLUGIN_BUILD_CLASSES_DIR = "grails.project.plugin.build.class.dir"
-
- /**
- * The name of the system property for plugin provided classes diretory
- *
- * @deprecated Source plugins no longer supported
- */
- @Deprecated
- public static final String PROJECT_PLUGIN_PROVIDED_CLASSES_DIR = "grails.project.plugin.provided.class.dir"
/**
* The name of the system property for project test classes directory. Must be set if changed from build/test/classes
@@ -240,22 +162,6 @@ class BuildSettings {
public static final String PROJECT_AUTODEPLOY_DIR = "grails.project.autodeploy.dir"
/**
- * The name of the system property for multiple build listeners
- *
- * @deprecated Build listeners no longer supported. Use gradle instead.
- */
- @Deprecated
- public static final String BUILD_LISTENERS = "grails.build.listeners"
-
- /**
- * The name of the system property for enabling verbose compilation verbose compile
- *
- * @deprecated Use Gradle configuration instead
- */
- @Deprecated
- public static final String VERBOSE_COMPILE = "grails.project.compile.verbose"
-
- /**
* A system property with this name is populated in the preparation phase of functional testing
* with the base URL that tests should be run against.
*/
@@ -1,9 +0,0 @@
-package org.codehaus.groovy.grails.io.support
-
-/**
- * @author Graeme Rocher
- * @deprecated Use {@link org.grails.io.support.GrailsResourceUtils} instead
- */
-@Deprecated
-class GrailsResourceUtils extends org.grails.io.support.GrailsResourceUtils{
-}
@@ -1,10 +0,0 @@
-package org.codehaus.groovy.grails.io.support
-
-/**
- * @deprecated Use {@link org.grails.io.support.Resource} instead
- * @author Graeme Rocher
- */
-@Deprecated
-public interface Resource extends org.grails.io.support.Resource{
-
-}
@@ -1,10 +0,0 @@
-
-package org.codehaus.groovy.grails.plugins
-
-/**
- * @author Graeme Rocher
- * @deprecated Use {@link grails.plugins.GrailsPluginInfo} instead
- */
-@Deprecated
-public interface GrailsPluginInfo extends grails.plugins.GrailsPluginInfo {
-}
@@ -1,4 +1,4 @@
-package org.codehaus.groovy.grails.cli.parsing
+package org.grails.build.parsing
import grails.util.Environment
import org.grails.build.parsing.CommandLineParser
@@ -1,39 +0,0 @@
-/*
- * Copyright 2002-2008 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.
- */
-package org.codehaus.groovy.grails.beans.factory
-
-import groovy.transform.CompileStatic
-import org.springframework.beans.factory.ListableBeanFactory
-
-/**
- * A fork of the Spring 2.5.6 GenericBeanFactoryAccess class that was removed from Spring 3.0.
- *
- * @author Rob Harrop
- * @author Juergen Hoeller
- * @since 2.0
- * @deprecated Will be removed in a future version of Grails
- *
- */
-@Deprecated
-@CompileStatic
-class GenericBeanFactoryAccessor extends org.grails.spring.beans.factory.GenericBeanFactoryAccessor{
- /**
- * Constructs a <code>GenericBeanFactoryAccessor</code> that wraps the supplied {@link ListableBeanFactory}.
- */
- GenericBeanFactoryAccessor(ListableBeanFactory beanFactory) {
- super(beanFactory)
- }
-}
@@ -1,11 +0,0 @@
-package org.codehaus.groovy.grails.commons
-
-import groovy.transform.InheritConstructors
-
-/**
- * @deprecated Use {@link org.grails.core.AbstractGrailsClass} instead
- */
-@InheritConstructors
-@Deprecated
-abstract class AbstractGrailsClass extends org.grails.core.AbstractGrailsClass {
-}
@@ -1,27 +0,0 @@
-/*
- * Copyright 2004-2005 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.
- */
-package org.codehaus.groovy.grails.commons
-
-/**
- * @author Graeme Rocher
- * @deprecated Use {@link org.grails.core.AbstractInjectableGrailsClass} instead
- */
-@Deprecated
-class AbstractInjectableGrailsClass extends org.grails.core.AbstractInjectableGrailsClass {
- AbstractInjectableGrailsClass(Class<?> clazz, String trailingName) {
- super(clazz, trailingName)
- }
-}
@@ -1,24 +0,0 @@
-/*
- * Copyright 2004-2005 Graeme Rocher
- *
- * 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.
- */
-package org.codehaus.groovy.grails.commons
-
-/**
- * @author Graeme Rocher
- * @deprecated Use {@link org.grails.core.artefact.AnnotationDomainClassArtefactHandler} instead
- */
-@Deprecated
-class AnnotationDomainClassArtefactHandler extends org.grails.core.artefact.AnnotationDomainClassArtefactHandler{
-}
Oops, something went wrong.

0 comments on commit a454a0c

Please sign in to comment.