Author: dkulp
Date: Wed Nov 28 16:38:06 2012
New Revision: 1414801
URL: http://svn.apache.org/viewvc?rev=1414801&view=rev
Log:
Few more m2e updates
Modified:
cxf/trunk/distribution/src/main/release/samples/corba/bank/pom.xml
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
Modified: cxf/trunk/distribution/src/main/release/samples/corba/bank/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/corba/bank/pom.xml?rev=1414801&r1=1414800&r2=1414801&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/corba/bank/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/corba/bank/pom.xml Wed Nov
28 16:38:06 2012
@@ -62,6 +62,7 @@
<wsdlOptions>
<wsdlOption>
<wsdl>src/main/resources/wsdl/bank.wsdl</wsdl>
+ <frontEnd>jaxws21</frontEnd>
<packagenames>
<package>bank.common</package>
</packagenames>
@@ -147,12 +148,10 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified:
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml?rev=1414801&r1=1414800&r2=1414801&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
Wed Nov 28 16:38:06 2012
@@ -129,6 +129,39 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store
Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-dependency-plugin
+ </artifactId>
+
<versionRange>[2.2,)</versionRange>
+ <goals>
+
<goal>copy-dependencies</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
Modified:
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java?rev=1414801&r1=1414800&r2=1414801&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
Wed Nov 28 16:38:06 2012
@@ -28,6 +28,8 @@ import org.apache.cxf.jaxrs.utils.Resour
public class SampleServlet extends CXFNonSpringJaxrsServlet {
+ private static final long serialVersionUID = -1531317723099896635L;
+
protected void createServerFromApplication(String cName, ServletConfig
servletConfig)
throws ServletException {
// technically, you should look up the application name from
ServletConfig's init parameters
