You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gm...@apache.org on 2012/08/16 22:56:10 UTC
svn commit: r1374051 - in /cxf/fediz/trunk/examples: ./ simpleWebapp/
wsclientWebapp/ wsclientWebapp/webapp/
wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/
wsclientWebapp/webservice/ wsclientWebapp/webservice/common/
wsclientWebapp/w...
Author: gmazza
Date: Thu Aug 16 20:56:10 2012
New Revision: 1374051
URL: http://svn.apache.org/viewvc?rev=1374051&view=rev
Log:
POM refactoring to make Fediz examples unique in Eclipse
Modified:
cxf/fediz/trunk/examples/pom.xml
cxf/fediz/trunk/examples/simpleWebapp/pom.xml
cxf/fediz/trunk/examples/wsclientWebapp/pom.xml
cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml
cxf/fediz/trunk/examples/wsclientWebapp/webservice/pom.xml
cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml
Modified: cxf/fediz/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/pom.xml (original)
+++ cxf/fediz/trunk/examples/pom.xml Thu Aug 16 20:56:10 2012
@@ -16,22 +16,23 @@
specific language governing permissions and limitations
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">
+<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.fediz</groupId>
- <artifactId>fediz</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <groupId>org.apache.cxf.fediz.examples</groupId>
- <artifactId>examples</artifactId>
- <name>Apache Fediz examples</name>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.cxf.fediz</groupId>
+ <artifactId>fediz</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.cxf.fediz</groupId>
+ <artifactId>examples</artifactId>
+ <name>Apache CXF Fediz Examples</name>
+ <packaging>pom</packaging>
- <modules>
- <module>simpleWebapp</module>
- <module>wsclientWebapp</module>
- </modules>
+ <modules>
+ <module>simpleWebapp</module>
+ <module>wsclientWebapp</module>
+ </modules>
</project>
Modified: cxf/fediz/trunk/examples/simpleWebapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/simpleWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/simpleWebapp/pom.xml Thu Aug 16 20:56:10 2012
@@ -17,33 +17,26 @@
specific language governing permissions and limitations
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">
+<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.fediz.examples</groupId>
- <artifactId>examples</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.cxf.fediz.examples</groupId>
- <artifactId>simpleWebapp</artifactId>
- <name>Apache Fediz Examples - Webapp Simple</name>
- <packaging>war</packaging>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <!--
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
- <scope>provided</scope>
- </dependency>
- -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.cxf.fediz</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.cxf.fediz.examples.simpleWebapp</groupId>
+ <artifactId>simpleWebapp</artifactId>
+ <name>Fediz Example: SimpleWebapp</name>
+ <packaging>war</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -52,42 +45,30 @@
</dependency>
<!-- Required to cast Principal to FederationPrincipal -->
<dependency>
- <groupId>org.apache.cxf.fediz</groupId>
- <artifactId>fediz-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.cxf.fediz</groupId>
+ <artifactId>fediz-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.0.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.0.1</version>
</dependency>
</dependencies>
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
+ <plugin><!--for mvn tomcat:deploy/:undeploy/:redeploy -->
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.1</version>
<configuration>
- <server>myTomcat</server>
- <url>http://localhost:8080/manager/text</url>
- <warFile>${project.build.finalName}.war</warFile>
+ <server>myTomcat</server>
+ <url>http://localhost:8080/manager/text</url>
+ <path>/${project.build.finalName}</path>
</configuration>
</plugin>
- -->
- <plugin><!--for mvn tomcat:deploy/:undeploy/:redeploy -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <server>myTomcat</server>
- <url>http://localhost:8080/manager/text</url>
- <path>/${project.build.finalName}</path>
- </configuration>
- </plugin>
</plugins>
<!-- Name of the generated WAR file -->
<finalName>fedizhelloworld</finalName>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/pom.xml Thu Aug 16 20:56:10 2012
@@ -16,22 +16,23 @@
specific language governing permissions and limitations
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">
+<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.fediz.examples</groupId>
- <artifactId>examples</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.cxf.fediz.examples</groupId>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.cxf.fediz</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId>
<artifactId>wsclientWebapp</artifactId>
- <name>Apache Fediz Examples - Webapp WS Client</name>
- <packaging>pom</packaging>
+ <name>Fediz Example: WSClientWebapp</name>
+ <packaging>pom</packaging>
- <modules>
- <module>webservice</module>
- <module>webapp</module>
- </modules>
+ <modules>
+ <module>webservice</module>
+ <module>webapp</module>
+ </modules>
</project>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml Thu Aug 16 20:56:10 2012
@@ -17,132 +17,121 @@
specific language governing permissions and limitations
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">
+<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.fediz.examples</groupId>
- <artifactId>wsclientWebapp</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>webapp</artifactId>
- <name>Apache Fediz Examples - Webapp WS Client - Webapp</name>
- <packaging>war</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId>
+ <artifactId>wsclientWebapp</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>wsclientWebapp-webapp</artifactId>
+ <name>Fediz Example: WSClientWebapp (webapp)</name>
+ <packaging>war</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf.fediz.examples.webservice</groupId>
- <artifactId>service-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
- <scope>provided</scope>
- </dependency>
- <!-- Required to cast Principal to FederationPrincipal -->
- <dependency>
- <groupId>org.apache.cxf.fediz</groupId>
- <artifactId>fediz-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>xmlsec</artifactId>
- <groupId>org.apache.santuario</groupId>
- </exclusion>
- <exclusion>
- <artifactId>wss4j</artifactId>
- <groupId>org.apache.ws.security</groupId>
- </exclusion>
- <exclusion>
- <artifactId>ehcache-core</artifactId>
- <groupId>net.sf.ehcache</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId>
+ <artifactId>wsclientWebapp-webservice-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Required to cast Principal to FederationPrincipal -->
+ <dependency>
+ <groupId>org.apache.cxf.fediz</groupId>
+ <artifactId>fediz-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlsec</artifactId>
+ <groupId>org.apache.santuario</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>wss4j</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>ehcache-core</artifactId>
+ <groupId>net.sf.ehcache</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
+ <plugin><!--for mvn tomcat:deploy/:undeploy/:redeploy -->
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.1</version>
<configuration>
- <server>myTomcat</server>
- <url>http://localhost:8080/manager/text</url>
- <warFile>${project.build.finalName}.war</warFile>
+ <server>myTomcat</server>
+ <url>http://localhost:8080/manager/text</url>
+ <path>/${project.build.finalName}</path>
</configuration>
</plugin>
- -->
- <plugin><!--for mvn tomcat:deploy/:undeploy/:redeploy -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <server>myTomcat</server>
- <url>http://localhost:8080/manager/text</url>
- <path>/${project.build.finalName}</path>
- </configuration>
- </plugin>
</plugins>
<!-- Name of the generated WAR file -->
<finalName>fedizhelloworld</finalName>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java?rev=1374051&r1=1374050&r2=1374051&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java Thu Aug 16 20:56:10 2012
@@ -66,7 +66,6 @@ public class FederationServlet extends H
out.println("Request url: " + request.getRequestURL().toString() + "<p>");
-
out.println("<br><b>User</b><p>");
Principal p = request.getUserPrincipal();
if (p != null) {
@@ -101,7 +100,7 @@ public class FederationServlet extends H
StringWriter buffer = new StringWriter();
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
transformer.transform(new DOMSource(el),
- new StreamResult(buffer));
+ new StreamResult(buffer));
token = buffer.toString();
out.println("<p>" + StringEscapeUtils.escapeXml(token));
} catch (Exception ex) {
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml Thu Aug 16 20:56:10 2012
@@ -16,17 +16,17 @@
specific language governing permissions and limitations
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">
+<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.fediz.examples</groupId>
- <artifactId>webservice</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId>
+ <artifactId>wsclientWebapp-webservice</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.cxf.fediz.examples.webservice</groupId>
- <artifactId>service-common</artifactId>
- <name>Apache Fediz Examples - Webapp WS Client - Web Service Common</name>
+ <artifactId>wsclientWebapp-webservice-common</artifactId>
+ <name>Fediz Example: WSClientWebapp (web service common)</name>
<packaging>jar</packaging>
<dependencies>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webservice/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webservice/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webservice/pom.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webservice/pom.xml Thu Aug 16 20:56:10 2012
@@ -16,16 +16,17 @@
specific language governing permissions and limitations
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">
+<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.fediz.examples</groupId>
- <artifactId>wsclientWebapp</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId>
+ <artifactId>wsclientWebapp</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
- <artifactId>webservice</artifactId>
- <name>Apache Fediz Examples - Webapp WS Client - Web Service</name>
+ <artifactId>wsclientWebapp-webservice</artifactId>
+ <name>Fediz Example: WSClientWebapp (web service)</name>
<packaging>pom</packaging>
<properties>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml Thu Aug 16 20:56:10 2012
@@ -16,97 +16,97 @@
specific language governing permissions and limitations
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">
+<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.fediz.examples</groupId>
- <artifactId>webservice</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.cxf.fediz.examples.webservice</groupId>
- <artifactId>service-war</artifactId>
- <name>Apache Fediz Examples - Webapp WS Client - Web Service Implementation</name>
- <packaging>war</packaging>
+ <parent>
+ <groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId>
+ <artifactId>wsclientWebapp-webservice</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>wsclientWebapp-webservice-war</artifactId>
+ <name>Fediz Example: WSClientWebapp (web service WAR)</name>
+ <packaging>war</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
- <configuration>
- <webResources>
- <resource>
- <directory>src/main/webapp</directory>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <server>myTomcat</server>
- <url>http://localhost:10080/manager/text</url>
- <path>/${project.build.finalName}</path>
- </configuration>
- </plugin>
- </plugins>
- <finalName>fedizservice</finalName>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf.fediz.examples.webservice</groupId>
- <artifactId>service-common</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <server>myTomcat</server>
+ <url>http://localhost:10080/manager/text</url>
+ <path>/${project.build.finalName}</path>
+ </configuration>
+ </plugin>
+ </plugins>
+ <finalName>fedizservice</finalName>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId>
+ <artifactId>wsclientWebapp-webservice-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-addr</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-addr</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>