Author: bentmann
Date: Fri Jul 16 10:35:18 2010
New Revision: 964738
URL: http://svn.apache.org/viewvc?rev=964738&view=rev
Log:
o Allowed manual creation of settings builder for reuse in non-ioc envs
Added:
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
(with props)
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/
(with props)
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java
(with props)
maven/maven-3/trunk/maven-settings-builder/src/test/resources/ (with
props)
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/
(with props)
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/
(with props)
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/simple.xml
(with props)
Modified:
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
Modified:
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java?rev=964738&r1=964737&r2=964738&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
(original)
+++
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
Fri Jul 16 10:35:18 2010
@@ -63,6 +63,24 @@ public class DefaultSettingsBuilder
private MavenSettingsMerger settingsMerger = new MavenSettingsMerger();
+ public DefaultSettingsBuilder setSettingsReader( SettingsReader
settingsReader )
+ {
+ this.settingsReader = settingsReader;
+ return this;
+ }
+
+ public DefaultSettingsBuilder setSettingsWriter( SettingsWriter
settingsWriter )
+ {
+ this.settingsWriter = settingsWriter;
+ return this;
+ }
+
+ public DefaultSettingsBuilder setSettingsValidator( SettingsValidator
settingsValidator )
+ {
+ this.settingsValidator = settingsValidator;
+ return this;
+ }
+
public SettingsBuildingResult build( SettingsBuildingRequest request )
throws SettingsBuildingException
{
Added:
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java?rev=964738&view=auto
==============================================================================
---
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
(added)
+++
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
Fri Jul 16 10:35:18 2010
@@ -0,0 +1,71 @@
+package org.apache.maven.settings.building;
+
+/*
+ * 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.settings.io.DefaultSettingsReader;
+import org.apache.maven.settings.io.DefaultSettingsWriter;
+import org.apache.maven.settings.io.SettingsReader;
+import org.apache.maven.settings.io.SettingsWriter;
+import org.apache.maven.settings.validation.DefaultSettingsValidator;
+import org.apache.maven.settings.validation.SettingsValidator;
+
+/**
+ * A factory to create settings builder instances when no dependency injection
is available. <em>Note:</em> This class
+ * is only meant as a utility for developers that want to employ the settings
builder outside of the Maven build system,
+ * Maven plugins should always acquire settings builder instances via
dependency injection. Developers might want to
+ * subclass this factory to provide custom implementations for some of the
components used by the settings builder.
+ *
+ * @author Benjamin Bentmann
+ */
+public class DefaultSettingsBuilderFactory
+{
+
+ protected SettingsReader newSettingsReader()
+ {
+ return new DefaultSettingsReader();
+ }
+
+ protected SettingsWriter newSettingsWriter()
+ {
+ return new DefaultSettingsWriter();
+ }
+
+ protected SettingsValidator newSettingsValidator()
+ {
+ return new DefaultSettingsValidator();
+ }
+
+ /**
+ * Creates a new settings builder instance.
+ *
+ * @return The new settings builder instance, never {...@code null}.
+ */
+ public DefaultSettingsBuilder newInstance()
+ {
+ DefaultSettingsBuilder builder = new DefaultSettingsBuilder();
+
+ builder.setSettingsReader( newSettingsReader() );
+ builder.setSettingsWriter( newSettingsWriter() );
+ builder.setSettingsValidator( newSettingsValidator() );
+
+ return builder;
+ }
+
+}
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added:
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java?rev=964738&view=auto
==============================================================================
---
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java
(added)
+++
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java
Fri Jul 16 10:35:18 2010
@@ -0,0 +1,53 @@
+package org.apache.maven.settings.building;
+
+/*
+ * 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 java.io.File;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Benjamin Bentmann
+ */
+public class DefaultSettingsBuilderFactoryTest
+ extends TestCase
+{
+
+ private File getSettings( String name )
+ {
+ return new File( "src/test/resources/settings/factory/" + name +
".xml" ).getAbsoluteFile();
+ }
+
+ public void testCompleteWiring()
+ throws Exception
+ {
+ SettingsBuilder builder = new
DefaultSettingsBuilderFactory().newInstance();
+ assertNotNull( builder );
+
+ DefaultSettingsBuildingRequest request = new
DefaultSettingsBuildingRequest();
+ request.setSystemProperties( System.getProperties() );
+ request.setUserSettingsFile( getSettings( "simple" ) );
+
+ SettingsBuildingResult result = builder.build( request );
+ assertNotNull( result );
+ assertNotNull( result.getEffectiveSettings() );
+ }
+
+}
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/resources/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/resources/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/resources/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/resources/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added:
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/simple.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/simple.xml?rev=964738&view=auto
==============================================================================
---
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/simple.xml
(added)
+++
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/simple.xml
Fri Jul 16 10:35:18 2010
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<settings>
+ <localRepository>${user.home}/.m2/repository</localRepository>
+</settings>
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/simple.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/maven-3/trunk/maven-settings-builder/src/test/resources/settings/factory/simple.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
