You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2011/11/16 11:24:51 UTC
svn commit: r1202619 - in
/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service: ./
src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/
src/main/resources/archetype-resources/src/main/java/
src/main/resources/archetype-resources/...
Author: sergeyb
Date: Wed Nov 16 10:24:50 2011
New Revision: 1202619
URL: http://svn.apache.org/viewvc?rev=1202619&view=rev
Log:
[CXF-3912,CXF-3907] Updates to get the archetype pom use CXF project version, removing escape characters from the sources
Modified:
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/META-INF/maven/archetype-metadata.xml
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties
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=1202619&r1=1202618&r2=1202619&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml Wed Nov 16 10:24:50 2011
@@ -3,13 +3,21 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-jaxrs-simple-sample-archetype</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>cxf-jaxrs-service-archetype</artifactId>
+ <version>2.5.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
- <name>cxf-jaxrs-simple-sample-archetype</name>
+ <name>cxf-jaxrs-service-archetype</name>
+ <description>Simple CXF JAX-RS webapp service using Spring configuration</description>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
@@ -28,5 +36,5 @@
</pluginManagement>
</build>
- <description>Simple CXF JAX-RS webapp service using spring configuration</description>
+
</project>
Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1202619&r1=1202618&r2=1202619&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/META-INF/maven/archetype-metadata.xml Wed Nov 16 10:24:50 2011
@@ -2,11 +2,6 @@
<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">
- <requiredProperties>
- <requiredProperty key="cxf-version">
- <defaultValue>2.5.0</defaultValue>
- </requiredProperty>
- </requiredProperties>
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/main/java</directory>
Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml?rev=1202619&r1=1202618&r2=1202619&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml Wed Nov 16 10:24:50 2011
@@ -1,21 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <version>${version}</version>
+ <groupId>$groupId</groupId>
+ <artifactId>$artifactId</artifactId>
+ <version>$version</version>
<packaging>war</packaging>
<name>Simple CXF JAX-RS webapp service using spring configuration</name>
<description>Simple CXF JAX-RS webapp service using spring configuration</description>
<properties>
- <cxf.version>2.5.0</cxf.version>
<jackson.version>1.8.6</jackson.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
@@ -38,11 +37,6 @@
<version>4.10</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
- <version>${cxf.version}</version>
- </dependency>
</dependencies>
<build>
<pluginManagement>
Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java?rev=1202619&r1=1202618&r2=1202619&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java Wed Nov 16 10:24:50 2011
@@ -1,7 +1,4 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package};
+package ${packageName};
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java?rev=1202619&r1=1202618&r2=1202619&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java Wed Nov 16 10:24:50 2011
@@ -1,7 +1,4 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package};
+package ${packageName};
public class JsonBean {
@@ -24,4 +21,4 @@ public class JsonBean {
this.val2 = val2;
}
-}
\ No newline at end of file
+}
Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml?rev=1202619&r1=1202618&r2=1202619&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml Wed Nov 16 10:24:50 2011
@@ -1,6 +1,3 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1202619&r1=1202618&r2=1202619&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Wed Nov 16 10:24:50 2011
@@ -1,6 +1,3 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
<?xml version="1.0" encoding="utf-8"?>
<web-app
xmlns="http://java.sun.com/xml/ns/j2ee"
Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties?rev=1202619&r1=1202618&r2=1202619&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties Wed Nov 16 10:24:50 2011
@@ -1,6 +1,5 @@
#Mon Nov 14 13:42:57 EST 2011
-cxf-version=2.5.0
-package=it.pkg
+packageName=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=basic