Skip to content

Commit 8804652

Browse files
cstamascstamas
authored
Kill off dead Plexus (#418)
Kill deprecated stuff, do not use anything from it.
1 parent 5fb0e86 commit 8804652

File tree

10 files changed

+77
-40
lines changed

10 files changed

+77
-40
lines changed

‎modello-core/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
1919
<dependency>
2020
<groupId>org.eclipse.sisu</groupId>
2121
<artifactId>org.eclipse.sisu.plexus</artifactId>
22+
<scope>provided</scope>
2223
</dependency>
2324
<dependency>
2425
<groupId>org.sonatype.sisu</groupId>
2526
<artifactId>sisu-guice</artifactId>
2627
<classifier>no_aop</classifier>
28+
<scope>runtime</scope>
2729
</dependency>
2830
<dependency>
2931
<groupId>org.codehaus.plexus</groupId>
@@ -33,6 +35,15 @@
3335
<groupId>org.codehaus.plexus</groupId>
3436
<artifactId>plexus-xml</artifactId>
3537
</dependency>
38+
<dependency>
39+
<groupId>org.slf4j</groupId>
40+
<artifactId>slf4j-api</artifactId>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.slf4j</groupId>
44+
<artifactId>slf4j-simple</artifactId>
45+
<scope>test</scope>
46+
</dependency>
3647
</dependencies>
3748

3849
<build>

‎modello-core/src/main/java/org/codehaus/modello/Modello.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,26 @@
2222
* SOFTWARE.
2323
*/
2424

25+
import javax.inject.Inject;
26+
2527
import java.io.Reader;
2628
import java.io.Writer;
2729
import java.util.Properties;
2830

2931
import org.codehaus.modello.core.ModelloCore;
3032
import org.codehaus.modello.model.Model;
3133
import org.codehaus.modello.model.ModelValidationException;
32-
import org.codehaus.plexus.DefaultPlexusContainer;
33-
import org.codehaus.plexus.PlexusContainer;
3434

3535
/**
3636
* @author <a href="mailto:[email protected]">Jason van Zyl</a>
3737
* @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
3838
*/
3939
public class Modello {
40-
private PlexusContainer container;
41-
42-
private ModelloCore core;
43-
44-
public Modello() throws ModelloException {
45-
try {
46-
container = new DefaultPlexusContainer();
40+
private final ModelloCore core;
4741

48-
core = (ModelloCore) container.lookup(ModelloCore.ROLE);
49-
} catch (Exception ex) {
50-
throw new ModelloException("Error while starting plexus.", ex);
51-
}
42+
@Inject
43+
public Modello(ModelloCore core) {
44+
this.core = core;
5245
}
5346

5447
public void generate(Reader modelReader, String outputType, Properties parameters)

‎modello-core/src/main/java/org/codehaus/modello/ModelloCli.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.io.File;
2626
import java.util.Properties;
2727

28+
import org.codehaus.plexus.DefaultPlexusContainer;
2829
import org.codehaus.plexus.util.StringUtils;
2930
import org.codehaus.plexus.util.xml.XmlStreamReader;
3031

@@ -39,7 +40,7 @@ public class ModelloCli {
3940
private static Properties parameters;
4041

4142
public static void main(String[] args) throws Exception {
42-
Modello modello = new Modello();
43+
Modello modello = new DefaultPlexusContainer().lookup(Modello.class);
4344

4445
parseArgumentsFromCommandLine(args);
4546

‎modello-core/src/main/java/org/codehaus/modello/core/AbstractModelloCore.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,18 @@
2828
import org.codehaus.modello.ModelloException;
2929
import org.codehaus.modello.model.Model;
3030
import org.codehaus.modello.model.ModelValidationException;
31-
import org.codehaus.plexus.logging.AbstractLogEnabled;
31+
import org.slf4j.Logger;
32+
import org.slf4j.LoggerFactory;
3233

3334
/**
3435
* @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
3536
*/
36-
public abstract class AbstractModelloCore extends AbstractLogEnabled implements ModelloCore {
37+
public abstract class AbstractModelloCore implements ModelloCore {
38+
private final Logger logger = LoggerFactory.getLogger(getClass());
39+
40+
protected Logger getLogger() {
41+
return logger;
42+
}
3743
// ----------------------------------------------------------------------
3844
// Partial ModelloCore implementation
3945
// ----------------------------------------------------------------------

‎modello-core/src/main/java/org/codehaus/modello/metadata/AbstractMetadataPlugin.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,20 @@
2424

2525
import java.util.Map;
2626

27-
import org.codehaus.plexus.logging.AbstractLogEnabled;
2827
import org.codehaus.plexus.util.StringUtils;
28+
import org.slf4j.Logger;
29+
import org.slf4j.LoggerFactory;
2930

3031
/**
3132
* @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
3233
*/
33-
public abstract class AbstractMetadataPlugin extends AbstractLogEnabled implements MetadataPlugin {
34+
public abstract class AbstractMetadataPlugin implements MetadataPlugin {
35+
private final Logger logger = LoggerFactory.getLogger(getClass());
36+
37+
protected Logger getLogger() {
38+
return logger;
39+
}
40+
3441
protected boolean getBoolean(Map<String, String> data, String key, boolean defaultValue) {
3542
String value = data.get(key);
3643

‎modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
* SOFTWARE.
2323
*/
2424

25+
import javax.inject.Inject;
26+
2527
import java.io.File;
2628
import java.io.FilterWriter;
2729
import java.io.IOException;
@@ -41,23 +43,19 @@
4143
import org.codehaus.modello.model.ModelDefault;
4244
import org.codehaus.modello.model.ModelField;
4345
import org.codehaus.modello.model.Version;
44-
import org.codehaus.plexus.PlexusConstants;
45-
import org.codehaus.plexus.PlexusContainer;
4646
import org.codehaus.plexus.build.BuildContext;
47-
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
48-
import org.codehaus.plexus.context.Context;
49-
import org.codehaus.plexus.context.ContextException;
50-
import org.codehaus.plexus.logging.AbstractLogEnabled;
51-
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
5247
import org.codehaus.plexus.util.StringUtils;
5348
import org.codehaus.plexus.util.io.CachingWriter;
49+
import org.slf4j.Logger;
50+
import org.slf4j.LoggerFactory;
5451

5552
/**
5653
* @author <a href="mailto:[email protected]">Jason van Zyl</a>
5754
* @author <a href="mailto:[email protected]">Emmanuel Venisse</a>
5855
*/
59-
public abstract class AbstractModelloGenerator extends AbstractLogEnabled
60-
implements ModelloGenerator, Contextualizable {
56+
public abstract class AbstractModelloGenerator implements ModelloGenerator {
57+
private final Logger logger = LoggerFactory.getLogger(getClass());
58+
6159
private Model model;
6260

6361
private File outputDirectory;
@@ -68,8 +66,13 @@ public abstract class AbstractModelloGenerator extends AbstractLogEnabled
6866

6967
private String encoding;
7068

69+
@Inject
7170
private BuildContext buildContext;
7271

72+
protected Logger getLogger() {
73+
return logger;
74+
}
75+
7376
protected void initialize(Model model, Properties parameters) throws ModelloException {
7477
this.model = model;
7578

@@ -232,16 +235,6 @@ protected String getParameter(Properties parameters, String name, String default
232235
return parameters.getProperty(name, defaultValue);
233236
}
234237

235-
public void contextualize(Context ctx) throws ContextException {
236-
PlexusContainer plexus = (PlexusContainer) ctx.get(PlexusConstants.PLEXUS_KEY);
237-
238-
try {
239-
buildContext = (BuildContext) plexus.lookup(BuildContext.class.getName());
240-
} catch (ComponentLookupException e) {
241-
throw new ContextException("Unable to lookup required component", e);
242-
}
243-
}
244-
245238
protected BuildContext getBuildContext() {
246239
return buildContext;
247240
}

‎modello-core/src/main/java/org/codehaus/modello/plugin/AbstractPluginManager.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,19 @@
2626
import java.util.Map;
2727

2828
import org.codehaus.modello.ModelloRuntimeException;
29-
import org.codehaus.plexus.logging.AbstractLogEnabled;
30-
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
29+
import org.slf4j.Logger;
30+
import org.slf4j.LoggerFactory;
3131

3232
/**
3333
* @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
3434
*/
35-
public abstract class AbstractPluginManager<T> extends AbstractLogEnabled implements Initializable {
35+
public abstract class AbstractPluginManager<T> {
36+
private final Logger logger = LoggerFactory.getLogger(getClass());
37+
38+
protected Logger getLogger() {
39+
return logger;
40+
}
41+
3642
public void initialize() {}
3743

3844
public abstract Map<String, T> getPlugins();

‎modello-maven-plugin/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@
119119
<groupId>org.codehaus.plexus</groupId>
120120
<artifactId>plexus-build-api</artifactId>
121121
</dependency>
122+
<dependency>
123+
<groupId>org.slf4j</groupId>
124+
<artifactId>slf4j-simple</artifactId>
125+
<scope>test</scope>
126+
</dependency>
122127
</dependencies>
123128

124129
<reporting>

‎modello-plugins/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
<artifactId>modello-test</artifactId>
4545
<scope>test</scope>
4646
</dependency>
47+
<dependency>
48+
<groupId>org.slf4j</groupId>
49+
<artifactId>slf4j-simple</artifactId>
50+
<scope>test</scope>
51+
</dependency>
4752
</dependencies>
4853

4954
<build>

‎pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,16 @@
320320
<artifactId>plexus-build-api</artifactId>
321321
<version>1.2.0</version>
322322
</dependency>
323+
<dependency>
324+
<groupId>org.slf4j</groupId>
325+
<artifactId>slf4j-api</artifactId>
326+
<version>1.7.36</version>
327+
</dependency>
328+
<dependency>
329+
<groupId>org.slf4j</groupId>
330+
<artifactId>slf4j-simple</artifactId>
331+
<version>1.7.36</version>
332+
</dependency>
323333
<dependency>
324334
<groupId>junit</groupId>
325335
<artifactId>junit</artifactId>

0 commit comments

Comments
 (0)