Author: dkulp
Date: Mon Dec 12 20:58:10 2011
New Revision: 1213440
URL: http://svn.apache.org/viewvc?rev=1213440&view=rev
Log:
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.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml
- copied unchanged from r1213438,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype-metadata.xml
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml?rev=1213440&r1=1213439&r2=1213440&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
(original)
+++
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
Mon Dec 12 20:58:10 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.4.5-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>
<version>2.4.5-SNAPSHOT</version>
+ <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>
- <url>http://cxf.apache.org</url>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- <eclipse.skip>true</eclipse.skip>
- </properties>
+
<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.4.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.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java?rev=1213440&r1=1213439&r2=1213440&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
(original)
+++
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
Mon Dec 12 20:58:10 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.4.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.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java?rev=1213440&r1=1213439&r2=1213440&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
(original)
+++
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
Mon Dec 12 20:58:10 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.4.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.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml?rev=1213440&r1=1213439&r2=1213440&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
(original)
+++
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
Mon Dec 12 20:58:10 2011
@@ -28,7 +28,7 @@
<jaxws:endpoint
id="helloWorld"
- implementor="${packageName}.HelloWorldImpl"
+ implementor="${package}.HelloWorldImpl"
address="/HelloWorld" />
</beans>
