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 2011/12/12 21:53:13 UTC
svn commit: r1213438 - in /cxf/trunk/maven-plugins/archetypes:
cxf-jaxrs-service/ cxf-jaxws-javafirst/
cxf-jaxws-javafirst/src/main/resources/META-INF/maven/
cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/
cxf-jaxws-javafirst/...
Author: dkulp
Date: Mon Dec 12 20:53:12 2011
New Revision: 1213438
URL: http://svn.apache.org/viewvc?rev=1213438&view=rev
Log:
[CXF-3905] Fixup jaxws archetype to actually work with the latest
archetype plugin
Added:
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml (with props)
Modified:
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml?rev=1213438&r1=1213437&r2=1213438&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml Mon Dec 12 20:53:12 2011
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
+<!--
+ licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -9,8 +27,8 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-jaxrs-service-archetype</artifactId>
+ <groupId>org.apache.cxf.archetype</groupId>
+ <artifactId>cxf-jaxrs-service</artifactId>
<version>2.5.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
@@ -42,7 +60,4 @@
</plugins>
</pluginManagement>
</build>
-
-
-
</project>
Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml?rev=1213438&r1=1213437&r2=1213438&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml Mon Dec 12 20:53:12 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.5.1-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.cxf.archetype</groupId>
<artifactId>cxf-jaxws-javafirst</artifactId>
- <name>Apache CXF Archetype - Simple JAX-WS Java First</name>
- <description>Creates a project for developing a Web service starting from Java code</description>
<version>2.5.1-SNAPSHOT</version>
- <url>http://cxf.apache.org</url>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- <eclipse.skip>true</eclipse.skip>
- </properties>
+ <packaging>maven-archetype</packaging>
+
+ <name>Apache CXF Archetype - Simple JAX-WS Java First</name>
+ <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>
Added: cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1213438&view=auto
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml (added)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml Mon Dec 12 20:53:12 2011
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="cxf-jaxrs-simple-sample"
+ xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <fileSets>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>.settings</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>.settings</directory>
+ <includes>
+ <include>**/*.prefs</include>
+ <include>**/*.component</include>
+ <include>**/*.container</include>
+ <include>**/*.name</include>
+ <include>**/*.jsdtscope</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>.classpath</include>
+ <include>.gitignore</include>
+ <include>.project</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
Propchange: cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java?rev=1213438&r1=1213437&r2=1213438&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java Mon Dec 12 20:53:12 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/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java?rev=1213438&r1=1213437&r2=1213438&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java Mon Dec 12 20:53:12 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/trunk/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/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml?rev=1213438&r1=1213437&r2=1213438&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml Mon Dec 12 20:53:12 2011
@@ -28,7 +28,7 @@
<jaxws:endpoint
id="helloWorld"
- implementor="${packageName}.HelloWorldImpl"
+ implementor="${package}.HelloWorldImpl"
address="/HelloWorld" />
</beans>