axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r367498 - in /webservices/axis2/trunk/java: ./ etc/ modules/core/src/org/apache/axis2/client/ modules/core/src/org/apache/axis2/transport/http/ release-docs/release-etc/min/
Date Tue, 10 Jan 2006 06:05:30 GMT
Author: chinthaka
Date: Mon Jan  9 22:05:09 2006
New Revision: 367498

URL: http://svn.apache.org/viewcvs?rev=367498&view=rev
Log:
- deprecating Call, MEPClient.java, InOutMEPClient.java, InOutMEPClient.java, MessageSender.java
- adding more changes to maven.xml from Azeez


Modified:
    webservices/axis2/trunk/java/etc/project.properties
    webservices/axis2/trunk/java/maven.xml
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
    webservices/axis2/trunk/java/release-docs/release-etc/min/project.properties

Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=367498&r1=367497&r2=367498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Mon Jan  9 22:05:09 2006
@@ -19,6 +19,8 @@
 #                Project Information
 # -------------------------------------------------------------------
 axis2_version=0.94-SNAPSHOT
+release_date=January 11, 2006
+
 
 # -------------------------------------------------------------------
 #                Dependency Repositories

Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/maven.xml?rev=367498&r1=367497&r2=367498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Mon Jan  9 22:05:09 2006
@@ -266,16 +266,6 @@
         <echo message="the files are up to date = ${jars.uptodate}"></echo>
     </goal>
 
-    <goal name="init-dist">
-        <ant:filter token="axis2_version" value="${pom.currentVersion}"/>
-        <ant:filter token="release_date" value="${release_date}"/>
-
-        <property name="min_dep_cache" value="target/temp/cache/min"/>
-        <property name="std_dep_cache" value="target/temp/cache/std"/>
-
-        <ant:mkdir dir="target/dist"/>
-    </goal>
-
     <goal name="modules:clean">
         <attainGoal name="modules:reactor:init"/>
         <u:tokenize var="directories" delim=",">${modules.directories}</u:tokenize>
@@ -432,6 +422,16 @@
         <ant:delete dir="target/apidocs"/>
     </goal>
 
+    <goal name="init-dist">
+        <ant:filter token="axis2_version" value="${pom.currentVersion}"/>
+        <ant:filter token="release_date" value="${release_date}"/>
+
+        <property name="min_dep_cache" value="target/temp/cache/min"/>
+        <property name="std_dep_cache" value="target/temp/cache/std"/>
+
+        <ant:mkdir dir="target/dist"/>
+    </goal>
+
     <goal name="dist-min-bin" prereqs="init-dist,cache-min-deps">
         <ant:echo>+----------------------------------------------</ant:echo>
         <ant:echo>| Creating: Axis2 Minimal Binary Distribution</ant:echo>
@@ -565,7 +565,7 @@
         <ant:copy todir="${std.bin.temp.dir}/samples/userguide">
             <ant:fileset file="${std.bin.temp.dir}/samples/groovyService.aar"/>
         </ant:copy>
-        <ant:delete file="${std.bin.temp.dir}/samples/groovyService.aar" />
+        <ant:delete file="${std.bin.temp.dir}/samples/groovyService.aar"/>
 
         <!-- Copy the release documents -->
         <macros:copy-release-docs toDir="${std.bin.temp.dir}"
@@ -581,9 +581,14 @@
         <ant:echo>| Creating: Axis2 Standard Source Distribution</ant:echo>
         <ant:echo>+----------------------------------------------</ant:echo>
 
-        <ant:mkdir dir="target/dist"/>
+        <ant:property name="std.src.temp.dir" value="target/temp/std/src"/>
+
+        <!-- Copy bin scripts -->
+        <ant:copy todir="${std.src.temp.dir}/bin">
+            <ant:fileset dir="modules/tool/script"/>
+        </ant:copy>
 
-        <ant:copy toDir="target/temp/std/src">
+        <ant:copy toDir="${std.src.temp.dir}">
             <ant:fileset dir=".">
                 <ant:include name="**/etc/**"/>
                 <ant:include name="**/modules/core/**"/>
@@ -597,6 +602,7 @@
                 <ant:include name="**/modules/addressing/**"/>
                 <ant:include name="**/modules/samples/**"/>
                 <ant:exclude name="**/target/**"/>
+                <ant:exclude name="**/xdocs/**"/>
                 <ant:exclude name="**/*class*/**"/>
                 <ant:exclude name="**/.svn/**"/>
                 <ant:exclude name="**/bin/**"/>
@@ -606,26 +612,35 @@
                 <ant:exclude name="**/*.iml"/>
             </ant:fileset>
         </ant:copy>
-        <ant:copy toDir="target/temp/std/src/etc" overwrite="true" filtering="on">
+        <ant:copy toDir="${std.src.temp.dir}/etc" overwrite="true" filtering="on">
             <ant:fileset dir="release-docs/release-etc/std"/>
         </ant:copy>
 
         <!-- Copy the master maven files for the standard src distro -->
-        <ant:copy toFile="target/temp/std/src/maven.xml">
+        <ant:copy toFile="${std.src.temp.dir}/maven.xml">
             <ant:fileset file="release-docs/maven-scripts/maven-std.xml"/>
         </ant:copy>
-        <ant:copy toDir="target/temp/std/src">
+        <ant:copy toDir="${std.src.temp.dir}">
             <ant:fileset file="project.xml"/>
         </ant:copy>
 
+        <!-- Copy the samples -->
+        <ant:copy todir="${std.src.temp.dir}/samples">
+            <ant:fileset dir="modules/samples/target/samples">
+                <ant:exclude name="**/*.jar"/>
+                <ant:exclude name="**/*.aar"/>
+                <ant:exclude name="**/*.mar"/>
+            </ant:fileset>
+        </ant:copy>
+
         <!-- Copy the release documents -->
-        <macros:copy-release-docs toDir="target/temp/std/src"
+        <macros:copy-release-docs toDir="${std.src.temp.dir}"
                                   readmeFile="release-docs/readme-files/README-std-src.txt"/>
 
         <ant:zip file="${dist.dir}/axis2-std-${pom.currentVersion}-src.zip">
-            <ant:fileset dir="target/temp/std/src"/>
+            <ant:fileset dir="${std.src.temp.dir}"/>
         </ant:zip>
-        <ant:delete dir="target/temp/std/src"/>
+        <ant:delete dir="${std.src.temp.dir}"/>
     </goal>
 
     <goal name="dist-war" prereqs="war">
@@ -662,7 +677,7 @@
         <ant:echo message="***** IMPORTANT: Please manually copy the Eclipse &amp;
IDEA plugins"/>
     </goal>
 
-    <goal name="cache-min-deps" prereqs="init-dist">
+   <goal name="cache-min-deps" prereqs="init-dist">
         <ant:mkdir dir="${min_dep_cache}"/>
         <j:if test="${minDeps.uptodate != 'yes'}">
             <macros:copy-deps copyToDir="${min_dep_cache}"
@@ -769,6 +784,8 @@
 
     <define:taglib uri="macros">
         <define:tag name="copy-deps">
+            <ant:echo message="######## MODULES=${mods}"/>
+            <ant:echo message="######## Copy2Dir=${copyToDir}"/>
 
             <j:set var="modules" value="${mods}"/>
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java?rev=367498&r1=367497&r2=367498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java Mon Jan
 9 22:05:09 2006
@@ -36,6 +36,8 @@
 /**
  * This class is used to invoke INOUT web services and serves as a convenience
  * class to work with INOUT MEP.
+ * @deprecated
+ * @see ServiceClient
  */
 public class Call extends InOutMEPClient {
     protected AxisOperation axisOperationTemplate;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java?rev=367498&r1=367497&r2=367498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java
Mon Jan  9 22:05:09 2006
@@ -30,6 +30,8 @@
 
 /**
  * This class handles In-Only (fire and forget) MEP
+* @deprecated
+ * @see ServiceClient
  */
 public class InOnlyMEPClient extends MEPClient {
     public InOnlyMEPClient(ServiceContext service) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java?rev=367498&r1=367497&r2=367498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
Mon Jan  9 22:05:09 2006
@@ -46,6 +46,9 @@
  * This class captures the handling of In-Out type method invocations for both blocking
  * and non-blocking calls. The basic API is based on MessageContext and
  * provides more convenient APIs.
+ *
+ * @deprecated 
+ * @see ServiceClient
  */
 public class InOutMEPClient extends MEPClient {
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java?rev=367498&r1=367497&r2=367498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java Mon
Jan  9 22:05:09 2006
@@ -44,6 +44,8 @@
 
 /**
  * This is the super class for all MEPClients.
+ * @deprecated
+ * @see OperationClient
  */
 public abstract class MEPClient {
     private static final String ANONYMOUS_SERVICE = "AnonymousService";

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java?rev=367498&r1=367497&r2=367498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
Mon Jan  9 22:05:09 2006
@@ -34,6 +34,9 @@
 
 /**
  * Message Sender is similar to the Call. Call is just a wrapper that provides a simple API.
+ *
+ * @see ServiceClient
+ * @deprecated
  */
 public class MessageSender extends InOnlyMEPClient {
     protected static AxisOperation axisOperationTemplate;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=367498&r1=367497&r2=367498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
Mon Jan  9 22:05:09 2006
@@ -91,7 +91,6 @@
                 throw new AxisFault("HTTP version can not be Null");
             }
 
-//            String httpVersion = null;
 
             if (HttpVersion.HTTP_1_0.equals(ver)) {
 //                httpVersion = HTTPConstants.HEADER_PROTOCOL_10;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java?rev=367498&r1=367497&r2=367498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
Mon Jan  9 22:05:09 2006
@@ -104,7 +104,6 @@
          */
         if (postMethod.getStatusCode() == HttpStatus.SC_OK) {
             processResponse(postMethod, msgContext);
-
             return;
         } else if (postMethod.getStatusCode() == HttpStatus.SC_ACCEPTED) {
             return;
@@ -122,6 +121,8 @@
                     return;
                 }
             }
+        } else {
+            throw new AxisFault("Axis2 transport error : " + postMethod.getStatusText(),
SOAP12Constants.FAULT_CODE_SENDER);
         }
 
         throw new AxisFault(Messages.getMessage("transportError",

Modified: webservices/axis2/trunk/java/release-docs/release-etc/min/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/release-docs/release-etc/min/project.properties?rev=367498&r1=367497&r2=367498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/release-docs/release-etc/min/project.properties (original)
+++ webservices/axis2/trunk/java/release-docs/release-etc/min/project.properties Mon Jan 
9 22:05:09 2006
@@ -19,7 +19,6 @@
 #                Project Information
 # -------------------------------------------------------------------
 axis2_version=0.94
-release_date=January 11, 2006
 
 # -------------------------------------------------------------------
 #                Dependency Repositories



Mime
View raw message