开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:tar_scm:hessian.spec Changed

@@ -1,15 +1,18 @@
 Name:                hessian
 Summary:             Java implementation of a binary protocol for web services
-Version:             4.0.38
-Release:             1
+Version:             4.0.65
+Release:             2
 Epoch:               0
 License:             ASL 1.1
 URL:                 http://hessian.caucho.com/
 Source0:             http://caucho.com/download/%{name}-%{version}-src.jar
 Source1:             https://repo1.maven.org/maven2/com/caucho/%{name}/%{version}/%{name}-%{version}.pom
 Source2:             https://opensource.org/licenses/Apache-1.1#/Apache-1.1.html#/Apache-1.1
-BuildRequires:       maven-local mvn(javax.servlet:javax.servlet-api)
-BuildRequires:       mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:       maven-local mvn(javax.servlet:javax.servlet-api) mvn(org.springframework:spring-web)
+BuildRequires:       mvn(org.apache.felix:maven-bundle-plugin)    
+
+Patch1:         	 %{name}-20230907.patch
+
 BuildArch:           noarch
 %description
 This is the Java implementation of Caucho's Hession binary transport
@@ -21,7 +24,8 @@
 API documentation for %{name}.
 
 %prep
-%setup -q -c
+%autosetup -c -p1
+
 mkdir src
 mv com src/
 rm -r META-INF
@@ -29,6 +33,7 @@
 cp -p %{SOURCE1} pom.xml
 cp -p %{SOURCE2} apache.license.html
 %pom_change_dep :servlet-api javax.servlet:javax.servlet-api:3.1.0
+%pom_change_dep :spring-web org.springframework:spring-web:3.2.18.RELEASE
 %pom_remove_plugin :maven-gpg-plugin
 %pom_remove_plugin :maven-javadoc-plugin
 %pom_remove_plugin :maven-source-plugin
@@ -69,5 +74,11 @@
 %license apache.license.html
 
 %changelog
-* Sat Aug 15 2020 Ge Wang <wangge20@huawei.com> - 4.0.38-1
+* Tue Aug 29 2023 Bin Huang <huangbin54@huawei.com> - 0:4.0.65-2
+- commit patch
+
+* Mon Aug 21 2023 Bin Huang <huangbin54@huawei.com> - 0:4.0.65-1
+- Package update version to 4.0.65
+
+* Sat Aug 15 2020 Ge Wang <wangge20@huawei.com> - 0:4.0.38-1
 - Package init

_service:tar_scm:hessian-20230907.patch Added

@@ -0,0 +1,6985 @@
+diff -Npur hessian-4.0.65-src/META-INF/hessian/deserializers hessian-4.0.65-fix/META-INF/hessian/deserializers
+--- hessian-4.0.65-src/META-INF/hessian/deserializers	1970-01-01 08:00:00.000000000 +0800
++++ hessian-4.0.65-fix/META-INF/hessian/deserializers	2023-08-15 18:39:22.000000000 +0800
+@@ -0,0 +1,3 @@
++java.io.File=com.caucho.hessian.io.FileDeserializer
++java.math.BigDecimal=com.caucho.hessian.io.BigDecimalDeserializer
++javax.management.ObjectName=com.caucho.hessian.io.ObjectNameDeserializer
+diff -Npur hessian-4.0.65-src/META-INF/hessian/serializers hessian-4.0.65-fix/META-INF/hessian/serializers
+--- hessian-4.0.65-src/META-INF/hessian/serializers	1970-01-01 08:00:00.000000000 +0800
++++ hessian-4.0.65-fix/META-INF/hessian/serializers	2023-08-15 18:39:22.000000000 +0800
+@@ -0,0 +1,6 @@
++com.caucho.hessian.io.HessianRemoteObject=com.caucho.hessian.io.RemoteSerializer
++com.caucho.burlap.io.BurlapRemoteObject=com.caucho.hessian.io.RemoteSerializer
++java.io.File=com.caucho.hessian.io.StringValueSerializer
++java.math.BigDecimal=com.caucho.hessian.io.StringValueSerializer
++java.util.Locale=com.caucho.hessian.io.LocaleSerializer
++javax.management.ObjectName=com.caucho.hessian.io.StringValueSerializer
+diff -Npur hessian-4.0.65-src/com/caucho/hessian/client/HessianProxy.java hessian-4.0.65-fix/com/caucho/hessian/client/HessianProxy.java
+--- hessian-4.0.65-src/com/caucho/hessian/client/HessianProxy.java	2020-07-23 12:51:28.000000000 +0800
++++ hessian-4.0.65-fix/com/caucho/hessian/client/HessianProxy.java	2023-08-15 18:39:22.000000000 +0800
+@@ -1,483 +1,483 @@
+-/*
+- * The Apache Software License, Version 1.1
+- *
+- * Copyright (c) 2001-2004 Caucho Technology, Inc.  All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- *
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- *
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in
+- *    the documentation and/or other materials provided with the
+- *    distribution.
+- *
+- * 3. The end-user documentation included with the redistribution, if
+- *    any, must include the following acknowlegement:
+- *       "This product includes software developed by the
+- *        Caucho Technology (http://www.caucho.com/)."
+- *    Alternately, this acknowlegement may appear in the software itself,
+- *    if and wherever such third-party acknowlegements normally appear.
+- *
+- * 4. The names "Hessian", "Resin", and "Caucho" must not be used to
+- *    endorse or promote products derived from this software without prior
+- *    written permission. For written permission, please contact
+- *    info@caucho.com.
+- *
+- * 5. Products derived from this software may not be called "Resin"
+- *    nor may "Resin" appear in their names without prior written
+- *    permission of Caucho Technology.
+- *
+- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+- * DISCLAIMED.  IN NO EVENT SHALL CAUCHO TECHNOLOGY OR ITS CONTRIBUTORS
+- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- *
+- * @author Scott Ferguson
+- */
+-
+-package com.caucho.hessian.client;
+-
+-import com.caucho.hessian.io.*;
+-import com.caucho.services.server.*;
+-
+-import java.io.*;
+-import java.util.logging.*;
+-import java.lang.reflect.InvocationHandler;
+-import java.lang.reflect.Method;
+-import java.lang.reflect.Proxy;
+-import java.util.WeakHashMap;
+-import java.net.HttpURLConnection;
+-import java.net.URL;
+-import java.net.URLConnection;
+-import java.util.zip.*;
+-
+-/**
+- * Proxy implementation for Hessian clients.  Applications will generally
+- * use HessianProxyFactory to create proxy clients.
+- */
+-public class HessianProxy implements InvocationHandler, Serializable {
+-  private static final Logger log
+-    = Logger.getLogger(HessianProxy.class.getName());
+-  
+-  protected HessianProxyFactory _factory;
+-  
+-  private WeakHashMap<Method,String> _mangleMap
+-    = new WeakHashMap<Method,String>();
+-
+-  private Class<?> _type;
+-  private URL _url;
+-
+-  /**
+-   * Protected constructor for subclassing
+-   */
+-  protected HessianProxy(URL url, HessianProxyFactory factory)
+-  {
+-    this(url, factory, null);
+-  }
+-
+-  /**
+-   * Protected constructor for subclassing
+-   */
+-  protected HessianProxy(URL url,
+-                         HessianProxyFactory factory, 
+-                         Class<?> type)
+-  {
+-    _factory = factory;
+-    _url = url;
+-    _type = type;
+-  }
+-
+-  /**
+-   * Returns the proxy's URL.
+-   */
+-  public URL getURL()
+-  {
+-    return _url;
+-  }
+-
+-  /**
+-   * Handles the object invocation.
+-   *
+-   * @param proxy the proxy object to invoke
+-   * @param method the method to call
+-   * @param args the arguments to the proxy object
+-   */
+-  public Object invoke(Object proxy, Method method, Object args)
+-    throws Throwable
+-  {
+-    String mangleName;
+-
+-    synchronized (_mangleMap) {
+-      mangleName = _mangleMap.get(method);
+-    }
+-
+-    if (mangleName == null) {
+-      String methodName = method.getName();
+-      Class<?> params = method.getParameterTypes();
+-
+-      // equals and hashCode are special cased
+-      if (methodName.equals("equals")
+-          && params.length == 1 && params0.equals(Object.class)) {
+-        Object value = args0;
+-        if (value == null || ! Proxy.isProxyClass(value.getClass()))
+-          return Boolean.FALSE;
+-
+-        Object proxyHandler = Proxy.getInvocationHandler(value);
+-
+-        if (! (proxyHandler instanceof HessianProxy))
+-          return Boolean.FALSE;
+-
+-        HessianProxy handler = (HessianProxy) proxyHandler;
+-
+-        return new Boolean(_url.equals(handler.getURL()));
+-      }
+-      else if (methodName.equals("hashCode") && params.length == 0)
+-        return new Integer(_url.hashCode());
+-      else if (methodName.equals("getHessianType"))
+-        return proxy.getClass().getInterfaces()0.getName();
+-      else if (methodName.equals("getHessianURL"))
+-        return _url.toString();
+-      else if (methodName.equals("toString") && params.length == 0)
+-        return "HessianProxy" + _url + "";
+-      
+-      if (! _factory.isOverloadEnabled())
+-        mangleName = method.getName();
+-      else
+-        mangleName = mangleName(method);
+-
+-      synchronized (_mangleMap) {
+-        _mangleMap.put(method, mangleName);
+-      }
+-    }
+-
+-    InputStream is = null;
+-    HessianConnection conn = null;
+-    
+-    try {
+-      if (log.isLoggable(Level.FINER))
+-        log.finer("Hessian" + _url + " calling " + mangleName);
+-      
+-      conn = sendRequest(mangleName, args);
+-
+-      is = getInputStream(conn);
+-
+-      if (log.isLoggable(Level.FINEST)) {
+-        PrintWriter dbg = new PrintWriter(new LogWriter(log));
+-        HessianDebugInputStream dIs
+-          = new HessianDebugInputStream(is, dbg);

_service:tar_scm:hessian-4.0.38-src.jar Deleted

_service:tar_scm:hessian-4.0.65-src.jar Added

_service:tar_scm:hessian-4.0.38.pom -> _service:tar_scm:hessian-4.0.65.pom Changed