Author: veithen
Date: Sun Aug 22 13:37:20 2010
New Revision: 987904
URL: http://svn.apache.org/viewvc?rev=987904&view=rev
Log:
Merged the SOAP monitor refactoring (split between Axis2 module code and
applet/servlet code) to the 1.5 branch so that we get a proper Maven artifact
for the servlet code. This makes packaging of the distributions easier.
Added:
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/ (props
changed)
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/pom.xml
(contents, props changed)
- copied, changed from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
(props changed)
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/SOAPMonitorHandler.java
- copied unchanged from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/SOAPMonitorHandler.java
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/SOAPMonitorModule.java
- copied unchanged from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/SOAPMonitorModule.java
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/resources/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/resources/META-INF/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
(props changed)
- copied unchanged from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/
(props changed)
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/pom.xml
- copied, changed from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
(props changed)
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/SOAPMonitorApplet.java
- copied unchanged from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/SOAPMonitorApplet.java
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
(props changed)
- copied from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/SOAPMonitorConstants.java
- copied unchanged from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/SOAPMonitorConstants.java
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/SOAPMonitorService.java
- copied unchanged from r777648,
webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/SOAPMonitorService.java
Removed:
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/src/
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/documentation/xdocs/@axis2_version_dir@/soapmonitor-module.xml
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
axis/axis2/java/core/branches/java/1_5/pom.xml
Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715
-/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/distribution:922914,922941,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715
-/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml?rev=987904&r1=987903&r2=987904&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml Sun Aug
22 13:37:20 2010
@@ -87,6 +87,11 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
+ <artifactId>soapmonitor-servlet</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-fastinfoset</artifactId>
<version>${pom.version}</version>
</dependency>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/documentation/xdocs/@axis2_version_dir@/soapmonitor-module.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/documentation/xdocs/%40axis2_version_dir%40/soapmonitor-module.xml?rev=987904&r1=987903&r2=987904&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/documentation/xdocs/@axis2_version_dir@/soapmonitor-module.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/documentation/xdocs/@axis2_version_dir@/soapmonitor-module.xml
Sun Aug 22 13:37:20 2010
@@ -136,21 +136,14 @@ code to the web.xml (The SOAPMonitorPort
<url-pattern>/SOAPMonitor</url-pattern>
</servlet-mapping></pre>
-<p>Finally, compile the applet classes and place them at the root (eg:
-<CATALINA_HOME>/webapps/axis2/) of the extracted WAR file. You can find
-the SOAPMonitorApplet.java in the source distribution. To compile, use the
-following command:</p>
-<pre>javac -classpath axis2-soapmonitor.jar
org/apache/axis2/soapmonitor/applet/SOAPMonitorApplet.java</pre>
-
-<p>Alternatively, you can directly get the <strong>compiled applet
-classes</strong> from the WEB-INF/lib/soapmonitor-1.4.jar which is inside
-the extracted axis2.war. To extract the soapmonitor-1.4.jar file, simply
-execute the command, <code>jar -xf soapmonitor-1.4.jar</code> and place
-the compiled applet classes in the root directory of the extracted WAR, for
-example, in <CATALINA_HOME>/webapps/axis2/. NOTE: Starting with axis2
1.4,
-the applets code is in the org.apache.axis2.soapmonitor.applet package.
Therefore
-the 'org' directory created by the unpacking of soapmonitor-1.4.jar should be
placed
-in <CATALINA_HOME>/webapps/axis2/ as shown in the above example.</p>
+<p>Finally, the applet classes must be placed into the Web application so that
+they can be loaded by the Web browser. You can get the compiled applet
+classes from the WEB-INF/lib/soapmonitor-servl...@axis2_version@.jar which is
inside
+the extracted axis2.war. To extract the content of the file, simply
+execute the command, <code>jar -xf
soapmonitor-servl...@axis2_version@.jar</code>.
+The applet code is in the org.apache.axis2.soapmonitor.applet package and
therefore
+the 'org' directory created by the unpacking of JAR file should be placed
+in <CATALINA_HOME>/webapps/axis2/.</p>
<p>Using a Web browser, go to http[s]://host[:port][/webapp]/SOAPMonitor
(e.g.http://localhost:8080/axis2/SOAPMonitor) substituting the correct values
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/parent:922914,922941,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715
-/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -0,0 +1 @@
+/axis/axis2/java/core/trunk/modules/soapmonitor/module:922983,965032,965056,966401
Copied:
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/pom.xml (from
r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml)
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/pom.xml?p2=axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/pom.xml&p1=webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml&r1=777648&r2=987904&rev=987904&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/pom.xml
Sun Aug 22 13:37:20 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>soapmonitor</artifactId>
@@ -36,33 +36,39 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>soapmonitor-servlet</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module</developerConnection>
+
<url>http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module</url>
+ </scm>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>../../..</directory>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>${version}</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -0,0 +1,3 @@
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:922914,922983,965032,965056,966401
+/webservices/axis2/branches/java/1_5/modules/soapmonitor/pom.xml:745088,749052,749058,751161,751271,760467,765840
+/webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml:807160
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -0,0 +1,3 @@
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:922914,922983,965032,965056,966401
+/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/handlers:745088,749052,749058,751161,751271,760467,765840
+/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:777648,807160
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -0,0 +1,3 @@
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:922914,922983,965032,965056,966401
+/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/META-INF/module.xml:745088,749052,749058,751161,751271,760467,765840
+/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:807160
Propchange: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -0,0 +1 @@
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet:922914,965032,965056,965213
Copied:
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/pom.xml
(from r777648, webservices/axis2/trunk/java/modules/soapmonitor/servlet/pom.xml)
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/pom.xml?p2=axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/pom.xml&p1=webservices/axis2/trunk/java/modules/soapmonitor/servlet/pom.xml&r1=777648&r2=987904&rev=987904&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/soapmonitor/servlet/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/pom.xml
Sun Aug 22 13:37:20 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>soapmonitor-servlet</artifactId>
@@ -37,17 +37,33 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
</dependencies>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet</developerConnection>
+
<url>http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet</url>
+ </scm>
<build>
- <resources>
- <resource>
- <directory>../../..</directory>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -0,0 +1,3 @@
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:922914,965032,965056,965213
+/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/soapmonitor/applet:745088,749052,749058,751161,751271,760467,765840
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:777648,807160
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -0,0 +1,3 @@
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:922914,965032,965056,965213
+/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/soapmonitor/servlet:745088,749052,749058,751161,751271,760467,765840
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:777648,807160
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715
-/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715
-/webservices/axis2/trunk/java/modules/transport/local:733539,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/local:733539,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml?rev=987904&r1=987903&r2=987904&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml Sun Aug 22
13:37:20 2010
@@ -1442,14 +1442,14 @@
</includes>
</resource>
<resource>
-
<directory>${basedir}/../soapmonitor/target</directory>
+
<directory>${basedir}/../soapmonitor/module/target</directory>
<targetPath>WEB-INF/modules</targetPath>
<includes>
<include>soapmonitor*.mar</include>
</includes>
</resource>
<resource>
-
<directory>${basedir}/../soapmonitor/target</directory>
+
<directory>${basedir}/../soapmonitor/servlet/target</directory>
<targetPath>WEB-INF/lib</targetPath>
<includes>
<include>soapmonitor*.jar</include>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 13:37:20 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904660,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/pom.xml?rev=987904&r1=987903&r2=987904&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/pom.xml Sun Aug 22 13:37:20 2010
@@ -55,7 +55,8 @@
<module>modules/parent</module>
<module>modules/ping</module>
<module>modules/samples/version</module>
- <module>modules/soapmonitor</module>
+ <module>modules/soapmonitor/servlet</module>
+ <module>modules/soapmonitor/module</module>
<module>modules/spring</module>
<module>modules/tool/axis2-aar-maven-plugin</module>
<module>modules/tool/axis2-ant-plugin</module>
