Author: gmazza
Date: Wed Dec 5 16:05:42 2012
New Revision: 1417501
URL: http://svn.apache.org/viewvc?rev=1417501&view=rev
Log:
Better alphabetized properties in parent/pom.xml; added a cxf.junit.version in
parent/pom.xml that can be read in by the Maven archetypes, added JUnit unit
test to cxf-jaxws-javafirst archetype.
Added:
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
Modified:
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
cxf/trunk/parent/pom.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=1417501&r1=1417500&r2=1417501&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml Wed Dec 5
16:05:42 2012
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf</artifactId>
+ <artifactId>cxf-parent</artifactId>
<version>2.7.1-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.cxf.archetype</groupId>
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=1417501&r1=1417500&r2=1417501&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 Dec 5 16:05:42 2012
@@ -32,16 +32,16 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.6.RELEASE</version>
+ <version>${cxf.spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${cxf.junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
Modified:
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml?rev=1417501&r1=1417500&r2=1417501&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
(original)
+++
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
Wed Dec 5 16:05:42 2012
@@ -21,8 +21,8 @@
<artifactId>$artifactId</artifactId>
<version>$version</version>
<packaging>war</packaging>
- <name>Simple CXF project using spring configuration</name>
- <description>Simple CXF project using spring configuration</description>
+ <name>Simple CXF Java-first SOAP project using Spring configuration</name>
+ <description>Simple CXF Java-first SOAP project using Spring
configuration</description>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -37,7 +37,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.6.RELEASE</version>
+ <version>${cxf.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${cxf.junit.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Added:
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java?rev=1417501&view=auto
==============================================================================
---
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
(added)
+++
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
Wed Dec 5 16:05:42 2012
@@ -0,0 +1,31 @@
+## 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.
+
+package ${package};
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+public class HelloWorldImplTest {
+
+ @Test
+ public void testSayHi() {
+ HelloWorldImpl helloWorldImpl = new HelloWorldImpl();
+ String response = helloWorldImpl.sayHi("Sam");
+ assertEquals("HelloWorldImpl not properly saying hi", "Hello Sam",
response);
+ }
+}
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1417501&r1=1417500&r2=1417501&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed Dec 5 16:05:42 2012
@@ -85,27 +85,57 @@
<cxf.abdera.version>1.1.2</cxf.abdera.version>
<cxf.abdera-parser.bundle.version>1.1.2_1</cxf.abdera-parser.bundle.version>
<cxf.activemq.version>5.7.0</cxf.activemq.version>
+ <cxf.axiom.version>1.2.10</cxf.axiom.version>
+ <cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
+ <cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version>
+ <cxf.commons-codec.version>1.7</cxf.commons-codec.version>
+
<cxf.commons-collections.version>3.2.1</cxf.commons-collections.version>
+ <cxf.commons-lang.version>2.6</cxf.commons-lang.version>
<cxf.derby.version>10.2.2.0</cxf.derby.version>
-
+ <cxf.ehcache.version>2.5.1</cxf.ehcache.version>
+ <cxf.ehcache.bundle.version>2.5.1_1</cxf.ehcache.bundle.version>
+
<cxf.fastinfoset.bundle.version>1.2.7_4</cxf.fastinfoset.bundle.version>
+ <cxf.hazelcast.version>1.9.4</cxf.hazelcast.version>
+
<cxf.httpcomponents.asyncclient.version>4.0-beta3</cxf.httpcomponents.asyncclient.version>
+
<cxf.httpcomponents.asyncclient.version.range>[4.0-beta3,4.1)</cxf.httpcomponents.asyncclient.version.range>
+
<cxf.httpcomponents.client.version>4.2.1</cxf.httpcomponents.client.version>
+
<cxf.httpcomponents.core.version>4.2.2</cxf.httpcomponents.core.version>
+
<cxf.httpcomponents.core.version.range>[4.2.1,4.3.0)</cxf.httpcomponents.core.version.range>
+
<cxf.geronimo.annotation.version>1.1.1</cxf.geronimo.annotation.version>
+ <cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
+
<cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
+ <cxf.geronimo.jpa.version>1.0</cxf.geronimo.jpa.version>
+ <cxf.geronimo.servlet.version>1.0</cxf.geronimo.servlet.version>
+ <cxf.geronimo.servlet25.version>1.1.2</cxf.geronimo.servlet25.version>
+
<cxf.geronimo.transaction.version>1.1.1</cxf.geronimo.transaction.version>
+
<cxf.geronimo.ws.metadata.version>1.1.3</cxf.geronimo.ws.metadata.version>
+ <cxf.javax.ws.rs.version>2.0-m10</cxf.javax.ws.rs.version>
<cxf.jaxb21.version>2.1</cxf.jaxb21.version>
<cxf.jaxb21.impl.version>2.1.13</cxf.jaxb21.impl.version>
<cxf.jaxb21.xjc.version>2.1.13</cxf.jaxb21.xjc.version>
<cxf.jaxb22.version>2.2.6</cxf.jaxb22.version>
<cxf.jaxb22.impl.version>2.2.6</cxf.jaxb22.impl.version>
<cxf.jaxb22.xjc.version>2.2.6</cxf.jaxb22.xjc.version>
-
<!-- by default, we use jaxb 2.1, but java5 profile will override to
2.2 -->
<cxf.jaxb.version>${cxf.jaxb21.version}</cxf.jaxb.version>
<cxf.jaxb.impl.version>${cxf.jaxb21.impl.version}</cxf.jaxb.impl.version>
<cxf.jaxb.xjc.version>${cxf.jaxb21.xjc.version}</cxf.jaxb.xjc.version>
-
- <cxf.specs.jaxws.api.version>1.1</cxf.specs.jaxws.api.version>
-
+ <cxf.joda.time.version>1.6.2</cxf.joda.time.version>
+ <cxf.joda.time.version2>2.1</cxf.joda.time.version2>
<cxf.jdom.version>1.0</cxf.jdom.version>
+ <cxf.jettison.version>1.3.2</cxf.jettison.version>
<cxf.jetty.version>8.1.7.v20120910</cxf.jetty.version>
<cxf.jetty.osgi.version>[7.2,8.2)</cxf.jetty.osgi.version>
+ <cxf.jibx.version>1.2.4.5</cxf.jibx.version>
+ <cxf.junit.version>4.10</cxf.junit.version>
<cxf.maven.core.version>2.2.1</cxf.maven.core.version>
<cxf.msv.version>2011.1</cxf.msv.version>
+ <cxf.neethi.version>3.0.2</cxf.neethi.version>
+ <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
+ <cxf.opensaml.version>2.5.1</cxf.opensaml.version>
+ <cxf.opensaml.osgi.version>2.5.1_2</cxf.opensaml.osgi.version>
+
<cxf.opensaml.xmltooling.version>1.3.2-1</cxf.opensaml.xmltooling.version>
+ <cxf.opensamlws.version>1.4.2-1</cxf.opensamlws.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
<cxf.saaj-api.version>1.3.4</cxf.saaj-api.version>
<cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>
@@ -113,58 +143,24 @@
<cxf.servlet-api.version>1.0</cxf.servlet-api.version>
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
<cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
+ <cxf.specs.jaxws.api.version>1.1</cxf.specs.jaxws.api.version>
<cxf.spring.version>3.0.7.RELEASE</cxf.spring.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.stax.impl.groupId>org.codehaus.woodstox</cxf.stax.impl.groupId>
<cxf.stax.impl.artifactId>woodstox-core-asl</cxf.stax.impl.artifactId>
- <cxf.woodstox.core.version>4.1.4</cxf.woodstox.core.version>
<cxf.stax.impl.version>${cxf.woodstox.core.version}</cxf.stax.impl.version>
+ <cxf.velocity.version>1.7</cxf.velocity.version>
+ <cxf.woodstox.core.version>4.1.4</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.1</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.2</cxf.wsdl4j.version>
+ <cxf.wss4j.version>1.6.8</cxf.wss4j.version>
<cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version>
<cxf.xmlschema.version>2.0.3</cxf.xmlschema.version>
- <cxf.jibx.version>1.2.4.5</cxf.jibx.version>
<cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
- <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
- <cxf.axiom.version>1.2.10</cxf.axiom.version>
- <cxf.jettison.version>1.3.2</cxf.jettison.version>
- <cxf.wss4j.version>1.6.8</cxf.wss4j.version>
- <cxf.joda.time.version>1.6.2</cxf.joda.time.version>
- <cxf.joda.time.version2>2.1</cxf.joda.time.version2>
- <cxf.opensaml.version>2.5.1</cxf.opensaml.version>
- <cxf.opensamlws.version>1.4.2-1</cxf.opensamlws.version>
- <cxf.opensaml.osgi.version>2.5.1_2</cxf.opensaml.osgi.version>
-
<cxf.opensaml.xmltooling.version>1.3.2-1</cxf.opensaml.xmltooling.version>
- <cxf.neethi.version>3.0.2</cxf.neethi.version>
- <cxf.velocity.version>1.7</cxf.velocity.version>
-
<cxf.httpcomponents.core.version>4.2.2</cxf.httpcomponents.core.version>
-
<cxf.httpcomponents.client.version>4.2.1</cxf.httpcomponents.client.version>
-
<cxf.httpcomponents.core.version.range>[4.2.1,4.3.0)</cxf.httpcomponents.core.version.range>
-
<cxf.httpcomponents.asyncclient.version>4.0-beta3</cxf.httpcomponents.asyncclient.version>
-
<cxf.httpcomponents.asyncclient.version.range>[4.0-beta3,4.1)</cxf.httpcomponents.asyncclient.version.range>
-
-
<cxf.geronimo.annotation.version>1.1.1</cxf.geronimo.annotation.version>
-
<cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
- <cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
-
<cxf.geronimo.transaction.version>1.1.1</cxf.geronimo.transaction.version>
-
<cxf.geronimo.ws.metadata.version>1.1.3</cxf.geronimo.ws.metadata.version>
- <cxf.geronimo.servlet.version>1.0</cxf.geronimo.servlet.version>
- <cxf.geronimo.servlet25.version>1.1.2</cxf.geronimo.servlet25.version>
- <cxf.geronimo.jpa.version>1.0</cxf.geronimo.jpa.version>
- <cxf.javax.ws.rs.version>2.0-m10</cxf.javax.ws.rs.version>
- <cxf.commons-codec.version>1.7</cxf.commons-codec.version>
- <cxf.commons-lang.version>2.6</cxf.commons-lang.version>
-
<cxf.commons-collections.version>3.2.1</cxf.commons-collections.version>
- <cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
- <cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version>
-
<cxf.fastinfoset.bundle.version>1.2.7_4</cxf.fastinfoset.bundle.version>
- <cxf.hazelcast.version>1.9.4</cxf.hazelcast.version>
- <cxf.ehcache.version>2.5.1</cxf.ehcache.version>
- <cxf.ehcache.bundle.version>2.5.1_1</cxf.ehcache.bundle.version>
<!-- various OSGi related versions -->
<cxf.aries.version>1.0.0</cxf.aries.version>
@@ -579,7 +575,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>${cxf.junit.version}</version>
<scope>test</scope>
</dependency>
