Author: veithen
Date: Wed Oct 31 23:17:14 2012
New Revision: 1404415
URL: http://svn.apache.org/viewvc?rev=1404415&view=rev
Log:
Correctly build and deploy the SOAP Monitor applet.
Added:
axis/axis1/java/trunk/soapmonitor-applet/ (with props)
axis/axis1/java/trunk/soapmonitor-applet/pom.xml (with props)
axis/axis1/java/trunk/soapmonitor-applet/src/
axis/axis1/java/trunk/soapmonitor-applet/src/main/
axis/axis1/java/trunk/soapmonitor-applet/src/main/java/
axis/axis1/java/trunk/soapmonitor-applet/src/main/java/SOAPMonitorApplet.java
- copied unchanged from r1404313,
axis/axis1/java/trunk/axis-war/src/main/webapp/SOAPMonitorApplet.java
Removed:
axis/axis1/java/trunk/axis-war/src/main/webapp/SOAPMonitorApplet.java
Modified:
axis/axis1/java/trunk/axis-war/pom.xml
axis/axis1/java/trunk/pom.xml
Modified: axis/axis1/java/trunk/axis-war/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-war/pom.xml?rev=1404415&r1=1404414&r2=1404415&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-war/pom.xml (original)
+++ axis/axis1/java/trunk/axis-war/pom.xml Wed Oct 31 23:17:14 2012
@@ -44,6 +44,11 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>soapmonitor-applet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -58,6 +63,19 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+
<packagingExcludes>WEB-INF/lib/soapmonitor-applet-*.jar</packagingExcludes>
+ <overlays>
+ <overlay>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>soapmonitor-applet</artifactId>
+ <type>jar</type>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
Modified: axis/axis1/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1404415&r1=1404414&r2=1404415&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Wed Oct 31 23:17:14 2012
@@ -82,6 +82,7 @@
<module>interop-mock</module>
<module>maven</module>
<module>samples</module>
+ <module>soapmonitor-applet</module>
<module>tcpmon</module>
</modules>
<dependencyManagement>
@@ -199,6 +200,10 @@
<artifactId>jetty-maven-plugin</artifactId>
<version>7.5.4.v20111024</version>
</plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Propchange: axis/axis1/java/trunk/soapmonitor-applet/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Oct 31 23:17:14 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Added: axis/axis1/java/trunk/soapmonitor-applet/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/soapmonitor-applet/pom.xml?rev=1404415&view=auto
==============================================================================
--- axis/axis1/java/trunk/soapmonitor-applet/pom.xml (added)
+++ axis/axis1/java/trunk/soapmonitor-applet/pom.xml Wed Oct 31 23:17:14 2012
@@ -0,0 +1,37 @@
+<?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>soapmonitor-applet</artifactId>
+ <name>SOAP Monitor Applet</name>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: axis/axis1/java/trunk/soapmonitor-applet/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
