cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r474846 - in /incubator/cxf/trunk: codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java tools/eclipse-plugin/src/main/assembly/plugin.xml
Date Tue, 14 Nov 2006 16:15:12 GMT
Author: dkulp
Date: Tue Nov 14 08:15:11 2006
New Revision: 474846

URL: http://svn.apache.org/viewvc?view=rev&rev=474846
Log:
Fixes for eclipse plugin stuff.

* Make the eclipse version that is used match our version defined in the pom
* Put the stuff in plugins/org.apache.cxf_${version} instead of the root to match a normal
eclipse plugin

Modified:
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java
    incubator/cxf/trunk/tools/eclipse-plugin/src/main/assembly/plugin.xml

Modified: incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java?view=diff&rev=474846&r1=474845&r2=474846
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java
(original)
+++ incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java
Tue Nov 14 08:15:11 2006
@@ -29,7 +29,6 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.tools.wsdl2java.frontend.jaxws.VelocityWriter;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
@@ -98,7 +97,7 @@
     }
 
     private String getVersion() {
-        return StringUtils.formatVersionNumber(project.getVersion());
+        return project.getVersion();
     }
 
     // TODO: Reuse the velocity in the tools 

Modified: incubator/cxf/trunk/tools/eclipse-plugin/src/main/assembly/plugin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/eclipse-plugin/src/main/assembly/plugin.xml?view=diff&rev=474846&r1=474845&r2=474846
==============================================================================
--- incubator/cxf/trunk/tools/eclipse-plugin/src/main/assembly/plugin.xml (original)
+++ incubator/cxf/trunk/tools/eclipse-plugin/src/main/assembly/plugin.xml Tue Nov 14 08:15:11
2006
@@ -28,14 +28,14 @@
     <fileSets>
         <fileSet>
             <directory>src/main/resources/</directory>
-            <outputDirectory></outputDirectory>
+            <outputDirectory>plugins/org.apache.cxf_${version}</outputDirectory>
             <includes>
                 <include>**/*</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>target</directory>
-            <outputDirectory></outputDirectory>
+            <outputDirectory>plugins/org.apache.cxf_${version}</outputDirectory>
             <includes>
                 <include>plugin.xml</include>
             </includes>
@@ -43,7 +43,7 @@
     </fileSets>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>lib</outputDirectory>
+            <outputDirectory>plugins/org.apache.cxf_${version}/lib</outputDirectory>
             <unpack>false</unpack>
             <scope>runtime</scope>
         </dependencySet>



Mime
View raw message