axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r777648 - in /webservices/axis2/trunk/java: ./ modules/distribution/ modules/distribution/src/main/assembly/ modules/documentation/xdocs/@axis2_version_dir@/ modules/soapmonitor/ modules/soapmonitor/module/ modules/soapmonitor/module/src/ m...
Date Fri, 22 May 2009 18:28:52 GMT
Author: veithen
Date: Fri May 22 18:28:51 2009
New Revision: 777648

URL: http://svn.apache.org/viewvc?rev=777648&view=rev
Log:
Split the SOAP Monitor into two different submodules: one for the servlet/applet part and
one for the module. Reason: the project already produced a JAR file (using ant), but it was
not available as a Maven artifact.

Added:
    webservices/axis2/trunk/java/modules/soapmonitor/module/
    webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml   (contents, props changed)
      - copied, changed from r777434, webservices/axis2/trunk/java/modules/soapmonitor/pom.xml
    webservices/axis2/trunk/java/modules/soapmonitor/module/src/
    webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/
    webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/
    webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/
    webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/
    webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/
    webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
  (props changed)
      - copied from r777434, webservices/axis2/trunk/java/modules/soapmonitor/src/org/apache/axis2/handlers/
    webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/
    webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/
    webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
  (props changed)
      - copied unchanged from r777434, webservices/axis2/trunk/java/modules/soapmonitor/src/META-INF/module.xml
    webservices/axis2/trunk/java/modules/soapmonitor/servlet/
    webservices/axis2/trunk/java/modules/soapmonitor/servlet/pom.xml   (with props)
    webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/
    webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/
    webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/
    webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/
    webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/
    webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/
    webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/
    webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
  (props changed)
      - copied from r777434, webservices/axis2/trunk/java/modules/soapmonitor/src/org/apache/axis2/soapmonitor/applet/
    webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
  (props changed)
      - copied from r777434, webservices/axis2/trunk/java/modules/soapmonitor/src/org/apache/axis2/soapmonitor/servlet/
Removed:
    webservices/axis2/trunk/java/modules/soapmonitor/pom.xml
    webservices/axis2/trunk/java/modules/soapmonitor/src/
Modified:
    webservices/axis2/trunk/java/modules/distribution/pom.xml
    webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml
    webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/soapmonitor-module.xml
    webservices/axis2/trunk/java/modules/webapp/pom.xml
    webservices/axis2/trunk/java/pom.xml

Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?rev=777648&r1=777647&r2=777648&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Fri May 22 18:28:51 2009
@@ -341,7 +341,7 @@
                                 <mkdir dir="target/tmp-repository/modules"/>
                                 <mkdir dir="target/tmp-repository/services"/>
 
-                                <copy file="../../modules/soapmonitor/target/soapmonitor-${version}.mar"
+                                <copy file="../../modules/soapmonitor/module/target/soapmonitor-${version}.mar"
                                       tofile="target/tmp-repository/modules/soapmonitor-${soapmonitor.mar.version}.mar"/>
                                 <copy file="../../modules/addressing/target/addressing-${version}.mar"
                                       tofile="target/tmp-repository/modules/addressing-${addressing.mar.version}.mar"/>

Modified: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml?rev=777648&r1=777647&r2=777648&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml Fri
May 22 18:28:51 2009
@@ -194,10 +194,10 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../../modules/soapmonitor/target</directory>
+            <directory>../../modules/soapmonitor/servlet/target</directory>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>soapmonitor-${version}.jar</include>
+                <include>soapmonitor-servlet-${version}.jar</include>
             </includes>
         </fileSet>
         <fileSet>

Modified: webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/soapmonitor-module.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/xdocs/%40axis2_version_dir%40/soapmonitor-module.xml?rev=777648&r1=777647&r2=777648&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/soapmonitor-module.xml
(original)
+++ webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/soapmonitor-module.xml
Fri May 22 18:28:51 2009
@@ -136,21 +136,14 @@
         &lt;url-pattern&gt;/SOAPMonitor&lt;/url-pattern&gt;
     &lt;/servlet-mapping&gt;</pre>
 
-<p>Finally, compile the applet classes and place them at the root (eg:
-&lt;CATALINA_HOME&gt;/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 &lt;CATALINA_HOME&gt;/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 &lt;CATALINA_HOME&gt;/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-servlet-@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-servlet-@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 &lt;CATALINA_HOME&gt;/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

Copied: webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml (from r777434, webservices/axis2/trunk/java/modules/soapmonitor/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml?p2=webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml&p1=webservices/axis2/trunk/java/modules/soapmonitor/pom.xml&r1=777434&r2=777648&rev=777648&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/soapmonitor/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml Fri May 22 18:28:51 2009
@@ -26,86 +26,40 @@
         <groupId>org.apache.axis2</groupId>
         <artifactId>axis2-parent</artifactId>
         <version>SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <artifactId>soapmonitor</artifactId>
     <packaging>mar</packaging>
-    <name>Apache Axis2 - SOAP Monitor</name>
-    <description>soapmonitor for Axis 2.0</description>
+    <name>Apache Axis2 - SOAP Monitor Module</name>
+    <description>soapmonitor module for Axis 2.0</description>
     <dependencies>
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>soapmonitor-servlet</artifactId>
+            <version>${version}</version>
+        </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src</sourceDirectory>
-        <testSourceDirectory>test</testSourceDirectory>
         <resources>
             <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>conf</directory>
-                <excludes>
-                    <exclude>**/*.properties</exclude>
-                </excludes>
-                <filtering>false</filtering>
+                <directory>src/main/resources</directory>
             </resource>
             <resource>
-                <directory>src</directory>
+                <directory>../../..</directory>
                 <includes>
-                    <include>**/module.xml</include>
+                    <include>NOTICE.txt</include>
+                    <include>LICENSE.txt</include>
                 </includes>
                 <filtering>false</filtering>
             </resource>
         </resources>
-        <testResources>
-            <testResource>
-                <targetPath>../test-resources</targetPath>
-                <directory>test-resources</directory>
-                <includes>
-                    <include>**/**</include>
-                </includes>
-            </testResource>
-        </testResources>
         <plugins>
             <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-classes</id>
-                        <phase>process-classes</phase>
-                        <configuration>
-                            <tasks>
-                                <echo message="Creating soapmonitor jar..."/>
-                                <jar destfile="${pom.basedir}/target/${project.build.finalName}.jar"
-                                     basedir="${pom.basedir}/target/classes"
-                                     excludes="**/module.xml,*handlers*,**/*Module*,**/*Handler*"
-                                        />
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-mar-maven-plugin</artifactId>
                 <version>${version}</version>

Propchange: webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 22 18:28:51 2009
@@ -0,0 +1 @@
+/webservices/axis2/branches/java/1_5/modules/soapmonitor/pom.xml:745088,749052,749058,751161,751271,760467,765840

Propchange: webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 22 18:28:51 2009
@@ -0,0 +1 @@
+/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/handlers:745088,749052,749058,751161,751271,760467,765840

Propchange: webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 22 18:28:51 2009
@@ -0,0 +1 @@
+/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/META-INF/module.xml:745088,749052,749058,751161,751271,760467,765840

Added: webservices/axis2/trunk/java/modules/soapmonitor/servlet/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/soapmonitor/servlet/pom.xml?rev=777648&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/soapmonitor/servlet/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/soapmonitor/servlet/pom.xml Fri May 22 18:28:51 2009
@@ -0,0 +1,53 @@
+<?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.axis2</groupId>
+        <artifactId>axis2-parent</artifactId>
+        <version>SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
+    </parent>
+    <artifactId>soapmonitor-servlet</artifactId>
+    <packaging>jar</packaging>
+    <name>Apache Axis2 - SOAP Monitor Servlet</name>
+    <description>soapmonitor servlet for Axis 2.0</description>
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>../../..</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                    <include>LICENSE.txt</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+    </build>
+</project>

Propchange: webservices/axis2/trunk/java/modules/soapmonitor/servlet/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 22 18:28:51 2009
@@ -0,0 +1 @@
+/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/soapmonitor/applet:745088,749052,749058,751161,751271,760467,765840

Propchange: webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 22 18:28:51 2009
@@ -0,0 +1 @@
+/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/soapmonitor/servlet:745088,749052,749058,751161,751271,760467,765840

Modified: webservices/axis2/trunk/java/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/pom.xml?rev=777648&r1=777647&r2=777648&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/webapp/pom.xml Fri May 22 18:28:51 2009
@@ -1381,14 +1381,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>

Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?rev=777648&r1=777647&r2=777648&view=diff
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Fri May 22 18:28:51 2009
@@ -50,7 +50,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>



Mime
View raw message