--- old/src/share/jaxws_classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java	2013-04-04 15:28:33.264614107 +0200
+++ new/src/share/jaxws_classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java	2013-04-04 15:28:33.200614106 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,163 +26,40 @@
 package com.sun.xml.internal.ws.api;
 
 import com.sun.istack.internal.NotNull;
-import com.sun.istack.internal.Nullable;
-import com.sun.xml.internal.ws.api.message.Packet;
-import com.sun.xml.internal.ws.client.RequestContext;
-import com.sun.xml.internal.ws.client.ResponseContext;
-
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.WebServiceContext;
-import java.util.Map.Entry;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Set;
 
 /**
- * {@link PropertySet} that combines properties exposed from multiple
- * {@link PropertySet}s into one.
- *
- * <p>
- * This implementation allows one {@link PropertySet} to assemble
- * all properties exposed from other "satellite" {@link PropertySet}s.
- * (A satellite may itself be a {@link DistributedPropertySet}, so
- * in general this can form a tree.)
- *
- * <p>
- * This is useful for JAX-WS because the properties we expose to the application
- * are contributed by different pieces, and therefore we'd like each of them
- * to have a separate {@link PropertySet} implementation that backs up
- * the properties. For example, this allows FastInfoset to expose its
- * set of properties to {@link RequestContext} by using a strongly-typed fields.
- *
- * <p>
- * This is also useful for a client-side transport to expose a bunch of properties
- * into {@link ResponseContext}. It simply needs to create a {@link PropertySet}
- * object with methods for each property it wants to expose, and then add that
- * {@link PropertySet} to {@link Packet}. This allows property values to be
- * lazily computed (when actually asked by users), thus improving the performance
- * of the typical case where property values are not asked.
- *
- * <p>
- * A similar benefit applies on the server-side, for a transport to expose
- * a bunch of properties to {@link WebServiceContext}.
- *
- * <p>
- * To achieve these benefits, access to {@link DistributedPropertySet} is slower
- * compared to {@link PropertySet} (such as get/set), while adding a satellite
- * object is relatively fast.
+ * Placeholder for backwards compatibility.
  *
+ * @deprecated Use com.oracle.webservices.internal.api.message.DistributedPropertySet instead.
  * @author Kohsuke Kawaguchi
  */
-public abstract class DistributedPropertySet
-    extends PropertySet
-    implements com.sun.xml.internal.org.jvnet.ws.message.DistributedPropertySet
-{
+public abstract class DistributedPropertySet extends com.oracle.webservices.internal.api.message.BaseDistributedPropertySet {
+
     /**
-     * All {@link PropertySet}s that are bundled into this {@link PropertySet}.
+     * @deprecated
      */
-    private final Map<Class, PropertySet> satellites = new IdentityHashMap<Class, PropertySet>();
-
     public void addSatellite(@NotNull PropertySet satellite) {
-        addSatellite(satellite.getClass(), satellite);
+        super.addSatellite(satellite);
     }
 
+    /**
+     * @deprecated
+     */
     public void addSatellite(@NotNull Class keyClass, @NotNull PropertySet satellite) {
-        satellites.put(keyClass, satellite);
+        super.addSatellite(keyClass, satellite);
     }
 
+    /**
+     * @deprecated
+     */
     public void copySatelliteInto(@NotNull DistributedPropertySet r) {
-        r.satellites.putAll(this.satellites);
+        super.copySatelliteInto(r);
     }
 
-    public @Nullable <T extends com.sun.xml.internal.org.jvnet.ws.message.PropertySet> T getSatellite(Class<T> satelliteClass) {
-        T satellite = (T) satellites.get(satelliteClass);
-        if (satellite != null)
-                return satellite;
-
-        for (PropertySet child : satellites.values()) {
-            if (satelliteClass.isInstance(child)) {
-                return satelliteClass.cast(child);
-            }
-
-            if (DistributedPropertySet.class.isInstance(child)) {
-                satellite = DistributedPropertySet.class.cast(child).getSatellite(satelliteClass);
-                if (satellite != null) {
-                    return satellite;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Object get(Object key) {
-        // check satellites
-        for (PropertySet child : satellites.values()) {
-            if(child.supports(key))
-                return child.get(key);
-        }
-
-        // otherwise it must be the master
-        return super.get(key);
-    }
-
-    @Override
-    public Object put(String key, Object value) {
-        // check satellites
-        for (PropertySet child : satellites.values()) {
-            if(child.supports(key))
-                return child.put(key,value);
-        }
-
-        // otherwise it must be the master
-        return super.put(key,value);
-    }
-
-    @Override
-    public boolean supports(Object key) {
-        // check satellites
-        for (PropertySet child : satellites.values()) {
-            if(child.supports(key))
-                return true;
-        }
-
-        return super.supports(key);
-    }
-
-    @Override
-    public Object remove(Object key) {
-        // check satellites
-        for (PropertySet child : satellites.values()) {
-            if(child.supports(key))
-                return child.remove(key);
-        }
-
-        return super.remove(key);
-    }
-
-    @Override
-    /*package*/ void createEntrySet(Set<Entry<String, Object>> core) {
-        super.createEntrySet(core);
-        for (PropertySet child : satellites.values()) {
-            child.createEntrySet(core);
-        }
-    }
-
-    public void addSatellite(com.sun.xml.internal.org.jvnet.ws.message.PropertySet satellite) {
-        addSatellite((PropertySet)satellite);
-    }
-
-    public void addSatellite(@NotNull Class keyClass, @NotNull com.sun.xml.internal.org.jvnet.ws.message.PropertySet satellite) {
-        addSatellite(keyClass, (PropertySet)satellite);
-    }
-
-    public void removeSatellite(com.sun.xml.internal.org.jvnet.ws.message.PropertySet satellite) {
-        removeSatellite((PropertySet)satellite);
-    }
-
-    public void copySatelliteInto(com.sun.xml.internal.org.jvnet.ws.message.MessageContext r) {
-        copySatelliteInto((DistributedPropertySet)r);
+    /**
+     * @deprecated
+     */
+    public void removeSatellite(PropertySet satellite) {
+        super.removeSatellite(satellite);
     }
 }