Author: veithen
Date: Mon Jan 30 13:28:53 2012
New Revision: 1237643
URL: http://svn.apache.org/viewvc?rev=1237643&view=rev
Log:
Initial setup for the binary distribution.
Added:
axis/axis1/java/trunk/distribution/
axis/axis1/java/trunk/distribution/pom.xml (with props)
axis/axis1/java/trunk/distribution/src/
axis/axis1/java/trunk/distribution/src/main/
axis/axis1/java/trunk/distribution/src/main/assembly/
axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml (with props)
axis/axis1/java/trunk/distribution/src/main/files/
axis/axis1/java/trunk/distribution/src/main/files/samples/
- copied from r1237252, axis/axis1/java/trunk/samples/
axis/axis1/java/trunk/distribution/src/main/files/xmls/
axis/axis1/java/trunk/distribution/src/main/files/xmls/path_refs.xml
- copied unchanged from r1237252, axis/axis1/java/trunk/xmls/path_refs.xml
axis/axis1/java/trunk/distribution/src/main/files/xmls/properties.xml
- copied unchanged from r1237252,
axis/axis1/java/trunk/xmls/properties.xml
axis/axis1/java/trunk/distribution/src/main/files/xmls/targets.xml
- copied unchanged from r1237252, axis/axis1/java/trunk/xmls/targets.xml
axis/axis1/java/trunk/distribution/src/main/files/xmls/taskdefs.xml
- copied unchanged from r1237252, axis/axis1/java/trunk/xmls/taskdefs.xml
axis/axis1/java/trunk/distribution/src/main/files/xmls/taskdefs_post_compile.xml
- copied unchanged from r1237252,
axis/axis1/java/trunk/xmls/taskdefs_post_compile.xml
Removed:
axis/axis1/java/trunk/samples/
Modified:
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java
axis/axis1/java/trunk/pom.xml
Added: axis/axis1/java/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/pom.xml?rev=1237643&view=auto
==============================================================================
--- axis/axis1/java/trunk/distribution/pom.xml (added)
+++ axis/axis1/java/trunk/distribution/pom.xml Mon Jan 30 13:28:53 2012
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ 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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis-project</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>distribution</artifactId>
+ <name>Distribution</name>
+ <packaging>pom</packaging>
+ <description>
+ Produces the Axis source and binary distributions.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-ant</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-distribution</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <unzip
src="${project.build.directory}/${project.artifactId}-${project.version}-bin.zip"
dest="${project.build.directory}" />
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-samples</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/addr"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/attachments"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/bidbuy"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/echo"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/encoding"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/faults"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/handler"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/integrationGuide"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/jaxrpc"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/jms"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/math"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/message"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/misc"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/perf"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/proxy"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/security"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/stock"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/swa"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/transport"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/userguide"/>
+ <ant
dir="${project.build.directory}/axis-${project.version}/samples/xbeans"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-extra-libs</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/axis-${project.version}/lib</outputDirectory>
+ <includeArtifactIds>junit</includeArtifactIds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: axis/axis1/java/trunk/distribution/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml?rev=1237643&view=auto
==============================================================================
--- axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml (added)
+++ axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml Mon Jan 30
13:28:53 2012
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<assembly>
+ <id>bin</id>
+ <baseDirectory>axis-${project.version}</baseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/files</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <exclude>ant:ant:jar</exclude>
+ <exclude>junit:junit:jar</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange: axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1237643&r1=1237642&r2=1237643&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Mon Jan 30 13:28:53 2012
@@ -66,7 +66,7 @@
<goal>wsdl2java-test</goal>
</goals>
<configuration>
- <file>../samples/echo/InteropTest.wsdl</file>
+
<file>../distribution/src/main/files/samples/echo/InteropTest.wsdl</file>
<typeMappingVersion>1.1</typeMappingVersion>
<mappings>
<mapping>
@@ -86,7 +86,7 @@
<goal>wsdl2java-test</goal>
</goals>
<configuration>
- <file>../samples/addr/AddressBook.wsdl</file>
+
<file>../distribution/src/main/files/samples/addr/AddressBook.wsdl</file>
<typeMappingVersion>1.1</typeMappingVersion>
<mappings>
<mapping>
@@ -925,7 +925,7 @@
<target>
<!-- TODO: quick and dirty hack to be able to
compile all tests -->
<mkdir
dir="${project.build.directory}/work/samples/client"/>
- <copy
file="../samples/client/DynamicInvoker.java"
todir="${project.build.directory}/work/samples/client"/>
+ <copy
file="../distribution/src/main/files/samples/client/DynamicInvoker.java"
todir="${project.build.directory}/work/samples/client"/>
</target>
</configuration>
</execution>
Modified:
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java?rev=1237643&r1=1237642&r2=1237643&view=diff
==============================================================================
---
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java
(original)
+++
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java
Mon Jan 30 13:28:53 2012
@@ -39,7 +39,7 @@ public class ServiceGetPort extends Test
public void testGetGeneratedStub() throws Exception {
Service service = ServiceFactory.newInstance().createService(
- new URL("file:../samples/addr/AddressBook.wsdl"),
+ new
URL("file:../distribution/src/main/files/samples/addr/AddressBook.wsdl"),
new QName("urn:AddressFetcher2", "AddressBookService"));
QName portName = new QName("urn:AddressFetcher2", "AddressBook");
Remote stub = service.getPort(portName, AddressBook.class);
Modified: axis/axis1/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1237643&r1=1237642&r2=1237643&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Mon Jan 30 13:28:53 2012
@@ -67,6 +67,7 @@
<module>axis-jms</module>
<module>integration</module>
<module>axis-war</module>
+ <module>distribution</module>
</modules>
<dependencyManagement>
<dependencies>
@@ -122,6 +123,14 @@
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
