You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by mm...@apache.org on 2006/11/01 16:20:55 UTC

svn commit: r469930 - in /incubator/cxf/trunk: codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/ codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/3.0/ codegen-plugin/src/main/resources/ codegen-plugin/src/main/resources/...

Author: mmao
Date: Wed Nov  1 07:20:54 2006
New Revision: 469930

URL: http://svn.apache.org/viewvc?view=rev&rev=469930
Log:
[CXF-187]Provide Eclipse plugin from CXF to faciliate STP Integration
* Added a maven plugin to generate eclipse plugin which will generate the Eclipse3.0 compatible plugin zip file.
  It's packaged jar files on described in POM.xml dependencies, and you can exclude the jar files using regular expression.
* A new top level dir eclipse-plugin added to generate the cxf eclipse plugin.
* Set build-helper-maven-plugin version to 1.0

Added:
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/3.0/
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/3.0/plugin.xml.vm
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java   (with props)
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/Zipper.java   (with props)
    incubator/cxf/trunk/codegen-plugin/src/main/resources/
    incubator/cxf/trunk/codegen-plugin/src/main/resources/eclipse/
    incubator/cxf/trunk/codegen-plugin/src/main/resources/eclipse/plugin.xml.vm
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java   (with props)
    incubator/cxf/trunk/eclipse-plugin/
    incubator/cxf/trunk/eclipse-plugin/pom.xml   (with props)
Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/StringUtils.java
    incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
    incubator/cxf/trunk/rt/frontend/jaxws/pom.xml

Added: incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/3.0/plugin.xml.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/3.0/plugin.xml.vm?view=auto&rev=469930
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/3.0/plugin.xml.vm (added)
+++ incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/3.0/plugin.xml.vm Wed Nov  1 07:20:54 2006
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Automatically generated from plugin.xsl.-->
+<?eclipse version="${ECLIPSE_VERSION}"?>
+
+<plugin id="${GROUP_ID}" name="Apache CXF Tools Plug-in" provider-name="Apache CXF" version="${PLUGIN_VERSION}">
+    <runtime>
+        #foreach ($jarfile in $jars)
+	<library name="${libPath}/$jarfile.name">
+	    <export name="*"/>
+	</library>
+        #end
+    </runtime>
+</plugin>
\ No newline at end of file

Added: 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=auto&rev=469930
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java (added)
+++ incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java Wed Nov  1 07:20:54 2006
@@ -0,0 +1,212 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.maven_plugin.eclipse;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.tools.wsdl2java.frontend.jaxws.VelocityWriter;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+
+/**
+ * @goal eclipseplugin
+ * @description CXF eclipse plugin generator
+ */
+public class EclipsePluginMojo extends AbstractMojo {
+    private static final String LIB_PATH = "lib";
+    private static final String PLUGIN_XML = "plugin.xml";
+    private static final String ECLIPSE_PLUGIN_TEMPLATE = 
+        "/org/apache/cxf/maven_plugin/eclipse/3.0/plugin.xml.vm";
+    /**
+     * @parameter expression="${project}"
+     * @required
+     */
+    MavenProject project;
+
+    /**
+     * The set of dependencies required by the project 
+     * @parameter default-value="${project.artifacts}"
+     * @required
+     * @readonly
+     */
+    java.util.Set dependencies;
+
+    /**
+     * @parameter  expression="${project.build.directory}"
+     * @required
+     */
+    String targetDirectory;
+
+    /**
+     * @parameter
+     */
+    String[] excludes;
+
+    private File baseDir;
+    private File libPath;
+    private File zipFile;
+
+    private void init() {
+        baseDir = new File(targetDirectory, project.getGroupId() + "_" + project.getVersion());
+        libPath = new File(baseDir, LIB_PATH);
+        zipFile = new File(targetDirectory, project.getGroupId() + "_" + project.getVersion() + ".zip");
+
+        // TODO: reuse the file create/detele in tools.
+        if (baseDir.exists()) {
+            FileUtils.removeDir(baseDir);
+        }
+
+        if (!libPath.exists()) {
+            FileUtils.mkDir(libPath);
+        }
+
+        if (!libPath.exists()) {
+            throw new RuntimeException("Can not create lib dir: " + libPath);
+        }
+    }
+
+    // This exclude support regular expression ;-)
+    private boolean isExclued(File file) {
+        if (file == null || !file.exists()) {
+            return true;
+        }
+        if (excludes == null || excludes.length == 0) {
+            System.err.println(" excludes is NULL");
+            return false;
+        }
+        for (int i = 0; i < excludes.length; i++) {
+            if (!StringUtils.isEmpty(StringUtils.getFound(file.getName(), excludes[i]))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        init();
+
+        if (dependencies != null && !dependencies.isEmpty()) {
+            List jars = new ArrayList();
+            org.apache.tools.ant.util.FileUtils fileUtils = org.apache.tools.ant.util.FileUtils
+                .newFileUtils();
+            for (Iterator it = dependencies.iterator(); it.hasNext();) {
+                Artifact artifact = (Artifact)it.next();
+                File oldJar = artifact.getFile();
+                if (isExclued(oldJar)) {
+                    continue;
+                }
+
+                File newJar = new File(libPath, artifact.getFile().getName());
+                if (!oldJar.exists()) {
+                    System.err.println("file : " + oldJar + " is not exist");
+                }
+                try {
+                    fileUtils.copyFile(oldJar, newJar);
+                } catch (IOException e) {
+                    System.err.println("Copy file " + oldJar + " to " + newJar + " failed!");
+                    e.printStackTrace();
+                    throw new MojoExecutionException(e.getMessage(), e);
+                }
+
+                jars.add(newJar);
+            }
+
+            try {
+                generatePluginXML(jars, new File(baseDir, PLUGIN_XML));
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new MojoExecutionException(e.getMessage(), e);
+            }
+
+            zip();
+
+            cleanUp();
+        }
+    }
+
+    private void cleanUp() {
+        FileUtils.removeDir(baseDir);
+    }
+
+    private void zip() {
+        Zipper.zip(baseDir, zipFile);
+    }
+
+    private String getVelocityLogFile(String log) {
+        return new File(targetDirectory, log).toString();
+    }
+
+    // TODO: Reuse the velocity in the tools 
+    private void initVelocity() throws Exception {
+        Properties props = new Properties();
+        String clzName = "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader";
+        props.put("resource.loader", "class");
+        props.put("class.resource.loader.class", clzName);
+        props.put("runtime.log", getVelocityLogFile("velocity.log"));
+
+        Velocity.init(props);
+
+    }
+
+    private void generatePluginXML(List jars, File targetFile) throws Exception {
+        initVelocity();
+
+        String templateName = ECLIPSE_PLUGIN_TEMPLATE;
+
+        Template tmpl = null;
+
+        tmpl = Velocity.getTemplate(templateName);
+
+        VelocityContext ctx = new VelocityContext();
+        ctx.put("ECLIPSE_VERSION", "3.0");
+        ctx.put("PLUGIN_VERSION", project.getVersion());
+        ctx.put("GROUP_ID", project.getGroupId());
+        ctx.put("libPath", LIB_PATH);
+        ctx.put("jars", jars);
+
+        Writer outputs = null;
+
+        outputs = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(targetFile)), "UTF-8");
+        VelocityWriter writer = new VelocityWriter(outputs);
+        if (tmpl == null) {
+            throw new RuntimeException("Can not load template file: " + templateName);
+        }
+
+        tmpl.merge(ctx, writer);
+        writer.close();
+    }
+}

Propchange: incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/Zipper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/Zipper.java?view=auto&rev=469930
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/Zipper.java (added)
+++ incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/Zipper.java Wed Nov  1 07:20:54 2006
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.maven_plugin.eclipse;
+
+import java.io.File;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Target;
+import org.apache.tools.ant.taskdefs.Zip;
+
+public final class Zipper extends Zip {
+    
+    private Zipper() {
+        setProject(new Project());
+        getProject().init();
+        this.setTaskType("zip");
+        this.setTaskName("zip");
+        this.setOwningTarget(new Target());        
+    }
+
+    public static void zip(File baseDir, File destFile) {
+        Zipper zipper = new Zipper();
+        zipper.setCompress(true);
+        zipper.setDestFile(destFile);
+        zipper.setBasedir(baseDir);
+        zipper.execute();
+    }
+}

Propchange: incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/Zipper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/Zipper.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/codegen-plugin/src/main/resources/eclipse/plugin.xml.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/src/main/resources/eclipse/plugin.xml.vm?view=auto&rev=469930
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/src/main/resources/eclipse/plugin.xml.vm (added)
+++ incubator/cxf/trunk/codegen-plugin/src/main/resources/eclipse/plugin.xml.vm Wed Nov  1 07:20:54 2006
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Automatically generated from plugin.xsl.-->
+<?eclipse version="${ECLIPSE_VERSION}"?>
+
+<plugin id="${GROUP_ID}" name="Apache CXF Tools Plug-in" provider-name="Apache CXF" version="PLUGIN_VERSION">
+    <runtime>
+        #foreach ($jarfile in $jars)
+	<library name="${libPath}/$jarfile.name">
+	    <export name="*"/>
+	</library>
+        #end
+    </runtime>
+</plugin>
\ No newline at end of file

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/StringUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/StringUtils.java?view=diff&rev=469930&r1=469929&r2=469930
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/StringUtils.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/StringUtils.java Wed Nov  1 07:20:54 2006
@@ -25,6 +25,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public final class StringUtils {
 
@@ -73,6 +75,16 @@
         return true;
     }
     
+    public static boolean isEmpty(List<String> list) {
+        if (list == null || list.size() == 0) {
+            return true;
+        }
+        if (list.size() == 1 && isEmpty(list.get(0))) {
+            return true;
+        }
+        return false;
+    }
+    
     public static String trim(String target, String token) {
         int tokenLength = token.length();
         int targetLength = target.length();
@@ -126,4 +138,22 @@
         }
         return str;
     }
+    
+    public static List<String> getFound(String contents, String regex) {
+        if (isEmpty(regex) || isEmpty(contents)) {
+            return null;
+        }
+        List<String> results = new ArrayList<String>();
+        Pattern pattern = Pattern.compile(regex, Pattern.UNICODE_CASE);
+        Matcher matcher = pattern.matcher(contents);
+        
+        while (matcher.find()) {
+            if (matcher.groupCount() > 0) {
+                results.add(matcher.group(1));
+            } else {
+                results.add(matcher.group());
+            }
+        }
+        return results;
+    } 
 }

Added: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java?view=auto&rev=469930
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java (added)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java Wed Nov  1 07:20:54 2006
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.helpers;
+
+import java.io.File;
+import java.util.Locale;
+
+public final class FileUtils {
+    private static final int RETRY_SLEEP_MILLIS = 10;
+    
+    private FileUtils() {
+        
+    }
+
+    public static void mkDir(File dir) {
+        if (dir == null) {
+            throw new RuntimeException("dir attribute is required");
+        }
+
+        if (dir.isFile()) {
+            throw new RuntimeException("Unable to create directory as a file "
+                                    + "already exists with that name: " + dir.getAbsolutePath());
+        }
+
+        if (!dir.exists()) {
+            boolean result = doMkDirs(dir);
+            if (!result) {
+                String msg = "Directory " + dir.getAbsolutePath()
+                             + " creation was not successful for an unknown reason";
+                throw new RuntimeException(msg);
+            }
+        }
+    }
+
+    /**
+     * Attempt to fix possible race condition when creating directories on
+     * WinXP, also Windows2000. If the mkdirs does not work, wait a little and
+     * try again.
+     */
+    private static boolean doMkDirs(File f) {
+        if (!f.mkdirs()) {
+            try {
+                Thread.sleep(RETRY_SLEEP_MILLIS);
+                return f.mkdirs();
+            } catch (InterruptedException ex) {
+                return f.mkdirs();
+            }
+        }
+        return true;
+    }
+
+    public static void removeDir(File d) {
+        String[] list = d.list();
+        if (list == null) {
+            list = new String[0];
+        }
+        for (int i = 0; i < list.length; i++) {
+            String s = list[i];
+            File f = new File(d, s);
+            if (f.isDirectory()) {
+                removeDir(f);
+            } else {
+                delete(f);
+            }
+        }
+        delete(d);
+    }
+
+    private static void delete(File f) {
+        if (!f.delete()) {
+            if (isWindows()) {
+                System.gc();
+            }
+            try {
+                Thread.sleep(RETRY_SLEEP_MILLIS);
+            } catch (InterruptedException ex) {
+                // Ignore Exception
+            }
+            if (!f.delete()) {
+                f.deleteOnExit();
+            }
+        }
+    }
+
+    private static boolean isWindows() {
+        String osName = System.getProperty("os.name").toLowerCase(Locale.US);
+        return osName.indexOf("windows") > -1;
+    }
+}

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java?view=diff&rev=469930&r1=469929&r2=469930
==============================================================================
--- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java (original)
+++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java Wed Nov  1 07:20:54 2006
@@ -51,4 +51,12 @@
         assertEquals("me", parts.get(1));
         assertEquals("CXF", parts.get(2));
     }
+    
+    public void testGetFound() throws Exception {
+        String regex = "velocity-\\d+\\.\\d+\\.jar";
+        
+        assertTrue(StringUtils.isEmpty(StringUtils.getFound("velocity-dep-1.4.jar", regex)));
+        assertFalse(StringUtils.isEmpty(StringUtils.getFound("velocity-1.4.jar", regex)));
+        assertTrue(StringUtils.isEmpty(StringUtils.getFound(null, regex)));
+    }
 }

Added: incubator/cxf/trunk/eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/eclipse-plugin/pom.xml?view=auto&rev=469930
==============================================================================
--- incubator/cxf/trunk/eclipse-plugin/pom.xml (added)
+++ incubator/cxf/trunk/eclipse-plugin/pom.xml Wed Nov  1 07:20:54 2006
@@ -0,0 +1,86 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf</groupId>
+    <artifactId>cxf-eclipse-plugin</artifactId>
+    <packaging>jar</packaging>
+    <version>2.0-incubator-M1-SNAPSHOT</version>
+    <name>CXF Eclipse Distribution</name>
+    <url>http://cxf.apache.org/</url>
+
+    <parent>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf</artifactId>
+        <version>2.0-incubator-M1-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+        <topDirectoryLocation>..</topDirectoryLocation>
+    </properties>
+
+    <dependencies>
+	<dependency>
+	    <groupId>${pom.groupId}</groupId>
+	    <artifactId>cxf-tools-wsdl2java</artifactId>
+	    <version>${project.version}</version>
+	</dependency>
+
+	<dependency>
+	    <groupId>${pom.groupId}</groupId>
+	    <artifactId>cxf-tools-java2wsdl</artifactId>
+	    <version>${project.version}</version>
+	</dependency>
+    </dependencies>
+
+
+    <build>
+	<plugins>
+	    <plugin>
+		<groupId>org.apache.cxf</groupId>
+		<artifactId>cxf-codegen-plugin</artifactId>
+		<version>${project.version}</version>
+		<executions>
+		    <execution>
+			<id>eclipse-package</id>
+			<phase>package</phase>
+			<configuration>
+			    <excludes>
+				<exclude>spring</exclude>
+				<exclude>aopalliance</exclude>
+				<exclude>commons-logging</exclude>
+				<exclude>servlet-api</exclude>
+				<exclude>velocity-\d+\.\d+\.jar</exclude>
+				<exclude>saaj</exclude>
+				<exclude>jsr250</exclude>
+				<exclude>XmlSchema</exclude>
+			    </excludes>
+			</configuration>
+			<goals>
+			    <goal>eclipseplugin</goal>
+			</goals>
+		    </execution>
+		</executions>
+	    </plugin>
+	</plugins>
+    </build>
+
+</project>

Propchange: incubator/cxf/trunk/eclipse-plugin/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/eclipse-plugin/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/eclipse-plugin/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/pom.xml?view=diff&rev=469930&r1=469929&r2=469930
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/pom.xml Wed Nov  1 07:20:54 2006
@@ -108,6 +108,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>