Author: sergeyb
Date: Wed Nov 16 10:42:29 2011
New Revision: 1202624
URL: http://svn.apache.org/viewvc?rev=1202624&view=rev
Log:
[CXF-3912,CXF-3907] Few more minor updates
Modified:
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/test/java/HelloWorldIT.java
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties
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=1202624&r1=1202623&r2=1202624&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:42:29 2011
@@ -19,7 +19,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd";
<jaxrs:server id="services" address="/">
<jaxrs:serviceBeans>
- <bean class="${package}.HelloWorld" />
+ <bean class="${packageName}.HelloWorld" />
</jaxrs:serviceBeans>
<jaxrs:providers>
<bean class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>
Modified:
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java?rev=1202624&r1=1202623&r2=1202624&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java
(original)
+++
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java
Wed Nov 16 10:42:29 2011
@@ -1,7 +1,4 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package};
+package ${packageName};
import static org.junit.Assert.assertEquals;
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=1202624&r1=1202623&r2=1202624&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:42:29 2011
@@ -1,5 +1,5 @@
#Mon Nov 14 13:42:57 EST 2011
-packageName=it.pkg
+package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=basic
