jvanzyl 2004/03/22 10:05:39
Modified: maven-core NOTES.txt project.xml
maven-core/src/main/java/org/apache/maven/plugin/descriptor
PluginDescriptor.java
maven-core/src/test/java/org/apache/maven/plugin
PluginDescriptorBuilderTest.java
maven-core/src/test/resources/org/apache/maven/plugin
field-plugin.xml integrated-plugin.xml
setter-plugin.xml singleton-plugin.xml
Log:
o fix scalability problem and let the plugin descriptor state the
instantiation strategy and remove the crap logic from the PluginDescriptor
to pick off the instantiation strategy from the mode.
Revision Changes Path
1.2 +1 -1 maven-components/maven-core/NOTES.txt
Index: NOTES.txt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/NOTES.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NOTES.txt 19 Mar 2004 04:13:17 -0000 1.1
+++ NOTES.txt 22 Mar 2004 18:05:39 -0000 1.2
@@ -2,4 +2,4 @@
plugin.xml and plexus components.xml is not acceptable.
o plugin testing harness is required so that plugins can be tested
- independently. what's in maven1 is horrid, unscalable mess.
+ independently. what's in maven1 is horrid, unscalable mess.
\ No newline at end of file
1.2 +17 -16 maven-components/maven-core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 04:13:16 -0000 1.1
+++ project.xml 22 Mar 2004 18:05:39 -0000 1.2
@@ -104,26 +104,27 @@
</dependencies>
- <build>
- <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
- <sourceDirectory>src/main/java</sourceDirectory>
- <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/PluginTest.java</include>
- </includes>
+ <build>
+ <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/PluginTest.java</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>src/test/resources</directory>
+ </resource>
+ </resources>
+ </unitTest>
<resources>
<resource>
- <directory>src/test/resources</directory>
+ <directory>src/main/resources</directory>
</resource>
</resources>
- </unitTest>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- </build>
+ </build>
+
<reports>
<report>maven-jxr-plugin</report>
1.5 +1 -11
maven-components/maven-core/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
Index: PluginDescriptor.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PluginDescriptor.java 22 Mar 2004 14:34:12 -0000 1.4
+++ PluginDescriptor.java 22 Mar 2004 18:05:39 -0000 1.5
@@ -28,21 +28,11 @@
private List goals;
- private String mode = "field";
+ private String mode;
public String getRole()
{
return "org.apache.maven.plugin.Plugin";
- }
-
- public String getInstantiationStrategy()
- {
- if ( mode.equals( "field" ) || mode.equals( "setter" ) )
- {
- return "per-lookup";
- }
-
- return "singleton";
}
public String getId()
1.4 +5 -5
maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginDescriptorBuilderTest.java
Index: PluginDescriptorBuilderTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginDescriptorBuilderTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PluginDescriptorBuilderTest.java 21 Mar 2004 00:33:18 -0000 1.3
+++ PluginDescriptorBuilderTest.java 22 Mar 2004 18:05:39 -0000 1.4
@@ -86,12 +86,12 @@
assertNotNull( parameters );
- assertEquals( "#build.sourceDirectory", ((ParameterDescriptor)
parameters.get( 0 ) ).getName() );
+ assertEquals( "sourceDirectory", ((ParameterDescriptor) parameters.get( 0 )
).getName() );
- assertEquals( "maven.build.dest", ((ParameterDescriptor) parameters.get( 1
) ).getName() );
+ assertEquals( "outputDirectory", ((ParameterDescriptor) parameters.get( 1 )
).getName() );
- assertEquals( "#classpathElements",((ParameterDescriptor) parameters.get( 2
) ).getName() );
+ assertEquals( "classpathElements",((ParameterDescriptor) parameters.get( 2
) ).getName() );
- assertEquals( "javac",((ParameterDescriptor) parameters.get( 3 )
).getName() );
+ assertEquals( "compiler",((ParameterDescriptor) parameters.get( 3 )
).getName() );
}
}
1.3 +1 -0
maven-components/maven-core/src/test/resources/org/apache/maven/plugin/field-plugin.xml
Index: field-plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/test/resources/org/apache/maven/plugin/field-plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- field-plugin.xml 19 Mar 2004 16:12:27 -0000 1.2
+++ field-plugin.xml 22 Mar 2004 18:05:39 -0000 1.3
@@ -1,6 +1,7 @@
<plugin>
<id>field-plugin</id>
<implementation>org.apache.maven.plugin.FieldPlugin</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
<mode>field</mode>
<goals>
<goal>
1.3 +1 -0
maven-components/maven-core/src/test/resources/org/apache/maven/plugin/integrated-plugin.xml
Index: integrated-plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/test/resources/org/apache/maven/plugin/integrated-plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- integrated-plugin.xml 19 Mar 2004 16:12:27 -0000 1.2
+++ integrated-plugin.xml 22 Mar 2004 18:05:39 -0000 1.3
@@ -1,6 +1,7 @@
<plugin>
<id>integrated-plugin</id>
<implementation>org.apache.maven.plugin.IntegratedPlugin</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
<mode>integrated</mode>
<goals>
<goal>
1.3 +1 -0
maven-components/maven-core/src/test/resources/org/apache/maven/plugin/setter-plugin.xml
Index: setter-plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/test/resources/org/apache/maven/plugin/setter-plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setter-plugin.xml 19 Mar 2004 16:12:27 -0000 1.2
+++ setter-plugin.xml 22 Mar 2004 18:05:39 -0000 1.3
@@ -1,6 +1,7 @@
<plugin>
<id>setter-plugin</id>
<implementation>org.apache.maven.plugin.SetterPlugin</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
<mode>setter</mode>
<goals>
<goal>
1.3 +1 -0
maven-components/maven-core/src/test/resources/org/apache/maven/plugin/singleton-plugin.xml
Index: singleton-plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/test/resources/org/apache/maven/plugin/singleton-plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- singleton-plugin.xml 19 Mar 2004 16:12:27 -0000 1.2
+++ singleton-plugin.xml 22 Mar 2004 18:05:39 -0000 1.3
@@ -1,6 +1,7 @@
<plugin>
<id>singleton-plugin</id>
<implementation>org.apache.maven.plugin.SingletonPlugin</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
<mode>singleton</mode>
<goals>
<goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
