filename);
+
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/webservices/internal/api/message/BaseDistributedPropertySet.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/BaseDistributedPropertySet.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,323 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.webservices.internal.api.message;
+
+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.ws.WebServiceContext;
+
+import java.util.AbstractMap;
+import java.util.Map.Entry;
+import java.util.HashSet;
+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.
+ *
+ *
+ * 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.)
+ *
+ *
+ * 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.
+ *
+ *
+ * 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.
+ *
+ *
+ * A similar benefit applies on the server-side, for a transport to expose
+ * a bunch of properties to {@link WebServiceContext}.
+ *
+ *
+ * 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.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class BaseDistributedPropertySet extends BasePropertySet implements DistributedPropertySet {
+
+ /**
+ * All {@link PropertySet}s that are bundled into this {@link PropertySet}.
+ */
+ private final Map, PropertySet> satellites
+ = new IdentityHashMap, PropertySet>();
+
+ private final Map viewthis;
+
+ public BaseDistributedPropertySet() {
+ this.viewthis = super.createView();
+ }
+
+ @Override
+ public void addSatellite(@NotNull PropertySet satellite) {
+ addSatellite(satellite.getClass(), satellite);
+ }
+
+ @Override
+ public void addSatellite(@NotNull Class keyClass, @NotNull PropertySet satellite) {
+ satellites.put(keyClass, satellite);
+ }
+
+ @Override
+ public void removeSatellite(PropertySet satellite) {
+ satellites.remove(satellite.getClass());
+ }
+
+ public void copySatelliteInto(@NotNull DistributedPropertySet r) {
+ for (Map.Entry, PropertySet> entry : satellites.entrySet()) {
+ r.addSatellite(entry.getKey(), entry.getValue());
+ }
+ }
+
+ @Override
+ public void copySatelliteInto(MessageContext r) {
+ copySatelliteInto((DistributedPropertySet)r);
+ }
+
+ @Override
+ public @Nullable T getSatellite(Class 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 Map, com.oracle.webservices.internal.api.message.PropertySet> getSatellites() {
+ return satellites;
+ }
+
+ @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 containsKey(Object key) {
+ if (viewthis.containsKey(key))
+ return true;
+ for (PropertySet child : satellites.values()) {
+ if (child.containsKey(key)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @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
+ protected void createEntrySet(Set> core) {
+ super.createEntrySet(core);
+ for (PropertySet child : satellites.values()) {
+ ((BasePropertySet) child).createEntrySet(core);
+ }
+ }
+
+ protected Map asMapLocal() {
+ return viewthis;
+ }
+
+ protected boolean supportsLocal(Object key) {
+ return super.supports(key);
+ }
+
+ class DistributedMapView extends AbstractMap {
+ @Override
+ public Object get(Object key) {
+ for (PropertySet child : satellites.values()) {
+ if (child.supports(key)) {
+ return child.get(key);
+ }
+ }
+
+ return viewthis.get(key);
+ }
+
+ @Override
+ public int size() {
+ int size = viewthis.size();
+ for (PropertySet child : satellites.values()) {
+ size += child.asMap().size();
+ }
+ return size;
+ }
+
+ @Override
+ public boolean containsKey(Object key) {
+ if (viewthis.containsKey(key))
+ return true;
+ for (PropertySet child : satellites.values()) {
+ if (child.containsKey(key))
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public Set> entrySet() {
+ Set> entries = new HashSet>();
+ for (PropertySet child : satellites.values()) {
+ for (Entry entry : child.asMap().entrySet()) {
+ // the code below is here to avoid entries.addAll(child.asMap().entrySet()); which works differently on JDK6/7
+ // see DMI_ENTRY_SETS_MAY_REUSE_ENTRY_OBJECTS
+ entries.add(new SimpleImmutableEntry(entry.getKey(), entry.getValue()));
+ }
+ }
+ for (Entry entry : viewthis.entrySet()) {
+ // the code below is here to avoid entries.addAll(child.asMap().entrySet()); which works differently on JDK6/7
+ // see DMI_ENTRY_SETS_MAY_REUSE_ENTRY_OBJECTS
+ entries.add(new SimpleImmutableEntry(entry.getKey(), entry.getValue()));
+ }
+
+ return entries;
+ }
+
+ @Override
+ public Object put(String key, Object value) {
+ for (PropertySet child : satellites.values()) {
+ if (child.supports(key)) {
+ return child.put(key, value);
+ }
+ }
+
+ return viewthis.put(key, value);
+ }
+
+ @Override
+ public void clear() {
+ satellites.clear();
+ viewthis.clear();
+ }
+
+ @Override
+ public Object remove(Object key) {
+ for (PropertySet child : satellites.values()) {
+ if (child.supports(key)) {
+ return child.remove(key);
+ }
+ }
+
+ return viewthis.remove(key);
+ }
+ }
+
+ @Override
+ protected Map createView() {
+ return new DistributedMapView();
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/webservices/internal/api/message/BasePropertySet.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/BasePropertySet.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,563 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.webservices.internal.api.message;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.AbstractMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+/**
+ * A set of "properties" that can be accessed via strongly-typed fields
+ * as well as reflexibly through the property name.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@SuppressWarnings("SuspiciousMethodCalls")
+public abstract class BasePropertySet implements PropertySet {
+
+ /**
+ * Creates a new instance of TypedMap.
+ */
+ protected BasePropertySet() {
+ }
+
+ private Map mapView;
+
+ /**
+ * Represents the list of strongly-typed known properties
+ * (keyed by property names.)
+ *
+ *
+ * Just giving it an alias to make the use of this class more fool-proof.
+ */
+ protected static class PropertyMap extends HashMap {
+
+ // the entries are often being iterated through so performance can be improved
+ // by their caching instead of iterating through the original (immutable) map each time
+ transient PropertyMapEntry[] cachedEntries = null;
+
+ PropertyMapEntry[] getPropertyMapEntries() {
+ if (cachedEntries == null) {
+ cachedEntries = createPropertyMapEntries();
+ }
+ return cachedEntries;
+ }
+
+ private PropertyMapEntry[] createPropertyMapEntries() {
+ final PropertyMapEntry[] modelEntries = new PropertyMapEntry[size()];
+ int i = 0;
+ for (final Entry e : entrySet()) {
+ modelEntries[i++] = new PropertyMapEntry(e.getKey(), e.getValue());
+ }
+ return modelEntries;
+ }
+
+ }
+
+ /**
+ * PropertyMapEntry represents a Map.Entry in the PropertyMap with more efficient access.
+ */
+ static public class PropertyMapEntry {
+ public PropertyMapEntry(String k, Accessor v) {
+ key = k; value = v;
+ }
+ String key;
+ Accessor value;
+ }
+
+ /**
+ * Map representing the Fields and Methods annotated with {@link PropertySet.Property}.
+ * Model of {@link PropertySet} class.
+ *
+ *
+ * At the end of the derivation chain this method just needs to be implemented
+ * as:
+ *
+ *
+ * private static final PropertyMap model;
+ * static {
+ * model = parse(MyDerivedClass.class);
+ * }
+ * protected PropertyMap getPropertyMap() {
+ * return model;
+ * }
+ *
+ */
+ protected abstract PropertyMap getPropertyMap();
+
+ /**
+ * This method parses a class for fields and methods with {@link PropertySet.Property}.
+ */
+ protected static PropertyMap parse(final Class clazz) {
+ // make all relevant fields and methods accessible.
+ // this allows runtime to skip the security check, so they runs faster.
+ return AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
+ public PropertyMap run() {
+ PropertyMap props = new PropertyMap();
+ for (Class c=clazz; c!=null; c=c.getSuperclass()) {
+ for (Field f : c.getDeclaredFields()) {
+ Property cp = f.getAnnotation(Property.class);
+ if(cp!=null) {
+ for(String value : cp.value()) {
+ props.put(value, new FieldAccessor(f, value));
+ }
+ }
+ }
+ for (Method m : c.getDeclaredMethods()) {
+ Property cp = m.getAnnotation(Property.class);
+ if(cp!=null) {
+ String name = m.getName();
+ assert name.startsWith("get") || name.startsWith("is");
+
+ String setName = name.startsWith("is") ? "set"+name.substring(2) : // isFoo -> setFoo
+ 's' +name.substring(1); // getFoo -> setFoo
+ Method setter;
+ try {
+ setter = clazz.getMethod(setName,m.getReturnType());
+ } catch (NoSuchMethodException e) {
+ setter = null; // no setter
+ }
+ for(String value : cp.value()) {
+ props.put(value, new MethodAccessor(m, setter, value));
+ }
+ }
+ }
+ }
+
+ return props;
+ }
+ });
+ }
+
+ /**
+ * Represents a typed property defined on a {@link PropertySet}.
+ */
+ protected interface Accessor {
+ String getName();
+ boolean hasValue(PropertySet props);
+ Object get(PropertySet props);
+ void set(PropertySet props, Object value);
+ }
+
+ static final class FieldAccessor implements Accessor {
+ /**
+ * Field with the annotation.
+ */
+ private final Field f;
+
+ /**
+ * One of the values in {@link Property} annotation on {@link #f}.
+ */
+ private final String name;
+
+ protected FieldAccessor(Field f, String name) {
+ this.f = f;
+ f.setAccessible(true);
+ this.name = name;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean hasValue(PropertySet props) {
+ return get(props)!=null;
+ }
+
+ @Override
+ public Object get(PropertySet props) {
+ try {
+ return f.get(props);
+ } catch (IllegalAccessException e) {
+ throw new AssertionError();
+ }
+ }
+
+ @Override
+ public void set(PropertySet props, Object value) {
+ try {
+ f.set(props,value);
+ } catch (IllegalAccessException e) {
+ throw new AssertionError();
+ }
+ }
+ }
+
+ static final class MethodAccessor implements Accessor {
+ /**
+ * Getter method.
+ */
+ private final @NotNull Method getter;
+ /**
+ * Setter method.
+ * Some property is read-only.
+ */
+ private final @Nullable Method setter;
+
+ /**
+ * One of the values in {@link Property} annotation on {@link #getter}.
+ */
+ private final String name;
+
+ protected MethodAccessor(Method getter, Method setter, String value) {
+ this.getter = getter;
+ this.setter = setter;
+ this.name = value;
+ getter.setAccessible(true);
+ if (setter!=null) {
+ setter.setAccessible(true);
+ }
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean hasValue(PropertySet props) {
+ return get(props)!=null;
+ }
+
+ @Override
+ public Object get(PropertySet props) {
+ try {
+ return getter.invoke(props);
+ } catch (IllegalAccessException e) {
+ throw new AssertionError();
+ } catch (InvocationTargetException e) {
+ handle(e);
+ return 0; // never reach here
+ }
+ }
+
+ @Override
+ public void set(PropertySet props, Object value) {
+ if(setter==null) {
+ throw new ReadOnlyPropertyException(getName());
+ }
+ try {
+ setter.invoke(props,value);
+ } catch (IllegalAccessException e) {
+ throw new AssertionError();
+ } catch (InvocationTargetException e) {
+ handle(e);
+ }
+ }
+
+ /**
+ * Since we don't expect the getter/setter to throw a checked exception,
+ * it should be possible to make the exception propagation transparent.
+ * That's what we are trying to do here.
+ */
+ private Exception handle(InvocationTargetException e) {
+ Throwable t = e.getTargetException();
+ if (t instanceof Error) {
+ throw (Error)t;
+ }
+ if (t instanceof RuntimeException) {
+ throw (RuntimeException)t;
+ }
+ throw new Error(e);
+ }
+ }
+
+
+ /**
+ * Class allowing to work with PropertySet object as with a Map; it doesn't only allow to read properties from
+ * the map but also to modify the map in a way it is in sync with original strongly typed fields. It also allows
+ * (if necessary) to store additional properties those can't be found in strongly typed fields.
+ *
+ * @see com.sun.xml.internal.ws.api.PropertySet#asMap() method
+ */
+ final class MapView extends HashMap {
+
+ // flag if it should allow store also different properties
+ // than the from strongly typed fields
+ boolean extensible;
+
+ MapView(boolean extensible) {
+ super(getPropertyMap().getPropertyMapEntries().length);
+ this.extensible = extensible;
+ initialize();
+ }
+
+ public void initialize() {
+ // iterate (cached) array instead of map to speed things up ...
+ PropertyMapEntry[] entries = getPropertyMap().getPropertyMapEntries();
+ for (PropertyMapEntry entry : entries) {
+ super.put(entry.key, entry.value);
+ }
+ }
+
+ @Override
+ public Object get(Object key) {
+ Object o = super.get(key);
+ if (o instanceof Accessor) {
+ return ((Accessor) o).get(BasePropertySet.this);
+ } else {
+ return o;
+ }
+ }
+
+ @Override
+ public Set> entrySet() {
+ Set> entries = new HashSet>();
+ for (String key : keySet()) {
+ entries.add(new SimpleImmutableEntry(key, get(key)));
+ }
+ return entries;
+ }
+
+ @Override
+ public Object put(String key, Object value) {
+
+ Object o = super.get(key);
+ if (o != null && o instanceof Accessor) {
+
+ Object oldValue = ((Accessor) o).get(BasePropertySet.this);
+ ((Accessor) o).set(BasePropertySet.this, value);
+ return oldValue;
+
+ } else {
+
+ if (extensible) {
+ return super.put(key, value);
+ } else {
+ throw new IllegalStateException("Unknown property [" + key + "] for PropertySet [" +
+ BasePropertySet.this.getClass().getName() + "]");
+ }
+ }
+ }
+
+ @Override
+ public void clear() {
+ for (String key : keySet()) {
+ remove(key);
+ }
+ }
+
+ @Override
+ public Object remove(Object key) {
+ Object o;
+ o = super.get(key);
+ if (o instanceof Accessor) {
+ ((Accessor)o).set(BasePropertySet.this, null);
+ }
+ return super.remove(key);
+ }
+ }
+
+ @Override
+ public boolean containsKey(Object key) {
+ Accessor sp = getPropertyMap().get(key);
+ if (sp != null) {
+ return sp.get(this) != null;
+ }
+ return false;
+ }
+
+ /**
+ * Gets the name of the property.
+ *
+ * @param key
+ * This field is typed as {@link Object} to follow the {@link Map#get(Object)}
+ * convention, but if anything but {@link String} is passed, this method
+ * just returns null.
+ */
+ @Override
+ public Object get(Object key) {
+ Accessor sp = getPropertyMap().get(key);
+ if (sp != null) {
+ return sp.get(this);
+ }
+ throw new IllegalArgumentException("Undefined property "+key);
+ }
+
+ /**
+ * Sets a property.
+ *
+ * Implementation Note
+ * This method is slow. Code inside JAX-WS should define strongly-typed
+ * fields in this class and access them directly, instead of using this.
+ *
+ * @throws ReadOnlyPropertyException
+ * if the given key is an alias of a strongly-typed field,
+ * and if the name object given is not assignable to the field.
+ *
+ * @see Property
+ */
+ @Override
+ public Object put(String key, Object value) {
+ Accessor sp = getPropertyMap().get(key);
+ if(sp!=null) {
+ Object old = sp.get(this);
+ sp.set(this,value);
+ return old;
+ } else {
+ throw new IllegalArgumentException("Undefined property "+key);
+ }
+ }
+
+ /**
+ * Checks if this {@link PropertySet} supports a property of the given name.
+ */
+ @Override
+ public boolean supports(Object key) {
+ return getPropertyMap().containsKey(key);
+ }
+
+ @Override
+ public Object remove(Object key) {
+ Accessor sp = getPropertyMap().get(key);
+ if(sp!=null) {
+ Object old = sp.get(this);
+ sp.set(this,null);
+ return old;
+ } else {
+ throw new IllegalArgumentException("Undefined property "+key);
+ }
+ }
+
+ /**
+ * Creates a {@link Map} view of this {@link PropertySet}.
+ *
+ *
+ * This map is partially live, in the sense that values you set to it
+ * will be reflected to {@link PropertySet}.
+ *
+ *
+ * However, this map may not pick up changes made
+ * to {@link PropertySet} after the view is created.
+ *
+ * @deprecated use newer implementation {@link PropertySet#asMap()} which produces
+ * readwrite {@link Map}
+ *
+ * @return
+ * always non-null valid instance.
+ */
+ @Deprecated
+ @Override
+ public final Map createMapView() {
+ final Set> core = new HashSet>();
+ createEntrySet(core);
+
+ return new AbstractMap() {
+ @Override
+ public Set> entrySet() {
+ return core;
+ }
+ };
+ }
+
+ /**
+ * Creates a modifiable {@link Map} view of this {@link PropertySet}.
+ *
+ * Changes done on this {@link Map} or on {@link PropertySet} object work in both directions - values made to
+ * {@link Map} are reflected to {@link PropertySet} and changes done using getters/setters on {@link PropertySet}
+ * object are automatically reflected in this {@link Map}.
+ *
+ * If necessary, it also can hold other values (not present on {@link PropertySet}) -
+ * {@see PropertySet#mapAllowsAdditionalProperties}
+ *
+ * @return always non-null valid instance.
+ */
+ @Override
+ public Map asMap() {
+ if (mapView == null) {
+ mapView = createView();
+ }
+ return mapView;
+ }
+
+ protected Map createView() {
+ return new MapView(mapAllowsAdditionalProperties());
+ }
+
+ /**
+ * Used when constructing the {@link MapView} for this object - it controls if the {@link MapView} servers only to
+ * access strongly typed values or allows also different values
+ *
+ * @return true if {@link Map} should allow also properties not defined as strongly typed fields
+ */
+ protected boolean mapAllowsAdditionalProperties() {
+ return false;
+ }
+
+ protected void createEntrySet(Set> core) {
+ for (final Entry e : getPropertyMap().entrySet()) {
+ core.add(new Entry() {
+ @Override
+ public String getKey() {
+ return e.getKey();
+ }
+
+ @Override
+ public Object getValue() {
+ return e.getValue().get(BasePropertySet.this);
+ }
+
+ @Override
+ public Object setValue(Object value) {
+ Accessor acc = e.getValue();
+ Object old = acc.get(BasePropertySet.this);
+ acc.set(BasePropertySet.this,value);
+ return old;
+ }
+ });
+ }
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/webservices/internal/api/message/ContentType.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/ContentType.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,93 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.webservices.internal.api.message;
+
+//TODO Do we want to remove this implementation dependency?
+import com.sun.xml.internal.ws.encoding.ContentTypeImpl;
+
+/**
+ * A Content-Type transport header that will be returned by {@link MessageContext#write(java.io.OutputStream)}.
+ * It will provide the Content-Type header and also take care of SOAP 1.1 SOAPAction header.
+ *
+ * @author Vivek Pandey
+ */
+public interface ContentType {
+
+ /**
+ * Gives non-null Content-Type header value.
+ */
+ public String getContentType();
+
+ /**
+ * Gives SOAPAction transport header value. It will be non-null only for SOAP 1.1 messages. In other cases
+ * it MUST be null. The SOAPAction transport header should be written out only when its non-null.
+ *
+ * @return It can be null, in that case SOAPAction header should be written.
+ */
+ public String getSOAPActionHeader();
+
+ /**
+ * Controls the Accept transport header, if the transport supports it.
+ * Returning null means the transport need not add any new header.
+ *
+ *
+ * We realize that this is not an elegant abstraction, but
+ * this would do for now. If another person comes and asks for
+ * a similar functionality, we'll define a real abstraction.
+ */
+ public String getAcceptHeader();
+
+ static public class Builder {
+ private String contentType;
+ private String soapAction;
+ private String accept;
+ private String charset;
+
+ public Builder contentType(String s) {contentType = s; return this; }
+ public Builder soapAction (String s) {soapAction = s; return this; }
+ public Builder accept (String s) {accept = s; return this; }
+ public Builder charset (String s) {charset = s; return this; }
+ public ContentType build() {
+ //TODO Do we want to remove this implementation dependency?
+ return new ContentTypeImpl(contentType, soapAction, accept, charset);
+ }
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/webservices/internal/api/message/DistributedPropertySet.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/DistributedPropertySet.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,96 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.webservices.internal.api.message;
+
+import java.util.Map;
+
+import com.sun.istack.internal.Nullable;
+
+/**
+ * {@link PropertySet} that combines properties exposed from multiple
+ * {@link PropertySet}s into one.
+ *
+ *
+ * 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.)
+ *
+ *
+ * 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.
+ *
+ *
+ * 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.
+ *
+ *
+ * A similar benefit applies on the server-side, for a transport to expose
+ * a bunch of properties to {@link WebServiceContext}.
+ *
+ *
+ * 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.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface DistributedPropertySet extends com.oracle.webservices.internal.api.message.PropertySet {
+
+ public @Nullable T getSatellite(Class satelliteClass);
+
+ public Map, com.oracle.webservices.internal.api.message.PropertySet> getSatellites();
+
+ public void addSatellite(com.oracle.webservices.internal.api.message.PropertySet satellite);
+
+ public void addSatellite(Class keyClass, com.oracle.webservices.internal.api.message.PropertySet satellite);
+
+ public void removeSatellite(com.oracle.webservices.internal.api.message.PropertySet satellite);
+
+ public void copySatelliteInto(com.oracle.webservices.internal.api.message.MessageContext r);
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/webservices/internal/api/message/MessageContext.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/MessageContext.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,116 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.webservices.internal.api.message;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.WritableByteChannel;
+
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+
+/**
+ * MessageContext represents a container of a SOAP message and all the properties
+ * including the transport headers.
+ *
+ * MessageContext is a composite {@link PropertySet} that combines properties exposed from multiple
+ * {@link PropertySet}s into one.
+ *
+ *
+ * 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.)
+ *
+ * @author shih-chang.chen@oracle.com
+ */
+public interface MessageContext extends DistributedPropertySet {
+ /**
+ * Gets the SAAJ SOAPMessage representation of the SOAP message.
+ *
+ * @return The SOAPMessage
+ */
+ SOAPMessage getAsSOAPMessage() throws SOAPException;
+
+ /**
+ * Gets the SAAJ SOAPMessage representation of the SOAP message.
+ * @deprecated use getAsSOAPMessage
+ * @return The SOAPMessage
+ */
+ SOAPMessage getSOAPMessage() throws SOAPException;
+
+ /**
+ * Writes the XML infoset portion of this MessageContext
+ * (from <soap:Envelope> to </soap:Envelope>).
+ *
+ * @param out
+ * Must not be null. The caller is responsible for closing the stream,
+ * not the callee.
+ *
+ * @return
+ * The MIME content type of the encoded message (such as "application/xml").
+ * This information is often ncessary by transport.
+ *
+ * @throws IOException
+ * if a {@link OutputStream} throws {@link IOException}.
+ */
+ ContentType writeTo( OutputStream out ) throws IOException;
+
+ /**
+ * The version of {@link #writeTo(OutputStream)}
+ * that writes to NIO {@link ByteBuffer}.
+ *
+ *
+ * TODO: for the convenience of implementation, write
+ * an adapter that wraps {@link WritableByteChannel} to {@link OutputStream}.
+ */
+// ContentType writeTo( WritableByteChannel buffer );
+
+ /**
+ * Gets the Content-type of this message. For an out-bound message that this getContentType()
+ * method returns a null, the Content-Type can be determined only by calling the writeTo
+ * method to write the MessageContext to an OutputStream.
+ *
+ * @return The MIME content type of this message
+ */
+ ContentType getContentType();
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,145 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.webservices.internal.api.message;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.oracle.webservices.internal.api.EnvelopeStyle;
+import com.sun.xml.internal.ws.api.SOAPVersion; // TODO leaking RI APIs
+import com.sun.xml.internal.ws.util.ServiceFinder;
+
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.transform.Source;
+import javax.xml.ws.WebServiceFeature;
+
+public abstract class MessageContextFactory
+{
+ private static final MessageContextFactory DEFAULT = new com.sun.xml.internal.ws.api.message.MessageContextFactory(new WebServiceFeature[0]);
+
+ protected abstract MessageContextFactory newFactory(WebServiceFeature ... f);
+
+ public abstract MessageContext createContext();
+
+ public abstract MessageContext createContext(SOAPMessage m);
+
+ public abstract MessageContext createContext(Source m);
+
+ public abstract MessageContext createContext(Source m, EnvelopeStyle.Style envelopeStyle);
+
+ public abstract MessageContext createContext(InputStream in, String contentType) throws IOException;
+
+ /**
+ * @deprecated http://java.net/jira/browse/JAX_WS-1077
+ */
+ @Deprecated
+ public abstract MessageContext createContext(InputStream in, MimeHeaders headers) throws IOException;
+
+ static public MessageContextFactory createFactory(WebServiceFeature ... f) {
+ return createFactory(null, f);
+ }
+
+ static public MessageContextFactory createFactory(ClassLoader cl, WebServiceFeature ...f) {
+ for (MessageContextFactory factory : ServiceFinder.find(MessageContextFactory.class, cl)) {
+ MessageContextFactory newfac = factory.newFactory(f);
+ if (newfac != null) return newfac;
+ }
+ return new com.sun.xml.internal.ws.api.message.MessageContextFactory(f);
+ }
+
+ @Deprecated
+ public abstract MessageContext doCreate();
+
+ @Deprecated
+ public abstract MessageContext doCreate(SOAPMessage m);
+
+ //public abstract MessageContext doCreate(InputStream x);
+
+ @Deprecated
+ public abstract MessageContext doCreate(Source x, SOAPVersion soapVersion);
+
+ @Deprecated
+ public static MessageContext create(final ClassLoader... classLoader) {
+ return serviceFinder(classLoader,
+ new Creator() {
+ public MessageContext create(final MessageContextFactory f) {
+ return f.doCreate();
+ }
+ });
+ }
+
+ @Deprecated
+ public static MessageContext create(final SOAPMessage m, final ClassLoader... classLoader) {
+ return serviceFinder(classLoader,
+ new Creator() {
+ public MessageContext create(final MessageContextFactory f) {
+ return f.doCreate(m);
+ }
+ });
+ }
+
+ @Deprecated
+ public static MessageContext create(final Source m, final SOAPVersion v, final ClassLoader... classLoader) {
+ return serviceFinder(classLoader,
+ new Creator() {
+ public MessageContext create(final MessageContextFactory f) {
+ return f.doCreate(m, v);
+ }
+ });
+ }
+
+ @Deprecated
+ private static MessageContext serviceFinder(final ClassLoader[] classLoader, final Creator creator) {
+ final ClassLoader cl = classLoader.length == 0 ? null : classLoader[0];
+ for (MessageContextFactory factory : ServiceFinder.find(MessageContextFactory.class, cl)) {
+ final MessageContext messageContext = creator.create(factory);
+ if (messageContext != null)
+ return messageContext;
+ }
+ return creator.create(DEFAULT);
+ }
+
+ @Deprecated
+ private static interface Creator {
+ public MessageContext create(MessageContextFactory f);
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/webservices/internal/api/message/PropertySet.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/PropertySet.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,149 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.webservices.internal.api.message;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Map;
+
+import javax.xml.ws.handler.MessageContext;
+
+/**
+ * A set of "properties" that can be accessed via strongly-typed fields
+ * as well as reflexibly through the property name.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface PropertySet {
+
+ /**
+ * Marks a field on {@link PropertySet} as a
+ * property of {@link MessageContext}.
+ *
+ *
+ * To make the runtime processing easy, this annotation
+ * must be on a public field (since the property name
+ * can be set through {@link Map} anyway, you won't be
+ * losing abstraction by doing so.)
+ *
+ *
+ * For similar reason, this annotation can be only placed
+ * on a reference type, not primitive type.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+ @Inherited
+ @Retention(RetentionPolicy.RUNTIME)
+ @Target({ElementType.FIELD,ElementType.METHOD})
+ public @interface Property {
+ /**
+ * Name of the property.
+ */
+ String[] value();
+ }
+
+ public boolean containsKey(Object key);
+
+ /**
+ * Gets the name of the property.
+ *
+ * @param key
+ * This field is typed as {@link Object} to follow the {@link Map#get(Object)}
+ * convention, but if anything but {@link String} is passed, this method
+ * just returns null.
+ */
+ public Object get(Object key);
+
+ /**
+ * Sets a property.
+ *
+ *
Implementation Note
+ * This method is slow. Code inside JAX-WS should define strongly-typed
+ * fields in this class and access them directly, instead of using this.
+ *
+ * @see Property
+ */
+ public Object put(String key, Object value);
+
+ /**
+ * Checks if this {@link PropertySet} supports a property of the given name.
+ */
+ public boolean supports(Object key);
+
+ public Object remove(Object key);
+
+ /**
+ * Creates a {@link Map} view of this {@link PropertySet}.
+ *
+ *
+ * This map is partially live, in the sense that values you set to it
+ * will be reflected to {@link PropertySet}.
+ *
+ *
+ * However, this map may not pick up changes made
+ * to {@link PropertySet} after the view is created.
+ *
+ * @deprecated use newer implementation {@link com.sun.xml.internal.ws.api.PropertySet#asMap()} which produces
+ * readwrite {@link Map}
+ *
+ * @return
+ * always non-null valid instance.
+ */
+ @Deprecated
+ public Map createMapView();
+
+ /**
+ * Creates a modifiable {@link Map} view of this {@link PropertySet}.
+ *
+ * Changes done on this {@link Map} or on {@link PropertySet} object work in both directions - values made to
+ * {@link Map} are reflected to {@link PropertySet} and changes done using getters/setters on {@link PropertySet}
+ * object are automatically reflected in this {@link Map}.
+ *
+ * If necessary, it also can hold other values (not present on {@link PropertySet}) -
+ * {@see PropertySet#mapAllowsAdditionalProperties}
+ *
+ * @return always non-null valid instance.
+ */
+ public Map asMap();
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/webservices/internal/api/message/ReadOnlyPropertyException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/ReadOnlyPropertyException.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,63 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.webservices.internal.api.message;
+
+/**
+ * Used to indicate that {@link PropertySet#put(String, Object)} failed
+ * because a property is read-only.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class ReadOnlyPropertyException extends IllegalArgumentException {
+ private final String propertyName;
+
+ public ReadOnlyPropertyException(String propertyName) {
+ super(propertyName+" is a read-only property.");
+ this.propertyName = propertyName;
+ }
+
+ /**
+ * Gets the name of the property that was read-only.
+ */
+ public String getPropertyName() {
+ return propertyName;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/webservices/internal/impl/encoding/StreamDecoderImpl.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/webservices/internal/impl/encoding/StreamDecoderImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,67 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.webservices.internal.impl.encoding;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.xml.stream.XMLStreamReader;
+
+import com.oracle.webservices.internal.impl.internalspi.encoding.StreamDecoder;
+
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.message.AttachmentSet;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
+import com.sun.xml.internal.ws.encoding.StreamSOAPCodec;
+import com.sun.xml.internal.ws.streaming.TidyXMLStreamReader;
+
+public class StreamDecoderImpl implements StreamDecoder {
+
+ @Override
+ public Message decode(InputStream in, String charset,
+ AttachmentSet att, SOAPVersion soapVersion) throws IOException {
+ XMLStreamReader reader = XMLStreamReaderFactory.create(null, in, charset, true);
+ reader = new TidyXMLStreamReader(reader, in);
+ return StreamSOAPCodec.decode(soapVersion, reader, att);
+ }
+
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/webservices/internal/impl/internalspi/encoding/StreamDecoder.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/webservices/internal/impl/internalspi/encoding/StreamDecoder.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,60 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.webservices.internal.impl.internalspi.encoding;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.message.AttachmentSet;
+import com.sun.xml.internal.ws.api.message.Message;
+
+/**
+ * Decodes SOAPEnvelope read from an InputStream into a Message instance.
+ * This SPI allows for other implementations instead of the default, which is based on XMLStreamReader.
+ *
+ * @since 2.2.9
+ */
+public interface StreamDecoder {
+ Message decode(
+ InputStream in, String charset,
+ AttachmentSet att, SOAPVersion soapVersion) throws IOException;
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ExistingAnnotationsType.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ExistingAnnotationsType.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,92 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for existing-annotations-type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <simpleType name="existing-annotations-type">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="merge"/>
+ * <enumeration value="ignore"/>
+ * </restriction>
+ * </simpleType>
+ *
+ *
+ */
+@XmlType(name = "existing-annotations-type")
+@XmlEnum
+public enum ExistingAnnotationsType {
+
+ @XmlEnumValue("merge")
+ MERGE("merge"),
+ @XmlEnumValue("ignore")
+ IGNORE("ignore");
+ private final String value;
+
+ ExistingAnnotationsType(String v) {
+ value = v;
+ }
+
+ public String value() {
+ return value;
+ }
+
+ public static ExistingAnnotationsType fromValue(String v) {
+ for (ExistingAnnotationsType c: ExistingAnnotationsType.values()) {
+ if (c.value.equals(v)) {
+ return c;
+ }
+ }
+ throw new IllegalArgumentException(v);
+ }
+
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaMethod.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaMethod.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,280 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import org.w3c.dom.Element;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementRefs;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <group ref="{http://xmlns.oracle.com/webservices/jaxws-databinding}method-annotation" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="java-params" minOccurs="0">
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{http://xmlns.oracle.com/webservices/jaxws-databinding}java-param" maxOccurs="unbounded"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </element>
+ * </sequence>
+ * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <anyAttribute processContents='skip' namespace='##other'/>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "methodAnnotation",
+ "javaParams"
+})
+@XmlRootElement(name = "java-method")
+public class JavaMethod {
+
+ @XmlElementRefs({
+ @XmlElementRef(name = "web-endpoint", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlWebEndpoint.class, required = false),
+ @XmlElementRef(name = "oneway", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlOneway.class, required = false),
+ @XmlElementRef(name = "action", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlAction.class, required = false),
+ @XmlElementRef(name = "soap-binding", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlSOAPBinding.class, required = false),
+ @XmlElementRef(name = "web-result", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlWebResult.class, required = false),
+ @XmlElementRef(name = "web-method", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlWebMethod.class, required = false)
+ })
+ @XmlAnyElement
+ protected List methodAnnotation;
+ @XmlElement(name = "java-params")
+ protected JavaMethod.JavaParams javaParams;
+ @XmlAttribute(name = "name", required = true)
+ protected String name;
+ @XmlAnyAttribute
+ private Map otherAttributes = new HashMap();
+
+ /**
+ * Gets the value of the methodAnnotation property.
+ *
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a set method for the methodAnnotation property.
+ *
+ *
+ * For example, to add a new item, do as follows:
+ *
+ * getMethodAnnotation().add(newItem);
+ *
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link XmlWebEndpoint }
+ * {@link XmlOneway }
+ * {@link XmlAction }
+ * {@link XmlSOAPBinding }
+ * {@link XmlWebResult }
+ * {@link XmlWebMethod }
+ * {@link Element }
+ *
+ *
+ */
+ public List getMethodAnnotation() {
+ if (methodAnnotation == null) {
+ methodAnnotation = new ArrayList();
+ }
+ return this.methodAnnotation;
+ }
+
+ /**
+ * Gets the value of the javaParams property.
+ *
+ * @return
+ * possible object is
+ * {@link JavaMethod.JavaParams }
+ *
+ */
+ public JavaMethod.JavaParams getJavaParams() {
+ return javaParams;
+ }
+
+ /**
+ * Sets the value of the javaParams property.
+ *
+ * @param value
+ * allowed object is
+ * {@link JavaMethod.JavaParams }
+ *
+ */
+ public void setJavaParams(JavaMethod.JavaParams value) {
+ this.javaParams = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets a map that contains attributes that aren't bound to any typed property on this class.
+ *
+ *
+ * the map is keyed by the name of the attribute and
+ * the value is the string value of the attribute.
+ *
+ * the map returned by this method is live, and you can add new attribute
+ * by updating the map directly. Because of this design, there's no setter.
+ *
+ *
+ * @return
+ * always non-null
+ */
+ public Map getOtherAttributes() {
+ return otherAttributes;
+ }
+
+
+ /**
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{http://xmlns.oracle.com/webservices/jaxws-databinding}java-param" maxOccurs="unbounded"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ *
+ *
+ */
+ @XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder = {
+ "javaParam"
+ })
+ public static class JavaParams {
+
+ @XmlElement(name = "java-param", required = true)
+ protected List javaParam;
+
+ /**
+ * Gets the value of the javaParam property.
+ *
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a set method for the javaParam property.
+ *
+ *
+ * For example, to add a new item, do as follows:
+ *
+ * getJavaParam().add(newItem);
+ *
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link JavaParam }
+ *
+ *
+ */
+ public List getJavaParam() {
+ if (javaParam == null) {
+ javaParam = new ArrayList();
+ }
+ return this.javaParam;
+ }
+
+ }
+
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaParam.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaParam.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,167 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import org.w3c.dom.Element;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <group ref="{http://xmlns.oracle.com/webservices/jaxws-databinding}param-annotation" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="java-type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <anyAttribute processContents='skip' namespace='##other'/>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "paramAnnotation"
+})
+@XmlRootElement(name = "java-param")
+public class JavaParam {
+
+ @XmlElementRef(name = "web-param", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlWebParam.class, required = false)
+ @XmlAnyElement
+ protected List paramAnnotation;
+ @XmlAttribute(name = "java-type")
+ protected String javaType;
+ @XmlAnyAttribute
+ private Map otherAttributes = new HashMap();
+
+ /**
+ * Gets the value of the paramAnnotation property.
+ *
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a set method for the paramAnnotation property.
+ *
+ *
+ * For example, to add a new item, do as follows:
+ *
+ * getParamAnnotation().add(newItem);
+ *
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link XmlWebParam }
+ * {@link Element }
+ *
+ *
+ */
+ public List getParamAnnotation() {
+ if (paramAnnotation == null) {
+ paramAnnotation = new ArrayList();
+ }
+ return this.paramAnnotation;
+ }
+
+ /**
+ * Gets the value of the javaType property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getJavaType() {
+ return javaType;
+ }
+
+ /**
+ * Sets the value of the javaType property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setJavaType(String value) {
+ this.javaType = value;
+ }
+
+ /**
+ * Gets a map that contains attributes that aren't bound to any typed property on this class.
+ *
+ *
+ * the map is keyed by the name of the attribute and
+ * the value is the string value of the attribute.
+ *
+ * the map returned by this method is live, and you can add new attribute
+ * by updating the map directly. Because of this design, there's no setter.
+ *
+ *
+ * @return
+ * always non-null
+ */
+ public Map getOtherAttributes() {
+ return otherAttributes;
+ }
+
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaWsdlMappingType.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaWsdlMappingType.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,466 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import org.w3c.dom.Element;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementRefs;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for java-wsdl-mapping-type complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType name="java-wsdl-mapping-type">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="xml-schema-mapping" minOccurs="0">
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <any maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </element>
+ * <group ref="{http://xmlns.oracle.com/webservices/jaxws-databinding}class-annotation" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="java-methods" minOccurs="0">
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{http://xmlns.oracle.com/webservices/jaxws-databinding}java-method" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </element>
+ * </sequence>
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="java-type-name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="existing-annotations" type="{http://xmlns.oracle.com/webservices/jaxws-databinding}existing-annotations-type" />
+ * <attribute name="databinding" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <anyAttribute processContents='skip' namespace='##other'/>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "java-wsdl-mapping-type", propOrder = {
+ "xmlSchemaMapping",
+ "classAnnotation",
+ "javaMethods"
+})
+public class JavaWsdlMappingType {
+
+ @XmlElement(name = "xml-schema-mapping")
+ protected JavaWsdlMappingType.XmlSchemaMapping xmlSchemaMapping;
+ @XmlElementRefs({
+ @XmlElementRef(name = "web-service-client", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlWebServiceClient.class, required = false),
+ @XmlElementRef(name = "binding-type", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlBindingType.class, required = false),
+ @XmlElementRef(name = "web-service", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlWebService.class, required = false),
+ @XmlElementRef(name = "web-fault", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlWebFault.class, required = false),
+ @XmlElementRef(name = "service-mode", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlServiceMode.class, required = false),
+ @XmlElementRef(name = "mtom", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlMTOM.class, required = false),
+ @XmlElementRef(name = "handler-chain", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlHandlerChain.class, required = false),
+ @XmlElementRef(name = "soap-binding", namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", type = XmlSOAPBinding.class, required = false)
+ })
+ @XmlAnyElement
+ protected List classAnnotation;
+ @XmlElement(name = "java-methods")
+ protected JavaWsdlMappingType.JavaMethods javaMethods;
+ @XmlAttribute(name = "name")
+ protected String name;
+ @XmlAttribute(name = "java-type-name")
+ protected String javaTypeName;
+ @XmlAttribute(name = "existing-annotations")
+ protected ExistingAnnotationsType existingAnnotations;
+ @XmlAttribute(name = "databinding")
+ protected String databinding;
+ @XmlAnyAttribute
+ private Map otherAttributes = new HashMap();
+
+ /**
+ * Gets the value of the xmlSchemaMapping property.
+ *
+ * @return
+ * possible object is
+ * {@link JavaWsdlMappingType.XmlSchemaMapping }
+ *
+ */
+ public JavaWsdlMappingType.XmlSchemaMapping getXmlSchemaMapping() {
+ return xmlSchemaMapping;
+ }
+
+ /**
+ * Sets the value of the xmlSchemaMapping property.
+ *
+ * @param value
+ * allowed object is
+ * {@link JavaWsdlMappingType.XmlSchemaMapping }
+ *
+ */
+ public void setXmlSchemaMapping(JavaWsdlMappingType.XmlSchemaMapping value) {
+ this.xmlSchemaMapping = value;
+ }
+
+ /**
+ *
+ * The class-annotation group defines the set of
+ * annotations applicable to the Java class
+ * declaration.
+ * Gets the value of the classAnnotation property.
+ *
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a set method for the classAnnotation property.
+ *
+ *
+ * For example, to add a new item, do as follows:
+ *
+ * getClassAnnotation().add(newItem);
+ *
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link XmlWebServiceClient }
+ * {@link XmlBindingType }
+ * {@link XmlWebService }
+ * {@link XmlWebFault }
+ * {@link XmlServiceMode }
+ * {@link XmlMTOM }
+ * {@link XmlHandlerChain }
+ * {@link Element }
+ * {@link XmlSOAPBinding }
+ *
+ *
+ */
+ public List getClassAnnotation() {
+ if (classAnnotation == null) {
+ classAnnotation = new ArrayList();
+ }
+ return this.classAnnotation;
+ }
+
+ /**
+ * Gets the value of the javaMethods property.
+ *
+ * @return
+ * possible object is
+ * {@link JavaWsdlMappingType.JavaMethods }
+ *
+ */
+ public JavaWsdlMappingType.JavaMethods getJavaMethods() {
+ return javaMethods;
+ }
+
+ /**
+ * Sets the value of the javaMethods property.
+ *
+ * @param value
+ * allowed object is
+ * {@link JavaWsdlMappingType.JavaMethods }
+ *
+ */
+ public void setJavaMethods(JavaWsdlMappingType.JavaMethods value) {
+ this.javaMethods = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the javaTypeName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getJavaTypeName() {
+ return javaTypeName;
+ }
+
+ /**
+ * Sets the value of the javaTypeName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setJavaTypeName(String value) {
+ this.javaTypeName = value;
+ }
+
+ /**
+ * Gets the value of the classAnnotations property.
+ *
+ * @return
+ * possible object is
+ * {@link ExistingAnnotationsType }
+ *
+ */
+ public ExistingAnnotationsType getExistingAnnotations() {
+ return existingAnnotations;
+ }
+
+ /**
+ * Sets the value of the classAnnotations property.
+ *
+ * @param value
+ * allowed object is
+ * {@link ExistingAnnotationsType }
+ *
+ */
+ public void setExistingAnnotations(ExistingAnnotationsType value) {
+ this.existingAnnotations = value;
+ }
+
+ /**
+ * Gets the value of the databinding property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDatabinding() {
+ return databinding;
+ }
+
+ /**
+ * Sets the value of the databinding property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDatabinding(String value) {
+ this.databinding = value;
+ }
+
+ /**
+ * Gets a map that contains attributes that aren't bound to any typed property on this class.
+ *
+ *
+ * the map is keyed by the name of the attribute and
+ * the value is the string value of the attribute.
+ *
+ * the map returned by this method is live, and you can add new attribute
+ * by updating the map directly. Because of this design, there's no setter.
+ *
+ *
+ * @return
+ * always non-null
+ */
+ public Map getOtherAttributes() {
+ return otherAttributes;
+ }
+
+
+ /**
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{http://xmlns.oracle.com/webservices/jaxws-databinding}java-method" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ *
+ *
+ */
+ @XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder = {
+ "javaMethod"
+ })
+ public static class JavaMethods {
+
+ @XmlElement(name = "java-method")
+ protected List javaMethod;
+
+ /**
+ * Gets the value of the javaMethod property.
+ *
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a set method for the javaMethod property.
+ *
+ *
+ * For example, to add a new item, do as follows:
+ *
+ * getJavaMethod().add(newItem);
+ *
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link JavaMethod }
+ *
+ *
+ */
+ public List getJavaMethod() {
+ if (javaMethod == null) {
+ javaMethod = new ArrayList();
+ }
+ return this.javaMethod;
+ }
+
+ }
+
+
+ /**
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <any maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ *
+ *
+ */
+ @XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder = {
+ "any"
+ })
+ public static class XmlSchemaMapping {
+
+ @XmlAnyElement(lax = true)
+ protected List any;
+
+ /**
+ * Gets the value of the any property.
+ *
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a set method for the any property.
+ *
+ *
+ * For example, to add a new item, do as follows:
+ *
+ * getAny().add(newItem);
+ *
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link Object }
+ *
+ *
+ */
+ public List getAny() {
+ if (any == null) {
+ any = new ArrayList();
+ }
+ return this.any;
+ }
+
+ }
+
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ObjectFactory.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ObjectFactory.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,283 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the com.sun.xml.internal.ws.ext2.java_wsdl package.
+ * An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _JavaWsdlMapping_QNAME = new QName("http://xmlns.oracle.com/webservices/jaxws-databinding", "java-wsdl-mapping");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.sun.xml.internal.ws.ext2.java_wsdl
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link JavaMethod }
+ *
+ */
+ public JavaMethod createJavaMethod() {
+ return new JavaMethod();
+ }
+
+ /**
+ * Create an instance of {@link JavaWsdlMappingType }
+ *
+ */
+ public JavaWsdlMappingType createJavaWsdlMappingType() {
+ return new JavaWsdlMappingType();
+ }
+
+ /**
+ * Create an instance of {@link XmlWebEndpoint }
+ *
+ */
+ public XmlWebEndpoint createWebEndpoint() {
+ return new XmlWebEndpoint();
+ }
+
+ /**
+ * Create an instance of {@link XmlMTOM }
+ *
+ */
+ public XmlMTOM createMtom() {
+ return new XmlMTOM();
+ }
+
+ /**
+ * Create an instance of {@link XmlWebServiceClient }
+ *
+ */
+ public XmlWebServiceClient createWebServiceClient() {
+ return new XmlWebServiceClient();
+ }
+
+ /**
+ * Create an instance of {@link XmlServiceMode }
+ *
+ */
+ public XmlServiceMode createServiceMode() {
+ return new XmlServiceMode();
+ }
+
+ /**
+ * Create an instance of {@link XmlBindingType }
+ *
+ */
+ public XmlBindingType createBindingType() {
+ return new XmlBindingType();
+ }
+
+ /**
+ * Create an instance of {@link XmlWebServiceRef }
+ *
+ */
+ public XmlWebServiceRef createWebServiceRef() {
+ return new XmlWebServiceRef();
+ }
+
+ /**
+ * Create an instance of {@link JavaParam }
+ *
+ */
+ public JavaParam createJavaParam() {
+ return new JavaParam();
+ }
+
+ /**
+ * Create an instance of {@link XmlWebParam }
+ *
+ */
+ public XmlWebParam createWebParam() {
+ return new XmlWebParam();
+ }
+
+ /**
+ * Create an instance of {@link XmlWebMethod }
+ *
+ */
+ public XmlWebMethod createWebMethod() {
+ return new XmlWebMethod();
+ }
+
+ /**
+ * Create an instance of {@link XmlWebResult }
+ *
+ */
+ public XmlWebResult createWebResult() {
+ return new XmlWebResult();
+ }
+
+ /**
+ * Create an instance of {@link XmlOneway }
+ *
+ */
+ public XmlOneway createOneway() {
+ return new XmlOneway();
+ }
+
+ /**
+ * Create an instance of {@link XmlSOAPBinding }
+ *
+ */
+ public XmlSOAPBinding createSoapBinding() {
+ return new XmlSOAPBinding();
+ }
+
+ /**
+ * Create an instance of {@link XmlAction }
+ *
+ */
+ public XmlAction createAction() {
+ return new XmlAction();
+ }
+
+ /**
+ * Create an instance of {@link XmlFaultAction }
+ *
+ */
+ public XmlFaultAction createFaultAction() {
+ return new XmlFaultAction();
+ }
+
+ /**
+ * Create an instance of {@link JavaMethod.JavaParams }
+ *
+ */
+ public JavaMethod.JavaParams createJavaMethodJavaParams() {
+ return new JavaMethod.JavaParams();
+ }
+
+ /**
+ * Create an instance of {@link XmlHandlerChain }
+ *
+ */
+ public XmlHandlerChain createHandlerChain() {
+ return new XmlHandlerChain();
+ }
+
+ /**
+ * Create an instance of {@link XmlWebServiceProvider }
+ *
+ */
+ public XmlWebServiceProvider createWebServiceProvider() {
+ return new XmlWebServiceProvider();
+ }
+
+ /**
+ * Create an instance of {@link XmlWebFault }
+ *
+ */
+ public XmlWebFault createWebFault() {
+ return new XmlWebFault();
+ }
+
+ /**
+ * Create an instance of {@link XmlResponseWrapper }
+ *
+ */
+ public XmlResponseWrapper createResponseWrapper() {
+ return new XmlResponseWrapper();
+ }
+
+ /**
+ * Create an instance of {@link XmlWebService }
+ *
+ */
+ public XmlWebService createWebService() {
+ return new XmlWebService();
+ }
+
+ /**
+ * Create an instance of {@link XmlRequestWrapper }
+ *
+ */
+ public XmlRequestWrapper createRequestWrapper() {
+ return new XmlRequestWrapper();
+ }
+
+ /**
+ * Create an instance of {@link JavaWsdlMappingType.XmlSchemaMapping }
+ *
+ */
+ public JavaWsdlMappingType.XmlSchemaMapping createJavaWsdlMappingTypeXmlSchemaMapping() {
+ return new JavaWsdlMappingType.XmlSchemaMapping();
+ }
+
+ /**
+ * Create an instance of {@link JavaWsdlMappingType.JavaMethods }
+ *
+ */
+ public JavaWsdlMappingType.JavaMethods createJavaWsdlMappingTypeJavaMethods() {
+ return new JavaWsdlMappingType.JavaMethods();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link JavaWsdlMappingType }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", name = "java-wsdl-mapping")
+ public JAXBElement createJavaWsdlMapping(JavaWsdlMappingType value) {
+ return new JAXBElement(_JavaWsdlMapping_QNAME, JavaWsdlMappingType.class, null, value);
+ }
+
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingParameterStyle.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingParameterStyle.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,78 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for soap-binding-parameter-style.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <simpleType name="soap-binding-parameter-style">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="BARE"/>
+ * <enumeration value="WRAPPED"/>
+ * </restriction>
+ * </simpleType>
+ *
+ *
+ */
+@XmlType(name = "soap-binding-parameter-style")
+@XmlEnum
+public enum SoapBindingParameterStyle {
+
+ BARE,
+ WRAPPED;
+
+ public String value() {
+ return name();
+ }
+
+ public static SoapBindingParameterStyle fromValue(String v) {
+ return valueOf(v);
+ }
+
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingStyle.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingStyle.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,78 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for soap-binding-style.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <simpleType name="soap-binding-style">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="DOCUMENT"/>
+ * <enumeration value="RPC"/>
+ * </restriction>
+ * </simpleType>
+ *
+ *
+ */
+@XmlType(name = "soap-binding-style")
+@XmlEnum
+public enum SoapBindingStyle {
+
+ DOCUMENT,
+ RPC;
+
+ public String value() {
+ return name();
+ }
+
+ public static SoapBindingStyle fromValue(String v) {
+ return valueOf(v);
+ }
+
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingUse.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingUse.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,78 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for soap-binding-use.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <simpleType name="soap-binding-use">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="LITERAL"/>
+ * <enumeration value="ENCODED"/>
+ * </restriction>
+ * </simpleType>
+ *
+ *
+ */
+@XmlType(name = "soap-binding-use")
+@XmlEnum
+public enum SoapBindingUse {
+
+ LITERAL,
+ ENCODED;
+
+ public String value() {
+ return name();
+ }
+
+ public static SoapBindingUse fromValue(String v) {
+ return valueOf(v);
+ }
+
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/Util.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/Util.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,72 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+
+import com.sun.xml.internal.ws.model.RuntimeModelerException;
+
+/**
+ * Simple util to handle default values.
+ *
+ * @author miroslav.kos@oracle.com
+ */
+class Util {
+
+ static String nullSafe(String value) {
+ return value == null ? "" : value;
+ }
+
+ static T nullSafe(T value, T defaultValue) {
+ return value == null ? defaultValue : value;
+ }
+
+ @SuppressWarnings("unchecked")
+ static T nullSafe(Enum value, T defaultValue) {
+ return value == null ? defaultValue : (T) T.valueOf(defaultValue.getClass(), value.toString());
+ }
+
+ public static Class findClass(String className) {
+ try {
+ return Class.forName(className);
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeModelerException("runtime.modeler.external.metadata.generic", e);
+ }
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/WebParamMode.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/WebParamMode.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,80 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for web-param-mode.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <simpleType name="web-param-mode">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="IN"/>
+ * <enumeration value="OUT"/>
+ * <enumeration value="INOUT"/>
+ * </restriction>
+ * </simpleType>
+ *
+ *
+ */
+@XmlType(name = "web-param-mode")
+@XmlEnum
+public enum WebParamMode {
+
+ IN,
+ OUT,
+ INOUT;
+
+ public String value() {
+ return name();
+ }
+
+ public static WebParamMode fromValue(String v) {
+ return valueOf(v);
+ }
+
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAction.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAction.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,188 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{http://xmlns.oracle.com/webservices/jaxws-databinding}fault-action" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="input" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="output" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "faultAction"
+})
+@XmlRootElement(name = "action")
+public class XmlAction implements javax.xml.ws.Action {
+
+ @XmlElement(name = "fault-action")
+ protected List faultAction;
+ @XmlAttribute(name = "input")
+ protected String input;
+ @XmlAttribute(name = "output")
+ protected String output;
+
+ /**
+ * Gets the value of the faultAction property.
+ *
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a set method for the faultAction property.
+ *
+ *
+ * For example, to add a new item, do as follows:
+ *
+ * getFaultAction().add(newItem);
+ *
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link XmlFaultAction }
+ *
+ *
+ */
+ public List getFaultAction() {
+ if (faultAction == null) {
+ faultAction = new ArrayList();
+ }
+ return this.faultAction;
+ }
+
+ /**
+ * Gets the value of the input property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getInput() {
+ return nullSafe(input);
+ }
+
+ /**
+ * Sets the value of the input property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setInput(String value) {
+ this.input = value;
+ }
+
+ /**
+ * Gets the value of the output property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getOutput() {
+ return nullSafe(output);
+ }
+
+ /**
+ * Sets the value of the output property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setOutput(String value) {
+ this.output = value;
+ }
+
+ @Override
+ public String input() {
+ return nullSafe(input);
+ }
+
+ @Override
+ public String output() {
+ return nullSafe(output);
+ }
+
+ @Override
+ public javax.xml.ws.FaultAction[] fault() {
+ return new javax.xml.ws.FaultAction[0];
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.Action.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAddressing.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAddressing.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,116 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.ws.soap.AddressingFeature;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "addressing")
+public class XmlAddressing implements javax.xml.ws.soap.Addressing {
+
+ @XmlAttribute(name = "enabled")
+ protected Boolean enabled;
+
+ @XmlAttribute(name = "required")
+ protected Boolean required;
+
+ public Boolean getEnabled() {
+ return enabled();
+ }
+
+ public void setEnabled(Boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public Boolean getRequired() {
+ return required();
+ }
+
+ public void setRequired(Boolean required) {
+ this.required = required;
+ }
+
+ @Override
+ public boolean enabled() {
+ return nullSafe(enabled, true);
+ }
+
+ @Override
+ public boolean required() {
+ return nullSafe(required, false);
+ }
+
+ @Override
+ public AddressingFeature.Responses responses() {
+ return AddressingFeature.Responses.ALL;
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.soap.Addressing.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlBindingType.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlBindingType.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,109 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "binding-type")
+public class XmlBindingType implements javax.xml.ws.BindingType {
+
+ @XmlAttribute(name = "value")
+ protected String value;
+
+ /**
+ * Gets the value of the value property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String value() {
+ return nullSafe(value);
+ }
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.BindingType.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlFaultAction.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlFaultAction.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,145 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.findClass;
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="className" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "fault-action")
+public class XmlFaultAction implements javax.xml.ws.FaultAction {
+
+ @XmlAttribute(name = "className", required = true)
+ protected String className;
+ @XmlAttribute(name = "value")
+ protected String value;
+
+ /**
+ * Gets the value of the className property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getClassName() {
+ return className;
+ }
+
+ /**
+ * Sets the value of the className property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setClassName(String value) {
+ this.className = value;
+ }
+
+ /**
+ * Gets the value of the value property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getValue() {
+ return nullSafe(value);
+ }
+
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public Class className() {
+ return (Class) findClass(className);
+ }
+
+ @Override
+ public String value() {
+ return nullSafe(value);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.FaultAction.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlHandlerChain.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlHandlerChain.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,115 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="file" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "handler-chain")
+public class XmlHandlerChain implements javax.jws.HandlerChain {
+
+ @XmlAttribute(name = "file")
+ protected String file;
+
+ /**
+ * Gets the value of the file property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getFile() {
+ return file;
+ }
+
+ /**
+ * Sets the value of the file property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setFile(String value) {
+ this.file = value;
+ }
+
+ @Override
+ public String file() {
+ return nullSafe(file);
+ }
+
+ @Override
+ public String name() {
+ return ""; // deprecated, so let's ignore it ...
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.jws.HandlerChain.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlMTOM.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlMTOM.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,153 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.ws.soap.MTOM;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="enabled" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ * <attribute name="threshold" type="{http://www.w3.org/2001/XMLSchema}int" default="0" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "mtom")
+public class XmlMTOM implements MTOM {
+
+ @XmlAttribute(name = "enabled")
+ protected Boolean enabled;
+ @XmlAttribute(name = "threshold")
+ protected Integer threshold;
+
+ /**
+ * Gets the value of the enabled property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isEnabled() {
+ if (enabled == null) {
+ return true;
+ } else {
+ return enabled;
+ }
+ }
+
+ /**
+ * Sets the value of the enabled property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setEnabled(Boolean value) {
+ this.enabled = value;
+ }
+
+ /**
+ * Gets the value of the threshold property.
+ *
+ * @return
+ * possible object is
+ * {@link Integer }
+ *
+ */
+ public int getThreshold() {
+ if (threshold == null) {
+ return 0;
+ } else {
+ return threshold;
+ }
+ }
+
+ /**
+ * Sets the value of the threshold property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Integer }
+ *
+ */
+ public void setThreshold(Integer value) {
+ this.threshold = value;
+ }
+
+ @Override
+ public boolean enabled() {
+ return nullSafe(enabled, Boolean.TRUE);
+ }
+
+ @Override
+ public int threshold() {
+ return nullSafe(threshold, 0);
+ }
+
+ @Override
+ public Class annotationType() {
+ return MTOM.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlOneway.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlOneway.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,79 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "oneway")
+public class XmlOneway implements javax.jws.Oneway {
+
+ @Override
+ public Class annotationType() {
+ return javax.jws.Oneway.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlRequestWrapper.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlRequestWrapper.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,203 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="local-name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="target-namespace" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="class-name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="part-name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "request-wrapper")
+public class XmlRequestWrapper implements javax.xml.ws.RequestWrapper {
+
+ @XmlAttribute(name = "local-name")
+ protected String localName;
+ @XmlAttribute(name = "target-namespace")
+ protected String targetNamespace;
+ @XmlAttribute(name = "class-name")
+ protected String className;
+ @XmlAttribute(name = "part-name")
+ protected String partName;
+
+ /**
+ * Gets the value of the localName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getLocalName() {
+ if (localName == null) {
+ return "";
+ } else {
+ return localName;
+ }
+ }
+
+ /**
+ * Sets the value of the localName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setLocalName(String value) {
+ this.localName = value;
+ }
+
+ /**
+ * Gets the value of the targetNamespace property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTargetNamespace() {
+ if (targetNamespace == null) {
+ return "";
+ } else {
+ return targetNamespace;
+ }
+ }
+
+ /**
+ * Sets the value of the targetNamespace property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTargetNamespace(String value) {
+ this.targetNamespace = value;
+ }
+
+ /**
+ * Gets the value of the className property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getClassName() {
+ if (className == null) {
+ return "";
+ } else {
+ return className;
+ }
+ }
+
+ /**
+ * Sets the value of the className property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setClassName(String value) {
+ this.className = value;
+ }
+
+ public String getPartName() {
+ return partName;
+ }
+
+ public void setPartName(String partName) {
+ this.partName = partName;
+ }
+
+ @Override
+ public String localName() {
+ return nullSafe(localName);
+ }
+
+ @Override
+ public String targetNamespace() {
+ return nullSafe(targetNamespace);
+ }
+
+ @Override
+ public String className() {
+ return nullSafe(className);
+ }
+
+ @Override
+ public String partName() {
+ return nullSafe(partName);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.RequestWrapper.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlResponseWrapper.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlResponseWrapper.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,202 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="local-name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="target-namespace" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="class-name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="part-name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "response-wrapper")
+public class XmlResponseWrapper implements javax.xml.ws.ResponseWrapper {
+
+ @XmlAttribute(name = "local-name")
+ protected String localName;
+ @XmlAttribute(name = "target-namespace")
+ protected String targetNamespace;
+ @XmlAttribute(name = "class-name")
+ protected String className;
+ @XmlAttribute(name = "part-name")
+ protected String partName;
+
+ /**
+ * Gets the value of the localName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getLocalName() {
+ if (localName == null) {
+ return "";
+ } else {
+ return localName;
+ }
+ }
+
+ /**
+ * Sets the value of the localName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setLocalName(String value) {
+ this.localName = value;
+ }
+
+ /**
+ * Gets the value of the targetNamespace property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTargetNamespace() {
+ if (targetNamespace == null) {
+ return "";
+ } else {
+ return targetNamespace;
+ }
+ }
+
+ /**
+ * Sets the value of the targetNamespace property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTargetNamespace(String value) {
+ this.targetNamespace = value;
+ }
+
+ /**
+ * Gets the value of the className property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getClassName() {
+ if (className == null) {
+ return "";
+ } else {
+ return className;
+ }
+ }
+
+ /**
+ * Sets the value of the className property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setClassName(String value) {
+ this.className = value;
+ }
+
+ public String getPartName() {
+ return partName;
+ }
+
+ public void setPartName(String partName) {
+ this.partName = partName;
+ }
+
+ @Override
+ public String localName() {
+ return nullSafe(localName);
+ }
+
+ @Override
+ public String targetNamespace() {
+ return nullSafe(targetNamespace);
+ }
+
+ @Override
+ public String className() {
+ return nullSafe(className);
+ }
+
+ @Override
+ public String partName() {
+ return nullSafe(partName);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.ResponseWrapper.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlSOAPBinding.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlSOAPBinding.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,186 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="style" type="{http://xmlns.oracle.com/webservices/jaxws-databinding}soap-binding-style" default="DOCUMENT" />
+ * <attribute name="use" type="{http://xmlns.oracle.com/webservices/jaxws-databinding}soap-binding-use" default="LITERAL" />
+ * <attribute name="parameter-style" type="{http://xmlns.oracle.com/webservices/jaxws-databinding}soap-binding-parameter-style" default="WRAPPED" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "soap-binding")
+public class XmlSOAPBinding implements javax.jws.soap.SOAPBinding {
+
+ @XmlAttribute(name = "style")
+ protected SoapBindingStyle style;
+ @XmlAttribute(name = "use")
+ protected SoapBindingUse use;
+ @XmlAttribute(name = "parameter-style")
+ protected SoapBindingParameterStyle parameterStyle;
+
+ /**
+ * Gets the value of the style property.
+ *
+ * @return
+ * possible object is
+ * {@link SoapBindingStyle }
+ *
+ */
+ public SoapBindingStyle getStyle() {
+ if (style == null) {
+ return SoapBindingStyle.DOCUMENT;
+ } else {
+ return style;
+ }
+ }
+
+ /**
+ * Sets the value of the style property.
+ *
+ * @param value
+ * allowed object is
+ * {@link SoapBindingStyle }
+ *
+ */
+ public void setStyle(SoapBindingStyle value) {
+ this.style = value;
+ }
+
+ /**
+ * Gets the value of the use property.
+ *
+ * @return
+ * possible object is
+ * {@link SoapBindingUse }
+ *
+ */
+ public SoapBindingUse getUse() {
+ if (use == null) {
+ return SoapBindingUse.LITERAL;
+ } else {
+ return use;
+ }
+ }
+
+ /**
+ * Sets the value of the use property.
+ *
+ * @param value
+ * allowed object is
+ * {@link SoapBindingUse }
+ *
+ */
+ public void setUse(SoapBindingUse value) {
+ this.use = value;
+ }
+
+ /**
+ * Gets the value of the parameterStyle property.
+ *
+ * @return
+ * possible object is
+ * {@link SoapBindingParameterStyle }
+ *
+ */
+ public SoapBindingParameterStyle getParameterStyle() {
+ if (parameterStyle == null) {
+ return SoapBindingParameterStyle.WRAPPED;
+ } else {
+ return parameterStyle;
+ }
+ }
+
+ /**
+ * Sets the value of the parameterStyle property.
+ *
+ * @param value
+ * allowed object is
+ * {@link SoapBindingParameterStyle }
+ *
+ */
+ public void setParameterStyle(SoapBindingParameterStyle value) {
+ this.parameterStyle = value;
+ }
+
+ @Override
+ public Style style() {
+ return nullSafe(style, Style.DOCUMENT);
+ }
+
+ @Override
+ public Use use() {
+ return nullSafe(use, Use.LITERAL);
+ }
+
+ @Override
+ public ParameterStyle parameterStyle() {
+ return nullSafe(parameterStyle, ParameterStyle.WRAPPED);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.jws.soap.SOAPBinding.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlServiceMode.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlServiceMode.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,118 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.ws.Service;
+
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" default="PAYLOAD" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "service-mode")
+public class XmlServiceMode implements javax.xml.ws.ServiceMode {
+
+ @XmlAttribute(name = "value")
+ protected String value;
+
+ /**
+ * Gets the value of the value property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getValue() {
+ if (value == null) {
+ return "PAYLOAD";
+ } else {
+ return value;
+ }
+ }
+
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public Service.Mode value() {
+ return Service.Mode.valueOf(nullSafe(value, "PAYLOAD"));
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.ServiceMode.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebEndpoint.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebEndpoint.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,110 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "web-endpoint")
+public class XmlWebEndpoint implements javax.xml.ws.WebEndpoint {
+
+ @XmlAttribute(name = "name")
+ protected String name;
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ @Override
+ public String name() {
+ return nullSafe(name);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.WebEndpoint.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebFault.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebFault.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,183 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="targetNamespace" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="faultBean" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "web-fault")
+public class XmlWebFault implements javax.xml.ws.WebFault {
+
+ @XmlAttribute(name = "name")
+ protected String name;
+ @XmlAttribute(name = "targetNamespace")
+ protected String targetNamespace;
+ @XmlAttribute(name = "faultBean")
+ protected String faultBean;
+ @XmlAttribute(name = "messageName")
+ protected String messageName;
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the targetNamespace property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTargetNamespace() {
+ return targetNamespace;
+ }
+
+ /**
+ * Sets the value of the targetNamespace property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTargetNamespace(String value) {
+ this.targetNamespace = value;
+ }
+
+ /**
+ * Gets the value of the faultBean property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getFaultBean() {
+ return faultBean;
+ }
+
+ /**
+ * Sets the value of the faultBean property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setFaultBean(String value) {
+ this.faultBean = value;
+ }
+
+ @Override
+ public String name() {
+ return nullSafe(name);
+ }
+
+ @Override
+ public String targetNamespace() {
+ return nullSafe(targetNamespace);
+ }
+
+ @Override
+ public String faultBean() {
+ return nullSafe(faultBean);
+ }
+
+ @Override
+ public String messageName() {
+ return nullSafe(messageName);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.WebFault.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebMethod.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebMethod.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,187 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="action" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * <attribute name="operation-name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "web-method")
+public class XmlWebMethod implements javax.jws.WebMethod {
+
+ @XmlAttribute(name = "action")
+ protected String action;
+ @XmlAttribute(name = "exclude")
+ protected Boolean exclude;
+ @XmlAttribute(name = "operation-name")
+ protected String operationName;
+
+ /**
+ * Gets the value of the action property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getAction() {
+ if (action == null) {
+ return "";
+ } else {
+ return action;
+ }
+ }
+
+ /**
+ * Sets the value of the action property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setAction(String value) {
+ this.action = value;
+ }
+
+ /**
+ * Gets the value of the exclude property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isExclude() {
+ if (exclude == null) {
+ return false;
+ } else {
+ return exclude;
+ }
+ }
+
+ /**
+ * Sets the value of the exclude property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setExclude(Boolean value) {
+ this.exclude = value;
+ }
+
+ /**
+ * Gets the value of the operationName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getOperationName() {
+ if (operationName == null) {
+ return "";
+ } else {
+ return operationName;
+ }
+ }
+
+ /**
+ * Sets the value of the operationName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setOperationName(String value) {
+ this.operationName = value;
+ }
+
+ @Override
+ public String operationName() {
+ return nullSafe(operationName);
+ }
+
+ @Override
+ public String action() {
+ return nullSafe(action);
+ }
+
+ @Override
+ public boolean exclude() {
+ return nullSafe(exclude, false);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.jws.WebMethod.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebParam.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebParam.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,258 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="header" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * <attribute name="mode" type="{http://xmlns.oracle.com/webservices/jaxws-databinding}web-param-mode" default="IN" />
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="part-name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="target-namespace" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "web-param")
+public class XmlWebParam implements javax.jws.WebParam {
+
+ @XmlAttribute(name = "header")
+ protected Boolean header;
+ @XmlAttribute(name = "mode")
+ protected WebParamMode mode;
+ @XmlAttribute(name = "name")
+ protected String name;
+ @XmlAttribute(name = "part-name")
+ protected String partName;
+ @XmlAttribute(name = "target-namespace")
+ protected String targetNamespace;
+
+ /**
+ * Gets the value of the header property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isHeader() {
+ if (header == null) {
+ return false;
+ } else {
+ return header;
+ }
+ }
+
+ /**
+ * Sets the value of the header property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setHeader(Boolean value) {
+ this.header = value;
+ }
+
+ /**
+ * Gets the value of the mode property.
+ *
+ * @return
+ * possible object is
+ * {@link WebParamMode }
+ *
+ */
+ public WebParamMode getMode() {
+ if (mode == null) {
+ return WebParamMode.IN;
+ } else {
+ return mode;
+ }
+ }
+
+ /**
+ * Sets the value of the mode property.
+ *
+ * @param value
+ * allowed object is
+ * {@link WebParamMode }
+ *
+ */
+ public void setMode(WebParamMode value) {
+ this.mode = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ if (name == null) {
+ return "";
+ } else {
+ return name;
+ }
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the partName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getPartName() {
+ if (partName == null) {
+ return "";
+ } else {
+ return partName;
+ }
+ }
+
+ /**
+ * Sets the value of the partName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setPartName(String value) {
+ this.partName = value;
+ }
+
+ /**
+ * Gets the value of the targetNamespace property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTargetNamespace() {
+ if (targetNamespace == null) {
+ return "";
+ } else {
+ return targetNamespace;
+ }
+ }
+
+ /**
+ * Sets the value of the targetNamespace property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTargetNamespace(String value) {
+ this.targetNamespace = value;
+ }
+
+ @Override
+ public String name() {
+ return nullSafe(name);
+ }
+
+ @Override
+ public String partName() {
+ return nullSafe(partName);
+ }
+
+ @Override
+ public String targetNamespace() {
+ return nullSafe(targetNamespace);
+ }
+
+ @Override
+ public Mode mode() {
+ return nullSafe(mode, Mode.IN);
+ }
+
+ @Override
+ public boolean header() {
+ return nullSafe(header, false);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.jws.WebParam.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebResult.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebResult.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,222 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="header" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="part-name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="target-namespace" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "web-result")
+public class XmlWebResult implements javax.jws.WebResult {
+
+ @XmlAttribute(name = "header")
+ protected Boolean header;
+ @XmlAttribute(name = "name")
+ protected String name;
+ @XmlAttribute(name = "part-name")
+ protected String partName;
+ @XmlAttribute(name = "target-namespace")
+ protected String targetNamespace;
+
+ /**
+ * Gets the value of the header property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isHeader() {
+ if (header == null) {
+ return false;
+ } else {
+ return header;
+ }
+ }
+
+ /**
+ * Sets the value of the header property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setHeader(Boolean value) {
+ this.header = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ if (name == null) {
+ return "";
+ } else {
+ return name;
+ }
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the partName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getPartName() {
+ if (partName == null) {
+ return "";
+ } else {
+ return partName;
+ }
+ }
+
+ /**
+ * Sets the value of the partName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setPartName(String value) {
+ this.partName = value;
+ }
+
+ /**
+ * Gets the value of the targetNamespace property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTargetNamespace() {
+ if (targetNamespace == null) {
+ return "";
+ } else {
+ return targetNamespace;
+ }
+ }
+
+ /**
+ * Sets the value of the targetNamespace property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTargetNamespace(String value) {
+ this.targetNamespace = value;
+ }
+
+ @Override
+ public String name() {
+ return nullSafe(name);
+ }
+
+ @Override
+ public String partName() {
+ return nullSafe(partName);
+ }
+
+ @Override
+ public String targetNamespace() {
+ return nullSafe(targetNamespace);
+ }
+
+ @Override
+ public boolean header() {
+ return nullSafe(header, false);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.jws.WebResult.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebService.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebService.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,296 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="endpoint-interface" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="port-name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="service-name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="target-namespace" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * <attribute name="wsdl-location" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "web-service")
+public class XmlWebService implements javax.jws.WebService {
+
+ @XmlAttribute(name = "endpoint-interface")
+ protected String endpointInterface;
+ @XmlAttribute(name = "name")
+ protected String name;
+ @XmlAttribute(name = "port-name")
+ protected String portName;
+ @XmlAttribute(name = "service-name")
+ protected String serviceName;
+ @XmlAttribute(name = "target-namespace")
+ protected String targetNamespace;
+ @XmlAttribute(name = "wsdl-location")
+ protected String wsdlLocation;
+
+ /**
+ * Gets the value of the endpointInterface property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getEndpointInterface() {
+ if (endpointInterface == null) {
+ return "";
+ } else {
+ return endpointInterface;
+ }
+ }
+
+ /**
+ * Sets the value of the endpointInterface property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setEndpointInterface(String value) {
+ this.endpointInterface = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ if (name == null) {
+ return "";
+ } else {
+ return name;
+ }
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the portName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getPortName() {
+ if (portName == null) {
+ return "";
+ } else {
+ return portName;
+ }
+ }
+
+ /**
+ * Sets the value of the portName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setPortName(String value) {
+ this.portName = value;
+ }
+
+ /**
+ * Gets the value of the serviceName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getServiceName() {
+ if (serviceName == null) {
+ return "";
+ } else {
+ return serviceName;
+ }
+ }
+
+ /**
+ * Sets the value of the serviceName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setServiceName(String value) {
+ this.serviceName = value;
+ }
+
+ /**
+ * Gets the value of the targetNamespace property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTargetNamespace() {
+ if (targetNamespace == null) {
+ return "";
+ } else {
+ return targetNamespace;
+ }
+ }
+
+ /**
+ * Sets the value of the targetNamespace property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTargetNamespace(String value) {
+ this.targetNamespace = value;
+ }
+
+ /**
+ * Gets the value of the wsdlLocation property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getWsdlLocation() {
+ if (wsdlLocation == null) {
+ return "";
+ } else {
+ return wsdlLocation;
+ }
+ }
+
+ /**
+ * Sets the value of the wsdlLocation property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setWsdlLocation(String value) {
+ this.wsdlLocation = value;
+ }
+
+ @Override
+ public String name() {
+ return nullSafe(name);
+ }
+
+ @Override
+ public String targetNamespace() {
+ return nullSafe(targetNamespace);
+ }
+
+ @Override
+ public String serviceName() {
+ return nullSafe(serviceName);
+ }
+
+ @Override
+ public String portName() {
+ return nullSafe(portName);
+ }
+
+ @Override
+ public String wsdlLocation() {
+ return nullSafe(wsdlLocation);
+ }
+
+ @Override
+ public String endpointInterface() {
+ return nullSafe(endpointInterface);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.jws.WebService.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceClient.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceClient.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,174 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="targetNamespace" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="wsdlLocation" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "web-service-client")
+public class XmlWebServiceClient implements javax.xml.ws.WebServiceClient {
+
+ @XmlAttribute(name = "name")
+ protected String name;
+ @XmlAttribute(name = "targetNamespace")
+ protected String targetNamespace;
+ @XmlAttribute(name = "wsdlLocation")
+ protected String wsdlLocation;
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the targetNamespace property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTargetNamespace() {
+ return targetNamespace;
+ }
+
+ /**
+ * Sets the value of the targetNamespace property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTargetNamespace(String value) {
+ this.targetNamespace = value;
+ }
+
+ /**
+ * Gets the value of the wsdlLocation property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getWsdlLocation() {
+ return wsdlLocation;
+ }
+
+ /**
+ * Sets the value of the wsdlLocation property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setWsdlLocation(String value) {
+ this.wsdlLocation = value;
+ }
+
+ @Override
+ public String name() {
+ return nullSafe(name);
+ }
+
+ @Override
+ public String targetNamespace() {
+ return nullSafe(targetNamespace);
+ }
+
+ @Override
+ public String wsdlLocation() {
+ return nullSafe(wsdlLocation);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.WebServiceClient.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceProvider.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceProvider.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,206 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="targetNamespace" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="serviceName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="portName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="wsdlLocation" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "web-service-provider")
+public class XmlWebServiceProvider implements javax.xml.ws.WebServiceProvider {
+
+ @XmlAttribute(name = "targetNamespace")
+ protected String targetNamespace;
+ @XmlAttribute(name = "serviceName")
+ protected String serviceName;
+ @XmlAttribute(name = "portName")
+ protected String portName;
+ @XmlAttribute(name = "wsdlLocation")
+ protected String wsdlLocation;
+
+ /**
+ * Gets the value of the targetNamespace property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTargetNamespace() {
+ return targetNamespace;
+ }
+
+ /**
+ * Sets the value of the targetNamespace property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTargetNamespace(String value) {
+ this.targetNamespace = value;
+ }
+
+ /**
+ * Gets the value of the serviceName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getServiceName() {
+ return serviceName;
+ }
+
+ /**
+ * Sets the value of the serviceName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setServiceName(String value) {
+ this.serviceName = value;
+ }
+
+ /**
+ * Gets the value of the portName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getPortName() {
+ return portName;
+ }
+
+ /**
+ * Sets the value of the portName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setPortName(String value) {
+ this.portName = value;
+ }
+
+ /**
+ * Gets the value of the wsdlLocation property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getWsdlLocation() {
+ return wsdlLocation;
+ }
+
+ /**
+ * Sets the value of the wsdlLocation property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setWsdlLocation(String value) {
+ this.wsdlLocation = value;
+ }
+
+ @Override
+ public String wsdlLocation() {
+ return nullSafe(wsdlLocation);
+ }
+
+ @Override
+ public String serviceName() {
+ return nullSafe(serviceName);
+ }
+
+ @Override
+ public String targetNamespace() {
+ return nullSafe(targetNamespace);
+ }
+
+ @Override
+ public String portName() {
+ return nullSafe(portName);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.WebServiceProvider.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceRef.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceRef.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,262 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.ws.Service;
+import java.lang.annotation.Annotation;
+
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.findClass;
+import static com.oracle.xmlns.internal.webservices.jaxws_databinding.Util.nullSafe;
+
+
+/**
+ * This file was generated by JAXB-RI v2.2.6 and afterwards modified
+ * to implement appropriate Annotation
+ *
+ * Java class for anonymous complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="mappedName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="wsdlLocation" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "web-service-ref")
+public class XmlWebServiceRef implements javax.xml.ws.WebServiceRef {
+
+ @XmlAttribute(name = "name")
+ protected String name;
+ @XmlAttribute(name = "type")
+ protected String type;
+ @XmlAttribute(name = "mappedName")
+ protected String mappedName;
+ @XmlAttribute(name = "value")
+ protected String value;
+ @XmlAttribute(name = "wsdlLocation")
+ protected String wsdlLocation;
+ @XmlAttribute(name = "lookup")
+ protected String lookup;
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the type property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Sets the value of the type property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setType(String value) {
+ this.type = value;
+ }
+
+ /**
+ * Gets the value of the mappedName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getMappedName() {
+ return mappedName;
+ }
+
+ /**
+ * Sets the value of the mappedName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setMappedName(String value) {
+ this.mappedName = value;
+ }
+
+ /**
+ * Gets the value of the value property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ /**
+ * Gets the value of the wsdlLocation property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getWsdlLocation() {
+ return wsdlLocation;
+ }
+
+ /**
+ * Sets the value of the wsdlLocation property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setWsdlLocation(String value) {
+ this.wsdlLocation = value;
+ }
+
+ public String getLookup() {
+ return lookup;
+ }
+
+ public void setLookup(String lookup) {
+ this.lookup = lookup;
+ }
+
+ @Override
+ public String name() {
+ return nullSafe(name);
+ }
+
+ @Override
+ public Class type() {
+ if (type == null) {
+ return Object.class;
+ }
+ return findClass(type);
+ }
+
+ @Override
+ public String mappedName() {
+ return nullSafe(mappedName);
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public Class value() {
+ if (value == null) {
+ return Service.class;
+ }
+ return (Class) findClass(value);
+ }
+
+ @Override
+ public String wsdlLocation() {
+ return nullSafe(wsdlLocation);
+ }
+
+ @Override
+ public String lookup() {
+ return nullSafe(lookup);
+ }
+
+ @Override
+ public Class annotationType() {
+ return javax.xml.ws.WebServiceRef.class;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/package-info.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/package-info.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,49 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.6-SNAPSHOT
+// See http://java.sun.com/xml/jaxb
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2012.03.21 at 10:57:01 AM CET
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://xmlns.oracle.com/webservices/jaxws-databinding", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package com.oracle.xmlns.internal.webservices.jaxws_databinding;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/Builder.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/Builder.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/Builder.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/ByteArrayDataSource.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/ByteArrayDataSource.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/ByteArrayDataSource.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/FinalArrayList.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/FinalArrayList.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/FinalArrayList.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/FragmentContentHandler.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/FragmentContentHandler.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/FragmentContentHandler.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/Interned.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/Interned.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/Interned.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/NotNull.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/NotNull.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/NotNull.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/Nullable.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/Nullable.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/Nullable.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/Pool.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/Pool.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/Pool.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/SAXException2.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/SAXException2.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/SAXException2.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/SAXParseException2.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/SAXParseException2.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/SAXParseException2.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/XMLStreamException2.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamException2.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamException2.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/localization/Localizable.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizable.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizable.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -59,5 +59,5 @@
*
* Use of "new" is to create an unique instance.
*/
- public static final String NOT_LOCALIZABLE = new String("\u0000");
+ public static final String NOT_LOCALIZABLE = "\u0000";
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessage.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessage.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessage.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -25,6 +25,8 @@
package com.sun.istack.internal.localization;
+import java.util.Arrays;
+
/**
* @author WS Development Team
*/
@@ -47,7 +49,7 @@
}
public Object[] getArguments() {
- return _args;
+ return Arrays.copyOf(_args, _args.length);
}
public String getResourceBundleName() {
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/localization/Localizer.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizer.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizer.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -88,8 +88,14 @@
alternateBundleName,
_locale);
} catch (MissingResourceException e2) {
- // give up
- return getDefaultMessage(l);
+ //try context classloader
+ try {
+ bundle = ResourceBundle.getBundle(bundlename, _locale, Thread.currentThread().getContextClassLoader());
+ } catch (MissingResourceException e3) {
+ // give up
+ return getDefaultMessage(l);
+ }
+
}
}
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/localization/NullLocalizable.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/istack/internal/localization/NullLocalizable.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 1997, 2012, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.istack.internal.localization;
+
+/**
+ * {@link Localizable} that wraps a non-localizable string.
+ *
+ * @author WS Development Team
+ */
+public final class NullLocalizable implements Localizable {
+ private final String msg;
+
+ public NullLocalizable(String msg) {
+ if(msg==null)
+ throw new IllegalArgumentException();
+ this.msg = msg;
+ }
+
+ public String getKey() {
+ return Localizable.NOT_LOCALIZABLE;
+ }
+ public Object[] getArguments() {
+ return new Object[]{msg};
+ }
+ public String getResourceBundleName() {
+ return "";
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/logging/Logger.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/logging/Logger.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/logging/Logger.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -31,7 +31,7 @@
import java.util.logging.Level;
/**
- * This is a helper class that provides some conveniece methods wrapped around the
+ * This is a helper class that provides some convenience methods wrapped around the
* standard {@link java.util.logging.Logger} interface.
*
* The class also makes sure that logger names of each Metro subsystem are consistent
@@ -129,6 +129,20 @@
logger.logp(level, componentClassName, getCallerMethodName(), message);
}
+ public void log(final Level level, final String message, Object param1) {
+ if (!this.logger.isLoggable(level)) {
+ return;
+ }
+ logger.logp(level, componentClassName, getCallerMethodName(), message, param1);
+ }
+
+ public void log(final Level level, final String message, Object[] params) {
+ if (!this.logger.isLoggable(level)) {
+ return;
+ }
+ logger.logp(level, componentClassName, getCallerMethodName(), message, params);
+ }
+
public void log(final Level level, final String message, final Throwable thrown) {
if (!this.logger.isLoggable(level)) {
return;
@@ -143,6 +157,13 @@
logger.logp(Level.FINEST, componentClassName, getCallerMethodName(), message);
}
+ public void finest(final String message, Object[] params) {
+ if (!this.logger.isLoggable(Level.FINEST)) {
+ return;
+ }
+ logger.logp(Level.FINEST, componentClassName, getCallerMethodName(), message, params);
+ }
+
public void finest(final String message, final Throwable thrown) {
if (!this.logger.isLoggable(Level.FINEST)) {
return;
@@ -157,6 +178,13 @@
logger.logp(Level.FINER, componentClassName, getCallerMethodName(), message);
}
+ public void finer(final String message, Object[] params) {
+ if (!this.logger.isLoggable(Level.FINER)) {
+ return;
+ }
+ logger.logp(Level.FINER, componentClassName, getCallerMethodName(), message, params);
+ }
+
public void finer(final String message, final Throwable thrown) {
if (!this.logger.isLoggable(Level.FINER)) {
return;
@@ -185,6 +213,13 @@
logger.logp(Level.INFO, componentClassName, getCallerMethodName(), message);
}
+ public void info(final String message, Object[] params) {
+ if (!this.logger.isLoggable(Level.INFO)) {
+ return;
+ }
+ logger.logp(Level.INFO, componentClassName, getCallerMethodName(), message, params);
+ }
+
public void info(final String message, final Throwable thrown) {
if (!this.logger.isLoggable(Level.INFO)) {
return;
@@ -199,6 +234,13 @@
logger.logp(Level.CONFIG, componentClassName, getCallerMethodName(), message);
}
+ public void config(final String message, Object[] params) {
+ if (!this.logger.isLoggable(Level.CONFIG)) {
+ return;
+ }
+ logger.logp(Level.CONFIG, componentClassName, getCallerMethodName(), message, params);
+ }
+
public void config(final String message, final Throwable thrown) {
if (!this.logger.isLoggable(Level.CONFIG)) {
return;
@@ -213,6 +255,13 @@
logger.logp(Level.WARNING, componentClassName, getCallerMethodName(), message);
}
+ public void warning(final String message, Object[] params) {
+ if (!this.logger.isLoggable(Level.WARNING)) {
+ return;
+ }
+ logger.logp(Level.WARNING, componentClassName, getCallerMethodName(), message, params);
+ }
+
public void warning(final String message, final Throwable thrown) {
if (!this.logger.isLoggable(Level.WARNING)) {
return;
@@ -227,6 +276,13 @@
logger.logp(Level.SEVERE, componentClassName, getCallerMethodName(), message);
}
+ public void severe(final String message, Object[] params) {
+ if (!this.logger.isLoggable(Level.SEVERE)) {
+ return;
+ }
+ logger.logp(Level.SEVERE, componentClassName, getCallerMethodName(), message, params);
+ }
+
public void severe(final String message, final Throwable thrown) {
if (!this.logger.isLoggable(Level.SEVERE)) {
return;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/package-info.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/package-info.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/package-info.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/tools/DefaultAuthenticator.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/istack/internal/tools/DefaultAuthenticator.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,324 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.istack.internal.tools;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.net.Authenticator;
+import java.net.Authenticator.RequestorType;
+import java.net.MalformedURLException;
+import java.net.PasswordAuthentication;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
+import org.xml.sax.Locator;
+import org.xml.sax.helpers.LocatorImpl;
+
+/**
+ * @author Vivek Pandey
+ * @author Lukas Jungmann
+ */
+public class DefaultAuthenticator extends Authenticator {
+
+ private static DefaultAuthenticator instance;
+ private static Authenticator systemAuthenticator = getCurrentAuthenticator();
+ private String proxyUser;
+ private String proxyPasswd;
+ private final List authInfo = new ArrayList();
+ private static int counter = 0;
+
+ DefaultAuthenticator() {
+ //try undocumented but often used properties
+ if (System.getProperty("http.proxyUser") != null) {
+ proxyUser = System.getProperty("http.proxyUser");
+ } else {
+ proxyUser = System.getProperty("proxyUser");
+ }
+ if (System.getProperty("http.proxyPassword") != null) {
+ proxyPasswd = System.getProperty("http.proxyPassword");
+ } else {
+ proxyPasswd = System.getProperty("proxyPassword");
+ }
+ }
+
+ public static synchronized DefaultAuthenticator getAuthenticator() {
+ if (instance == null) {
+ instance = new DefaultAuthenticator();
+ Authenticator.setDefault(instance);
+ }
+ counter++;
+ return instance;
+ }
+
+ public static synchronized void reset() {
+ --counter;
+ if (instance != null && counter == 0) {
+ Authenticator.setDefault(systemAuthenticator);
+ }
+ }
+
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ //If user sets proxy user and passwd and the RequestType is from proxy server then create
+ // PasswordAuthentication using proxyUser and proxyPasswd;
+ if ((getRequestorType() == RequestorType.PROXY) && proxyUser != null && proxyPasswd != null) {
+ return new PasswordAuthentication(proxyUser, proxyPasswd.toCharArray());
+ }
+ for (AuthInfo auth : authInfo) {
+ if (auth.matchingHost(getRequestingURL())) {
+ return new PasswordAuthentication(auth.getUser(), auth.getPassword().toCharArray());
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Proxy authorization string in form of username:password.
+ *
+ * @param proxyAuth
+ */
+ public void setProxyAuth(String proxyAuth) {
+ if (proxyAuth == null) {
+ this.proxyUser = null;
+ this.proxyPasswd = null;
+ } else {
+ int i = proxyAuth.indexOf(':');
+ if (i < 0) {
+ this.proxyUser = proxyAuth;
+ this.proxyPasswd = "";
+ } else if (i == 0) {
+ this.proxyUser = "";
+ this.proxyPasswd = proxyAuth.substring(1);
+ } else {
+ this.proxyUser = proxyAuth.substring(0, i);
+ this.proxyPasswd = proxyAuth.substring(i + 1);
+ }
+ }
+ }
+
+ public void setAuth(File f, Receiver l) {
+ Receiver listener = l == null ? new DefaultRImpl() : l;
+ BufferedReader in = null;
+ FileInputStream fi = null;
+ InputStreamReader is = null;
+ try {
+ String text;
+ LocatorImpl locator = new LocatorImpl();
+ locator.setSystemId(f.getAbsolutePath());
+ try {
+ fi = new FileInputStream(f);
+ is = new InputStreamReader(fi, "UTF-8");
+ in = new BufferedReader(is);
+ } catch (UnsupportedEncodingException e) {
+ listener.onError(e, locator);
+ return;
+ } catch (FileNotFoundException e) {
+ listener.onError(e, locator);
+ return;
+ }
+ try {
+ int lineno = 1;
+ locator.setSystemId(f.getCanonicalPath());
+ while ((text = in.readLine()) != null) {
+ locator.setLineNumber(lineno++);
+ //ignore empty lines and treat those starting with '#' as comments
+ if ("".equals(text.trim()) || text.startsWith("#")) {
+ continue;
+ }
+ try {
+ AuthInfo ai = parseLine(text);
+ authInfo.add(ai);
+ } catch (Exception e) {
+ listener.onParsingError(text, locator);
+ }
+ }
+ } catch (IOException e) {
+ listener.onError(e, locator);
+ Logger.getLogger(DefaultAuthenticator.class.getName()).log(Level.SEVERE, e.getMessage(), e);
+ }
+ } finally {
+ try {
+ if (in != null) {
+ in.close();
+ }
+ if (is != null) {
+ is.close();
+ }
+ if (fi != null) {
+ fi.close();
+ }
+ } catch (IOException ex) {
+ Logger.getLogger(DefaultAuthenticator.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ }
+
+ private AuthInfo parseLine(String text) throws Exception {
+ URL url;
+ try {
+ url = new URL(text);
+ } catch (MalformedURLException mue) {
+ //possible cause of this can be that password contains
+ //character which has to be encoded in URL,
+ //such as '@', ')', '#' and few others
+ //so try to recreate the URL with encoded string
+ //between 2nd ':' and last '@'
+ int i = text.indexOf(':', text.indexOf(':') + 1) + 1;
+ int j = text.lastIndexOf('@');
+ String encodedUrl =
+ text.substring(0, i)
+ + URLEncoder.encode(text.substring(i, j), "UTF-8")
+ + text.substring(j);
+ url = new URL(encodedUrl);
+ }
+
+ String authinfo = url.getUserInfo();
+
+ if (authinfo != null) {
+ int i = authinfo.indexOf(':');
+
+ if (i >= 0) {
+ String user = authinfo.substring(0, i);
+ String password = authinfo.substring(i + 1);
+ return new AuthInfo(
+ new URL(url.getProtocol(), url.getHost(), url.getPort(), url.getFile()),
+ user, URLDecoder.decode(password, "UTF-8"));
+ }
+ }
+ throw new Exception();
+ }
+
+ static Authenticator getCurrentAuthenticator() {
+ final Field f = getTheAuthenticator();
+ if (f == null) {
+ return null;
+ }
+
+ try {
+ AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
+ public Void run() {
+ f.setAccessible(true);
+ return null;
+ }
+ });
+ return (Authenticator) f.get(null);
+ } catch (Exception ex) {
+ return null;
+ } finally {
+ AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
+ public Void run() {
+ f.setAccessible(false);
+ return null;
+ }
+ });
+ }
+ }
+
+ private static Field getTheAuthenticator() {
+ try {
+ return Authenticator.class.getDeclaredField("theAuthenticator");
+ } catch (Exception ex) {
+ return null;
+ }
+ }
+
+ public static interface Receiver {
+
+ void onParsingError(String line, Locator loc);
+
+ void onError(Exception e, Locator loc);
+ }
+
+ private static class DefaultRImpl implements Receiver {
+
+ @Override
+ public void onParsingError(String line, Locator loc) {
+ System.err.println(getLocationString(loc) + ": " + line);
+ }
+
+ @Override
+ public void onError(Exception e, Locator loc) {
+ System.err.println(getLocationString(loc) + ": " + e.getMessage());
+ Logger.getLogger(DefaultAuthenticator.class.getName()).log(Level.SEVERE, e.getMessage(), e);
+ }
+
+ private String getLocationString(Locator l) {
+ return "[" + l.getSystemId() + "#" + l.getLineNumber() + "]";
+ }
+ }
+
+ /**
+ * Represents authorization information needed by
+ * {@link DefaultAuthenticator} to authenticate access to remote resources.
+ *
+ * @author Vivek Pandey
+ * @author Lukas Jungmann
+ */
+ final static class AuthInfo {
+
+ private final String user;
+ private final String password;
+ private final Pattern urlPattern;
+
+ public AuthInfo(URL url, String user, String password) {
+ String u = url.toExternalForm().replaceFirst("\\?", "\\\\?");
+ this.urlPattern = Pattern.compile(u.replace("*", ".*"), Pattern.CASE_INSENSITIVE);
+ this.user = user;
+ this.password = password;
+ }
+
+ public String getUser() {
+ return user;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ /**
+ * Returns if the requesting host and port are associated with this
+ * {@link AuthInfo}
+ */
+ public boolean matchingHost(URL requestingURL) {
+ return urlPattern.matcher(requestingURL.toExternalForm()).matches();
+ }
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/tools/MaskingClassLoader.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/tools/MaskingClassLoader.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/tools/MaskingClassLoader.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/tools/SecureLoader.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/tools/SecureLoader.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/tools/SecureLoader.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -72,6 +72,19 @@
}
}
+ static ClassLoader getParentClassLoader(final ClassLoader cl) {
+ if (System.getSecurityManager() == null) {
+ return cl.getParent();
+ } else {
+ return (ClassLoader) java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction() {
+ public java.lang.Object run() {
+ return cl.getParent();
+ }
+ });
+ }
+ }
+
static void setContextClassLoader(final ClassLoader cl) {
if (System.getSecurityManager() == null) {
Thread.currentThread().setContextClassLoader(cl);
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/istack/internal/tools/package-info.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/tools/package-info.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/tools/package-info.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMX.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMX.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMX.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,7 @@
* questions.
*/
+
package com.sun.org.glassfish.external.amx;
/**
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,7 @@
* questions.
*/
+
package com.sun.org.glassfish.external.amx;
import javax.management.ObjectName;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXUtil.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXUtil.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXUtil.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,7 @@
* questions.
*/
+
package com.sun.org.glassfish.external.amx;
import javax.management.MBeanServerConnection;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,7 @@
* questions.
*/
+
package com.sun.org.glassfish.external.amx;
import javax.management.ObjectName;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/amx/MBeanListener.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/MBeanListener.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/MBeanListener.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,7 @@
* questions.
*/
+
package com.sun.org.glassfish.external.amx;
import java.util.Set;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Stability.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Stability.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Stability.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,10 +23,9 @@
* questions.
*/
+
package com.sun.org.glassfish.external.arc;
-
-
/**
Taxonomy values.
See http://opensolaris.org/os/community/arc/policies/interface-taxonomy/
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Taxonomy.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Taxonomy.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Taxonomy.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.arc;
import java.lang.annotation.Documented;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -22,10 +22,8 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+
+
package com.sun.org.glassfish.external.probe.provider;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.probe.provider;
/**
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.probe.provider;
/**
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.probe.provider;
import java.util.Vector;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.probe.provider;
/**
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -24,6 +24,7 @@
*/
+
package com.sun.org.glassfish.external.probe.provider.annotations;
import java.lang.annotation.Retention;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.probe.provider.annotations;
import java.lang.annotation.Retention;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -24,6 +24,7 @@
*/
+
package com.sun.org.glassfish.external.probe.provider.annotations;
import java.lang.annotation.Retention;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -24,6 +24,7 @@
*/
+
package com.sun.org.glassfish.external.probe.provider.annotations;
import java.lang.annotation.Retention;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
/*
* AverageRangeStatistic.java
*
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics;
/**
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,7 @@
* questions.
*/
+
package com.sun.org.glassfish.external.statistics;
/**
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/CountStatistic.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/CountStatistic.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/CountStatistic.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics;
/**
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics;
/**
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Statistic.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Statistic.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Statistic.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics;
/**
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Stats.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Stats.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Stats.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics;
public interface Stats {
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/StringStatistic.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/StringStatistic.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/StringStatistic.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,7 @@
* questions.
*/
+
package com.sun.org.glassfish.external.statistics;
/**
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics;
/**
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics.annotations;
import java.lang.annotation.Retention;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics.impl;
import java.util.concurrent.atomic.AtomicLong;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.BoundaryStatistic;
import java.util.concurrent.atomic.AtomicLong;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic;
import java.util.concurrent.atomic.AtomicLong;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,7 @@
* questions.
*/
+
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.CountStatistic;
import java.util.concurrent.atomic.AtomicLong;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.RangeStatistic;
import java.util.concurrent.atomic.AtomicLong;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,7 @@
* questions.
*/
+
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.Statistic;
import java.io.Serializable;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.Stats;
import com.sun.org.glassfish.external.statistics.Statistic;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.StringStatistic;
import java.util.Map;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, 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
@@ -23,7 +23,10 @@
* questions.
*/
+
+
package com.sun.org.glassfish.external.statistics.impl;
+
import com.sun.org.glassfish.external.statistics.TimeStatistic;
import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin
--- a/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin Tue Apr 16 08:11:41 2013 -0700
@@ -3,3 +3,4 @@
com.sun.tools.internal.xjc.addon.sync.SynchronizedMethodAddOn
com.sun.tools.internal.xjc.addon.at_generated.PluginImpl
com.sun.tools.internal.xjc.addon.episode.PluginImpl
+com.sun.tools.internal.xjc.addon.accessors.PluginImpl
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ConfigReader.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ConfigReader.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ConfigReader.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -25,6 +25,7 @@
package com.sun.tools.internal.jxc;
+import com.sun.tools.internal.jxc.ap.Options;
import java.io.File;
import java.io.IOException;
import java.util.Collection;
@@ -51,6 +52,7 @@
import com.sun.tools.internal.xjc.api.Reference;
import com.sun.tools.internal.xjc.util.ForkContentHandler;
+import com.sun.xml.internal.bind.v2.util.XmlFactory;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -94,7 +96,7 @@
*/
public ConfigReader(ProcessingEnvironment env, Collection classes, File xmlFile, ErrorHandler errorHandler) throws SAXException, IOException {
this.env = env;
- Config config = parseAndGetConfig(xmlFile,errorHandler);
+ Config config = parseAndGetConfig(xmlFile, errorHandler, env.getOptions().containsKey(Options.DISABLE_XML_SECURITY));
checkAllClasses(config,classes);
String path = xmlFile.getAbsolutePath();
String xmlPath = path.substring(0,path.lastIndexOf(File.separatorChar));
@@ -150,14 +152,14 @@
private SchemaOutputResolver createSchemaOutputResolver(Config config, String xmlpath) {
File baseDir = new File(xmlpath, config.getBaseDir().getPath());
- SchemaOutputResolverImpl schemaOutputResolver = new SchemaOutputResolverImpl (baseDir);
+ SchemaOutputResolverImpl outResolver = new SchemaOutputResolverImpl (baseDir);
for( Schema schema : (List)config.getSchema() ) {
String namespace = schema.getNamespace();
File location = schema.getLocation();
- schemaOutputResolver.addSchemaInfo(namespace,location);
+ outResolver.addSchemaInfo(namespace,location);
}
- return schemaOutputResolver;
+ return outResolver;
}
/**
@@ -190,11 +192,10 @@
* @return
* A non null Config object
*/
- private Config parseAndGetConfig (File xmlFile, ErrorHandler errorHandler) throws SAXException, IOException {
+ private Config parseAndGetConfig (File xmlFile, ErrorHandler errorHandler, boolean disableSecureProcessing) throws SAXException, IOException {
XMLReader reader;
try {
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setNamespaceAware(true);
+ SAXParserFactory factory = XmlFactory.createParserFactory(disableSecureProcessing);
reader = factory.newSAXParser().getXMLReader();
} catch (ParserConfigurationException e) {
// in practice this will never happen
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2012, 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
@@ -30,10 +30,10 @@
Non-existent directory: {0}
VERSION = \
- schemagen 2.2.5-b10
+ schemagen 2.2.7-b63
FULLVERSION = \
- schemagen full version "2.2.5-b10"
+ schemagen full version "2.2.7-b63"
USAGE = \
Usage: schemagen [-options ...] \n\
@@ -43,6 +43,7 @@
\ \ \ \ -classpath : specify where to find user specified files\n\
\ \ \ \ -encoding : specify encoding to be used for annotation processing/javac invocation \n\
\ \ \ \ -episode : generate episode file for separate compilation\n\
+\ \ \ \ -disableXmlSecurity : disables XML security features for usage on xml parsing apis \n\
\ \ \ \ -version : display version information\n\
\ \ \ \ -fullversion : display full version information\n\
\ \ \ \ -help : display this usage message
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+UNEXPECTED_NGCC_TOKEN = Nicht erkanntes {0} in Zeile {1} Spalte {2}
+
+BASEDIR_DOESNT_EXIST = Nicht vorhandenes Verzeichnis: {0}
+
+VERSION = schemagen 2.2.7-b63
+
+FULLVERSION = schemagen vollst\u00E4ndige Version "2.2.7-b63"
+
+USAGE = Verwendung: schemagen [-options ...] \nOptionen: \n\\ \\ \\ \\ -d : Gibt an, wo die von Prozessor und javac generierten Klassendateien gespeichert werden sollen\n\\ \\ \\ \\ -cp : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -classpath : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -encoding : Gibt die Codierung f\u00FCr die Annotationsverarbeitung/den javac-Aufruf an \n\\ \\ \\ \\ -episode : Generiert Episodendatei f\u00FCr separate Kompilierung\n\\ \\ \\ \\ -version : Zeigt Versionsinformation an\n\\ \\ \\ \\ -fullversion : Zeigt vollst\u00E4ndige Versionsinformationen an\n\\ \\ \\ \\ -help : Zeigt diese Verwendungsmeldung an
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+UNEXPECTED_NGCC_TOKEN = Aparece un {0} inesperado en la l\u00EDnea {1} y la columna {2}
+
+BASEDIR_DOESNT_EXIST = Directorio no existente: {0}
+
+VERSION = schemagen 2.2.7-b63
+
+FULLVERSION = versi\u00F3n completa de schemagen "2.2.7-b63"
+
+USAGE = Sintaxis: schemagen [-options ...] \nOpciones: \n\\ \\ \\ \\ -d : especifique d\u00F3nde se colocan los archivos de clase generados por javac y el procesador\n\\ \\ \\ \\ -cp : especifique d\u00F3nde se encuentran los archivos especificados por el usuario\n\\ \\ \\ \\ -encoding : especifique la codificaci\u00F3n que se va a utilizar para el procesamiento de anotaciones/llamada de javac\n\\ \\ \\ \\ -episode : genera un archivo de episodio para una compilaci\u00F3n diferente\n\\ \\ \\ \\ -version : muestra la informaci\u00F3n de la versi\u00F3n\n\\ \\ \\ \\ -fullversion : muestra la informaci\u00F3n completa de la versi\u00F3n\n\\ \\ \\ \\ -help : muestra este mensaje de sintaxis
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+UNEXPECTED_NGCC_TOKEN = Un \u00E9l\u00E9ment {0} inattendu appara\u00EEt \u00E0 la ligne {1}, colonne {2}
+
+BASEDIR_DOESNT_EXIST = R\u00E9pertoire {0} inexistant
+
+VERSION = schemagen 2.2.7-b63
+
+FULLVERSION = version compl\u00E8te de schemagen "2.2.7-b63"
+
+USAGE = Syntaxe : schemagen [-options ...] \nOptions : \n\ \ \ \ -d : indiquez o\u00F9 placer les fichiers de classe g\u00E9n\u00E9r\u00E9s par le processeur et le compilateur javac\n\ \ \ \ -cp : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -classpath : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -encoding : indiquez l'encodage \u00E0 utiliser pour l'appel de javac/traitement de l'annotation \n\ \ \ \ -episode : g\u00E9n\u00E9rez un fichier d'\u00E9pisode pour la compilation s\u00E9par\u00E9e\n\ \ \ \ -version : affichez les informations de version\n\ \ \ \ -fullversion : affichez les informations compl\u00E8tes de version\n\ \ \ \ -help : affichez ce message de syntaxe
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+UNEXPECTED_NGCC_TOKEN = {0} imprevisto visualizzato sulla riga {1} colonna {2}
+
+BASEDIR_DOESNT_EXIST = Directory non esistente: {0}
+
+VERSION = schemagen 2.2.7-b63
+
+FULLVERSION = versione completa schemagen "2.2.7-b63"
+
+USAGE = Uso: schemagen [-options ...] \nOpzioni: \n\ \ \ \ -d : specifica dove posizionare il processore e i file della classe generata javac\n\ \ \ \ -cp : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -classpath : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -encoding : specifica la codifica da usare per l'elaborazione dell'annotazione/richiamo javac \n\ \ \ \ -episode : genera il file di episodio per la compilazione separata\n\ \ \ \ -version : visualizza le informazioni sulla versione\n\ \ \ \ -fullversion : visualizza le informazioni sulla versione completa\n\ \ \ \ -help : visualizza questo messaggio sull'uso
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+UNEXPECTED_NGCC_TOKEN = \u4E88\u671F\u3057\u306A\u3044{0}\u304C\u884C{1}\u3001\u5217{2}\u306B\u3042\u308A\u307E\u3059
+
+BASEDIR_DOESNT_EXIST = \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
+
+VERSION = schemagen 2.2.7-b63
+
+FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.7-b63"
+
+USAGE = \u4F7F\u7528\u65B9\u6CD5: schemagen [-options ...] \n\u30AA\u30D7\u30B7\u30E7\u30F3: \n\ \ \ \ -d : \u30D7\u30ED\u30BB\u30C3\u30B5\u304A\u3088\u3073javac\u304C\u751F\u6210\u3057\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u7F6E\u304F\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -cp : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -classpath : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -encoding : \u6CE8\u91C8\u51E6\u7406/javac\u547C\u51FA\u3057\u306B\u4F7F\u7528\u3059\u308B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -episode : \u30B3\u30F3\u30D1\u30A4\u30EB\u3054\u3068\u306B\u30A8\u30D4\u30BD\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3057\u307E\u3059\n\ \ \ \ -version : \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -fullversion : \u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -help : \u3053\u306E\u4F7F\u7528\u4F8B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+UNEXPECTED_NGCC_TOKEN = \uC608\uC0C1\uCE58 \uC54A\uC740 {0}\uC774(\uAC00) {1}\uD589 {2}\uC5F4\uC5D0 \uB098\uD0C0\uB0A9\uB2C8\uB2E4.
+
+BASEDIR_DOESNT_EXIST = \uC874\uC7AC\uD558\uC9C0 \uC54A\uB294 \uB514\uB809\uD1A0\uB9AC: {0}
+
+VERSION = schemagen 2.2.7-b63
+
+FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.2.7-b63"
+
+USAGE = \uC0AC\uC6A9\uBC95: schemagen [-options ...] \n\uC635\uC158: \n\ \ \ \ -d : \uD504\uB85C\uC138\uC11C \uBC0F javac\uC5D0\uC11C \uC0DD\uC131\uD55C \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uBC30\uCE58\uD560 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -cp : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -classpath : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -encoding : \uC8FC\uC11D \uCC98\uB9AC/javac \uD638\uCD9C\uC5D0 \uC0AC\uC6A9\uD560 \uC778\uCF54\uB529\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4. \n\ \ \ \ -episode : \uBCC4\uB3C4 \uCEF4\uD30C\uC77C\uC744 \uC704\uD574 episode \uD30C\uC77C\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n\ \ \ \ -version : \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -fullversion : \uC815\uC2DD \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -help : \uC774 \uC0AC\uC6A9\uBC95 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+UNEXPECTED_NGCC_TOKEN = {0} inesperado aparece na linha {1} coluna {2}
+
+BASEDIR_DOESNT_EXIST = Diret\u00F3rio n\u00E3o existente: {0}
+
+VERSION = gera\u00E7\u00E3o do esquema 2.2.7-b63
+
+FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.2.7-b63"
+
+USAGE = Uso: gera\u00E7\u00E3o do esquema [-options ...] \nOp\u00E7\u00F5es: \n\\ \\ \\ \\ -d : especificar onde colocar o processador e os arquivos da classe gerados por javac\n\\ \\ \\ \\ -cp : especificar onde localizar arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -classpath : especificar onde localizar os arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -encoding : especificar codifica\u00E7\u00E3o a ser usada para processamento de anota\u00E7\u00E3o/chamada javac \n\\ \\ \\ \\ -episode : gerar arquivo do epis\u00F3dio para compila\u00E7\u00E3o separada\n\\ \\ \\ \\ -version : exibir informa\u00E7\u00F5es da vers\u00E3o\n\\ \\ \\ \\ -fullversion : exibir informa\u00E7\u00F5es da vers\u00E3o completa\n\\ \\ \\ \\ -help : exibir esta mensagem de uso
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+UNEXPECTED_NGCC_TOKEN = \u5728\u7B2C {1} \u884C, \u7B2C {2} \u5217\u51FA\u73B0\u610F\u5916\u7684{0}
+
+BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u5F55: {0}
+
+VERSION = schemagen 2.2.7-b63
+
+FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.7-b63"
+
+USAGE = \u7528\u6CD5: schemagen [-options ...] \n\u9009\u9879: \n\ \ \ \ -d : \u6307\u5B9A\u653E\u7F6E\u5904\u7406\u7A0B\u5E8F\u548C javac \u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -cp : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -classpath : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -encoding : \u6307\u5B9A\u7528\u4E8E\u6CE8\u91CA\u5904\u7406/javac \u8C03\u7528\u7684\u7F16\u7801\n\ \ \ \ -episode : \u751F\u6210\u7247\u6BB5\u6587\u4EF6\u4EE5\u4F9B\u5355\u72EC\u7F16\u8BD1\n\ \ \ \ -version : \u663E\u793A\u7248\u672C\u4FE1\u606F\n\ \ \ \ -fullversion : \u663E\u793A\u5B8C\u6574\u7684\u7248\u672C\u4FE1\u606F\n\ \ \ \ -help : \u663E\u793A\u6B64\u7528\u6CD5\u6D88\u606F
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+UNEXPECTED_NGCC_TOKEN = \u672A\u9810\u671F\u7684 {0} \u986F\u793A\u65BC\u884C {1} \u8CC7\u6599\u6B04 {2}
+
+BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u9304: {0}
+
+VERSION = schemagen 2.2.7-b63
+
+FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.7-b63"
+
+USAGE = \u7528\u6CD5: schemagen [-options ...] \n\u9078\u9805: \n\\ \\ \\ \\ -d : \u6307\u5B9A\u8655\u7406\u5668\u4EE5\u53CA javac \u7522\u751F\u7684\u985E\u5225\u6A94\u6848\u653E\u7F6E\u4F4D\u7F6E\n\\ \\ \\ \\ -cp : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -classpath : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -encoding : \u6307\u5B9A\u8981\u7528\u65BC\u8A3B\u89E3\u8655\u7406/javac \u547C\u53EB\u7684\u7DE8\u78BC \n\\ \\ \\ \\ -episode : \u7522\u751F\u7368\u7ACB\u7DE8\u8B6F\u7684\u4E8B\u4EF6 (episode) \u6A94\u6848\n\\ \\ \\ \\ -version : \u986F\u793A\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -fullversion : \u986F\u793A\u5B8C\u6574\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -help : \u986F\u793A\u6B64\u7528\u6CD5\u8A0A\u606F
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java Tue Apr 16 08:11:41 2013 -0700
@@ -83,10 +83,9 @@
* @return
* A list of regular expression patterns {@link Pattern}
*/
- public List getIncludePatterns(List includeContent ) {
+ public List getIncludePatterns(List includeContent ) {
List includeRegexList = new ArrayList();
- for (int i = 0 ; i < includeContent.size(); i ++){
- String includes = (String)includeContent.get(i);
+ for (String includes : includeContent) {
String regex = convertToRegex(includes);
Pattern pattern = Pattern.compile(regex);
includeRegexList.add(pattern);
@@ -103,10 +102,9 @@
* @return
* A list of regular expression patterns {@link Pattern}
*/
- public List getExcludePatterns(List excludeContent ) {
- List excludeRegexList = new ArrayList();
- for (int i = 0 ; i < excludeContent.size(); i ++){
- String excludes = (String)excludeContent.get(i);
+ public List getExcludePatterns(List excludeContent ) {
+ List excludeRegexList = new ArrayList();
+ for (String excludes : excludeContent) {
String regex = convertToRegex(excludes);
Pattern pattern = Pattern.compile(regex);
excludeRegexList.add(pattern);
@@ -126,17 +124,16 @@
for ( int i = 0 ; i < pattern.length(); i ++ ) {
char c = pattern.charAt(i);
- int j = i;
nc = ' ';
- if ((j+1) != pattern.length()) {
- nc = pattern.charAt(j+1);
+ if ((i +1) != pattern.length()) {
+ nc = pattern.charAt(i +1);
}
//escape single '.'
- if ((c=='.') && ( nc !='.')){
+ if (c == '.' && nc != '.'){
regex.append('\\');
regex.append('.');
//do not allow patterns like a..b
- } else if ((c=='.') && ( nc =='.')){
+ } else if (c == '.'){
continue;
// "**" gets replaced by ".*"
} else if ((c=='*') && (nc == '*')) {
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java Tue Apr 16 08:11:41 2013 -0700
@@ -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
@@ -27,8 +27,6 @@
import com.sun.tools.internal.jxc.ap.Options;
import com.sun.tools.internal.xjc.BadCommandLineException;
-import com.sun.tools.internal.xjc.api.util.ApClassLoader;
-import com.sun.tools.internal.xjc.api.util.ToolsJarNotFoundException;
import com.sun.xml.internal.bind.util.Which;
import javax.lang.model.SourceVersion;
@@ -45,7 +43,9 @@
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
+import java.net.URLClassLoader;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
@@ -70,7 +70,6 @@
if (cl==null) {
cl = SecureLoader.getSystemClassLoader();
}
-// ClassLoader classLoader = new ApClassLoader(cl, packagePrefixes); // todo: check if can be removed
return run(args, cl);
} catch(Exception e) {
System.err.println(e.getMessage());
@@ -79,19 +78,6 @@
}
/**
- * List of package prefixes we want to load in the same package
- */
- private static final String[] packagePrefixes = {
- "com.sun.tools.internal.jxc.",
- "com.sun.tools.internal.xjc.",
- "com.sun.istack.internal.tools.",
- "com.sun.tools.javac.",
- "com.sun.tools.javadoc.",
- "javax.annotation.processing.",
- "javax.lang.model."
- };
-
- /**
* Runs the schema generator.
*
* @param classLoader
@@ -148,18 +134,8 @@
aptargs.add(options.encoding);
}
- // make jaxb-api.jar visible to classpath
- File jaxbApi = findJaxbApiJar();
- if(jaxbApi!=null) {
- if(options.classpath!=null) {
- options.classpath = options.classpath+File.pathSeparatorChar+jaxbApi;
- } else {
- options.classpath = jaxbApi.getPath();
- }
- }
-
aptargs.add("-cp");
- aptargs.add(options.classpath);
+ aptargs.add(setClasspath(options.classpath)); // set original classpath + jaxb-api to be visible to annotation processor
if(options.targetDir!=null) {
aptargs.add("-d");
@@ -172,6 +148,31 @@
return ((Boolean) compileMethod.invoke(null, argsarray, options.episodeFile)) ? 0 : 1;
}
+ private static String setClasspath(String givenClasspath) {
+ StringBuilder cp = new StringBuilder();
+ appendPath(cp, givenClasspath);
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ while (cl != null) {
+ if (cl instanceof URLClassLoader) {
+ for (URL url : ((URLClassLoader) cl).getURLs()) {
+ appendPath(cp, url.getPath());
+ }
+ }
+ cl = cl.getParent();
+ }
+
+ appendPath(cp, findJaxbApiJar());
+ return cp.toString();
+ }
+
+ private static void appendPath(StringBuilder cp, String url) {
+ if (url == null || url.trim().isEmpty())
+ return;
+ if (cp.length() != 0)
+ cp.append(File.pathSeparatorChar);
+ cp.append(url);
+ }
+
/**
* Computes the file system path of jaxb-api.jar so that
* Annotation Processing will see them in the -cp option.
@@ -183,7 +184,7 @@
* @return
* null if failed to locate it.
*/
- private static File findJaxbApiJar() {
+ private static String findJaxbApiJar() {
String url = Which.which(JAXBContext.class);
if(url==null) return null; // impossible, but hey, let's be defensive
@@ -198,11 +199,11 @@
try {
File f = new File(new URL(jarFileUrl).toURI());
if (f.exists() && f.getName().endsWith(".jar")) { // see 6510966
- return f;
+ return f.getPath();
}
f = new File(new URL(jarFileUrl).getFile());
if (f.exists() && f.getName().endsWith(".jar")) { // this is here for potential backw. compatibility issues
- return f;
+ return f.getPath();
}
} catch (URISyntaxException ex) {
Logger.getLogger(SchemaGenerator.class.getName()).log(Level.SEVERE, null, ex);
@@ -212,18 +213,6 @@
return null;
}
- /**
- * Returns true if the list of arguments have an argument
- * that looks like a class name.
- */
- private static boolean hasClass(List args) {
- for (String arg : args) {
- if(!arg.endsWith(".java"))
- return true;
- }
- return false;
- }
-
private static void usage( ) {
System.out.println(Messages.USAGE.format());
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java Tue Apr 16 08:11:41 2013 -0700
@@ -25,7 +25,6 @@
package com.sun.tools.internal.jxc;
-import com.sun.tools.internal.jxc.SecureLoader;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/SecureLoader.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SecureLoader.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SecureLoader.java Tue Apr 16 08:11:41 2013 -0700
@@ -37,9 +37,9 @@
if (System.getSecurityManager() == null) {
return Thread.currentThread().getContextClassLoader();
} else {
- return (ClassLoader) java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public java.lang.Object run() {
+ return java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction() {
+ public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
});
@@ -50,9 +50,9 @@
if (System.getSecurityManager() == null) {
return c.getClassLoader();
} else {
- return (ClassLoader) java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public java.lang.Object run() {
+ return java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction() {
+ public ClassLoader run() {
return c.getClassLoader();
}
});
@@ -63,9 +63,9 @@
if (System.getSecurityManager() == null) {
return ClassLoader.getSystemClassLoader();
} else {
- return (ClassLoader) java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public java.lang.Object run() {
+ return java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction() {
+ public ClassLoader run() {
return ClassLoader.getSystemClassLoader();
}
});
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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,10 +26,10 @@
package com.sun.tools.internal.jxc.ap;
import com.sun.tools.internal.jxc.ConfigReader;
+import com.sun.tools.internal.jxc.api.JXC;
import com.sun.tools.internal.xjc.ErrorReceiver;
import com.sun.tools.internal.xjc.api.J2SJAXBModel;
import com.sun.tools.internal.xjc.api.Reference;
-import com.sun.tools.internal.xjc.api.XJC;
import org.xml.sax.SAXException;
import javax.annotation.processing.AbstractProcessor;
@@ -37,7 +37,6 @@
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.annotation.processing.SupportedOptions;
-import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
@@ -50,7 +49,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
@@ -60,11 +58,12 @@
* and the config files
* It also reads config files
*
+ * Used in unit tests
+ *
* @author Bhakti Mehta (bhakti.mehta@sun.com)
*/
@SupportedAnnotationTypes("javax.xml.bind.annotation.*")
-@SupportedOptions("jaxb.config") // Const.CONFIG_FILE_OPTION.getValue()
-@SupportedSourceVersion(SourceVersion.RELEASE_6)
+@SupportedOptions("jaxb.config")
public final class AnnotationParser extends AbstractProcessor {
private ErrorReceiver errorListener;
@@ -110,7 +109,7 @@
);
Collection classesToBeIncluded = configReader.getClassesToBeIncluded();
- J2SJAXBModel model = XJC.createJavaCompiler().bind(
+ J2SJAXBModel model = JXC.createJavaCompiler().bind(
classesToBeIncluded, Collections.emptyMap(), null, processingEnv);
SchemaOutputResolver schemaOutputResolver = configReader.getSchemaOutputResolver();
@@ -128,10 +127,19 @@
private void filterClass(Collection rootElements, Collection elements) {
for (Element element : elements) {
- if (element.getKind().equals(ElementKind.CLASS) || element.getKind().equals(ElementKind.INTERFACE)) {
+ if (element.getKind().equals(ElementKind.CLASS) || element.getKind().equals(ElementKind.INTERFACE) ||
+ element.getKind().equals(ElementKind.ENUM)) {
rootElements.add((TypeElement) element);
filterClass(rootElements, ElementFilter.typesIn(element.getEnclosedElements()));
}
}
}
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ if (SourceVersion.latest().compareTo(SourceVersion.RELEASE_6) > 0)
+ return SourceVersion.valueOf("RELEASE_7");
+ else
+ return SourceVersion.RELEASE_6;
+ }
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_de.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_de.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+NON_EXISTENT_FILE = Verzeichnis "{0}" ist nicht vorhanden.
+
+UNRECOGNIZED_PARAMETER = Unbekannte Option {0} ist nicht g\u00FCltig.
+
+OPERAND_MISSING = In Option "{0}" fehlt ein Operand.
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_es.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_es.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+NON_EXISTENT_FILE = El directorio "{0}" no existe.
+
+UNRECOGNIZED_PARAMETER = La opci\u00F3n no reconocida {0} no es v\u00E1lida.
+
+OPERAND_MISSING = A la opci\u00F3n "{0}" le falta un operando.
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_fr.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_fr.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+NON_EXISTENT_FILE = Le r\u00E9pertoire "{0}" n''existe pas.
+
+UNRECOGNIZED_PARAMETER = L''option {0} non reconnue n''est pas valide.
+
+OPERAND_MISSING = Un op\u00E9rande est manquant dans l''option "{0}".
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_it.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_it.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+NON_EXISTENT_FILE = La directory "{0}" non esiste.
+
+UNRECOGNIZED_PARAMETER = L''opzione non riconosciuta {0} non \u00E8 valida.
+
+OPERAND_MISSING = Operando mancante nell''opzione "{0}".
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_ja.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_ja.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+NON_EXISTENT_FILE = \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
+
+UNRECOGNIZED_PARAMETER = \u8A8D\u8B58\u3055\u308C\u306A\u3044\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306F\u7121\u52B9\u3067\u3059\u3002
+
+OPERAND_MISSING = \u30AA\u30D7\u30B7\u30E7\u30F3"{0}"\u306B\u30AA\u30DA\u30E9\u30F3\u30C9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_ko.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_ko.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+NON_EXISTENT_FILE = "{0}" \uB514\uB809\uD1A0\uB9AC\uAC00 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+
+UNRECOGNIZED_PARAMETER = \uC778\uC2DD\uD560 \uC218 \uC5C6\uB294 \uC635\uC158 {0}\uC740(\uB294) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+
+OPERAND_MISSING = "{0}" \uC635\uC158\uC5D0 \uD53C\uC5F0\uC0B0\uC790\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_pt_BR.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_pt_BR.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+NON_EXISTENT_FILE = O diret\u00F3rio "{0}" n\u00E3o existe.
+
+UNRECOGNIZED_PARAMETER = A op\u00E7\u00E3o {0} n\u00E3o reconhecida \u00E9 inv\u00E1lida.
+
+OPERAND_MISSING = A op\u00E7\u00E3o "{0}" n\u00E3o encontrou um operando.
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_CN.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_CN.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+NON_EXISTENT_FILE = \u76EE\u5F55 "{0}" \u4E0D\u5B58\u5728\u3002
+
+UNRECOGNIZED_PARAMETER = \u65E0\u6CD5\u8BC6\u522B\u7684\u9009\u9879{0}, \u8BE5\u9009\u9879\u65E0\u6548\u3002
+
+OPERAND_MISSING = \u9009\u9879 "{0}" \u7F3A\u5C11\u64CD\u4F5C\u6570\u3002
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_TW.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_TW.properties Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 1997, 2011, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+NON_EXISTENT_FILE = \u76EE\u9304 "{0}" \u4E0D\u5B58\u5728.
+
+UNRECOGNIZED_PARAMETER = \u7121\u6CD5\u8FA8\u8B58\u7684\u9078\u9805 {0} \u7121\u6548.
+
+OPERAND_MISSING = \u9078\u9805 "{0}" \u907A\u6F0F\u904B\u7B97\u5143.
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Options.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Options.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Options.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -39,6 +39,8 @@
*/
public class Options {
+ public static final String DISABLE_XML_SECURITY = "-disableXmlSecurity";
+
// honor CLASSPATH environment variable, but it will be overrided by -cp
public String classpath = System.getenv("CLASSPATH");
@@ -46,6 +48,8 @@
public File episodeFile = null;
+ private boolean disableXmlSecurity = false;
+
// encoding is not required for JDK5, 6, but JDK 7 javac is much more strict - see issue 6859289
public String encoding = null;
@@ -85,6 +89,14 @@
return 1;
}
+ if (args[i].equals(DISABLE_XML_SECURITY)) {
+ if (i == args.length - 1)
+ throw new BadCommandLineException(
+ (Messages.OPERAND_MISSING.format(args[i])));
+ disableXmlSecurity = true;
+ return 1;
+ }
+
if (args[i].equals("-encoding")) {
if (i == args.length - 1)
throw new BadCommandLineException(
@@ -106,5 +118,13 @@
}
+ /**
+ * @return the disableXmlSecurity
+ */
+ public boolean isDisableXmlSecurity() {
+ return disableXmlSecurity;
+ }
+
+
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java Tue Apr 16 08:11:41 2013 -0700
@@ -27,15 +27,14 @@
package com.sun.tools.internal.jxc.ap;
+import com.sun.tools.internal.jxc.api.JXC;
import com.sun.tools.internal.xjc.api.J2SJAXBModel;
import com.sun.tools.internal.xjc.api.Reference;
-import com.sun.tools.internal.xjc.api.XJC;
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.Processor;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
@@ -66,7 +65,6 @@
* @author Kohsuke Kawaguchi
*/
@SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_6)
public class SchemaGenerator extends AbstractProcessor {
/**
@@ -96,7 +94,7 @@
// so that users won't have to manually exclude interfaces, which is silly.
filterClass(classes, roundEnv.getRootElements());
- J2SJAXBModel model = XJC.createJavaCompiler().bind(classes, Collections.emptyMap(), null, processingEnv);
+ J2SJAXBModel model = JXC.createJavaCompiler().bind(classes, Collections.emptyMap(), null, processingEnv);
if (model == null)
return false; // error
@@ -143,4 +141,12 @@
}
}
}
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ if (SourceVersion.latest().compareTo(SourceVersion.RELEASE_6) > 0)
+ return SourceVersion.valueOf("RELEASE_7");
+ else
+ return SourceVersion.RELEASE_6;
+ }
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SecureLoader.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SecureLoader.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SecureLoader.java Tue Apr 16 08:11:41 2013 -0700
@@ -37,9 +37,9 @@
if (System.getSecurityManager() == null) {
return Thread.currentThread().getContextClassLoader();
} else {
- return (ClassLoader) java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public java.lang.Object run() {
+ return java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction() {
+ public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
});
@@ -50,9 +50,9 @@
if (System.getSecurityManager() == null) {
return c.getClassLoader();
} else {
- return (ClassLoader) java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public java.lang.Object run() {
+ return java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction() {
+ public ClassLoader run() {
return c.getClassLoader();
}
});
@@ -63,9 +63,9 @@
if (System.getSecurityManager() == null) {
return ClassLoader.getSystemClassLoader();
} else {
- return (ClassLoader) java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public java.lang.Object run() {
+ return java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction() {
+ public ClassLoader run() {
return ClassLoader.getSystemClassLoader();
}
});
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/api/JXC.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/JXC.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2005, 2010, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.internal.jxc.api;
+
+import com.sun.tools.internal.xjc.api.JavaCompiler;
+import com.sun.tools.internal.jxc.api.impl.j2s.JavaCompilerImpl;
+
+/**
+ * User: Iaroslav Savytskyi
+ * Date: 25/05/12
+ */
+public class JXC {
+ /**
+ * Gets a fresh {@link JavaCompiler}.
+ *
+ * @return
+ * always return non-null object.
+ */
+ public static JavaCompiler createJavaCompiler() {
+ return new JavaCompilerImpl();
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/api/impl/j2s/JAXBModelImpl.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/impl/j2s/JAXBModelImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 1997, 2011, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.internal.jxc.api.impl.j2s;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.bind.SchemaOutputResolver;
+import javax.xml.bind.annotation.XmlList;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Result;
+
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+import com.sun.tools.internal.xjc.api.ErrorListener;
+import com.sun.tools.internal.xjc.api.J2SJAXBModel;
+import com.sun.tools.internal.xjc.api.Reference;
+import com.sun.xml.internal.bind.v2.model.annotation.AnnotationReader;
+import com.sun.xml.internal.bind.v2.model.core.ArrayInfo;
+import com.sun.xml.internal.bind.v2.model.core.ClassInfo;
+import com.sun.xml.internal.bind.v2.model.core.Element;
+import com.sun.xml.internal.bind.v2.model.core.ElementInfo;
+import com.sun.xml.internal.bind.v2.model.core.EnumLeafInfo;
+import com.sun.xml.internal.bind.v2.model.core.NonElement;
+import com.sun.xml.internal.bind.v2.model.core.Ref;
+import com.sun.xml.internal.bind.v2.model.core.TypeInfoSet;
+import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+import com.sun.xml.internal.bind.v2.schemagen.XmlSchemaGenerator;
+import com.sun.xml.internal.txw2.output.ResultFactory;
+
+/**
+ * @author Kohsuke Kawaguchi (kk@kohsuke.org)
+ */
+final class JAXBModelImpl implements J2SJAXBModel {
+
+ private final Map additionalElementDecls;
+
+ private final List classList = new ArrayList();
+
+ private final TypeInfoSet types;
+
+ private final AnnotationReader reader;
+
+ /**
+ * Lazily created schema generator.
+ */
+ private XmlSchemaGenerator xsdgen;
+
+ /**
+ * Look up table from an externally visible {@link Reference} object
+ * to our internal format.
+ */
+ private final Map> refMap = new HashMap>();
+
+ public JAXBModelImpl(TypeInfoSet types,
+ AnnotationReader reader,
+ Collection rootClasses,
+ Map additionalElementDecls) {
+ this.types = types;
+ this.reader = reader;
+ this.additionalElementDecls = additionalElementDecls;
+
+ Navigator navigator = types.getNavigator();
+
+ for (ClassInfo i : types.beans().values()) {
+ classList.add(i.getName());
+ }
+
+ for (ArrayInfo a : types.arrays().values()) {
+ String javaName = navigator.getTypeName(a.getType());
+ classList.add(javaName);
+ }
+
+ for (EnumLeafInfo l : types.enums().values()) {
+ QName tn = l.getTypeName();
+ if(tn!=null) {
+ String javaName = navigator.getTypeName(l.getType());
+ classList.add(javaName);
+ }
+ }
+
+ for (Reference ref : rootClasses)
+ refMap.put(ref,getXmlType(ref));
+
+ // check for collision between "additional" ones and the ones given to JAXB
+ // and eliminate duplication
+ Iterator> itr = additionalElementDecls.entrySet().iterator();
+ while(itr.hasNext()) {
+ Map.Entry entry = itr.next();
+ if(entry.getValue()==null) continue;
+
+ NonElement xt = getXmlType(entry.getValue());
+
+ assert xt!=null;
+ refMap.put(entry.getValue(),xt);
+ if(xt instanceof ClassInfo) {
+ ClassInfo xct = (ClassInfo) xt;
+ Element elem = xct.asElement();
+ if(elem!=null && elem.getElementName().equals(entry.getKey())) {
+ itr.remove();
+ continue;
+ }
+ }
+ ElementInfo ei = types.getElementInfo(null, entry.getKey());
+ if(ei!=null && ei.getContentType()==xt)
+ itr.remove();
+ }
+ }
+
+ public List getClassList() {
+ return classList;
+ }
+
+ public QName getXmlTypeName(Reference javaType) {
+ NonElement ti = refMap.get(javaType);
+
+ if(ti!=null)
+ return ti.getTypeName();
+
+ return null;
+ }
+
+ private NonElement getXmlType(Reference r) {
+ if(r==null)
+ throw new IllegalArgumentException();
+
+ XmlJavaTypeAdapter xjta = r.annotations.getAnnotation(XmlJavaTypeAdapter.class);
+ XmlList xl = r.annotations.getAnnotation(XmlList.class);
+
+ Ref ref = new Ref(
+ reader,types.getNavigator(),r.type,xjta,xl);
+
+ return types.getTypeInfo(ref);
+ }
+
+ public void generateSchema(SchemaOutputResolver outputResolver, ErrorListener errorListener) throws IOException {
+ getSchemaGenerator().write(outputResolver,errorListener);
+ }
+
+ public void generateEpisodeFile(Result output) {
+ getSchemaGenerator().writeEpisodeFile(ResultFactory.createSerializer(output));
+ }
+
+ private synchronized XmlSchemaGenerator getSchemaGenerator() {
+ if(xsdgen==null) {
+ xsdgen = new XmlSchemaGenerator(types.getNavigator(), types);
+
+ for (Map.Entry e : additionalElementDecls.entrySet()) {
+ Reference value = e.getValue();
+ if(value!=null) {
+ NonElement typeInfo = refMap.get(value);
+ if(typeInfo==null)
+ throw new IllegalArgumentException(e.getValue()+" was not specified to JavaCompiler.bind");
+ TypeMirror type = value.type;
+ xsdgen.add(e.getKey(), !(type != null && type.getKind().isPrimitive()), typeInfo);
+ } else {
+ xsdgen.add(e.getKey(),false,null);
+ }
+ }
+ }
+ return xsdgen;
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/api/impl/j2s/JavaCompilerImpl.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/impl/j2s/JavaCompilerImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 1997, 2011, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.internal.jxc.api.impl.j2s;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlList;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.annotation.processing.Messager;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+import javax.tools.Diagnostic;
+import com.sun.tools.internal.jxc.ap.InlineAnnotationReaderImpl;
+import com.sun.tools.internal.jxc.model.nav.ApNavigator;
+import com.sun.tools.internal.xjc.api.J2SJAXBModel;
+import com.sun.tools.internal.xjc.api.JavaCompiler;
+import com.sun.tools.internal.xjc.api.Reference;
+import com.sun.xml.internal.bind.v2.model.core.ErrorHandler;
+import com.sun.xml.internal.bind.v2.model.core.Ref;
+import com.sun.xml.internal.bind.v2.model.core.TypeInfoSet;
+import com.sun.xml.internal.bind.v2.model.impl.ModelBuilder;
+import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
+
+/**
+ * @author Kohsuke Kawaguchi (kk@kohsuke.org)
+ */
+public class JavaCompilerImpl implements JavaCompiler {
+ public J2SJAXBModel bind(
+ Collection rootClasses,
+ Map additionalElementDecls,
+ String defaultNamespaceRemap,
+ ProcessingEnvironment env) {
+
+ ModelBuilder builder =
+ new ModelBuilder(
+ InlineAnnotationReaderImpl.theInstance,
+ new ApNavigator(env),
+ Collections.emptyMap(),
+ defaultNamespaceRemap );
+
+ builder.setErrorHandler(new ErrorHandlerImpl(env.getMessager()));
+
+ for ( Reference ref : rootClasses ) {
+ TypeMirror t = ref.type;
+
+ XmlJavaTypeAdapter xjta = ref.annotations.getAnnotation(XmlJavaTypeAdapter.class);
+ XmlList xl = ref.annotations.getAnnotation(XmlList.class);
+
+ builder.getTypeInfo(new Ref(builder, t, xjta, xl));
+ }
+
+ TypeInfoSet r = builder.link();
+ if(r==null) return null;
+
+ if(additionalElementDecls==null)
+ additionalElementDecls = Collections.emptyMap();
+ else {
+ // fool proof check
+ for (Map.Entry e : additionalElementDecls.entrySet()) {
+ if(e.getKey()==null)
+ throw new IllegalArgumentException("nulls in additionalElementDecls");
+ }
+ }
+ return new JAXBModelImpl(r, builder.reader, rootClasses, new HashMap(additionalElementDecls));
+ }
+
+ private static final class ErrorHandlerImpl implements ErrorHandler {
+ private final Messager messager;
+
+ public ErrorHandlerImpl(Messager messager) {
+ this.messager = messager;
+ }
+
+ public void error(IllegalAnnotationException e) {
+ String error = e.toString();
+ messager.printMessage(Diagnostic.Kind.ERROR, error);
+ System.err.println(error); //TODO: temporary fix problem with no ouput from messager
+ }
+ }
+}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -78,29 +78,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 12:
- {
- if(($__uri.equals("") && $__local.equals("classes"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 11;
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 2:
- {
- if(($__uri.equals("") && $__local.equals("excludes"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 6;
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
case 0:
{
revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
@@ -123,6 +100,29 @@
}
}
break;
+ case 2:
+ {
+ if(($__uri.equals("") && $__local.equals("excludes"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ $_ngcc_current_state = 6;
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 12:
+ {
+ if(($__uri.equals("") && $__local.equals("classes"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ $_ngcc_current_state = 11;
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
default:
{
unexpectedEnterElement($__qname);
@@ -137,11 +137,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 3:
+ case 8:
{
- if(($__uri.equals("") && $__local.equals("excludes"))) {
+ if(($__uri.equals("") && $__local.equals("includes"))) {
$runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 1;
+ $_ngcc_current_state = 2;
}
else {
unexpectedLeaveElement($__qname);
@@ -159,12 +159,6 @@
}
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 0:
{
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
@@ -176,17 +170,23 @@
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 8:
+ case 3:
{
- if(($__uri.equals("") && $__local.equals("includes"))) {
+ if(($__uri.equals("") && $__local.equals("excludes"))) {
$runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 2;
+ $_ngcc_current_state = 1;
}
else {
unexpectedLeaveElement($__qname);
}
}
break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveElement($__qname);
@@ -201,12 +201,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 0:
{
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
@@ -218,6 +212,12 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -232,12 +232,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 0:
{
revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
@@ -249,6 +243,12 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -260,27 +260,14 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 6:
+ case 9:
{
- __text = $value;
- $_ngcc_current_state = 4;
- action1();
+ include_content = $value;
+ $_ngcc_current_state = 8;
+ action2();
}
break;
- case 3:
- {
- exclude_content = $value;
- $_ngcc_current_state = 3;
- action0();
- }
- break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 9:
+ case 8:
{
include_content = $value;
$_ngcc_current_state = 8;
@@ -299,6 +286,26 @@
action0();
}
break;
+ case 3:
+ {
+ exclude_content = $value;
+ $_ngcc_current_state = 3;
+ action0();
+ }
+ break;
+ case 6:
+ {
+ __text = $value;
+ $_ngcc_current_state = 4;
+ action1();
+ }
+ break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
case 10:
{
__text = $value;
@@ -306,13 +313,6 @@
action3();
}
break;
- case 8:
- {
- include_content = $value;
- $_ngcc_current_state = 8;
- action2();
- }
- break;
}
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -74,6 +74,22 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ if(($__uri.equals("") && $__local.equals("schema"))) {
+ NGCCHandler h = new Schema(this, super._source, $runtime, 31, baseDir);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
case 7:
{
if(($ai = $runtime.getAttributeIndex("","baseDir"))>=0) {
@@ -85,16 +101,11 @@
}
}
break;
- case 0:
+ case 8:
{
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 1:
- {
- if(($__uri.equals("") && $__local.equals("schema"))) {
- NGCCHandler h = new Schema(this, super._source, $runtime, 31, baseDir);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ if(($__uri.equals("") && $__local.equals("config"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ $_ngcc_current_state = 7;
}
else {
unexpectedEnterElement($__qname);
@@ -113,17 +124,6 @@
}
}
break;
- case 8:
- {
- if(($__uri.equals("") && $__local.equals("config"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 7;
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
case 4:
{
if(($__uri.equals("") && $__local.equals("classes"))) {
@@ -149,11 +149,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 7:
+ case 1:
{
- if(($ai = $runtime.getAttributeIndex("","baseDir"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("config"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
}
else {
unexpectedLeaveElement($__qname);
@@ -165,11 +165,11 @@
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
}
break;
- case 1:
+ case 7:
{
- if(($__uri.equals("") && $__local.equals("config"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
+ if(($ai = $runtime.getAttributeIndex("","baseDir"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
else {
unexpectedLeaveElement($__qname);
@@ -196,6 +196,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 7:
{
if(($__uri.equals("") && $__local.equals("baseDir"))) {
@@ -206,11 +211,6 @@
}
}
break;
- case 0:
- {
- revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
@@ -236,6 +236,12 @@
revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 5:
{
if(($__uri.equals("") && $__local.equals("baseDir"))) {
@@ -246,12 +252,6 @@
}
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -263,6 +263,18 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromText(this, super._cookie, $value);
+ }
+ break;
+ case 6:
+ {
+ bd = $value;
+ $_ngcc_current_state = 5;
+ action1();
+ }
+ break;
case 7:
{
if(($ai = $runtime.getAttributeIndex("","baseDir"))>=0) {
@@ -271,24 +283,12 @@
}
}
break;
- case 0:
- {
- revertToParentFromText(this, super._cookie, $value);
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
$runtime.sendText(super._cookie, $value);
}
break;
- case 6:
- {
- bd = $value;
- $_ngcc_current_state = 5;
- action1();
- }
- break;
}
}
@@ -301,6 +301,12 @@
$_ngcc_current_state = 1;
}
break;
+ case 34:
+ {
+ this.classes = ((Classes)result);
+ $_ngcc_current_state = 2;
+ }
+ break;
case 32:
{
this._schema = ((Schema)result);
@@ -308,12 +314,6 @@
$_ngcc_current_state = 1;
}
break;
- case 34:
- {
- this.classes = ((Classes)result);
- $_ngcc_current_state = 2;
- }
- break;
}
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -67,23 +67,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 6:
- {
- if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 2;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 0:
- {
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
case 2:
{
if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
@@ -107,6 +90,23 @@
}
}
break;
+ case 0:
+ {
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 6:
+ {
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
default:
{
unexpectedEnterElement($__qname);
@@ -121,23 +121,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 6:
- {
- if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 2;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 1:
{
if(($__uri.equals("") && $__local.equals("schema"))) {
@@ -161,6 +144,23 @@
}
}
break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 6:
+ {
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
default:
{
unexpectedLeaveElement($__qname);
@@ -175,13 +175,13 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 6:
+ case 2:
{
- if(($__uri.equals("") && $__local.equals("namespace"))) {
- $_ngcc_current_state = 8;
+ if(($__uri.equals("") && $__local.equals("location"))) {
+ $_ngcc_current_state = 4;
}
else {
- $_ngcc_current_state = 2;
+ $_ngcc_current_state = 1;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
}
@@ -191,13 +191,13 @@
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
- case 2:
+ case 6:
{
- if(($__uri.equals("") && $__local.equals("location"))) {
- $_ngcc_current_state = 4;
+ if(($__uri.equals("") && $__local.equals("namespace"))) {
+ $_ngcc_current_state = 8;
}
else {
- $_ngcc_current_state = 1;
+ $_ngcc_current_state = 2;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
}
@@ -216,6 +216,12 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 7:
{
if(($__uri.equals("") && $__local.equals("namespace"))) {
@@ -226,23 +232,6 @@
}
}
break;
- case 6:
- {
- $_ngcc_current_state = 2;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 0:
- {
- revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 3:
{
if(($__uri.equals("") && $__local.equals("location"))) {
@@ -253,6 +242,17 @@
}
}
break;
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 6:
+ {
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -264,14 +264,14 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 6:
+ case 2:
{
- if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendText(super._cookie, $value);
}
else {
- $_ngcc_current_state = 2;
+ $_ngcc_current_state = 1;
$runtime.sendText(super._cookie, $value);
}
}
@@ -283,25 +283,25 @@
action0();
}
break;
- case 0:
- {
- revertToParentFromText(this, super._cookie, $value);
- }
- break;
case 8:
{
namespace = $value;
$_ngcc_current_state = 7;
}
break;
- case 2:
+ case 0:
{
- if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
+ revertToParentFromText(this, super._cookie, $value);
+ }
+ break;
+ case 6:
+ {
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendText(super._cookie, $value);
}
else {
- $_ngcc_current_state = 1;
+ $_ngcc_current_state = 2;
$runtime.sendText(super._cookie, $value);
}
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java Tue Apr 16 08:11:41 2013 -0700
@@ -31,7 +31,6 @@
import com.sun.xml.internal.bind.v2.model.nav.Navigator;
import com.sun.xml.internal.bind.v2.runtime.Location;
-import java.lang.annotation.Annotation;
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.Element;
@@ -53,6 +52,7 @@
import javax.lang.model.util.Elements;
import javax.lang.model.util.SimpleTypeVisitor6;
import javax.lang.model.util.Types;
+import java.lang.annotation.Annotation;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -375,17 +375,17 @@
throw new IllegalStateException();
}
- @Override
+// @Override
public List getAnnotationMirrors() {
throw new IllegalStateException();
}
- @Override
+// @Override
public A getAnnotation(Class annotationType) {
throw new IllegalStateException();
}
- @Override
+// @Override
public A[] getAnnotationsByType(Class annotationType) {
throw new IllegalStateException();
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/Invoker.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/Invoker.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/Invoker.java Tue Apr 16 08:11:41 2013 -0700
@@ -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
@@ -55,6 +55,45 @@
* @author Kohsuke Kawaguchi
*/
public final class Invoker {
+
+ /**
+ * The list of package prefixes we want the
+ * {@link MaskingClassLoader} to prevent the parent
+ * classLoader from loading
+ */
+ static final String[] maskedPackages = new String[]{
+ "com.sun.istack.internal.tools.",
+ "com.sun.tools.internal.jxc.",
+ "com.sun.tools.internal.xjc.",
+ "com.sun.tools.internal.ws.",
+ "com.sun.codemodel.internal.",
+ "com.sun.relaxng.",
+ "com.sun.xml.internal.xsom.",
+ "com.sun.xml.internal.bind.",
+ "com.ctc.wstx.", //wsimport, wsgen ant task
+ "org.codehaus.stax2.", //wsimport, wsgen ant task
+ "com.sun.xml.internal.messaging.saaj.", //wsgen ant task
+ "com.sun.xml.internal.ws.",
+ "com.oracle.webservices.internal.api." //wsgen
+ };
+
+ /**
+ * Escape hatch to work around IBM JDK problem.
+ * See http://www-128.ibm.com/developerworks/forums/dw_thread.jsp?nav=false&forum=367&thread=164718&cat=10
+ */
+ public static final boolean noSystemProxies;
+
+ static {
+ boolean noSysProxiesProperty = false;
+ try {
+ noSysProxiesProperty = Boolean.getBoolean(Invoker.class.getName()+".noSystemProxies");
+ } catch(SecurityException e) {
+ // ignore
+ } finally {
+ noSystemProxies = noSysProxiesProperty;
+ }
+ }
+
static int invoke(String mainClass, String[] args) throws Throwable {
// use the platform default proxy if available.
// see sun.net.spi.DefaultProxySelector for details.
@@ -107,7 +146,7 @@
// finally load the rest of the RI. The actual class files are loaded from ancestors
cl = new ParallelWorldClassLoader(cl,"");
- }
+ }
}
@@ -194,29 +233,6 @@
}
/**
- * Creates a classloader for loading JAXB/WS 2.1 jar and tools.jar
- */
- private static URL[] findIstack21APIs(ClassLoader cl) throws ClassNotFoundException, MalformedURLException, ToolsJarNotFoundException {
- List urls = new ArrayList();
-
- if(Service.class.getClassLoader()==null) {
- // JAX-WS API is loaded from bootstrap classloader
- URL res = cl.getResource("javax/xml/ws/EndpointReference.class");
- if(res==null)
- throw new ClassNotFoundException("There's no JAX-WS 2.1 API in the classpath");
- urls.add(ParallelWorldClassLoader.toJarUrl(res));
-
- res = cl.getResource("javax/xml/bind/annotation/XmlSeeAlso.class");
- if(res==null)
- throw new ClassNotFoundException("There's no JAXB 2.1 API in the classpath");
- urls.add(ParallelWorldClassLoader.toJarUrl(res));
- }
-
- findToolsJar(cl, urls);
-
- return urls.toArray(new URL[urls.size()]);
- }
- /**
* Creates a classloader for loading JAXB/WS 2.2 jar and tools.jar
*/
private static URL[] findIstack22APIs(ClassLoader cl) throws ClassNotFoundException, IOException, ToolsJarNotFoundException {
@@ -258,37 +274,4 @@
}
}
- /**
- * The list of package prefixes we want the
- * {@link MaskingClassLoader} to prevent the parent
- * classLoader from loading
- */
- public static String[] maskedPackages = new String[]{
- "com.sun.istack.internal.tools.",
- "com.sun.tools.internal.jxc.",
- "com.sun.tools.internal.xjc.",
- "com.sun.tools.internal.ws.",
- "com.sun.codemodel.internal.",
- "com.sun.relaxng.",
- "com.sun.xml.internal.xsom.",
- "com.sun.xml.internal.bind.",
- "com.ctc.wstx.", //wsimport, wsgen ant task
- "org.codehaus.stax2.", //wsimport, wsgen ant task
- "com.sun.xml.internal.messaging.saaj.", //wsgen ant task
- "com.sun.xml.internal.ws."
- };
-
- /**
- * Escape hatch to work around IBM JDK problem.
- * See http://www-128.ibm.com/developerworks/forums/dw_thread.jsp?nav=false&forum=367&thread=164718&cat=10
- */
- public static boolean noSystemProxies = false;
-
- static {
- try {
- noSystemProxies = Boolean.getBoolean(Invoker.class.getName()+".noSystemProxies");
- } catch(SecurityException e) {
- // ignore
- }
- }
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/ToolVersion.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/ToolVersion.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/ToolVersion.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/WsGen.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/WsGen.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/WsGen.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/WsImport.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/WsImport.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/WsImport.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenExtension.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenExtension.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenExtension.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenProtocol.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenProtocol.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenProtocol.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2012, 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
@@ -41,13 +41,13 @@
public @interface WsgenProtocol {
/**
* Token for wsgen -wsdl[:protocol]
- * @return
+ * @return Token for wsgen -wsdl[:protocol]
*/
String token();
/**
* The corresponding lexical string used to create BindingID
- * @return
+ * @return lexical string used to create BindingID
*/
String lexical();
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/package-info.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/package-info.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/package-info.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/ProcessorException.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/ProcessorException.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/ProcessorException.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -60,11 +60,11 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import javax.annotation.processing.Filer;
+import javax.tools.FileObject;
-/**
- *
- * @author WS Development Team
- */
+import javax.tools.StandardLocation;
+
public abstract class GeneratorBase implements ModelVisitor {
private File destDir;
private String targetVersion;
@@ -96,28 +96,33 @@
}
}
+ @Override
public void visit(Model model) throws Exception {
for (Service service : model.getServices()) {
service.accept(this);
}
}
+ @Override
public void visit(Service service) throws Exception {
for (Port port : service.getPorts()) {
port.accept(this);
}
}
+ @Override
public void visit(Port port) throws Exception {
for (Operation operation : port.getOperations()) {
operation.accept(this);
}
}
+ @Override
public void visit(Operation operation) throws Exception {
operation.getRequest().accept(this);
- if (operation.getResponse() != null)
+ if (operation.getResponse() != null) {
operation.getResponse().accept(this);
+ }
Iterator faults = operation.getFaultsSet().iterator();
if (faults != null) {
Fault fault;
@@ -128,21 +133,20 @@
}
}
- public void visit(Parameter param) throws Exception {
- }
+ @Override
+ public void visit(Parameter param) throws Exception {}
- public void visit(Block block) throws Exception {
- }
+ @Override
+ public void visit(Block block) throws Exception {}
- public void visit(Response response) throws Exception {
- }
-
+ @Override
+ public void visit(Response response) throws Exception {}
- public void visit(Request request) throws Exception {
- }
+ @Override
+ public void visit(Request request) throws Exception {}
- public void visit(Fault fault) throws Exception {
- }
+ @Override
+ public void visit(Fault fault) throws Exception {}
public List getJAXWSClassComment(){
return getJAXWSClassComment(targetVersion);
@@ -162,8 +166,9 @@
cls = cm._class(className, type);
} catch (JClassAlreadyExistsException e){
cls = cm._getClass(className);
- if(cls == null)
+ if (cls == null) {
throw e;
+ }
}
return cls;
}
@@ -181,8 +186,9 @@
protected void writeHandlerConfig(String className, JDefinedClass cls, WsimportOptions options) {
Element e = options.getHandlerChainConfiguration();
- if(e == null)
+ if (e == null) {
return;
+ }
JAnnotationUse handlerChainAnn = cls.annotate(cm.ref(HandlerChain.class));
NodeList nl = e.getElementsByTagNameNS(
"http://java.sun.com/xml/ns/javaee", "handler-chain");
@@ -199,17 +205,25 @@
}
private void generateHandlerChainFile(Element hChains, String name) {
- String hcName = getHandlerConfigFileName(name);
- File packageDir = DirectoryUtil.getOutputDirectoryFor(name, destDir);
- File hcFile = new File(packageDir, hcName);
-
- options.addGeneratedFile(hcFile);
+ Filer filer = options.filer;
try {
- IndentingWriter p =
- new IndentingWriter(
- new OutputStreamWriter(new FileOutputStream(hcFile)));
+ IndentingWriter p;
+ FileObject jfo;
+ if (filer != null) {
+ jfo = filer.createResource(StandardLocation.SOURCE_OUTPUT,
+ Names.getPackageName(name), getHandlerConfigFileName(name));
+ options.addGeneratedFile(new File(jfo.toUri()));
+ p = new IndentingWriter(new OutputStreamWriter(jfo.openOutputStream()));
+ } else { // leave for backw. compatibility now
+ String hcName = getHandlerConfigFileName(name);
+ File packageDir = DirectoryUtil.getOutputDirectoryFor(name, destDir);
+ File hcFile = new File(packageDir, hcName);
+ options.addGeneratedFile(hcFile);
+ p = new IndentingWriter(new OutputStreamWriter(new FileOutputStream(hcFile)));
+ }
+
Transformer it = XmlUtil.newTransformer();
it.setOutputProperty(OutputKeys.METHOD, "xml");
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -62,7 +62,7 @@
/**
* Allow additional wsimport options
- * @param name, for instance, "-neoption"
+ * @param name for instance, "-neoption"
* @return whether the name specifies an option recognized by the extension
*/
public boolean validateOption(String name) {
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java Tue Apr 16 08:11:41 2013 -0700
@@ -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
@@ -50,6 +50,7 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
import java.io.File;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -84,12 +85,12 @@
jwsImplGenerator.init(model, options, receiver);
jwsImplGenerator.doGeneration();
// print a warning message while implFiles.size() is zero
- if (jwsImplGenerator.implFiles.size() == 0) {
- StringBuffer msg = new StringBuffer();
+ if (jwsImplGenerator.implFiles.isEmpty()) {
+ StringBuilder msg = new StringBuilder();
if (options.implServiceName != null)
- msg.append("serviceName=[" + options.implServiceName + "] ");
+ msg.append("serviceName=[").append(options.implServiceName).append("] ");
if (options.implPortName != null)
- msg.append("portName=[" + options.implPortName + "] ");
+ msg.append("portName=[").append(options.implPortName).append("] ");
if (msg.length() > 0)
msg.append(", Not found in wsdl file.\n");
@@ -107,7 +108,7 @@
public static boolean moveToImplDestDir(List gImplFiles,
WsimportOptions options, ErrorReceiver receiver) {
if (options.implDestDir == null || gImplFiles == null
- || gImplFiles.size() == 0)
+ || gImplFiles.isEmpty())
return true;
List generatedImplFiles = ImplFile.toImplFiles(gImplFiles);
@@ -335,24 +336,29 @@
webServiceAnn.param("wsdlLocation", wsdlLocation);
webServiceAnn.param("endpointInterface", port.getJavaInterface().getName());
}
+
//CR373098 To transform the java class name as validate.
- private String transToValidJavaIdentifier(String s) {
- if (s == null) return null;
- final int len = s.length();
- StringBuffer retSB = new StringBuffer();
- if (len == 0 || !Character.isJavaIdentifierStart(s.charAt(0)))
- retSB.append("J"); //update to a default start char
- else
- retSB.append(s.charAt(0));
+ private String transToValidJavaIdentifier(String s) {
+ if (s == null) {
+ return null;
+ }
+ final int len = s.length();
+ StringBuilder retSB = new StringBuilder();
+ if (len == 0 || !Character.isJavaIdentifierStart(s.charAt(0))) {
+ retSB.append("J"); //update to a default start char
+ } else {
+ retSB.append(s.charAt(0));
+ }
- for (int i = 1; i < len; i++) {
- if (!Character.isJavaIdentifierPart(s.charAt(i)))
- ; //delete it if it is illegal //TODO: It might conflict "a-b" vs. "ab"
- else
- retSB.append(s.charAt(i));
- }
- return retSB.toString();
- }
+ for (int i = 1; i < len; i++) {
+ if (!Character.isJavaIdentifierPart(s.charAt(i)))
+ ; //delete it if it is illegal //TODO: It might conflict "a-b" vs. "ab"
+ else {
+ retSB.append(s.charAt(i));
+ }
+ }
+ return retSB.toString();
+ }
private String makePackageQualified(String s) {
s = transToValidJavaIdentifier(s);
@@ -446,21 +452,20 @@
}
}
- // process the bindings in backup list of model
+ // process the bindings in whole document
if (value == null) {
- // TODO: The property "BAKEUP_BINDINGS" is set in WsdlModeler when init
- // the model
- // make this as a const if needed.
- HashMap hm = (HashMap) model.getProperty("BAKEUP_BINDINGS");
- Binding b = (Binding) hm.get(bName);
- if (b != null) {
+ if (model.getEntity() instanceof Definitions) {
+ Definitions definitions = (Definitions) model.getEntity();
+ Binding b = (Binding) definitions.resolveBindings().get(bName);
+ if (b != null) {
List bindextends = (List) b
.extensions();
for (TWSDLExtension wsdlext : bindextends) {
- value = resolveBindingValue(wsdlext);
- if (value != null)
- break;
+ value = resolveBindingValue(wsdlext);
+ if (value != null)
+ break;
}
+ }
}
}
@@ -478,14 +483,14 @@
* retrieved from WSDL
* @return Standard BindingType URI defined by JAX-WS 2.0 specification.
*/
- private String translate(String transportURI)
- {
- String translatedBindingId = TRANSLATION_MAP.get(transportURI);
- if (translatedBindingId == null)
- translatedBindingId = transportURI;
-
- return translatedBindingId;
- }
+// private String translate(String transportURI)
+// {
+// String translatedBindingId = TRANSLATION_MAP.get(transportURI);
+// if (translatedBindingId == null)
+// translatedBindingId = transportURI;
+//
+// return translatedBindingId;
+// }
/*****************************************************************************
* Inner classes definition
@@ -529,7 +534,10 @@
ret = options.implDestDir;
}
- ret.mkdirs();
+ boolean created = ret.mkdirs();
+ if (options.verbose && !created) {
+ System.out.println(MessageFormat.format("Directory not created: {0}", ret));
+ }
return ret;
}
@@ -549,7 +557,7 @@
private static File findFile(WsimportOptions options, String qualifiedFileName)
throws java.io.IOException {
- String baseDir = options.destDir.getCanonicalPath();
+ String baseDir = options.sourceDir.getCanonicalPath();
String fp = null;
for (File f : options.getGeneratedFiles()) {
fp = getQualifiedFileName(baseDir, f);
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/Names.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/Names.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/Names.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -36,10 +36,8 @@
import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
import com.sun.tools.internal.ws.wscompile.Options;
import com.sun.tools.internal.ws.wscompile.WsimportOptions;
-import com.sun.tools.internal.ws.wscompile.AbortException;
import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
import com.sun.tools.internal.ws.wsdl.document.PortType;
-import com.sun.tools.internal.ws.wsdl.document.Kinds;
import com.sun.tools.internal.ws.resources.GeneratorMessages;
import javax.jws.WebMethod;
@@ -55,7 +53,6 @@
import org.xml.sax.Locator;
public class SeiGenerator extends GeneratorBase {
- private String serviceNS;
private TJavaGeneratorExtension extension;
private List extensionHandlers;
@@ -76,10 +73,11 @@
register(new W3CAddressingJavaGeneratorExtension());
}
- for (TJavaGeneratorExtension j : extensions)
+ for (TJavaGeneratorExtension j : extensions) {
register(j);
+ }
- this.extension = new JavaGeneratorExtensionFacade(extensionHandlers.toArray(new TJavaGeneratorExtension[0]));
+ this.extension = new JavaGeneratorExtensionFacade(extensionHandlers.toArray(new TJavaGeneratorExtension[extensionHandlers.size()]));
}
private void write(Port port) {
@@ -92,7 +90,7 @@
}
- JDefinedClass cls = null;
+ JDefinedClass cls;
try {
cls = getClass(className, ClassType.INTERFACE);
} catch (JClassAlreadyExistsException e) {
@@ -102,16 +100,18 @@
Locator loc = null;
if(portTypeName != null){
PortType pt = port.portTypes.get(portTypeName);
- if(pt!=null)
+ if (pt!=null) {
loc = pt.getLocator();
+ }
}
receiver.error(loc, GeneratorMessages.GENERATOR_SEI_CLASS_ALREADY_EXIST(intf.getName(), portTypeName));
return;
}
// If the class has methods it has already been defined
// so skip it.
- if (!cls.methods().isEmpty())
+ if (!cls.methods().isEmpty()) {
return;
+ }
//write class comment - JAXWS warning
JDocComment comment = cls.javadoc();
@@ -138,8 +138,9 @@
writeSOAPBinding(port, cls);
//@XmlSeeAlso
- if(options.target.isLaterThan(Options.Target.V2_1))
+ if (options.target.isLaterThan(Options.Target.V2_1)) {
writeXmlSeeAlso(cls);
+ }
for (Operation operation: port.getOperations()) {
JavaMethod method = operation.getJavaMethod();
@@ -159,8 +160,9 @@
JCommentPart ret = methodDoc.addReturn();
ret.add("returns "+retType.getName());
}
- if(methodJavaDoc != null)
+ if (methodJavaDoc != null) {
methodDoc.add(methodJavaDoc);
+ }
writeWebMethod(operation, m);
JClass holder = cm.ref(Holder.class);
@@ -196,8 +198,9 @@
List objectFactories = model.getJAXBModel().getS2JJAXBModel().getAllObjectFactories();
//if there are no object facotires, dont generate @XmlSeeAlso
- if(objectFactories.size() == 0)
+ if (objectFactories.isEmpty()) {
return;
+ }
JAnnotationUse xmlSeeAlso = cls.annotate(cm.ref(XmlSeeAlso.class));
JAnnotationArrayMember paramArray = xmlSeeAlso.paramArray("value");
@@ -261,21 +264,24 @@
wr = m.annotate(javax.jws.WebResult.class);
wr.param("name", resultName);
}
- if((nsURI != null) && (!nsURI.equals(serviceNS) || (isDocStyle && operation.isWrapped()))){
- if(wr == null)
+ if (nsURI != null || (isDocStyle && operation.isWrapped())) {
+ if(wr == null) {
wr = m.annotate(javax.jws.WebResult.class);
+ }
wr.param("targetNamespace", nsURI);
}
//doclit wrapped could have additional headers
if(!(isDocStyle && operation.isWrapped()) ||
(parameter.getBlock().getLocation() == Block.HEADER)){
- if(wr == null)
+ if (wr == null) {
wr = m.annotate(javax.jws.WebResult.class);
+ }
wr.param("partName", parameter.getName());
}
if(parameter.getBlock().getLocation() == Block.HEADER){
- if(wr == null)
+ if (wr == null) {
wr = m.annotate(javax.jws.WebResult.class);
+ }
wr.param("header",true);
}
}
@@ -318,34 +324,43 @@
}
private boolean isHeaderParam(Parameter param, Message message) {
- if (message.getHeaderBlockCount() == 0)
+ if (message.getHeaderBlockCount() == 0) {
return false;
+ }
- for (Block headerBlock : message.getHeaderBlocksMap().values())
- if (param.getBlock().equals(headerBlock))
+ for (Block headerBlock : message.getHeaderBlocksMap().values()) {
+ if (param.getBlock().equals(headerBlock)) {
return true;
+ }
+ }
return false;
}
private boolean isAttachmentParam(Parameter param, Message message){
- if (message.getAttachmentBlockCount() == 0)
+ if (message.getAttachmentBlockCount() == 0) {
return false;
+ }
- for (Block attBlock : message.getAttachmentBlocksMap().values())
- if (param.getBlock().equals(attBlock))
+ for (Block attBlock : message.getAttachmentBlocksMap().values()) {
+ if (param.getBlock().equals(attBlock)) {
return true;
+ }
+ }
return false;
}
private boolean isUnboundParam(Parameter param, Message message){
- if (message.getUnboundBlocksCount() == 0)
+ if (message.getUnboundBlocksCount() == 0) {
return false;
+ }
- for (Block unboundBlock : message.getUnboundBlocksMap().values())
- if (param.getBlock().equals(unboundBlock))
+ for (Block unboundBlock : message.getUnboundBlocksMap().values()) {
+ if (param.getBlock().equals(unboundBlock)) {
return true;
+ }
+ }
return false;
}
@@ -361,10 +376,11 @@
String name;
boolean isWrapped = operation.isWrapped();
- if((param.getBlock().getLocation() == Block.HEADER) || (isDocStyle && !isWrapped))
+ if ((param.getBlock().getLocation() == Block.HEADER) || (isDocStyle && !isWrapped)) {
name = param.getBlock().getName().getLocalPart();
- else
+ } else {
name = param.getName();
+ }
paramAnno.param("name", name);
@@ -379,8 +395,9 @@
ns = param.getBlock().getName().getNamespaceURI();
}
- if((ns != null) && (!ns.equals(serviceNS) || (isDocStyle && isWrapped)))
+ if (ns != null || (isDocStyle && isWrapped)) {
paramAnno.param("targetNamespace", ns);
+ }
if (header) {
paramAnno.param("header", true);
@@ -394,8 +411,9 @@
}
//doclit wrapped could have additional headers
- if(!(isDocStyle && isWrapped) || header)
+ if (!(isDocStyle && isWrapped) || header) {
paramAnno.param("partName", javaParameter.getParameter().getName());
+ }
}
private boolean isDocStyle = true;
@@ -418,15 +436,18 @@
continue;
}
sameParamStyle = (isWrapper == operation.isWrapped());
- if(!sameParamStyle)
+ if (!sameParamStyle) {
break;
+ }
}
- if(sameParamStyle)
+ if (sameParamStyle) {
port.setWrapped(isWrapper);
+ }
}
if(sameParamStyle && !port.isWrapped()){
- if(soapBindingAnn == null)
+ if (soapBindingAnn == null) {
soapBindingAnn = cls.annotate(SOAPBinding.class);
+ }
soapBindingAnn.param("parameterStyle", SOAPBinding.ParameterStyle.BARE);
}
}
@@ -437,15 +458,14 @@
wsa.param("targetNamespace", name.getNamespaceURI());
}
-
-
-
+ @Override
public void visit(Model model) throws Exception {
for(Service s:model.getServices()){
s.accept(this);
}
}
+ @Override
public void visit(Service service) throws Exception {
String jd = model.getJavaDoc();
if(jd != null){
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -66,6 +66,7 @@
import java.net.URL;
import com.sun.xml.internal.ws.util.ServiceFinder;
+import java.util.Locale;
/**
* @author WS Development Team
@@ -100,7 +101,7 @@
}
cls._extends(javax.xml.ws.Service.class);
- String serviceFieldName = BindingHelper.mangleNameToClassName(service.getName().getLocalPart()).toUpperCase();
+ String serviceFieldName = BindingHelper.mangleNameToClassName(service.getName().getLocalPart()).toUpperCase(Locale.ENGLISH);
String wsdlLocationName = serviceFieldName + "_WSDL_LOCATION";
JFieldVar urlField = cls.field(JMod.PRIVATE | JMod.STATIC | JMod.FINAL, URL.class, wsdlLocationName);
@@ -219,8 +220,9 @@
Locator loc = null;
if (portTypeName != null) {
PortType pt = port.portTypes.get(portTypeName);
- if (pt != null)
+ if (pt != null) {
loc = pt.getLocator();
+ }
}
receiver.error(loc, GeneratorMessages.GENERATOR_SEI_CLASS_ALREADY_EXIST(port.getJavaInterface().getName(), portTypeName));
return;
@@ -230,8 +232,9 @@
writeDefaultGetPort(port, retType, cls);
//write getXyzPort(WebServicesFeature...)
- if (options.target.isLaterThan(Options.Target.V2_1))
+ if (options.target.isLaterThan(Options.Target.V2_1)) {
writeGetPort(port, retType, cls);
+ }
}
writeGetWsdlLocation(cm.ref(URL.class), cls, urlField, exField);
@@ -240,8 +243,9 @@
private void writeGetPort(Port port, JType retType, JDefinedClass cls) {
JMethod m = cls.method(JMod.PUBLIC, retType, port.getPortGetter());
JDocComment methodDoc = m.javadoc();
- if (port.getJavaDoc() != null)
+ if (port.getJavaDoc() != null) {
methodDoc.add(port.getJavaDoc());
+ }
JCommentPart ret = methodDoc.addReturn();
JCommentPart paramDoc = methodDoc.addParam("features");
paramDoc.append("A list of ");
@@ -250,7 +254,7 @@
ret.add("returns " + retType.name());
m.varParam(WebServiceFeature.class, "features");
JBlock body = m.body();
- StringBuffer statement = new StringBuffer("return ");
+ StringBuilder statement = new StringBuilder("return ");
statement.append("super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
statement.append(retType.name());
statement.append(".class, features);");
@@ -389,12 +393,13 @@
String portGetter = port.getPortGetter();
JMethod m = cls.method(JMod.PUBLIC, retType, portGetter);
JDocComment methodDoc = m.javadoc();
- if (port.getJavaDoc() != null)
+ if (port.getJavaDoc() != null) {
methodDoc.add(port.getJavaDoc());
+ }
JCommentPart ret = methodDoc.addReturn();
ret.add("returns " + retType.name());
JBlock body = m.body();
- StringBuffer statement = new StringBuffer("return ");
+ StringBuilder statement = new StringBuilder("return ");
statement.append("super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
statement.append(retType.name());
statement.append(".class);");
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AbstractType.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AbstractType.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AbstractType.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Block.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Block.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Block.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Fault.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Fault.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Fault.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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,7 +26,6 @@
package com.sun.tools.internal.ws.processor.model;
import com.sun.codemodel.internal.JClass;
-import com.sun.tools.internal.ws.processor.generator.GeneratorUtil;
import com.sun.tools.internal.ws.processor.model.java.JavaException;
import com.sun.tools.internal.ws.wsdl.framework.Entity;
@@ -34,7 +33,6 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import java.util.TreeSet;
/**
*
@@ -49,7 +47,6 @@
public Fault(String name, Entity entity) {
super(entity);
this.name = name;
- parentFault = null;
}
public String getName() {
@@ -80,12 +77,8 @@
visitor.visit(this);
}
- public Fault getParentFault() {
- return parentFault;
- }
-
public Iterator getSubfaults() {
- if (subfaults.size() == 0) {
+ if (subfaults.isEmpty()) {
return null;
}
return subfaults.iterator();
@@ -103,7 +96,7 @@
public Iterator getAllFaults() {
Set allFaults = getAllFaultsSet();
- if (allFaults.size() == 0) {
+ if (allFaults.isEmpty()) {
return null;
}
return allFaults.iterator();
@@ -160,7 +153,6 @@
private String name;
private Block block;
private JavaException javaException;
- private Fault parentFault;
private Set subfaults = new HashSet();
private QName elementName = null;
private String javaMemberName = null;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Model.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Model.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Model.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelException.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelException.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelException.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -25,8 +25,8 @@
package com.sun.tools.internal.ws.processor.model;
+import com.sun.istack.internal.localization.Localizable;
import com.sun.tools.internal.ws.processor.ProcessorException;
-import com.sun.xml.internal.ws.util.localization.Localizable;
/**
* ModelException represents an exception that occurred while
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelObject.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelObject.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelObject.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Operation.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Operation.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Operation.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Parameter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Parameter.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Parameter.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Port.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Port.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Port.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Request.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Request.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Request.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Response.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Response.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Response.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Service.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Service.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Service.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -86,14 +86,14 @@
public void addParameter(JavaParameter param) {
// verify that this member does not already exist
if (hasParameter(param.getName())) {
- if(options.isExtensionMode()){
+ if (options.isExtensionMode()) {
param.setName(getUniqueName(param.getName()));
- }else{
+ } else {
Parameter duplicParam = getParameter(param.getName());
if(param.getParameter().isEmbedded()){
errorReceiver.error(param.getParameter().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE_WRAPPER(param.getName(), param.getParameter().getEntityName()));
errorReceiver.error(duplicParam.getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE_WRAPPER(param.getName(), duplicParam.getEntityName()));
- }else{
+ } else {
errorReceiver.error(param.getParameter().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), param.getParameter().getEntityName()));
errorReceiver.error(duplicParam.getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), duplicParam.getEntityName()));
}
@@ -121,7 +121,7 @@
private String getUniqueName(String param){
int parmNum = 0;
- while(hasParameter(param)){
+ while (hasParameter(param)) {
param = param + Integer.toString(parmNum++);
}
return param;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -25,8 +25,8 @@
package com.sun.tools.internal.ws.processor.modeler;
+import com.sun.istack.internal.localization.Localizable;
import com.sun.tools.internal.ws.processor.ProcessorException;
-import com.sun.xml.internal.ws.util.localization.Localizable;
/**
* ModelerException represents an exception that occurred while
@@ -38,6 +38,10 @@
*/
public class ModelerException extends ProcessorException {
+ public ModelerException(String key) {
+ super(key);
+ }
+
public ModelerException(String key, Object... args) {
super(key, args);
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -57,7 +57,7 @@
public SeiContext getSeiContext(Name seiName) {
SeiContext context = seiContextMap.get(seiName);
if (context == null) {
- context = new SeiContext(seiName);
+ context = new SeiContext();
addSeiContext(seiName, context);
}
return context;
@@ -107,14 +107,17 @@
private Map resOperationWrapperMap = new HashMap();
private Map exceptionBeanMap = new HashMap();
- private Name seiName;
private Name seiImplName;
private boolean implementsSei;
private String namespaceUri;
- public SeiContext(Name seiName) {
- this.seiName = seiName;
- }
+ public SeiContext() {};
+
+ /**
+ * @deprecated use empty constructor, seiName value is ignored
+ * @param seiName
+ */
+ public SeiContext(Name seiName) {};
public void setImplementsSei(boolean implementsSei) {
this.implementsSei = implementsSei;
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -31,7 +31,7 @@
import java.util.List;
/**
- *
+ * Note: this class has a natural ordering that is inconsistent with equals.
* @author WS Development Team
*/
final class MemberInfo implements Comparable {
@@ -57,7 +57,23 @@
return paramName;
}
+ @Override
public int compareTo(MemberInfo member) {
return paramName.compareTo(member.paramName);
}
+
+ @Override
+ public boolean equals(Object o) {
+ return super.equals(o);
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 5;
+ hash = 47 * hash + (this.paramType != null ? this.paramType.hashCode() : 0);
+ hash = 47 * hash + (this.paramName != null ? this.paramName.hashCode() : 0);
+ hash = 47 * hash + (this.jaxbAnnotations != null ? this.jaxbAnnotations.hashCode() : 0);
+ return hash;
+ }
+
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -63,8 +63,9 @@
retClass = getDeclaringClassMethod(superClass, methodName, args);
}
if (retClass == null) {
- for (TypeMirror interfaceType : theClass.getInterfaces())
+ for (TypeMirror interfaceType : theClass.getInterfaces()) {
retClass = getDeclaringClassMethod(interfaceType, methodName, args);
+ }
}
if (retClass == null) {
Collection methods = ElementFilter.methodsIn(theClass.getEnclosedElements());
@@ -105,7 +106,7 @@
Collection argTypes = ((DeclaredType) type).getTypeArguments();
if (argTypes.size() == 1) {
return argTypes.iterator().next();
- } else if (argTypes.size() == 0) {
+ } else if (argTypes.isEmpty()) {
VariableElement member = getValueMember(typeElement);
if (member != null) {
return member.asType();
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,6 +25,7 @@
package com.sun.tools.internal.ws.processor.modeler.annotation;
+import com.sun.istack.internal.logging.Logger;
import com.sun.tools.internal.ws.processor.generator.GeneratorUtil;
import com.sun.tools.internal.ws.processor.modeler.ModelerException;
import com.sun.tools.internal.ws.resources.WebserviceapMessages;
@@ -36,7 +37,6 @@
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.annotation.processing.SupportedOptions;
-import javax.annotation.processing.SupportedSourceVersion;
import javax.jws.WebService;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
@@ -51,12 +51,15 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
+import java.lang.reflect.Method;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
+import java.util.Scanner;
import java.util.Set;
+import java.util.logging.Level;
/**
* WebServiceAp is a AnnotationProcessor for processing javax.jws.* and
@@ -87,9 +90,10 @@
"javax.xml.ws.WebServiceRef"
})
@SupportedOptions({WebServiceAp.DO_NOT_OVERWRITE, WebServiceAp.IGNORE_NO_WEB_SERVICE_FOUND_WARNING})
-@SupportedSourceVersion(SourceVersion.RELEASE_6)
public class WebServiceAp extends AbstractProcessor implements ModelBuilder {
+ private static final Logger LOGGER = Logger.getLogger(WebServiceAp.class);
+
public static final String DO_NOT_OVERWRITE = "doNotOverWrite";
public static final String IGNORE_NO_WEB_SERVICE_FOUND_WARNING = "ignoreNoWebServiceFoundWarning";
@@ -120,7 +124,7 @@
}
@Override
- public void init(ProcessingEnvironment processingEnv) {
+ public synchronized void init(ProcessingEnvironment processingEnv) {
super.init(processingEnv);
remoteElement = processingEnv.getElementUtils().getTypeElement(Remote.class.getName());
remoteExceptionElement = processingEnv.getElementUtils().getTypeElement(RemoteException.class.getName()).asType();
@@ -135,18 +139,67 @@
doNotOverWrite = getOption(DO_NOT_OVERWRITE);
ignoreNoWebServiceFoundWarning = getOption(IGNORE_NO_WEB_SERVICE_FOUND_WARNING);
- String property = System.getProperty("sun.java.command"); // todo: check if property can be null
- options.verbose = property != null && property.contains("-verbose");
- // todo: check how to get -s and -d, -classpath options
- String classDir = ".";
- sourceDir = new File(classDir);
- property = System.getProperty("java.class.path");
+ String classDir = parseArguments();
+ String property = System.getProperty("java.class.path");
options.classpath = classDir + File.pathSeparator + (property != null ? property : "");
isCommandLineInvocation = true;
}
options.filer = processingEnv.getFiler();
}
+ private String parseArguments() {
+ // let's try to parse JavacOptions
+
+ String classDir = null;
+ try {
+ ClassLoader cl = WebServiceAp.class.getClassLoader();
+ Class javacProcessingEnvironmentClass = Class.forName("com.sun.tools.javac.processing.JavacProcessingEnvironment", false, cl);
+ if (javacProcessingEnvironmentClass.isInstance(processingEnv)) {
+ Method getContextMethod = javacProcessingEnvironmentClass.getDeclaredMethod("getContext");
+ Object tmpContext = getContextMethod.invoke(processingEnv);
+ Class optionsClass = Class.forName("com.sun.tools.javac.util.Options", false, cl);
+ Class contextClass = Class.forName("com.sun.tools.javac.util.Context", false, cl);
+ Method instanceMethod = optionsClass.getDeclaredMethod("instance", new Class[]{contextClass});
+ Object tmpOptions = instanceMethod.invoke(null, tmpContext);
+ if (tmpOptions != null) {
+ Method getMethod = optionsClass.getDeclaredMethod("get", new Class[]{String.class});
+ Object result = getMethod.invoke(tmpOptions, "-s"); // todo: we have to check for -d also
+ if (result != null) {
+ classDir = (String) result;
+ }
+ this.options.verbose = getMethod.invoke(tmpOptions, "-verbose") != null;
+ }
+ }
+ } catch (Exception e) {
+ /// some Error was here - problems with reflection or security
+ processWarning(WebserviceapMessages.WEBSERVICEAP_PARSING_JAVAC_OPTIONS_ERROR());
+ report(e.getMessage());
+ }
+
+ if (classDir == null) { // some error within reflection block
+ String property = System.getProperty("sun.java.command");
+ if (property != null) {
+ Scanner scanner = new Scanner(property);
+ boolean sourceDirNext = false;
+ while (scanner.hasNext()) {
+ String token = scanner.next();
+ if (sourceDirNext) {
+ classDir = token;
+ sourceDirNext = false;
+ } else if ("-verbose".equals(token)) {
+ options.verbose = true;
+ } else if ("-s".equals(token)) {
+ sourceDirNext = true;
+ }
+ }
+ }
+ }
+ if (classDir != null) {
+ sourceDir = new File(classDir);
+ }
+ return classDir;
+ }
+
private boolean getOption(String key) {
String value = processingEnv.getOptions().get(key);
if (value != null) {
@@ -186,8 +239,9 @@
}
if (!processedEndpoint) {
if (isCommandLineInvocation) {
- if (!ignoreNoWebServiceFoundWarning)
+ if (!ignoreNoWebServiceFoundWarning) {
processWarning(WebserviceapMessages.WEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND());
+ }
} else {
processError(WebserviceapMessages.WEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND());
}
@@ -214,9 +268,14 @@
}
protected void report(String msg) {
- PrintStream outStream = out != null ? out : new PrintStream(out, true);
- outStream.println(msg);
- outStream.flush();
+ if (out == null) {
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "No output set for web service annotation processor reporting.");
+ }
+ return;
+ }
+ out.println(msg);
+ out.flush();
}
@Override
@@ -296,4 +355,9 @@
public String getOperationName(Name messageName) {
return messageName != null ? messageName.toString() : null;
}
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -31,6 +31,7 @@
import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
import com.sun.xml.internal.ws.model.RuntimeModeler;
+import javax.annotation.processing.ProcessingEnvironment;
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -53,6 +54,7 @@
import javax.lang.model.util.ElementFilter;
import javax.lang.model.util.SimpleElementVisitor6;
import javax.lang.model.util.SimpleTypeVisitor6;
+import javax.lang.model.util.Types;
import java.lang.annotation.Annotation;
import java.util.Collection;
import java.util.HashSet;
@@ -139,7 +141,10 @@
serviceImplName = null;
postProcessWebService(webService, e);
serviceImplName = null;
+ break;
}
+ default:
+ break;
}
return null;
}
@@ -281,6 +286,8 @@
soapStyle = SOAPStyle.DOCUMENT;
wrapped = soapBinding.parameterStyle().equals(ParameterStyle.WRAPPED);
}
+ } else {
+ pushedSoapBinding = false;
}
return soapBinding;
}
@@ -366,6 +373,7 @@
}
for (TypeMirror superType : element.getInterfaces())
processMethods((TypeElement) ((DeclaredType) superType).asElement());
+ break;
}
case CLASS: {
builder.log("ProcessedMethods Class: " + element);
@@ -382,7 +390,10 @@
if (!superclass.getKind().equals(TypeKind.NONE)) {
processMethods((TypeElement) ((DeclaredType) superclass).asElement());
}
+ break;
}
+ default:
+ break;
}
}
@@ -504,7 +515,7 @@
boolean hasDefaultConstructor = false;
for (ExecutableElement constructor : ElementFilter.constructorsIn(classElement.getEnclosedElements())) {
if (constructor.getModifiers().contains(Modifier.PUBLIC) &&
- constructor.getParameters().size() == 0) {
+ constructor.getParameters().isEmpty()) {
hasDefaultConstructor = true;
break;
}
@@ -547,7 +558,7 @@
if (((DeclaredType) interfaceType).asElement().equals(interfaceElement))
return true;
}
- List classMethods = ElementFilter.methodsIn(classElement.getEnclosedElements());
+ List classMethods = getClassMethods(classElement);
boolean implementsMethod;
for (ExecutableElement interfaceMethod : ElementFilter.methodsIn(interfaceElement.getEnclosedElements())) {
implementsMethod = false;
@@ -566,17 +577,32 @@
return true;
}
+ private static List getClassMethods(TypeElement classElement) {
+ if (classElement.getQualifiedName().toString().equals(Object.class.getName())) // we don't need Object's methods
+ return null;
+ TypeElement superclassElement = (TypeElement) ((DeclaredType) classElement.getSuperclass()).asElement();
+ List superclassesMethods = getClassMethods(superclassElement);
+ List classMethods = ElementFilter.methodsIn(classElement.getEnclosedElements());
+ if (superclassesMethods == null)
+ return classMethods;
+ else
+ superclassesMethods.addAll(classMethods);
+ return superclassesMethods;
+ }
+
protected boolean sameMethod(ExecutableElement method1, ExecutableElement method2) {
if (!method1.getSimpleName().equals(method2.getSimpleName()))
return false;
- if (!method1.getReturnType().equals(method2.getReturnType()))
+ Types typeUtils = builder.getProcessingEnvironment().getTypeUtils();
+ if(!typeUtils.isSameType(method1.getReturnType(), method2.getReturnType())
+ && !typeUtils.isSubtype(method2.getReturnType(), method1.getReturnType()))
return false;
List parameters1 = method1.getParameters();
List parameters2 = method2.getParameters();
if (parameters1.size() != parameters2.size())
return false;
for (int i = 0; i < parameters1.size(); i++) {
- if (!builder.getProcessingEnvironment().getTypeUtils().isSameType(parameters1.get(i).asType(), parameters2.get(i).asType()))
+ if (!typeUtils.isSameType(parameters1.get(i).asType(), parameters2.get(i).asType()))
return false;
}
return true;
@@ -616,9 +642,9 @@
}
DeclaredType superClass = (DeclaredType) element.getSuperclass();
- TypeElement typeElement = (TypeElement) superClass.asElement();
- return typeElement.getQualifiedName().toString().equals(Object.class.getName())
- || methodsAreLegal(typeElement);
+ TypeElement tE = (TypeElement) superClass.asElement();
+ return tE.getQualifiedName().toString().equals(Object.class.getName())
+ || methodsAreLegal(tE);
}
default: {
throw new IllegalArgumentException("Class or interface was expecting. But element: " + element);
@@ -800,12 +826,12 @@
protected boolean isLegalType(TypeMirror type) {
if (!(type != null && type.getKind().equals(TypeKind.DECLARED)))
return true;
- TypeElement typeElement = (TypeElement) ((DeclaredType) type).asElement();
- if (typeElement == null) {
+ TypeElement tE = (TypeElement) ((DeclaredType) type).asElement();
+ if (tE == null) {
// can be null, if this type's declaration is unknown. This may be the result of a processing error, such as a missing class file.
builder.processError(WebserviceapMessages.WEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(type.toString(), context.getRound()));
}
- return !builder.isRemote(typeElement);
+ return !builder.isRemote(tE);
}
protected VariableElement getOutParameter(ExecutableElement method) {
@@ -821,18 +847,22 @@
protected static class MySoapBinding implements SOAPBinding {
+ @Override
public Style style() {
return SOAPBinding.Style.DOCUMENT;
}
+ @Override
public Use use() {
return SOAPBinding.Use.LITERAL;
}
+ @Override
public ParameterStyle parameterStyle() {
return SOAPBinding.ParameterStyle.WRAPPED;
}
+ @Override
public Class annotationType() {
return SOAPBinding.class;
}
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -124,14 +124,17 @@
super(annReader, nav, beanMemberFactory);
}
+ @Override
protected TypeMirror getSafeType(TypeMirror type) {
return WebServiceWrapperGenerator.this.getSafeType(type);
}
+ @Override
protected TypeMirror getHolderValueType(TypeMirror paramType) {
return builder.getHolderValueType(paramType);
}
+ @Override
protected boolean isVoidType(TypeMirror type) {
return type != null && type.getKind().equals(TypeKind.VOID);
}
@@ -140,6 +143,7 @@
private static final class FieldFactory implements AbstractWrapperBeanGenerator.BeanMemberFactory {
+ @Override
public MemberInfo createWrapperBeanMember(TypeMirror paramType,
String paramName, List jaxb) {
return new MemberInfo(paramType, paramName, jaxb);
@@ -151,17 +155,20 @@
makeSafeVisitor = new MakeSafeTypeVisitor(builder.getProcessingEnvironment());
}
+ @Override
protected void processWebService(WebService webService, TypeElement d) {
cm = new JCodeModel();
wrapperNames = new HashSet();
processedExceptions = new HashSet();
}
+ @Override
protected void postProcessWebService(WebService webService, TypeElement d) {
super.postProcessWebService(webService, d);
doPostProcessWebService(webService, d);
}
+ @SuppressWarnings("CallToThreadDumpStack")
protected void doPostProcessWebService(WebService webService, TypeElement d) {
if (cm != null) {
File sourceDir = builder.getSourceDir();
@@ -178,6 +185,7 @@
}
}
+ @Override
protected void processMethod(ExecutableElement method, WebMethod webMethod) {
builder.log("WrapperGen - method: "+method);
builder.log("method.getDeclaringType(): " + method.asType());
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -107,7 +107,7 @@
* @param prop
* @param jaxbType
* @param block
- * @return
+ * @return unwrapped parameter
*/
private static Parameter createUnwrappedParameter(JAXBProperty prop,
JAXBType jaxbType, Block block, JAXBStructuredType type,
diff -r 26c840af7720 -r a5e7c2f093c9 src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java Thu Apr 11 09:40:09 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java Tue Apr 16 08:11:41 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, 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
@@ -128,13 +128,15 @@
}
private void build() {
- for(Iterator