You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/04/17 18:07:22 UTC
svn commit: r394721 -
/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/PackagingMojo.java
Author: sppatel
Date: Mon Apr 17 09:07:19 2006
New Revision: 394721
URL: http://svn.apache.org/viewcvs?rev=394721&view=rev
Log:
plugin may not contain plugin.xml
Modified:
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/PackagingMojo.java
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/PackagingMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/PackagingMojo.java?rev=394721&r1=394720&r2=394721&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/PackagingMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/PackagingMojo.java Mon Apr 17 09:07:19 2006
@@ -71,10 +71,10 @@
try {
URL[] urls = { artifact.getFile().toURL() };
URLClassLoader cl = new URLClassLoader(urls);
- if (cl.findResource("plugin.xml") != null) {
- processPlugin(artifact);
- } else if (cl.findResource("feature.xml") != null) {
+ if (cl.findResource("feature.xml") != null) {
processFeature(artifact);
+ } else {
+ processPlugin(artifact);
}
} catch (Exception e) {
e.printStackTrace();