Author: veithen
Date: Tue Feb 25 13:18:19 2014
New Revision: 1571681
URL: http://svn.apache.org/r1571681
Log:
* Realign the content of the binary distribution with Axis 1.4. In particular,
include axis-model in the uber-JAR.
* Update the relevant documentation.
Modified:
axis/axis1/java/trunk/axis-model/pom.xml
axis/axis1/java/trunk/axis/pom.xml
axis/axis1/java/trunk/distribution/pom.xml
axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
axis/axis1/java/trunk/src/site/xdoc/artifacts.xml
axis/axis1/java/trunk/src/site/xdoc/user-guide.xml
Modified: axis/axis1/java/trunk/axis-model/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-model/pom.xml?rev=1571681&r1=1571680&r2=1571681&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-model/pom.xml (original)
+++ axis/axis1/java/trunk/axis-model/pom.xml Tue Feb 25 13:18:19 2014
@@ -27,6 +27,13 @@
</parent>
<artifactId>axis-model</artifactId>
<name>EMF Model for WSDD Files</name>
+ <url>${baseUrl}/model</url>
+ <distributionManagement>
+ <site>
+ <id>axis</id>
+ <url>${baseSiteUrl}/model</url>
+ </site>
+ </distributionManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -99,14 +106,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <!-- TODO: skipping for now -->
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- <skipDeploy>true</skipDeploy>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: axis/axis1/java/trunk/axis/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/pom.xml?rev=1571681&r1=1571680&r2=1571681&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/pom.xml (original)
+++ axis/axis1/java/trunk/axis/pom.xml Tue Feb 25 13:18:19 2014
@@ -79,6 +79,7 @@
<configuration>
<artifactSet>
<includes>
+ <!-- Please keep
src/site/xdoc/artifacts.xml in sync with this list -->
<include>${project.groupId}:axis-rt-compat</include>
<include>${project.groupId}:axis-rt-core</include>
<include>${project.groupId}:axis-rt-databinding-castor</include>
@@ -90,6 +91,7 @@
<include>${project.groupId}:axis-rt-transport-jms</include>
<include>${project.groupId}:axis-rt-transport-http-hc3</include>
<include>${project.groupId}:axis-rt-transport-mail</include>
+
<include>${project.groupId}:axis-model</include>
<include>${project.groupId}:axis-codegen</include>
<include>${project.groupId}:axis-tools</include>
<include>${project.groupId}:soapmonitor-client</include>
Modified: axis/axis1/java/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/pom.xml?rev=1571681&r1=1571680&r2=1571681&view=diff
==============================================================================
--- axis/axis1/java/trunk/distribution/pom.xml (original)
+++ axis/axis1/java/trunk/distribution/pom.xml Tue Feb 25 13:18:19 2014
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-rt-core</artifactId>
+ <artifactId>axis</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -44,15 +44,19 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-tools</artifactId>
+ <artifactId>axis-jaxrpc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-standalone-server</artifactId>
+ <artifactId>axis-saaj</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -144,7 +148,7 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/axis-${project.version}/lib</outputDirectory>
- <includeArtifactIds>junit</includeArtifactIds>
+ <includeArtifactIds>junit,mail</includeArtifactIds>
<skip>${skipTests}</skip>
</configuration>
</execution>
Modified: 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=1571681&r1=1571680&r2=1571681&view=diff
==============================================================================
--- axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml (original)
+++ axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml Tue Feb 25
13:18:19 2014
@@ -177,10 +177,37 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>ant:ant:jar</exclude>
- <exclude>junit:junit:jar</exclude>
- </excludes>
+
<outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
+ <includes>
+ <include>*:axis:jar</include>
+ <include>*:axis-ant:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>jaxrpc.jar</outputFileNameMapping>
+ <includes>
+ <include>*:axis-jaxrpc:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>saaj.jar</outputFileNameMapping>
+ <includes>
+ <include>*:axis-saaj:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>*:commons-discovery:jar</include>
+ <include>*:commons-logging:jar</include>
+ <include>*:log4j:jar</include>
+ <include>*:wsdl4j:jar</include>
+ </includes>
</dependencySet>
</dependencySets>
</assembly>
Modified: axis/axis1/java/trunk/src/site/xdoc/artifacts.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/src/site/xdoc/artifacts.xml?rev=1571681&r1=1571680&r2=1571681&view=diff
==============================================================================
--- axis/axis1/java/trunk/src/site/xdoc/artifacts.xml (original)
+++ axis/axis1/java/trunk/src/site/xdoc/artifacts.xml Tue Feb 25 13:18:19 2014
@@ -73,7 +73,7 @@
</tr>
<tr>
<td>Runtime Core</td>
- <td style="text-align: center; vertical-align:middle"
colspan="2" rowspan="15">axis</td>
+ <td style="text-align: center; vertical-align:middle"
colspan="2" rowspan="16">axis</td>
<td style="text-align: center"><a
href="core/dependencies.html">axis-rt-core</a></td>
</tr>
<tr>
@@ -109,6 +109,10 @@
<td style="text-align: center"><a
href="transports/mail/dependencies.html">axis-rt-transport-mail</a></td>
</tr>
<tr>
+ <td>EMF Models</td>
+ <td style="text-align: center"><a
href="model/dependencies.html">axis-model</a></td>
+ </tr>
+ <tr>
<td>Code Generator</td>
<td style="text-align: center"><a
href="codegen/dependencies.html">axis-codegen</a></td>
</tr>
Modified: axis/axis1/java/trunk/src/site/xdoc/user-guide.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/src/site/xdoc/user-guide.xml?rev=1571681&r1=1571680&r2=1571681&view=diff
==============================================================================
--- axis/axis1/java/trunk/src/site/xdoc/user-guide.xml (original)
+++ axis/axis1/java/trunk/src/site/xdoc/user-guide.xml Tue Feb 25 13:18:19 2014
@@ -120,17 +120,16 @@
<p>See the <a href="install.html">Axis Installation Guide</a> for instructions
on installing Axis as a web application on your J2EE server.</p>
-<p>Before running the examples in this guide, you'll need to make sure that
your CLASSPATH includes (Note: If you build Axis from a CVS checkout, these
will be in xml-axis/java/build/lib instead of axis-1_2/lib):</p>
+<p>Before running the examples in this guide, you'll need to make sure that
your CLASSPATH includes the following elements from the Axis binary
distribution:</p>
<ul>
- <li>axis-1_2/lib/axis.jar</li>
- <li>axis-1_2/lib/jaxrpc.jar</li>
- <li>axis-1_2/lib/saaj.jar</li>
- <li>axis-1_2/lib/commons-logging.jar</li>
- <li>axis-1_2/lib/commons-discovery.jar</li>
- <li>axis-1_2/lib/wsdl4j.jar</li>
- <li>axis-1_2/ <i>(for the sample code)</i></li>
- <li>A JAXP-1.1 compliant XML parser such as Xerces or Crimson. We recommend
<a href="http://xml.apache.org/xerces2-j/";>Xerces</a>, as it is the one that
the product has been tested against.</li>
+ <li>axis-<i><version></i>/lib/axis.jar</li>
+ <li>axis-<i><version></i>/lib/jaxrpc.jar</li>
+ <li>axis-<i><version></i>/lib/saaj.jar</li>
+ <li>axis-<i><version></i>/lib/commons-logging-<i><version></i>.jar</li>
+
<li>axis-<i><version></i>/lib/commons-discovery-<i><version></i>.jar</li>
+ <li>axis-<i><version></i>/lib/wsdl4j-<i><version></i>.jar</li>
+ <li>axis-<i><version></i>/ <i>(for the sample code)</i></li>
</ul>
</section>
