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 2016/12/28 11:49:26 UTC

cxf git commit: Fixing description_swagger2_web demo on the trunk

Repository: cxf
Updated Branches:
  refs/heads/master 5ed63d63c -> dd723f846


Fixing description_swagger2_web demo on the trunk


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dd723f84
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dd723f84
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dd723f84

Branch: refs/heads/master
Commit: dd723f846949d66e24ab103c2efde426ea9fb141
Parents: 5ed63d6
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Dec 28 11:48:39 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Dec 28 11:49:10 2016 +0000

----------------------------------------------------------------------
 .../jax_rs/description_swagger2_web/README.txt  |  2 +-
 .../jax_rs/description_swagger2_web/pom.xml     | 28 ++++++++------------
 2 files changed, 12 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/dd723f84/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
index 32f7f4a..3ff529b 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
@@ -14,7 +14,7 @@ located), the Maven pom.xml file can be used to build and run the demo.
 Using either UNIX or Windows:
 
   mvn install
-  mvn package tomcat7:run
+  mvn jetty:run-war
 
 
 Two JAX-RS endpoints are availbale after the service has started. 

http://git-wip-us.apache.org/repos/asf/cxf/blob/dd723f84/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
index 64c1347..f404b29 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
@@ -37,25 +37,15 @@ under the License.
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat7-maven-plugin</artifactId>
-                <version>2.1</version>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>9.4.0.v20161208</version>
                 <configuration>
-                    <warSourceDirectory>${project.build.directory}/${project.artifactId}-${project.version}</warSourceDirectory>
-                    <port>9000</port>
-                    <path>/</path>
+                    <contextPath>/</contextPath>
+                    <httpConnector>
+                      <port>9000</port>
+                    </httpConnector>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>run-tomcat</id>
-                        <configuration>
-                            <fork>true</fork>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
@@ -98,5 +88,9 @@ under the License.
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
+        <dependency>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+        </dependency>
     </dependencies>
 </project>