Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed profile builder. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748244 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-02-26 18:03:57 +00:00
parent 29e80ac703
commit 1bc43bf147
4 changed files with 0 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
View File

@ -1,95 +0,0 @@
package org.apache.maven.profiles;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.
*/
import org.apache.maven.profiles.io.xpp3.ProfilesXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
@Component(role = MavenProfilesBuilder.class)
public class DefaultMavenProfilesBuilder
extends AbstractLogEnabled
implements MavenProfilesBuilder
{
private static final String PROFILES_XML_FILE = "profiles.xml";
public ProfilesRoot buildProfiles( File basedir )
throws IOException, XmlPullParserException
{
File profilesXml = new File( basedir, PROFILES_XML_FILE );
getLogger().debug( "Checking for external profiles in: " + profilesXml.getAbsolutePath() );
ProfilesRoot profilesRoot = null;
if ( profilesXml.isFile() )
{
getLogger().debug( "reading: " + profilesXml.getAbsolutePath() );
ProfilesXpp3Reader reader = new ProfilesXpp3Reader();
Reader profileReader = null;
try
{
profileReader = ReaderFactory.newXmlReader( profilesXml );
StringWriter sWriter = new StringWriter();
IOUtil.copy( profileReader, sWriter );
String rawInput = sWriter.toString();
try
{
RegexBasedInterpolator interpolator = new RegexBasedInterpolator();
interpolator.addValueSource( new EnvarBasedValueSource() );
rawInput = interpolator.interpolate( rawInput, "settings" );
}
catch ( Exception e )
{
getLogger().warn( "Failed to initialize environment variable resolver. Skipping environment substitution in " + PROFILES_XML_FILE + "." );
getLogger().debug( "Failed to initialize envar resolver. Skipping resolution.", e );
}
StringReader sReader = new StringReader( rawInput );
profilesRoot = reader.read( sReader );
}
finally
{
IOUtil.close( profileReader );
}
}
return profilesRoot;
}
}

34
maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
View File

@ -1,34 +0,0 @@
package org.apache.maven.profiles;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.
*/
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
import java.io.IOException;
/**
* @author jdcasey
*/
public interface MavenProfilesBuilder
{
ProfilesRoot buildProfiles( File basedir )
throws IOException, XmlPullParserException;
}

7
maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
View File

@ -23,13 +23,11 @@ import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.MavenProfilesBuilder;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.profiles.injection.ProfileInjector;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.repository.MavenRepositorySystem;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
@ -48,11 +46,6 @@ import java.util.List;
public class DefaultProfileAdvisor
implements ProfileAdvisor, LogEnabled, Contextualizable
{
@Requirement
private MavenRepositorySystem mavenTools;
@Requirement
private MavenProfilesBuilder profilesBuilder;
@Requirement
private ProfileInjector profileInjector;

4
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -38,7 +38,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
import org.apache.maven.profiles.MavenProfilesBuilder;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationContext;
@ -65,9 +64,6 @@ import org.codehaus.plexus.util.StringUtils;
public class DefaultMavenProjectBuilder
implements MavenProjectBuilder, LogEnabled
{
@Requirement
protected MavenProfilesBuilder profilesBuilder;
@Requirement
private ModelValidator validator;