cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1213863 - in /cxf/branches/2.3.x-fixes: ./ maven-plugins/archetypes/cxf-jaxws-javafirst/ maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/ maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archet...
Date Tue, 13 Dec 2011 18:59:16 GMT
Author: dkulp
Date: Tue Dec 13 18:59:16 2011
New Revision: 1213863

URL: http://svn.apache.org/viewvc?rev=1213863&view=rev
Log:
Merged revisions 1213440 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1213440 | dkulp | 2011-12-12 15:58:10 -0500 (Mon, 12 Dec 2011) | 10 lines
  
  Merged revisions 1213438 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1213438 | dkulp | 2011-12-12 15:53:12 -0500 (Mon, 12 Dec 2011) | 2 lines
    
    [CXF-3905] Fixup jaxws archetype to actually work with the latest
    archetype plugin
  ........
................

Added:
    cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml
      - copied unchanged from r1213440, cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml
Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
    cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
    cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
    cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml?rev=1213863&r1=1213862&r2=1213863&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml Tue Dec
13 18:59:16 2011
@@ -18,23 +18,23 @@
     under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
         <version>2.3.8-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.apache.cxf.archetype</groupId>
     <artifactId>cxf-jaxws-javafirst</artifactId>
+    <packaging>maven-archetype</packaging>
+
     <name>Apache CXF Archetype - Simple JAX-WS Java First</name>
     <version>2.3.8-SNAPSHOT</version>
-    <description>Apache CXF Archetype - Simple JAX-WS Java First</description>
-    <url>http://cxf.apache.org</url>
-    <properties>
-        <maven.test.skip>true</maven.test.skip>
-        <eclipse.skip>true</eclipse.skip>
-    </properties>
+    <description>Creates a project for developing a Web service starting from Java
code</description>
+
     <build>
         <resources>
             <resource>
@@ -42,5 +42,22 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
+
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.archetype</groupId>
+                <artifactId>archetype-packaging</artifactId>
+                <version>2.1</version>
+            </extension>
+        </extensions>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 </project>

Modified: cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java?rev=1213863&r1=1213862&r2=1213863&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
(original)
+++ cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
Tue Dec 13 18:59:16 2011
@@ -14,7 +14,7 @@
 ##    KIND, either express or implied. See the License for the
 ##    specific language governing permissions and limitations
 ##    under the License.
-package ${packageName};
+package ${package};
 
 import javax.jws.WebService;
 

Modified: cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java?rev=1213863&r1=1213862&r2=1213863&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
(original)
+++ cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
Tue Dec 13 18:59:16 2011
@@ -15,11 +15,11 @@
 ##    specific language governing permissions and limitations
 ##    under the License.
 
-package ${packageName};
+package ${package};
 
 import javax.jws.WebService;
 
-@WebService(endpointInterface = "${packageName}.HelloWorld")
+@WebService(endpointInterface = "${package}.HelloWorld")
 public class HelloWorldImpl implements HelloWorld {
 
     public String sayHi(String text) {

Modified: cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml?rev=1213863&r1=1213862&r2=1213863&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
(original)
+++ cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
Tue Dec 13 18:59:16 2011
@@ -28,7 +28,7 @@
 
 	<jaxws:endpoint 
 	  id="helloWorld" 
-	  implementor="${packageName}.HelloWorldImpl" 
+	  implementor="${package}.HelloWorldImpl" 
 	  address="/HelloWorld" />
 	  
 </beans>



Mime
View raw message