-
Notifications
You must be signed in to change notification settings - Fork 951
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Initial upgrade to Spring 3.1 M1 with Spring environment profiles int…
…egration, still more work to do on Spring MVC updates
- Loading branch information
1 parent
94b392d
commit fb53d5b
Showing
9 changed files
with
311 additions
and
391 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/env/GrailsEnvironment.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Copyright 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.commons.env; | ||
|
|
||
| import grails.util.Environment; | ||
| import org.codehaus.groovy.grails.commons.GrailsApplication; | ||
| import org.springframework.core.env.PropertySource; | ||
| import org.springframework.web.context.support.DefaultWebEnvironment; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Bridges Grails' existing environment API with the new Spring 3.1 environment profiles API | ||
| * | ||
| * @author Graeme Rocher | ||
| * @since 1.4 | ||
| */ | ||
| public class GrailsEnvironment extends DefaultWebEnvironment { | ||
|
|
||
| GrailsApplication grailsApplication; | ||
|
|
||
| public GrailsEnvironment(GrailsApplication grailsApplication) { | ||
| this.grailsApplication = grailsApplication; | ||
| getPropertySources().addFirst(new GrailsConfigPropertySource(grailsApplication)); | ||
| } | ||
|
|
||
| @Override | ||
| protected Set<String> doGetActiveProfiles() { | ||
| Set<String> activeProfiles = super.doGetActiveProfiles(); | ||
| activeProfiles.add(Environment.getCurrent().getName()); | ||
| return activeProfiles; | ||
| } | ||
|
|
||
|
|
||
| private class GrailsConfigPropertySource extends PropertySource<GrailsApplication> { | ||
|
|
||
| public GrailsConfigPropertySource(GrailsApplication grailsApplication) { | ||
| super(grailsApplication.getMetadata().getApplicationName(), grailsApplication); | ||
| } | ||
|
|
||
| @Override | ||
| public Object getProperty(String key) { | ||
| return grailsApplication.getFlatConfig().get(key); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.