cxf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Kulp <daniel.k...@iona.com>
Subject Re: svn commit: r551792 - in /incubator/cxf/trunk: maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/eclipse/ maven-plugins/eclipse-plugin-generator/ maven-plugins/eclipse-plugin-generator/src/main/java/org/apache/cxf/maven_plugin/ too...
Date Fri, 29 Jun 2007 15:15:01 GMT

The about.html is definitely not usable.    The plugin is distributed by 
the Apache Software Foundation, not Eclipse.   It's also Apache 
licensed, not Eclipse licensed.    The redistribution terms and 
conditions are dictated by the Apache license.  


I'm going to completely change this file based on some feedback from 
Jim J.

Dan


On Friday 29 June 2007 01:03, mmao@apache.org wrote:
> Author: mmao
> Date: Thu Jun 28 22:03:34 2007
> New Revision: 551792
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=551792
> Log:
> * Move eclipse-plugin-generator out of codegen-plugin
> * Add about.html which will show in the eclipse
>
>
> Added:
>     incubator/cxf/trunk/maven-plugins/eclipse-plugin-generator/
>       - copied from r551785,
> incubator/cxf/trunk/maven-plugins/codegen-plugin/
> incubator/cxf/trunk/tools/eclipse-plugin/src/main/resources/about.html
> Removed:
>    
> incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apa
>che/cxf/maven_plugin/eclipse/
> incubator/cxf/trunk/maven-plugins/eclipse-plugin-generator/src/main/ja
>va/org/apache/cxf/maven_plugin/CodegenUtils.java
> incubator/cxf/trunk/maven-plugins/eclipse-plugin-generator/src/main/ja
>va/org/apache/cxf/maven_plugin/Java2WSDLMojo.java
> incubator/cxf/trunk/maven-plugins/eclipse-plugin-generator/src/main/ja
>va/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
> incubator/cxf/trunk/maven-plugins/eclipse-plugin-generator/src/main/ja
>va/org/apache/cxf/maven_plugin/WsdlOption.java Modified:
>     incubator/cxf/trunk/maven-plugins/eclipse-plugin-generator/pom.xml
>     incubator/cxf/trunk/tools/eclipse-plugin/pom.xml
>
> Modified:
> incubator/cxf/trunk/maven-plugins/eclipse-plugin-generator/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/cxf/trunk/maven-plugins/eclipse
>-plugin-generator/pom.xml?view=diff&rev=551792&r1=551785&r2=551792
> ======================================================================
>======== ---
> incubator/cxf/trunk/maven-plugins/eclipse-plugin-generator/pom.xml
> (original) +++
> incubator/cxf/trunk/maven-plugins/eclipse-plugin-generator/pom.xml Thu
> Jun 28 22:03:34 2007 @@ -20,13 +20,12 @@
>  <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-codegen-plugin</artifactId>
> +    <artifactId>cxf-eclipse-plugin-generator</artifactId>
>      <packaging>maven-plugin</packaging>
>      <version>2.1-incubator-SNAPSHOT</version>
> -    <name>Apache CXF Code Generation Maven2 Plugins</name>
> +    <name>Apache CXF Eclipse Plugin Generator Maven2 Plugin</name>
>      <url>http://cwiki.apache.org/CXF</url>
>
> -
>      <parent>
>          <groupId>org.apache.cxf</groupId>
>          <artifactId>cxf-parent</artifactId>
> @@ -111,9 +110,9 @@
>      </repositories>
>
>      <scm>
> -       
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trun
>k/maven-plugins/codegen-plugin</connection> -       
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
>r/cxf/trunk/maven-plugins/codegen-plugin</developerConnection> -     
> <url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-c
>odegen-plugin</url> +       
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trun
>k/maven-plugins/eclipse-plugin-generator</connection> +       
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
>r/cxf/trunk/maven-plugins/eclipse-plugin-generator</developerConnection
>> +     
> <url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-e
>clipse-plugin-generator</url> </scm>
>
>  </project>
>
> Modified: incubator/cxf/trunk/tools/eclipse-plugin/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/eclipse-plugin/
>pom.xml?view=diff&rev=551792&r1=551791&r2=551792
> ======================================================================
>======== --- incubator/cxf/trunk/tools/eclipse-plugin/pom.xml
> (original) +++ incubator/cxf/trunk/tools/eclipse-plugin/pom.xml Thu
> Jun 28 22:03:34 2007 @@ -6,9 +6,9 @@
>    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
> @@ -41,7 +41,7 @@
>              <groupId>${pom.groupId}</groupId>
>             
> <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
> <version>${project.version}</version>
> -	</dependency>
> +        </dependency>
>          <dependency>
>              <groupId>${pom.groupId}</groupId>
>              <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
> @@ -66,19 +66,19 @@
>              </exclusions>
>          </dependency>
>
> -	<dependency>
> -	    <groupId>${pom.groupId}</groupId>
> -	    <artifactId>cxf-rt-frontend-jaxws</artifactId>
> -	    <version>${project.version}</version>
> -	</dependency>
> -
> -	<dependency>
> -	    <groupId>${pom.groupId}</groupId>
> -	    <artifactId>cxf-rt-frontend-simple</artifactId>
> -	    <version>${project.version}</version>
> -	</dependency>
> +        <dependency>
> +            <groupId>${pom.groupId}</groupId>
> +            <artifactId>cxf-rt-frontend-jaxws</artifactId>
> +            <version>${project.version}</version>
> +        </dependency>
>
> -        <dependency>
> +        <dependency>
> +            <groupId>${pom.groupId}</groupId>
> +            <artifactId>cxf-rt-frontend-simple</artifactId>
> +            <version>${project.version}</version>
> +        </dependency>
> +
> +        <dependency>
>              <groupId>${pom.groupId}</groupId>
>              <artifactId>cxf-tools-java2wsdl</artifactId>
>              <version>${project.version}</version>
> @@ -140,7 +140,7 @@
>              </plugin>
>              <plugin>
>                  <groupId>org.apache.cxf</groupId>
> -                <artifactId>cxf-codegen-plugin</artifactId>
> +                <artifactId>cxf-eclipse-plugin-generator</artifactId>
>                  <version>${project.version}</version>
>                  <executions>
>                      <execution>
>
> Added:
> incubator/cxf/trunk/tools/eclipse-plugin/src/main/resources/about.html
> URL:
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/eclipse-plugin/
>src/main/resources/about.html?view=auto&rev=551792
> ======================================================================
>======== ---
> incubator/cxf/trunk/tools/eclipse-plugin/src/main/resources/about.html
> (added) +++
> incubator/cxf/trunk/tools/eclipse-plugin/src/main/resources/about.html
> Thu Jun 28 22:03:34 2007 @@ -0,0 +1,46 @@
> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
> +    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
> +<html xmlns="http://www.w3.org/1999/xhtml">
> +<head>
> +<meta http-equiv="Content-Type" content="text/html;
> charset=ISO-8859-1"/> +<title>About</title>
> +</head>
> +<body lang="EN-US">
> +<h2>About This Content</h2>
> +
> +<p>June 29, 2007</p>
> +<h3>License</h3>
> +
> +<p>The Eclipse Foundation makes available all content in this plug-in
> (&quot;Content&quot;).  Unless otherwise +indicated below, the Content
> is provided to you under the terms and conditions of the +Eclipse
> Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is
> available +at <a
> href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.or
>g/legal/epl-v10.html</a>. +For purposes of the EPL, &quot;Program&quot;
> will mean the Content.</p> +
> +<p>If you did not receive this Content directly from the Eclipse
> Foundation, the Content is +being redistributed by another party
> (&quot;Redistributor&quot;) and different terms and conditions may
> +apply to your use of any object code in the Content.  Check the
> Redistributor's license that was +provided with the Content.  If no
> such license exists, contact the Redistributor.  Unless otherwise
> +indicated below, the terms and conditions of the EPL still apply to
> any source code in the Content +and such source code may be obtained
> at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
> +<h3>Third Party Content</h3>
> +
> +<p>The Content includes items that have been sourced from third
> parties as set out below. If you +did not receive this Content
> directly from the Eclipse Foundation, the following is provided +for
> informational purposes only, and you should look to the
> Redistributor&rsquo;s license for +terms and conditions of use.</p>
> +
> +<h4>Apache CXF 2.1-incubator-SNAPSHOT</h4>
> +<p>The plug-in includes software developed by The Apache Software
> Foundation as part of the CXF project.</p> +
> +<p>Your use of the CXF code and the scripts is subject to the terms
> and conditions of the Apache License, Version 2.0.  A copy of the
> license is contained +in the file <a href="about_files/asl-v20.txt"
> target="_blank">asl-v20.txt</a> and is also available at <a
> href="http://www.apache.org/licenses/LICENSE-2.0.html"
> target="_blank">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
> +</p>
> +<p>The names &quot;CXF&quot; and &quot;Apache Software
> Foundation&quot; must not be used to endorse or promote products
> derived from this +software without prior written permission.  For
> written permission, please contact <a
> href="mailto:apache@apache.org">apache@apache.org</a>.</p> +
> +<p>The Apache attribution <a href="about_files/NOTICE"
> target="_blank">NOTICE</a> file is included with the Content in
> accordance with 4d of the Apache License, Version 2.0.</p> +
> +</body>
> +</html>
> \ No newline at end of file

-- 
J. Daniel Kulp
Principal Engineer
IONA
P: 781-902-8727    C: 508-380-7194
daniel.kulp@iona.com
http://www.dankulp.com/blog

Mime
View raw message