You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/02/21 04:10:57 UTC
svn commit: r746431 - in /maven/components/trunk/maven-toolchain/src/main:
java/org/apache/maven/toolchain/ java/org/apache/maven/toolchain/java/
resources/
Author: jvanzyl
Date: Sat Feb 21 03:10:57 2009
New Revision: 746431
URL: http://svn.apache.org/viewvc?rev=746431&view=rev
Log:
o use annotations
Removed:
maven/components/trunk/maven-toolchain/src/main/resources/
Modified:
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java?rev=746431&r1=746430&r2=746431&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java Sat Feb 21 03:10:57 2009
@@ -40,6 +40,8 @@
import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
@@ -50,27 +52,18 @@
*
* @author mkleint
*/
+@Component(role=ToolchainManager.class)
public class DefaultToolchainManager extends AbstractLogEnabled
implements ToolchainManager,
- ToolchainManagerPrivate,
- Contextualizable
+ ToolchainManagerPrivate
{
-
- /**
- * @component
- */
+ @Requirement
private PlexusContainer container;
public DefaultToolchainManager( )
{
}
- public void contextualize( Context context )
- throws ContextException
- {
- container = (PlexusContainer) context.get(PlexusConstants.PLEXUS_KEY);
- }
-
public ToolchainPrivate[] getToolchainsForType( String type )
throws MisconfiguredToolchainException
{
Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java?rev=746431&r1=746430&r2=746431&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java Sat Feb 21 03:10:57 2009
@@ -29,7 +29,6 @@
*/
public final class RequirementMatcherFactory
{
-
private RequirementMatcherFactory( )
{
}
Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java?rev=746431&r1=746430&r2=746431&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java Sat Feb 21 03:10:57 2009
@@ -27,9 +27,6 @@
*/
public interface ToolchainFactory
{
-
- String ROLE = ToolchainFactory.class.getName();
-
/**
* Create instance of toolchain.
**/
Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java?rev=746431&r1=746430&r2=746431&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java Sat Feb 21 03:10:57 2009
@@ -28,14 +28,9 @@
*/
public interface ToolchainManager
{
-
- String ROLE = ToolchainManager.class.getName();
-
-
/**
* to be used from plugins capable of working with toolchains.
*/
Toolchain getToolchainFromBuildContext( String type,
MavenSession context );
-
}
\ No newline at end of file
Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java?rev=746431&r1=746430&r2=746431&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java Sat Feb 21 03:10:57 2009
@@ -29,8 +29,6 @@
*/
public interface ToolchainManagerPrivate
{
- String ROLE = ToolchainManagerPrivate.class.getName();
-
/**
* Retrieves the toolchains of given type from the user settings.
*/
Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java?rev=746431&r1=746430&r2=746431&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java Sat Feb 21 03:10:57 2009
@@ -22,6 +22,7 @@
import java.io.File;
import org.apache.maven.toolchain.DefaultToolchain;
import org.apache.maven.toolchain.model.ToolchainModel;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.Os;
@@ -29,11 +30,11 @@
/**
* @author Milos Kleint
*/
+@Component(role=JavaToolChain.class)
public class DefaultJavaToolChain
extends DefaultToolchain
implements JavaToolChain
{
-
private String javaHome;
public static final String KEY_JAVAHOME = "jdkHome"; //NOI18N
@@ -69,7 +70,6 @@
return null;
}
-
private static File findTool( String toolName, File installFolder )
{
File bin = new File( installFolder, "bin" ); //NOI18N
Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java?rev=746431&r1=746430&r2=746431&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java Sat Feb 21 03:10:57 2009
@@ -25,6 +25,7 @@
import org.apache.maven.toolchain.ToolchainFactory;
import org.apache.maven.toolchain.ToolchainPrivate;
import org.apache.maven.toolchain.model.ToolchainModel;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.FileUtils;
@@ -34,10 +35,10 @@
*
* @author mkleint
*/
+@Component(role=ToolchainFactory.class)
public class DefaultJavaToolchainFactory
implements ToolchainFactory, LogEnabled
{
-
private Logger logger;
public DefaultJavaToolchainFactory( )