Author: veithen
Date: Mon Dec 21 14:00:09 2015
New Revision: 1721157
URL: http://svn.apache.org/viewvc?rev=1721157&view=rev
Log:
TRANSPORTS-50: Properly integrate the transport samples into the build.
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/trunk/modules/samples/pom.xml
axis/axis2/java/core/trunk/modules/samples/transport/https-sample/httpsService/pom.xml
axis/axis2/java/core/trunk/modules/samples/transport/https-sample/pom.xml
axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/pom.xml
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1721157&r1=1721156&r2=1721157&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
Mon Dec 21 14:00:09 2015
@@ -146,6 +146,7 @@
<include>quickstartxmlbeans/**/*</include>
<include>servicelifecycle/**/*</include>
<include>soapwithattachments/**/*</include>
+ <include>transport/**/*</include>
<include>userguide/**/*</include>
<include>version/**/*</include>
<include>wsdl/**/*</include>
Modified: axis/axis2/java/core/trunk/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/pom.xml?rev=1721157&r1=1721156&r2=1721157&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/pom.xml Mon Dec 21 14:00:09 2015
@@ -38,6 +38,8 @@
<module>jaxws-interop</module>
<module>jaxws-samples</module>
<module>jaxws-version</module>
+ <module>transport/https-sample</module>
+ <module>transport/jms-sample</module>
</modules>
<build>
<plugins>
Modified:
axis/axis2/java/core/trunk/modules/samples/transport/https-sample/httpsService/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/transport/https-sample/httpsService/pom.xml?rev=1721157&r1=1721156&r2=1721157&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/samples/transport/https-sample/httpsService/pom.xml
(original)
+++
axis/axis2/java/core/trunk/modules/samples/transport/https-sample/httpsService/pom.xml
Mon Dec 21 14:00:09 2015
@@ -27,6 +27,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>keytool-maven-plugin</artifactId>
+ <version>1.5</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -55,6 +56,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.26</version>
<configuration>
<webAppConfig>
<contextPath>/</contextPath>
Modified:
axis/axis2/java/core/trunk/modules/samples/transport/https-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/transport/https-sample/pom.xml?rev=1721157&r1=1721156&r2=1721157&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/transport/https-sample/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/samples/transport/https-sample/pom.xml
Mon Dec 21 14:00:09 2015
@@ -13,9 +13,13 @@
<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>
- <groupId>org.apache.axis2.examples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
<artifactId>https-sample</artifactId>
- <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Axis2 Transport-HTTPS sample</name>
<build>
@@ -47,16 +51,6 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
<modules>
<module>httpsService</module>
<module>httpsClient</module>
Modified:
axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/pom.xml?rev=1721157&r1=1721156&r2=1721157&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/pom.xml Mon
Dec 21 14:00:09 2015
@@ -13,9 +13,13 @@
<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>
- <groupId>org.apache.axis2.examples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
<artifactId>jms-sample</artifactId>
- <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Axis2 Transport-JMS sample</name>
<build>
@@ -47,16 +51,6 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
<modules>
<module>jmsService</module>
</modules>
