From 1bc43bf14771c373abfc75e52cf73f4041d8db30 Mon Sep 17 00:00:00 2001 From: Britton Isbell Date: Thu, 26 Feb 2009 18:03:57 +0000 Subject: [PATCH] Removed profile builder. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748244 13f79535-47bb-0310-9956-ffa450edef68 --- .../profiles/DefaultMavenProfilesBuilder.java | 95 ------------------- .../maven/profiles/MavenProfilesBuilder.java | 34 ------- .../profiles/build/DefaultProfileAdvisor.java | 7 -- .../project/DefaultMavenProjectBuilder.java | 4 - 4 files changed, 140 deletions(-) delete mode 100644 maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java delete mode 100644 maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java diff --git a/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java b/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java deleted file mode 100644 index 559119fe9b..0000000000 --- a/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java +++ /dev/null @@ -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; - } - -} diff --git a/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java b/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java deleted file mode 100644 index a3825fbbab..0000000000 --- a/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java +++ /dev/null @@ -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; -} diff --git a/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java b/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java index 03026d7f8c..e1c288dce7 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java +++ b/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java @@ -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; diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index cd41e5ec66..82b0af02c6 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -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;