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

svn commit: r471852 [1/2] - in /incubator/cxf/trunk: ./ benchmark/performance/etc/ buildtools/src/main/resources/META-INF/ codegen-plugin/ codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/ codegen-plugin/src/main/resources/ common/ comm...

Author: dkulp
Date: Mon Nov  6 11:54:19 2006
New Revision: 471852

URL: http://svn.apache.org/viewvc?view=rev&rev=471852
Log:
* Fix more CeltiXfire -> CXF 
* Change the eclipse plugin stuff to be a normal assembly, just generate the plugin.xml in the code
* Make sure eclipse plugin is in -Peverything

Added:
    incubator/cxf/trunk/tools/eclipse-plugin/src/main/assembly/
    incubator/cxf/trunk/tools/eclipse-plugin/src/main/assembly/plugin.xml   (with props)
    incubator/cxf/trunk/tools/eclipse-plugin/src/main/resources/DISCLAIMER
    incubator/cxf/trunk/tools/eclipse-plugin/src/main/resources/NOTICE   (with props)
Removed:
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/Zipper.java
    incubator/cxf/trunk/codegen-plugin/src/main/resources/
Modified:
    incubator/cxf/trunk/benchmark/performance/etc/common_build.xml
    incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/codegen-plugin/pom.xml
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/EclipsePluginMojo.java
    incubator/cxf/trunk/common/common/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/common/common/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/common/pom.xml
    incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/common/xsd/pom.xml
    incubator/cxf/trunk/distribution/src/main/release/DISCLAIMER
    incubator/cxf/trunk/distribution/src/main/release/NOTICE
    incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/soap_header/server/HeaderTesterImpl.java
    incubator/cxf/trunk/distribution/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/distribution/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/integration/jbi/pom.xml
    incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/ServiceConsumer.java
    incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceEngine.java
    incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
    incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnitManager.java
    incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/Messages.properties
    incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitManagerTest.java
    incubator/cxf/trunk/jca/pom.xml
    incubator/cxf/trunk/metacode/pom.xml
    incubator/cxf/trunk/metacode/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/metacode/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/rt/bindings/http/pom.xml
    incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/bindings/pom.xml
    incubator/cxf/trunk/rt/bindings/soap/pom.xml
    incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/bindings/xml/pom.xml
    incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/core/pom.xml
    incubator/cxf/trunk/rt/core/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/core/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/frontend/js/pom.xml
    incubator/cxf/trunk/rt/frontend/js/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/frontend/js/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/frontend/simple/pom.xml
    incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/management/pom.xml
    incubator/cxf/trunk/rt/management/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/management/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/transports/http/pom.xml
    incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/transports/jms/pom.xml
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/transports/local/pom.xml
    incubator/cxf/trunk/rt/ws/addr/pom.xml
    incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/rt/ws/policy/pom.xml
    incubator/cxf/trunk/rt/ws/rm/pom.xml
    incubator/cxf/trunk/systests/pom.xml
    incubator/cxf/trunk/testutils/pom.xml
    incubator/cxf/trunk/tools/common/pom.xml
    incubator/cxf/trunk/tools/common/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/tools/common/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/tools/eclipse-plugin/pom.xml
    incubator/cxf/trunk/tools/java2wsdl/pom.xml
    incubator/cxf/trunk/tools/java2wsdl/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/tools/java2wsdl/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/tools/misctools/pom.xml
    incubator/cxf/trunk/tools/misctools/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/tools/misctools/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/tools/pom.xml
    incubator/cxf/trunk/tools/validator/pom.xml
    incubator/cxf/trunk/tools/validator/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/tools/validator/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/tools/wsdl2java/pom.xml
    incubator/cxf/trunk/tools/wsdl2java/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/tools/wsdl2java/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/tools/xjc/cfg-test/pom.xml
    incubator/cxf/trunk/tools/xjc/cfg/pom.xml
    incubator/cxf/trunk/tools/xjc/cfg/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/tools/xjc/cfg/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/tools/xjc/dv-test/pom.xml
    incubator/cxf/trunk/tools/xjc/dv/pom.xml
    incubator/cxf/trunk/tools/xjc/dv/src/main/resources/META-INF/DISCLAIMER
    incubator/cxf/trunk/tools/xjc/dv/src/main/resources/META-INF/NOTICE
    incubator/cxf/trunk/tools/xjc/pom.xml

Modified: incubator/cxf/trunk/benchmark/performance/etc/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/etc/common_build.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/etc/common_build.xml (original)
+++ incubator/cxf/trunk/benchmark/performance/etc/common_build.xml Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-<project name="CeltiXfire common build file" default="build">
+<project name="CXF common build file" default="build">
 
 
     <property environment="env"/>
@@ -39,7 +39,7 @@
         <equals arg1="${ant.java.version}" arg2="1.5"/>
     </condition>
 
-    <fail message="CeltiXfire requires Java version 1.5 or higher. You are currently using Java version ${ant.java.version}."
+    <fail message="CXF requires Java version 1.5 or higher. You are currently using Java version ${ant.java.version}."
         unless="is.java.version.15"/>
 
 

Modified: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/pom.xml (original)
+++ incubator/cxf/trunk/codegen-plugin/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>maven-plugin</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Code Generation Maven 2 Plugins</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
 
     <parent>
@@ -56,6 +56,12 @@
             <artifactId>maven-project</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <scope>provided</scope>
+            <version>2.0.4</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -73,8 +79,6 @@
             <version>${project.version}</version>
         </dependency>
         
-        
-
         <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>

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=471852&r1=471851&r2=471852
==============================================================================
--- 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 Mon Nov  6 11:54:19 2006
@@ -22,7 +22,6 @@
 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;
@@ -31,7 +30,6 @@
 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;
@@ -48,7 +46,6 @@
  */
 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";
     /**
@@ -66,123 +63,38 @@
     java.util.Set dependencies;
 
     /**
-     * @parameter  expression="${project.build.directory}"
+     * @parameter  expression="${project.build.directory}/plugin.xml";
      * @required
      */
-    String targetDirectory;
+    File targetFile;
 
-    /**
-     * @parameter
-     */
-    String[] excludes;
-
-    /**
-     * @parameter
-     */
-    String license;
-
-    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");
-
-        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;
-    }
 
-    private void copyLicense() throws IOException {
-        File licFile = new File(license);
-        if (licFile != null && licFile.exists()) {
-            org.apache.tools.ant.util.FileUtils fileUtils = org.apache.tools.ant.util.FileUtils
-                .newFileUtils();
-            fileUtils.copyFile(licFile, new File(baseDir, "LICENSE"));
-        }
-    }
 
-    private List copyJars() throws Exception {
+    private List listJars() throws Exception {
         List jars = new ArrayList();
         if (dependencies != null && !dependencies.isEmpty()) {            
-            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);
+                jars.add(oldJar);
             }            
         }
         return jars;
     }
 
     public void execute() throws MojoExecutionException, MojoFailureException {
-        init();
         
         try {
-            generatePluginXML(copyJars(), new File(baseDir, PLUGIN_XML));
-            copyLicense();
+            generatePluginXML(listJars());
         } 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();
+        return new File(targetFile.getParentFile(), log).toString();
     }
 
     private String getVersion() {
@@ -201,7 +113,7 @@
 
     }
 
-    private void generatePluginXML(List jars, File targetFile) throws Exception {
+    private void generatePluginXML(List jars) throws Exception {
         initVelocity();
 
         Template tmpl = null;

Modified: incubator/cxf/trunk/common/common/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/common/common/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/common/common/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/common/common/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/common/pom.xml (original)
+++ incubator/cxf/trunk/common/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>pom</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Common</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/common/xsd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xsd/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/common/xsd/pom.xml (original)
+++ incubator/cxf/trunk/common/xsd/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>maven-plugin</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Common XSD2Java  Plugins</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
 
     <parent>

Modified: incubator/cxf/trunk/distribution/src/main/release/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/DISCLAIMER (original)
+++ incubator/cxf/trunk/distribution/src/main/release/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/distribution/src/main/release/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/NOTICE (original)
+++ incubator/cxf/trunk/distribution/src/main/release/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/soap_header/server/HeaderTesterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/soap_header/server/HeaderTesterImpl.java?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/soap_header/server/HeaderTesterImpl.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/soap_header/server/HeaderTesterImpl.java Mon Nov  6 11:54:19 2006
@@ -57,11 +57,11 @@
                           Holder<SOAPHeaderData> headerInfo) {
         System.out.println("outHeader invoked");
 
-        System.out.println("\tSetting originator: Celtix server");
+        System.out.println("\tSetting originator: CXF server");
         System.out.println("\tSetting message: outHeader invocation succeeded");
 
         SOAPHeaderData sh = new SOAPHeaderData();
-        sh.setOriginator("Celtix server");
+        sh.setOriginator("CXF server");
         sh.setMessage("outHeader invocation succeeded");
         headerInfo.value = sh;
 
@@ -77,10 +77,10 @@
         System.out.println("\tGetting Originator: " + headerInfo.value.getOriginator());
         System.out.println("\tGetting Message: " + headerInfo.value.getMessage());
 
-        System.out.println("\tSetting originator: Celtix server");
+        System.out.println("\tSetting originator: CXF server");
         System.out.println("\tSetting message: inoutHeader invocation succeeded");
 
-        headerInfo.value.setOriginator("Celtix server");
+        headerInfo.value.setOriginator("CXF server");
         headerInfo.value.setMessage("inoutHeader invocation succeeded");
 
         InoutHeaderResponse iohr = new InoutHeaderResponse();

Modified: incubator/cxf/trunk/distribution/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/distribution/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/distribution/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/distribution/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/integration/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/integration/jbi/pom.xml (original)
+++ incubator/cxf/trunk/integration/jbi/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF JBI Integration</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/ServiceConsumer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/ServiceConsumer.java?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/ServiceConsumer.java (original)
+++ incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/ServiceConsumer.java Mon Nov  6 11:54:19 2006
@@ -23,7 +23,7 @@
 import javax.jbi.component.ComponentContext;
 
 /**
- * Defines a service consumer to be started by the Celtix Service
+ * Defines a service consumer to be started by the CXF Service
  * Engine.
  * 
  */

Modified: incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceEngine.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceEngine.java?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceEngine.java (original)
+++ incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceEngine.java Mon Nov  6 11:54:19 2006
@@ -42,7 +42,7 @@
 import org.apache.cxf.jbi.se.state.ServiceEngineStateMachine;
 
 
-/** A JBI component.  Initializes the Celtix JBI transport
+/** A JBI component.  Initializes the CXF JBI transport
  */
 public class CXFServiceEngine implements ComponentLifeCycle, Component {
     
@@ -113,19 +113,19 @@
     // Implementation of javax.jbi.component.Component
     
     public final ComponentLifeCycle getLifeCycle() {
-        LOG.fine("CeltixServiceEngine returning life cycle");
+        LOG.fine("CXFServiceEngine returning life cycle");
         return this;
     }
     
     public final ServiceUnitManager getServiceUnitManager() {
-        LOG.fine("CeltixServiceEngine return service unit manager");
+        LOG.fine("CXFServiceEngine return service unit manager");
         return AbstractServiceEngineStateMachine.getSUManager();
     }
     
     public final Document getServiceDescription(final ServiceEndpoint serviceEndpoint) {
         Document doc = 
             AbstractServiceEngineStateMachine.getSUManager().getServiceDescription(serviceEndpoint);
-        LOG.fine("CeltixServiceEngine returning service description: " + doc);
+        LOG.fine("CXFServiceEngine returning service description: " + doc);
         return doc;
     }
     

Modified: incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java (original)
+++ incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java Mon Nov  6 11:54:19 2006
@@ -53,7 +53,7 @@
 import org.apache.cxf.transport.ConduitInitiatorManager;
 
 /**
- * Wraps a Celtix service or client.
+ * Wraps a CXF service or client.
  */
 public class CXFServiceUnit {
     

Modified: incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnitManager.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnitManager.java?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnitManager.java (original)
+++ incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnitManager.java Mon Nov  6 11:54:19 2006
@@ -36,7 +36,7 @@
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 
-/** Manage deployment of service units to the Celtix service engine
+/** Manage deployment of service units to the CXF service engine
  * 
  */
 public class CXFServiceUnitManager implements ServiceUnitManager {

Modified: incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/Messages.properties?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/Messages.properties (original)
+++ incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/Messages.properties Mon Nov  6 11:54:19 2006
@@ -2,7 +2,7 @@
 BOOTSTRAP.ONINSTALL=Bootstrap.onInstall called
 BOOTSTRAP.ONUNINSTALL=Bootstrap.onUninstall called
 BOOTSTRAP.INIT=Bootstrap.init called
-SE.SHUTDOWN=Shutting down CeltixServiceEngine
+SE.SHUTDOWN=Shutting down CXFServiceEngine
 SE.SET.CONFIGURATION=set CXF configuration to:
 SE.NOT.FOUND.CONFIGURATION=could not find CXF configuration in\t
 SE.INSTALL.ROOT=CXF Service Engine installation root:

Modified: incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitManagerTest.java?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitManagerTest.java (original)
+++ incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitManagerTest.java Mon Nov  6 11:54:19 2006
@@ -37,7 +37,7 @@
     private static final Logger LOG = LogUtils.getL7dLogger(CXFServiceUnitManagerTest.class);
 
     //private static final String CELTIX_CONFIG = 
-    //    "/components/CeltixServiceEngine/version_1/META-INF/celtix-config.xml";
+    //    "/components/CXFServiceEngine/version_1/META-INF/celtix-config.xml";
     private CXFServiceUnitManager csuManager;
     private ComponentContext ctx = EasyMock.createMock(ComponentContext.class);
     private Bus bus;    

Modified: incubator/cxf/trunk/jca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/jca/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/jca/pom.xml (original)
+++ incubator/cxf/trunk/jca/pom.xml Mon Nov  6 11:54:19 2006
@@ -25,7 +25,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF JCA Connection</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/metacode/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/metacode/pom.xml (original)
+++ incubator/cxf/trunk/metacode/pom.xml Mon Nov  6 11:54:19 2006
@@ -75,8 +75,8 @@
                     <attach>true</attach>
                     <quiet>true</quiet>
                     <bottom>-</bottom>
-                    <header>CeltiXfire API</header>
-                    <footer>CeltiXfire API</footer>
+                    <header>Apache CXF API</header>
+                    <footer>Apache CXF API</footer>
                     <sourcepath>${basedir}/target/generated/src/main/java</sourcepath>
                     <subpackages>org.apache.cxf</subpackages>
                 </configuration>

Modified: incubator/cxf/trunk/metacode/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/metacode/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/metacode/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/metacode/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/metacode/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/metacode/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/metacode/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Mon Nov  6 11:54:19 2006
@@ -585,6 +585,11 @@
                 <version>1.4</version>
             </dependency>
             <dependency>
+                <groupId>velocity</groupId>
+                <artifactId>velocity-dep</artifactId>
+                <version>1.4</version>
+            </dependency>
+            <dependency>
                 <groupId>wsdl4j</groupId>
                 <artifactId>wsdl4j</artifactId>
                 <version>${wsdl4j.version}</version>

Modified: incubator/cxf/trunk/rt/bindings/http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/http/pom.xml Mon Nov  6 11:54:19 2006
@@ -22,7 +22,7 @@
     <artifactId>cxf-rt-bindings-http</artifactId>
     <packaging>jar</packaging>
     <name>CXF Runtime HTTP Binding</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/rt/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/bindings/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/pom.xml Mon Nov  6 11:54:19 2006
@@ -22,7 +22,7 @@
     <artifactId>cxf-rt-bindings</artifactId>
     <packaging>pom</packaging>
     <name>CXF Runtime Bindings</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/soap/pom.xml Mon Nov  6 11:54:19 2006
@@ -22,7 +22,7 @@
     <artifactId>cxf-rt-bindings-soap</artifactId>
     <packaging>jar</packaging>
     <name>CXF Runtime SOAP Binding</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Mon Nov  6 11:54:19 2006
@@ -22,7 +22,7 @@
     <artifactId>cxf-rt-bindings-xml</artifactId>
     <packaging>jar</packaging>
     <name>CXF Runtime XML Binding</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/rt/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/core/pom.xml (original)
+++ incubator/cxf/trunk/rt/core/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Runtime Core</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/core/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/core/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/core/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/core/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Mon Nov  6 11:54:19 2006
@@ -22,7 +22,7 @@
     <artifactId>cxf-rt-databinding-jaxb</artifactId>
     <packaging>jar</packaging>
     <name>CXF Runtime JAXB DataBinding</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

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=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Runtime JAX-WS Frontend</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/rt/frontend/js/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/js/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Runtime JavaScript Frontend</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/frontend/js/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/frontend/js/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/frontend/js/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/frontend/js/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/rt/frontend/simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/simple/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Runtime Simple Frontend</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/rt/management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/management/pom.xml (original)
+++ incubator/cxf/trunk/rt/management/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Runtime Management</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/management/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/management/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/management/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/management/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/management/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/management/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Runtime HTTP transport</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Runtime JMS Transport</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java Mon Nov  6 11:54:19 2006
@@ -519,7 +519,7 @@
                 }
             } else {
                 // we will never receive a non-oneway invocation in pub-sub
-                // domain from Celtix client - however a mis-behaving pure JMS
+                // domain from CXF client - however a mis-behaving pure JMS
                 // client could conceivably make suce an invocation, in which
                 // case we silently discard the reply
                 LOG.log(Level.WARNING,

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/rt/transports/local/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/local/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/transports/local/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/local/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Runtime Local transport</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/ws/addr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/addr/pom.xml Mon Nov  6 11:54:19 2006
@@ -22,7 +22,7 @@
     <artifactId>cxf-rt-ws-addr</artifactId>
     <packaging>jar</packaging>
     <name>CXF Runtime WS Addressing</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by

Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/policy/pom.xml Mon Nov  6 11:54:19 2006
@@ -22,7 +22,7 @@
     <artifactId>cxf-rt-ws-policy</artifactId>
     <packaging>jar</packaging>
     <name>CXF Runtime WS Policy</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/rm/pom.xml Mon Nov  6 11:54:19 2006
@@ -22,7 +22,7 @@
     <artifactId>cxf-rt-ws-rm</artifactId>
     <packaging>jar</packaging>
     <name>CXF Runtime WS Reliable Messaging</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF System Tests</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/testutils/pom.xml (original)
+++ incubator/cxf/trunk/testutils/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Test Utilities</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/pom.xml?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/tools/common/pom.xml (original)
+++ incubator/cxf/trunk/tools/common/pom.xml Mon Nov  6 11:54:19 2006
@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <version>2.0-incubator-M1-SNAPSHOT</version>
     <name>CXF Command Line Tools Common</name>
-    <url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
+    <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/tools/common/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/resources/META-INF/DISCLAIMER?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/cxf/trunk/tools/common/src/main/resources/META-INF/DISCLAIMER Mon Nov  6 11:54:19 2006
@@ -1,4 +1,4 @@
-Apache CeltiXfire is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
+Apache CXF is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 

Modified: incubator/cxf/trunk/tools/common/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/resources/META-INF/NOTICE?view=diff&rev=471852&r1=471851&r2=471852
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/tools/common/src/main/resources/META-INF/NOTICE Mon Nov  6 11:54:19 2006
@@ -1,7 +1,7 @@
    =========================================================================
    ==  NOTICE file corresponding to the section 4 d of                    ==
    ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache CeltiXfire distribution.               ==
+   ==  in this case for the Apache CXF distribution.               ==
    =========================================================================
 
    This product includes software developed by