Browse files

Refactor 'org.codehaus' -> 'org.grails' for 'grails-core'

  • Loading branch information...
1 parent c4733f7 commit c90b1786be9ed916654ea7d4c74fb8974d052b8b graemerocher committed Jun 19, 2014
Showing with 127 additions and 75 deletions.
  1. +26 −0 ...mpatibility/src/main/groovy/org/codehaus/groovy/grails/orm/support/TransactionManagerAware.groovy
  2. +6 −4 ...vy/{org/codehaus/groovy/grails/orm/support → grails/transaction}/GrailsTransactionTemplate.groovy
  3. +1 −1 grails-core/src/main/groovy/grails/transaction/Rollback.groovy
  4. +1 −1 ...groovy/{org/codehaus/groovy/grails/orm/support → grails/transaction}/TransactionManagerAware.java
  5. +1 −1 grails-core/src/main/groovy/grails/transaction/Transactional.java
  6. +1 −1 grails-core/src/main/groovy/{org/codehaus/groovy → }/grails/validation/ConstraintsEvaluator.java
  7. +1 −1 grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClass.java
  8. +1 −1 grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassProperty.java
  9. +1 −1 grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/DomainClassArtefactHandler.java
  10. +7 −7 grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/GrailsDomainConfigurationUtil.java
  11. +28 −0 grails-core/src/main/groovy/org/codehaus/groovy/grails/validation/ConstraintsEvaluator.groovy
  12. +1 −1 ...s-core/src/main/groovy/org/{codehaus/groovy → }/grails/transaction/ChainedTransactionManager.java
  13. +1 −1 ...in/groovy/org/{codehaus/groovy → }/grails/transaction/ChainedTransactionManagerPostProcessor.java
  14. +1 −1 ...-core/src/main/groovy/org/{codehaus/groovy → }/grails/transaction/GrailsTransactionAttribute.java
  15. +1 −1 ...s/groovy/grails/orm/support → grails/transaction}/GroovyAwareNamedTransactionAttributeSource.java
  16. +1 −1 grails-core/src/main/groovy/org/{codehaus/groovy → }/grails/transaction/MultiTransactionStatus.java
  17. +4 −4 ...n/groovy/org/{codehaus/groovy → }/grails/transaction/SpringTransactionSynchronizationManager.java
  18. +1 −1 grails-core/src/main/groovy/org/{codehaus/groovy → }/grails/transaction/SynchronizationManager.java
  19. +4 −3 ...rg/{codehaus/groovy/grails/orm/support → grails/transaction}/TransactionManagerPostProcessor.java
  20. +1 −1 ...re/src/main/groovy/org/{codehaus/groovy → }/grails/transaction/transform/RollbackTransform.groovy
  21. +4 −4 ...c/main/groovy/org/{codehaus/groovy → }/grails/transaction/transform/TransactionalTransform.groovy
  22. +1 −1 grails-core/src/main/groovy/org/{codehaus/groovy → }/grails/validation/ConstraintEvalUtils.groovy
  23. +1 −4 ...ovy/org/{codehaus/groovy → }/grails/transaction/ChainedTransactionManagerPostProcessorSpec.groovy
  24. +3 −3 ...e/src/test/groovy/org/{codehaus/groovy → }/grails/transaction/ChainedTransactionManagerTests.java
  25. +1 −1 ...ovy/org/grails/async/transform/internal/DefaultDelegateAsyncTransactionalMethodTransformer.groovy
  26. +1 −3 grails-plugin-async/src/test/groovy/grails/async/services/AsyncTransactionalServiceSpec.groovy
  27. +1 −1 ...in-controllers/src/main/groovy/org/codehaus/groovy/grails/web/plugins/support/WebMetaUtils.groovy
  28. +2 −2 ...ource/src/main/groovy/org/codehaus/groovy/grails/plugins/datasource/DataSourceGrailsPlugin.groovy
  29. +2 −2 ...in-domain-class/src/main/groovy/org/codehaus/groovy/grails/plugins/DomainClassGrailsPlugin.groovy
  30. +1 −1 grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy
  31. +1 −1 ...-services/src/main/groovy/org/codehaus/groovy/grails/plugins/services/ServicesGrailsPlugin.groovy
  32. +1 −1 grails-plugin-testing/src/main/groovy/grails/test/mixin/domain/DomainClassUnitTestMixin.groovy
  33. +1 −2 grails-plugin-testing/src/main/groovy/grails/test/runtime/CoreBeansTestPlugin.groovy
  34. +1 −1 grails-plugin-testing/src/main/groovy/grails/test/runtime/DomainClassTestPlugin.groovy
  35. +1 −1 grails-plugin-testing/src/main/groovy/grails/test/runtime/GrailsApplicationTestPlugin.groovy
  36. +1 −1 ...alidation/src/main/groovy/org/codehaus/groovy/grails/web/plugins/support/ValidationSupport.groovy
  37. +0 −1 grails-plugin-validation/src/test/groovy/grails/validation/DefaultASTValidateableHelperSpec.groovy
  38. +2 −1 ...rc/test/groovy/org/codehaus/groovy/grails/orm/support/TransactionManagerPostProcessorTests.groovy
  39. +8 −9 grails-test-suite-uber/src/test/groovy/grails/transaction/TransactionalTransformSpec.groovy
  40. +1 −1 ...suite-web/src/test/groovy/org/codehaus/groovy/grails/web/commandobjects/CommandObjectsSpec.groovy
  41. +1 −0 ...dation/src/main/groovy/org/codehaus/groovy/grails/validation/ConstraintsEvaluatorFactoryBean.java
  42. +3 −2 ...-validation/src/main/groovy/org/codehaus/groovy/grails/validation/DefaultConstraintEvaluator.java
  43. 0 ...validation/src/main/groovy}/org/codehaus/groovy/grails/validation/DefaultErrorMessages.properties
View
26 ...ity/src/main/groovy/org/codehaus/groovy/grails/orm/support/TransactionManagerAware.groovy
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2004-2006 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.orm.support
+
+/**
+ * @author Graeme Rocher
+ * @since 0.4
+ * @deprecated Use {@link grails.transaction.TransactionManagerAware} instead
+ */
+@Deprecated
+public interface TransactionManagerAware extends grails.transaction.TransactionManagerAware {
+
+}
View
10 .../support/GrailsTransactionTemplate.groovy → ...nsaction/GrailsTransactionTemplate.groovy
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.codehaus.groovy.grails.orm.support
+package grails.transaction
import groovy.transform.CompileStatic
-import org.codehaus.groovy.grails.transaction.GrailsTransactionAttribute
+import org.grails.transaction.GrailsTransactionAttribute
import org.springframework.transaction.PlatformTransactionManager
import org.springframework.transaction.TransactionDefinition
import org.springframework.transaction.TransactionException
@@ -33,6 +33,8 @@ import org.springframework.transaction.support.TransactionTemplate
* transaction exception handling.
*
* @author Kazuki YAMAMOTO
+ * @author Graeme Rocher
+ * @since 2.4
*/
@CompileStatic
class GrailsTransactionTemplate {
@@ -124,7 +126,7 @@ class GrailsTransactionTemplate {
* Internal holder class for a Throwable, used as a return value
* from a TransactionCallback (to be subsequently unwrapped again).
*/
- static class ThrowableHolder {
+ private static class ThrowableHolder {
private final Throwable throwable;
@@ -141,7 +143,7 @@ class GrailsTransactionTemplate {
* Internal holder class for a Throwable, used as a RuntimeException to be
* thrown from a TransactionCallback (and subsequently unwrapped again).
*/
- static class ThrowableHolderException extends RuntimeException {
+ private static class ThrowableHolderException extends RuntimeException {
ThrowableHolderException(Throwable throwable) {
super(throwable);
View
2 grails-core/src/main/groovy/grails/transaction/Rollback.groovy
@@ -34,7 +34,7 @@ import java.lang.annotation.Target
@Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented
-@GroovyASTTransformationClass("org.codehaus.groovy.grails.transaction.transform.RollbackTransform")
+@GroovyASTTransformationClass("org.grails.transaction.transform.RollbackTransform")
public @interface Rollback {
/**
* Whether or not the transaction for the annotated method should be rolled
View
2 .../orm/support/TransactionManagerAware.java → .../transaction/TransactionManagerAware.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.orm.support;
+package grails.transaction;
import org.springframework.beans.factory.Aware;
import org.springframework.transaction.PlatformTransactionManager;
View
2 grails-core/src/main/groovy/grails/transaction/Transactional.java
@@ -48,7 +48,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented
-@GroovyASTTransformationClass("org.codehaus.groovy.grails.transaction.transform.TransactionalTransform")
+@GroovyASTTransformationClass("org.grails.transaction.transform.TransactionalTransform")
public @interface Transactional {
/**
* A qualifier value for the specified transaction.
View
2 ...ails/validation/ConstraintsEvaluator.java → ...ails/validation/ConstraintsEvaluator.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.validation;
+package grails.validation;
import grails.validation.Constrained;
import org.codehaus.groovy.grails.commons.GrailsDomainClass;
View
2 grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClass.java
@@ -31,7 +31,7 @@
import org.grails.core.io.support.GrailsFactoriesLoader;
import org.codehaus.groovy.grails.exceptions.GrailsDomainException;
import org.codehaus.groovy.grails.exceptions.InvalidPropertyException;
-import org.codehaus.groovy.grails.validation.ConstraintsEvaluator;
+import grails.validation.ConstraintsEvaluator;
import org.springframework.context.ApplicationContext;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
View
2 .../src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassProperty.java
@@ -28,7 +28,7 @@
import grails.validation.Constrained;
import org.grails.core.io.support.GrailsFactoriesLoader;
-import org.codehaus.groovy.grails.validation.ConstraintsEvaluator;
+import grails.validation.ConstraintsEvaluator;
import org.springframework.core.style.ToStringCreator;
import org.springframework.util.ClassUtils;
import org.springframework.validation.Errors;
View
2 ...s-core/src/main/groovy/org/codehaus/groovy/grails/commons/DomainClassArtefactHandler.java
@@ -24,7 +24,7 @@
import java.util.concurrent.ConcurrentHashMap;
import org.codehaus.groovy.grails.plugins.support.aware.GrailsApplicationAware;
-import org.codehaus.groovy.grails.validation.ConstraintEvalUtils;
+import org.grails.validation.ConstraintEvalUtils;
/**
* Evaluates the conventions that define a domain class in Grails.
View
14 ...ore/src/main/groovy/org/codehaus/groovy/grails/commons/GrailsDomainConfigurationUtil.java
@@ -42,7 +42,7 @@
import grails.validation.Constrained;
import org.grails.core.io.support.GrailsFactoriesLoader;
-import org.codehaus.groovy.grails.validation.ConstraintsEvaluator;
+import grails.validation.ConstraintsEvaluator;
import org.springframework.util.StringUtils;
import org.springframework.validation.Errors;
@@ -357,7 +357,7 @@ public static boolean isNotConfigurational(String name) {
*
* @return A Map of constraints
*
- * @deprecated Use {@link org.codehaus.groovy.grails.validation.ConstraintsEvaluator} instead
+ * @deprecated Use {@link grails.validation.ConstraintsEvaluator} instead
*/
@Deprecated
public static Map<String, Constrained> evaluateConstraints(Object instance,
@@ -383,7 +383,7 @@ public static boolean isNotConfigurational(String name) {
*
* @return A Map of constraints
*
- * @deprecated Use {@link org.codehaus.groovy.grails.validation.ConstraintsEvaluator} instead
+ * @deprecated Use {@link grails.validation.ConstraintsEvaluator} instead
*/
@Deprecated
public static Map<String, Constrained> evaluateConstraints(final Class<?> theClass,
@@ -399,7 +399,7 @@ public static boolean isNotConfigurational(String name) {
* @return A Map of constraints
* When the bean cannot be introspected
*
- * @deprecated Use {@link org.codehaus.groovy.grails.validation.ConstraintsEvaluator} instead
+ * @deprecated Use {@link grails.validation.ConstraintsEvaluator} instead
*/
@Deprecated
public static Map<String, Constrained> evaluateConstraints(Object instance,
@@ -414,7 +414,7 @@ public static boolean isNotConfigurational(String name) {
* @return A Map of constraints
* When the bean cannot be introspected
*
- * @deprecated Use {@link org.codehaus.groovy.grails.validation.ConstraintsEvaluator} instead
+ * @deprecated Use {@link grails.validation.ConstraintsEvaluator} instead
*/
@Deprecated
public static Map<String, Constrained> evaluateConstraints(Object instance) {
@@ -428,7 +428,7 @@ public static boolean isNotConfigurational(String name) {
* @return A Map of constraints
* When the bean cannot be introspected
*
- * @deprecated Use {@link org.codehaus.groovy.grails.validation.ConstraintsEvaluator} instead
+ * @deprecated Use {@link grails.validation.ConstraintsEvaluator} instead
*/
@Deprecated
public static Map<String, Constrained> evaluateConstraints(Class<?> theClass) {
@@ -442,7 +442,7 @@ public static boolean isNotConfigurational(String name) {
* @return A Map of constraints
* When the bean cannot be introspected
*
- * @deprecated Use {@link org.codehaus.groovy.grails.validation.ConstraintsEvaluator} instead
+ * @deprecated Use {@link grails.validation.ConstraintsEvaluator} instead
*/
@Deprecated
public static Map<String, Constrained> evaluateConstraints(Class<?> theClass,
View
28 ...ls-core/src/main/groovy/org/codehaus/groovy/grails/validation/ConstraintsEvaluator.groovy
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2011 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.codehaus.groovy.grails.validation
+
+/**
+ * Evaluates and returns constraints.
+ *
+ * @author Graeme Rocher
+ * @since 2.0
+ * @deprecated Use {@link grails.validation.ConstraintsEvaluator} instead
+ */
+@Deprecated
+public interface ConstraintsEvaluator extends grails.validation.ConstraintsEvaluator{
+
+}
View
2 ...ransaction/ChainedTransactionManager.java → ...ransaction/ChainedTransactionManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.transaction;
+package org.grails.transaction;
import java.util.ArrayList;
import java.util.Arrays;
View
2 ...ainedTransactionManagerPostProcessor.java → ...ainedTransactionManagerPostProcessor.java
@@ -1,4 +1,4 @@
-package org.codehaus.groovy.grails.transaction;
+package org.grails.transaction;
import groovy.util.ConfigObject;
View
2 ...ansaction/GrailsTransactionAttribute.java → ...ansaction/GrailsTransactionAttribute.java
@@ -1,4 +1,4 @@
-package org.codehaus.groovy.grails.transaction;
+package org.grails.transaction;
import java.util.List;
View
2 ...AwareNamedTransactionAttributeSource.java → ...AwareNamedTransactionAttributeSource.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.orm.support;
+package org.grails.transaction;
import grails.util.CollectionUtils;
View
2 ...s/transaction/MultiTransactionStatus.java → ...s/transaction/MultiTransactionStatus.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.transaction;
+package org.grails.transaction;
import java.util.Collections;
import java.util.HashMap;
View
8 ...ingTransactionSynchronizationManager.java → ...ingTransactionSynchronizationManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.transaction;
+package org.grails.transaction;
import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -30,23 +30,23 @@
/*
* (non-Javadoc)
- * @see org.codehaus.groovy.grails.transaction.SynchronizationManager#initSynchronization()
+ * @see org.grails.transaction.SynchronizationManager#initSynchronization()
*/
public void initSynchronization() {
TransactionSynchronizationManager.initSynchronization();
}
/*
* (non-Javadoc)
- * @see org.codehaus.groovy.grails.transaction.SynchronizationManager#isSynchronizationActive()
+ * @see org.grails.transaction.SynchronizationManager#isSynchronizationActive()
*/
public boolean isSynchronizationActive() {
return TransactionSynchronizationManager.isSynchronizationActive();
}
/*
* (non-Javadoc)
- * @see org.codehaus.groovy.grails.transaction.SynchronizationManager#clearSynchronization()
+ * @see org.grails.transaction.SynchronizationManager#clearSynchronization()
*/
public void clearSynchronization() {
TransactionSynchronizationManager.clear();
View
2 ...s/transaction/SynchronizationManager.java → ...s/transaction/SynchronizationManager.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.codehaus.groovy.grails.transaction;
+package org.grails.transaction;
/**
* Strategy interface to allow providing a dedicated synchronization mechanism.
View
7 ...port/TransactionManagerPostProcessor.java → ...tion/TransactionManagerPostProcessor.java
@@ -13,9 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.orm.support;
+package org.grails.transaction;
import org.codehaus.groovy.grails.commons.GrailsApplication;
+import grails.transaction.TransactionManagerAware;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -28,7 +29,7 @@
import org.springframework.util.Assert;
/**
- * Injects the platform transaction manager into beans that implement {@link TransactionManagerAware}.
+ * Injects the platform transaction manager into beans that implement {@link grails.transaction.TransactionManagerAware}.
*
* @author Graeme Rocher
* @since 0.4
@@ -54,7 +55,7 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
/**
* Injects the platform transaction manager into the given bean if
- * that bean implements the {@link TransactionManagerAware} interface.
+ * that bean implements the {@link grails.transaction.TransactionManagerAware} interface.
* @param bean The bean to process.
* @param name The name of the bean.
* @return The bean after the transaction manager has been injected.
View
2 ...action/transform/RollbackTransform.groovy → ...action/transform/RollbackTransform.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.transaction.transform
+package org.grails.transaction.transform
import grails.transaction.Rollback
import groovy.transform.CompileStatic
View
8 ...n/transform/TransactionalTransform.groovy → ...n/transform/TransactionalTransform.groovy
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.codehaus.groovy.grails.transaction.transform
+package org.grails.transaction.transform
import org.codehaus.groovy.ast.stmt.Statement
@@ -37,9 +37,9 @@ import org.codehaus.groovy.control.CompilePhase
import org.codehaus.groovy.control.SourceUnit
import org.grails.compiler.injection.GrailsASTUtils
import org.grails.compiler.injection.GrailsArtefactClassInjector
-import org.codehaus.groovy.grails.orm.support.GrailsTransactionTemplate
-import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
-import org.codehaus.groovy.grails.transaction.GrailsTransactionAttribute
+import grails.transaction.GrailsTransactionTemplate
+import grails.transaction.TransactionManagerAware
+import org.grails.transaction.GrailsTransactionAttribute
import org.codehaus.groovy.syntax.Token
import org.codehaus.groovy.syntax.Types
import org.codehaus.groovy.transform.ASTTransformation
View
2 ...ils/validation/ConstraintEvalUtils.groovy → ...ils/validation/ConstraintEvalUtils.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.validation
+package org.grails.validation
import grails.util.ClosureToMapPopulator
View
5 ...ransactionManagerPostProcessorSpec.groovy → ...ransactionManagerPostProcessorSpec.groovy
@@ -1,9 +1,6 @@
-package org.codehaus.groovy.grails.transaction
+package org.grails.transaction
import grails.spring.BeanBuilder
-
-import org.codehaus.groovy.grails.orm.support.TransactionManagerPostProcessor
-
import spock.lang.Specification
class ChainedTransactionManagerPostProcessorSpec extends Specification {
View
6 ...ction/ChainedTransactionManagerTests.java → ...ction/ChainedTransactionManagerTests.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.transaction;
+package org.grails.transaction;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
-import static org.codehaus.groovy.grails.transaction.ChainedTransactionManagerTests.TestPlatformTransactionManager.*;
-import static org.codehaus.groovy.grails.transaction.ChainedTransactionManagerTests.TransactionManagerMatcher.*;
+import static org.grails.transaction.ChainedTransactionManagerTests.TestPlatformTransactionManager.*;
+import static org.grails.transaction.ChainedTransactionManagerTests.TransactionManagerMatcher.*;
import static org.springframework.transaction.HeuristicCompletionException.*;
import org.hamcrest.Description;
View
2 ...grails/async/transform/internal/DefaultDelegateAsyncTransactionalMethodTransformer.groovy
@@ -35,7 +35,7 @@ import org.codehaus.groovy.ast.stmt.BlockStatement
import org.codehaus.groovy.ast.stmt.ExpressionStatement
import org.grails.compiler.injection.GrailsASTUtils
import org.grails.compiler.web.async.TransactionalAsyncTransformUtils
-import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
+import grails.transaction.TransactionManagerAware
import org.codehaus.groovy.syntax.Token
import org.codehaus.groovy.syntax.Types
import org.springframework.transaction.PlatformTransactionManager
View
4 ...s-plugin-async/src/test/groovy/grails/async/services/AsyncTransactionalServiceSpec.groovy
@@ -1,9 +1,7 @@
package grails.async.services
import grails.async.DelegateAsync
-import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
-import org.grails.datastore.mapping.simple.SimpleMapDatastore
-import org.grails.datastore.mapping.transactions.DatastoreTransactionManager
+import grails.transaction.TransactionManagerAware
import org.springframework.transaction.PlatformTransactionManager
import org.springframework.transaction.TransactionDefinition
import org.springframework.transaction.TransactionException
View
2 ...ollers/src/main/groovy/org/codehaus/groovy/grails/web/plugins/support/WebMetaUtils.groovy
@@ -22,7 +22,7 @@ import grails.validation.ValidationErrors
import org.codehaus.groovy.grails.commons.GrailsApplication
import org.codehaus.groovy.grails.commons.GrailsClassUtils
import org.codehaus.groovy.grails.plugins.DomainClassPluginSupport
-import org.codehaus.groovy.grails.validation.ConstraintsEvaluator
+import grails.validation.ConstraintsEvaluator
import org.codehaus.groovy.grails.validation.DefaultConstraintEvaluator
import org.codehaus.groovy.grails.web.metaclass.ControllerDynamicMethods
import org.springframework.context.ApplicationContext
View
4 ...c/main/groovy/org/codehaus/groovy/grails/plugins/datasource/DataSourceGrailsPlugin.groovy
@@ -27,8 +27,8 @@ import org.apache.tomcat.jdbc.pool.DataSource as TomcatDataSource
import org.codehaus.groovy.grails.commons.GrailsApplication
import org.codehaus.groovy.grails.commons.cfg.ConfigurationHelper
import org.codehaus.groovy.grails.exceptions.GrailsConfigurationException
-import org.codehaus.groovy.grails.orm.support.TransactionManagerPostProcessor
-import org.codehaus.groovy.grails.transaction.ChainedTransactionManagerPostProcessor
+import org.grails.transaction.TransactionManagerPostProcessor
+import org.grails.transaction.ChainedTransactionManagerPostProcessor
import org.springframework.jdbc.datasource.DataSourceTransactionManager
import org.springframework.jdbc.datasource.DriverManagerDataSource
import org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy
View
4 ...n-class/src/main/groovy/org/codehaus/groovy/grails/plugins/DomainClassGrailsPlugin.groovy
@@ -28,8 +28,8 @@ import org.codehaus.groovy.grails.commons.GrailsDomainConfigurationUtil
import org.codehaus.groovy.grails.domain.GormApiSupport
import org.codehaus.groovy.grails.domain.GrailsDomainClassCleaner
import org.codehaus.groovy.grails.support.SoftThreadLocalMap
-import org.codehaus.groovy.grails.validation.ConstraintEvalUtils
-import org.codehaus.groovy.grails.validation.ConstraintsEvaluator
+import org.grails.validation.ConstraintEvalUtils
+import grails.validation.ConstraintsEvaluator
import org.codehaus.groovy.grails.validation.ConstraintsEvaluatorFactoryBean
import org.codehaus.groovy.grails.validation.GrailsDomainClassValidator
import org.grails.datastore.gorm.config.GrailsDomainClassMappingContext
View
2 ...lugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy
@@ -65,7 +65,7 @@ import org.grails.compiler.injection.GrailsAwareInjectionOperation
import org.codehaus.groovy.grails.compiler.web.ControllerActionTransformer
import org.grails.core.io.DefaultResourceLocator
import org.grails.core.io.ResourceLocator
-import org.codehaus.groovy.grails.transaction.transform.TransactionalTransform
+import org.grails.transaction.transform.TransactionalTransform
import grails.web.mapping.UrlMappings
import org.codehaus.groovy.syntax.Token
import org.codehaus.groovy.syntax.Types
View
2 ...s/src/main/groovy/org/codehaus/groovy/grails/plugins/services/ServicesGrailsPlugin.groovy
@@ -24,7 +24,7 @@ import java.lang.reflect.Modifier
import org.codehaus.groovy.grails.commons.GrailsServiceClass
import org.codehaus.groovy.grails.commons.ServiceArtefactHandler
import org.codehaus.groovy.grails.commons.spring.TypeSpecifyableTransactionProxyFactoryBean
-import org.codehaus.groovy.grails.orm.support.GroovyAwareNamedTransactionAttributeSource
+import org.grails.transaction.GroovyAwareNamedTransactionAttributeSource
import org.springframework.beans.factory.config.MethodInvokingFactoryBean
import org.springframework.core.annotation.AnnotationUtils
import org.springframework.transaction.annotation.Transactional
View
2 ...s-plugin-testing/src/main/groovy/grails/test/mixin/domain/DomainClassUnitTestMixin.groovy
@@ -24,7 +24,7 @@ import org.codehaus.groovy.grails.commons.GrailsClassUtils
import org.codehaus.groovy.grails.commons.GrailsDomainClass
import org.codehaus.groovy.grails.plugins.DomainClassGrailsPlugin
import org.codehaus.groovy.grails.plugins.web.ControllersGrailsPlugin
-import org.codehaus.groovy.grails.validation.ConstraintEvalUtils
+import org.grails.validation.ConstraintEvalUtils
import org.grails.datastore.gorm.GormEnhancer
import org.grails.datastore.mapping.model.PersistentEntity
import org.grails.datastore.mapping.simple.SimpleMapDatastore
View
3 grails-plugin-testing/src/main/groovy/grails/test/runtime/CoreBeansTestPlugin.groovy
@@ -23,11 +23,10 @@ import org.codehaus.groovy.grails.commons.GrailsApplication
import org.codehaus.groovy.grails.commons.InstanceFactoryBean
import org.codehaus.groovy.grails.commons.cfg.GrailsPlaceholderConfigurer
import org.codehaus.groovy.grails.commons.cfg.MapBasedSmartPropertyOverrideConfigurer
-import org.codehaus.groovy.grails.plugins.DefaultGrailsPluginManager
import org.grails.plugins.databinding.DataBindingGrailsPlugin
import org.codehaus.groovy.grails.plugins.support.aware.GrailsApplicationAwareBeanPostProcessor
import org.codehaus.groovy.grails.support.proxy.DefaultProxyHandler
-import org.codehaus.groovy.grails.validation.ConstraintsEvaluator
+import grails.validation.ConstraintsEvaluator
import org.codehaus.groovy.grails.validation.DefaultConstraintEvaluator
import org.springframework.context.support.ConversionServiceFactoryBean
import org.springframework.context.support.StaticMessageSource
View
2 grails-plugin-testing/src/main/groovy/grails/test/runtime/DomainClassTestPlugin.groovy
@@ -23,7 +23,7 @@ import org.codehaus.groovy.grails.commons.GrailsApplication
import org.codehaus.groovy.grails.domain.GrailsDomainClassCleaner
import org.codehaus.groovy.grails.plugins.DomainClassGrailsPlugin
import org.codehaus.groovy.grails.validation.ConstrainedProperty
-import org.codehaus.groovy.grails.validation.ConstraintsEvaluator
+import grails.validation.ConstraintsEvaluator
import org.codehaus.groovy.grails.validation.ConstraintsEvaluatorFactoryBean
import org.grails.datastore.gorm.events.AutoTimestampEventListener
import org.grails.datastore.gorm.events.DomainEventListener
View
2 grails-plugin-testing/src/main/groovy/grails/test/runtime/GrailsApplicationTestPlugin.groovy
@@ -41,7 +41,7 @@ import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration
import org.grails.web.servlet.context.support.WebRuntimeSpringConfiguration;
import org.grails.core.lifecycle.ShutdownOperations
import org.codehaus.groovy.grails.plugins.converters.ConvertersPluginSupport
-import org.codehaus.groovy.grails.validation.ConstraintEvalUtils
+import org.grails.validation.ConstraintEvalUtils
import org.grails.web.servlet.context.GrailsConfigUtils;
import org.grails.web.context.ServletEnvironmentGrailsApplicationDiscoveryStrategy
import org.grails.async.factory.SynchronousPromiseFactory
View
2 ...n/src/main/groovy/org/codehaus/groovy/grails/web/plugins/support/ValidationSupport.groovy
@@ -20,7 +20,7 @@ import grails.validation.ValidationErrors
import groovy.transform.CompileStatic
import org.codehaus.groovy.grails.validation.ConstrainedProperty
-import org.codehaus.groovy.grails.validation.ConstraintsEvaluator
+import grails.validation.ConstraintsEvaluator
import org.grails.datastore.gorm.support.BeforeValidateHelper
import org.springframework.beans.factory.BeanFactory
import org.springframework.validation.FieldError
View
1 ...ugin-validation/src/test/groovy/grails/validation/DefaultASTValidateableHelperSpec.groovy
@@ -8,7 +8,6 @@ import org.codehaus.groovy.classgen.GeneratorContext
import org.codehaus.groovy.control.SourceUnit
import org.grails.compiler.injection.ClassInjector
import org.grails.compiler.injection.GrailsAwareClassLoader
-import org.codehaus.groovy.grails.validation.ConstraintsEvaluator
import org.codehaus.groovy.grails.validation.DefaultConstraintEvaluator
import org.springframework.mock.web.MockServletContext
import org.springframework.web.context.WebApplicationContext
View
3 ...groovy/org/codehaus/groovy/grails/orm/support/TransactionManagerPostProcessorTests.groovy
@@ -1,7 +1,8 @@
package org.codehaus.groovy.grails.orm.support
import grails.spring.BeanBuilder
-
+import grails.transaction.TransactionManagerAware
+import org.grails.transaction.TransactionManagerPostProcessor
import org.springframework.jdbc.datasource.DataSourceTransactionManager
import org.springframework.jdbc.datasource.DriverManagerDataSource
import org.springframework.transaction.PlatformTransactionManager
View
17 grails-test-suite-uber/src/test/groovy/grails/transaction/TransactionalTransformSpec.groovy
@@ -22,7 +22,6 @@ import javax.annotation.PostConstruct
import javax.sql.DataSource
import org.codehaus.groovy.grails.commons.DefaultGrailsApplication
-import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
import org.springframework.beans.factory.InitializingBean
import org.springframework.beans.factory.config.MethodInvokingFactoryBean
import org.springframework.context.annotation.CommonAnnotationBeanPostProcessor
@@ -44,7 +43,7 @@ class TransactionalTransformSpec extends Specification {
when:"A new instance of a class with a @Transactional method is created that subclasses another transactional class"
def bookService = new GroovyShell().evaluate('''
import grails.transaction.*
- import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
+ import grails.transaction.TransactionManagerAware
import org.springframework.transaction.PlatformTransactionManager
import org.springframework.transaction.TransactionStatus
import org.springframework.transaction.annotation.Isolation
@@ -112,7 +111,7 @@ class TransactionalTransformSpec extends Specification {
when:"A new instance of a class with a @Transactional method is created"
def bookService = new GroovyShell().evaluate('''
import grails.transaction.*
-import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
+import grails.transaction.TransactionManagerAware
import org.springframework.transaction.PlatformTransactionManager
import org.springframework.transaction.TransactionStatus
import org.springframework.transaction.annotation.Isolation
@@ -180,7 +179,7 @@ new BookService()
when:"A new instance of a class with a @Transactional method is created"
def bookService = new GroovyShell().evaluate('''
import grails.transaction.*
-import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
+import grails.transaction.TransactionManagerAware
import org.springframework.transaction.PlatformTransactionManager
import org.springframework.transaction.TransactionStatus
import org.springframework.transaction.annotation.Isolation
@@ -242,7 +241,7 @@ new BookService()
when:"A new instance of a class with a @Transactional method is created"
def bookService = new GroovyShell().evaluate('''
import grails.transaction.*
-import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
+import grails.transaction.TransactionManagerAware
import org.springframework.transaction.PlatformTransactionManager
import org.springframework.transaction.TransactionStatus
import org.springframework.transaction.annotation.Isolation
@@ -306,7 +305,7 @@ new BookService()
when:"A new instance of a class with a @Transactional method is created"
def bookService = new GroovyShell().evaluate('''
import grails.transaction.*
-import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
+import grails.transaction.TransactionManagerAware
import org.springframework.transaction.PlatformTransactionManager
import org.springframework.transaction.TransactionStatus
import org.springframework.transaction.annotation.Isolation
@@ -360,7 +359,7 @@ new BookService()
when:"A new instance of a class with a @Transactional method is created"
def bookService = new GroovyShell().evaluate('''
import grails.transaction.*
-import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
+import grails.transaction.TransactionManagerAware
import org.springframework.transaction.PlatformTransactionManager
import org.springframework.transaction.TransactionStatus
import org.springframework.transaction.annotation.Isolation
@@ -483,7 +482,7 @@ new BookService()
given:
def bookService = new GroovyShell().evaluate('''
import grails.transaction.*
- import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
+ import grails.transaction.TransactionManagerAware
import org.springframework.transaction.PlatformTransactionManager
import org.springframework.transaction.TransactionStatus
import org.springframework.transaction.annotation.Isolation
@@ -516,7 +515,7 @@ new BookService()
given:
def bookService = new GroovyShell().evaluate('''
import grails.transaction.*
- import org.codehaus.groovy.grails.orm.support.TransactionManagerAware
+ import grails.transaction.TransactionManagerAware
import org.springframework.transaction.PlatformTransactionManager
import org.springframework.transaction.TransactionStatus
import org.springframework.transaction.annotation.Isolation
View
2 ...b/src/test/groovy/org/codehaus/groovy/grails/web/commandobjects/CommandObjectsSpec.groovy
@@ -4,7 +4,7 @@ import grails.artefact.Artefact
import grails.test.mixin.TestFor
import grails.util.ClosureToMapPopulator
-import org.codehaus.groovy.grails.validation.ConstraintsEvaluator
+import grails.validation.ConstraintsEvaluator
import org.codehaus.groovy.grails.validation.ConstraintsEvaluatorFactoryBean
import spock.lang.Issue
View
1 ...rc/main/groovy/org/codehaus/groovy/grails/validation/ConstraintsEvaluatorFactoryBean.java
@@ -17,6 +17,7 @@
import java.util.Map;
+import grails.validation.ConstraintsEvaluator;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
View
5 ...ion/src/main/groovy/org/codehaus/groovy/grails/validation/DefaultConstraintEvaluator.java
@@ -16,6 +16,7 @@
package org.codehaus.groovy.grails.validation;
import grails.validation.Constrained;
+import grails.validation.ConstraintsEvaluator;
import groovy.lang.Binding;
import groovy.lang.Closure;
import groovy.lang.GroovyClassLoader;
@@ -41,14 +42,14 @@
import org.codehaus.groovy.grails.io.support.GrailsIOUtils;
/**
- * Default implementation of the {@link ConstraintsEvaluator} interface.
+ * Default implementation of the {@link grails.validation.ConstraintsEvaluator} interface.
*
* TODO: Subclass this to add hibernate-specific exceptions!
*
* @author Graeme Rocher
* @since 2.0
*/
-public class DefaultConstraintEvaluator implements ConstraintsEvaluator {
+public class DefaultConstraintEvaluator implements ConstraintsEvaluator, org.codehaus.groovy.grails.validation.ConstraintsEvaluator {
private static final Log LOG = LogFactory.getLog(DefaultConstraintEvaluator.class);
private Map<String, Object> defaultConstraints;
View
0 ...alidation/DefaultErrorMessages.properties → ...alidation/DefaultErrorMessages.properties
File renamed without changes.

0 comments on commit c90b178

Please sign in to comment.