You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2006/08/02 03:15:52 UTC
svn commit: r427831 - in /webservices/muse/trunk/modules:
muse-core/src/org/apache/muse/core/proxy/
muse-core/src/org/apache/muse/ws/wsdl/
muse-util-xstream/src/org/apache/muse/core/serializer/xstream/
muse-wsa-soap/src/org/apache/muse/ws/addressing/ m...
Author: danj
Date: Tue Aug 1 18:15:51 2006
New Revision: 427831
URL: http://svn.apache.org/viewvc?rev=427831&view=rev
Log:
Remove of all references to IBM, autonomic computing, 'touchpoints', and other artifacts from the initial
code contribution. This is part of the fix for MUSE-33.
Modified:
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/ReflectionProxyHandler.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/ws/wsdl/Messages.properties
webservices/muse/trunk/modules/muse-util-xstream/src/org/apache/muse/core/serializer/xstream/XStreamSerializer.java
webservices/muse/trunk/modules/muse-wsa-soap/src/org/apache/muse/ws/addressing/MessageHeaders.java
webservices/muse/trunk/modules/muse-wsdm-muws-api/src/org/apache/muse/ws/dm/muws/Relationships.java
webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/Messages.properties
webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/listeners/AbstractChangeApprover.java
webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/listeners/ResourcePropertyListeners.java
webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/impl/Messages.properties
webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/Messages.properties
webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java
webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/AbstractSetRequestComponent.java
webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/Messages.properties
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/ReflectionProxyHandler.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/ReflectionProxyHandler.java?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/ReflectionProxyHandler.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/proxy/ReflectionProxyHandler.java Tue Aug 1 18:15:51 2006
@@ -154,14 +154,14 @@
//
// <my:ManagerReferenceType>
// <wsa:EndpointReference>
- // <wsa:Address>http://oksoda.raleigh.ibm.com</wsa:Address>
+ // <wsa:Address>http://www.example.com</wsa:Address>
// </wsa:EndpointReference>
// </my:ManagerReferenceType>
//
// should become:
//
// <my:ManagerReferenceType>
- // <wsa:Address>http://oksoda.raleigh.ibm.com</wsa:Address>
+ // <wsa:Address>http://www.example.com</wsa:Address>
// </my:ManagerReferenceType>
//
// because my:ManagerReferenceType is a sub-type of WS-A EPR.
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/ws/wsdl/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/ws/wsdl/Messages.properties?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/ws/wsdl/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/ws/wsdl/Messages.properties Tue Aug 1 18:15:51 2006
@@ -4,3 +4,4 @@
NullPortTypeQName = The QName describing the portType declaration is null.
NullPortTypeNamespaceURI = The portType declaration 'XXX' must have a non-null namespace URI.
NoActionOnInput = The WSDL operation 'XXX' has an input element 'XXX' with no wsa:Action attribute. This attribute is required in order for Muse to know which requests should be mapped to which Java methods (it uses the WS-A Action header value as a key). Currently, the input element has the following attributes on it: XXX
+NotDocLiteral = The operation 'XXX' in the WSDL file is not doc-literal - it must have one (and only one) message part for both input and output.
Modified: webservices/muse/trunk/modules/muse-util-xstream/src/org/apache/muse/core/serializer/xstream/XStreamSerializer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-util-xstream/src/org/apache/muse/core/serializer/xstream/XStreamSerializer.java?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-util-xstream/src/org/apache/muse/core/serializer/xstream/XStreamSerializer.java (original)
+++ webservices/muse/trunk/modules/muse-util-xstream/src/org/apache/muse/core/serializer/xstream/XStreamSerializer.java Tue Aug 1 18:15:51 2006
@@ -1,299 +1,299 @@
-/*=============================================================================*
- * Copyright 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *=============================================================================*/
-
-package org.apache.muse.core.serializer.xstream;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import org.apache.muse.core.serializer.Serializer;
-import org.apache.muse.util.ReflectUtils;
-import org.apache.muse.util.xml.XmlUtils;
-
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.alias.ClassMapper;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-import com.thoughtworks.xstream.io.xml.DomReader;
-import com.thoughtworks.xstream.io.xml.DomWriter;
-import com.thoughtworks.xstream.mapper.MapperWrapper;
-
-/**
- *
- * XStreamSerializer is a generic Serializer that relies on the XStream
- * library to serialize and deserialize objects to/from XML without any
- * configuration files or schemas. To use this class within Muse
- * applications, simply sub-class it an override the getSerializableType()
- * method to return the class or interface that is being serialized. That's it!
- * <br><br>
- * This serializer has some additional code that helps XStream create "pure"
- * XML by adding better support for XML namespaces and prefixes, as well as
- * being more flexible in the Java field name conventions that can be read
- * and converted into proper XML element names.
- * <br><br>
- * For more information about how XStream serializes your objects, and to get
- * the JAR file needed to execute this code, please visit XStream's web site:
- * <br><br>
- * <a href="http://xstream.codehaus.org">http://xstream.codehaus.org</a>
- *
- * @author Dan Jemiolo (danj)
- *
- * @see org.apache.muse.core.serializer.Serializer
- *
- */
-
-public abstract class XStreamSerializer implements Serializer
-{
- //
- // The XStream facade that aggregates all of the core XStream features.
- // Note we initialize XStream with the DOM driver so that sub-classes
- // that use the XStream.toXML and XStream.fromXML convenience methods
- // will not have to configure this themselves (the default driver is
- // XML Pull Parser, which we do not wish to include for legal reasons).
- //
- // This version of the XStream facade is an extension that calls
- // on this Serializer class to get the name/type that is being
- // serialized. This, in combination with some prefix/namespace support
- // code, allows us to generate "pure" XML that has no Java connotations.
- //
- private XStream _xstream = new MuseSerializerXStream();
-
- /**
- *
- * This method takes the non-namespace-aware DOM (DOM Level 1) that
- * is generated by XStream and converts it into an equivalent DOM
- * tree with the proper namespaces and prefixes. The namespace and
- * prefix values should be taken from the QName that is provided to
- * the Serializer.toXML() method.
- *
- */
- protected Element copySubTree(Element[] children,
- Element root,
- String namespace,
- String prefix)
- {
- Document doc = root.getOwnerDocument();
-
- for (int n = 0; n < children.length; ++n)
- {
- //
- // create a QName using the user's URI/prefix and the
- // local name created by XStream
- //
- QName qname = new QName(namespace, children[n].getLocalName(), prefix);
-
- //
- // now copy over the text and sub-child elements
- //
-
- Element childCopy = XmlUtils.createElement(doc, qname);
- root.appendChild(childCopy);
-
- String text = XmlUtils.extractText(children[n]);
-
- if (text != null)
- XmlUtils.setElementText(childCopy, text);
-
- Element[] subChildren = XmlUtils.getAllElements(children[n]);
- copySubTree(subChildren, childCopy, namespace, prefix);
- }
-
- return root;
- }
-
- /**
- *
- * @return A POJO representation of the given XML fragment.
- *
- */
- public Object fromXML(Element xml)
- {
- return getXStream().unmarshal(new DomReader(xml));
- }
-
- /**
- *
- * @return The XStream API, initialized with the DOM parser/driver.
- *
- */
- public final XStream getXStream()
- {
- return _xstream;
- }
-
- /**
- *
- * @return The XML representation of the object, with the root element
- * having the given QName.
- *
- */
- public Element toXML(Object result, QName qname)
- {
- Document doc = XmlUtils.createDocument();
-
- //
- // use marshal rather than toXML so we can serialize the object
- // directly to DOM (toXML returns a string of XML)
- //
- getXStream().marshal(result, new DomWriter(doc));
-
- //
- // XStream creates DOM Level 1 - argh! we need qualified names
- // to be schema-compliant, so we have to copy the whole DOM tree
- // in a Level 2 way. DOM (both levels) does not permit the
- // changing of the name(space) of nodes after their creation.
- //
- Element root = XmlUtils.getFirstElement(doc);
- Element[] children = XmlUtils.getAllElements(root);
-
- String namespace = qname.getNamespaceURI();
- String prefix = qname.getPrefix();
- Element qualifiedRoot = XmlUtils.createElement(doc, qname);
-
- return copySubTree(children, qualifiedRoot, namespace, prefix);
- }
-
- /**
- *
- * MuseSerializerXStream is a version of XStream that uses our
- * JavaFieldConverter class to map Java field names to XML elements.
- *
- * @author Dan Jemiolo (danj)
- *
- */
- private class MuseSerializerXStream extends XStream
- {
- public MuseSerializerXStream()
- {
- super(new DomDriver());
- }
-
- protected MapperWrapper wrapMapper(MapperWrapper next)
- {
- return new JavaFieldConverter(next);
- }
- }
-
- /**
- *
- * JavaFieldConverter is a pluggable XStream component that allows us
- * more control over the naming conventions XStream uses/accepts when
- * serializing and deserializing XML. We use this component to achieve
- * two goals:
- * <ol>
- * <li>Tolerate namespaces and prefixes in XML elements when XStream
- * is deserializing XML into POJOs. Normally, it would balk at the
- * prefixed-name of the element because it doesn't match the field
- * name or any of its aliases.
- * </li>
- * <br>
- * <li>Tolerate Java field naming conventions - camel casing (first
- * letter lowercase) and underscore prefixes. We drop underscore prefixes
- * from the name and convert the first letter to uppercase before using
- * the name to create an XML element. This makes it impossible to tell
- * that the XML came from a Java class.
- * </li>
- * <br>
- * </ol>
- *
- * @author Dan Jemiolo (danj)
- *
- */
- private class JavaFieldConverter extends MapperWrapper
- {
- public JavaFieldConverter(ClassMapper wrapper)
- {
- super(wrapper);
- }
-
- /**
- *
- * This method returns Serializer.getSerializableType(). Because
- * each XStreamSerializer-based serializer will have its own
- * instance of XStream, we can assume it is serializing this type.
- *
- */
- public Class realClass(String className)
- {
- return getSerializableType();
- }
-
- /**
- *
- * This method converts the XML element name to the Java field name.
- *
- */
- public String realMember(Class theClass, String elementName)
- {
- //
- // strip prefix from DOM element name
- //
- int colonIndex = elementName.indexOf(':');
-
- if (colonIndex >= 0)
- elementName = elementName.substring(colonIndex + 1);
-
- //
- // make two options - just camel case, or camel case with an
- // underscore prefix. try 'em both
- //
- String withLowerCase = Character.toLowerCase(elementName.charAt(0)) + elementName.substring(1);
- String withPrefix = '_' + withLowerCase;
-
- try
- {
- theClass.getDeclaredField(withPrefix);
- return withPrefix; // has the underscore - return it!
- }
-
- catch (NoSuchFieldException error)
- {
- //
- // no underscore - return regular name
- //
- return withLowerCase;
- }
- }
-
- /**
- *
- * This method returns the unqualified (no package) name of the
- * Java class (com.ibm.example.MyClass becomes "MyClass").
- *
- */
- public String serializedClass(Class theClass)
- {
- return ReflectUtils.getShortName(theClass);
- }
-
- /**
- *
- * This method strips an camel casing or underscore prefix from
- * the given field name so it can be used as an XML element name.
- *
- */
- public String serializedMember(Class theClass, String fieldName)
- {
- if (fieldName.charAt(0) == '_')
- fieldName = fieldName.substring(1);
-
- fieldName = Character.toUpperCase(fieldName.charAt(0)) + fieldName.substring(1);
-
- return super.serializedMember(theClass, fieldName);
- }
- }
-}
+/*=============================================================================*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *=============================================================================*/
+
+package org.apache.muse.core.serializer.xstream;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import org.apache.muse.core.serializer.Serializer;
+import org.apache.muse.util.ReflectUtils;
+import org.apache.muse.util.xml.XmlUtils;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.thoughtworks.xstream.io.xml.DomReader;
+import com.thoughtworks.xstream.io.xml.DomWriter;
+import com.thoughtworks.xstream.mapper.MapperWrapper;
+
+/**
+ *
+ * XStreamSerializer is a generic Serializer that relies on the XStream
+ * library to serialize and deserialize objects to/from XML without any
+ * configuration files or schemas. To use this class within Muse
+ * applications, simply sub-class it an override the getSerializableType()
+ * method to return the class or interface that is being serialized. That's it!
+ * <br><br>
+ * This serializer has some additional code that helps XStream create "pure"
+ * XML by adding better support for XML namespaces and prefixes, as well as
+ * being more flexible in the Java field name conventions that can be read
+ * and converted into proper XML element names.
+ * <br><br>
+ * For more information about how XStream serializes your objects, and to get
+ * the JAR file needed to execute this code, please visit XStream's web site:
+ * <br><br>
+ * <a href="http://xstream.codehaus.org">http://xstream.codehaus.org</a>
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ * @see org.apache.muse.core.serializer.Serializer
+ *
+ */
+
+public abstract class XStreamSerializer implements Serializer
+{
+ //
+ // The XStream facade that aggregates all of the core XStream features.
+ // Note we initialize XStream with the DOM driver so that sub-classes
+ // that use the XStream.toXML and XStream.fromXML convenience methods
+ // will not have to configure this themselves (the default driver is
+ // XML Pull Parser, which we do not wish to include for legal reasons).
+ //
+ // This version of the XStream facade is an extension that calls
+ // on this Serializer class to get the name/type that is being
+ // serialized. This, in combination with some prefix/namespace support
+ // code, allows us to generate "pure" XML that has no Java connotations.
+ //
+ private XStream _xstream = new MuseSerializerXStream();
+
+ /**
+ *
+ * This method takes the non-namespace-aware DOM (DOM Level 1) that
+ * is generated by XStream and converts it into an equivalent DOM
+ * tree with the proper namespaces and prefixes. The namespace and
+ * prefix values should be taken from the QName that is provided to
+ * the Serializer.toXML() method.
+ *
+ */
+ protected Element copySubTree(Element[] children,
+ Element root,
+ String namespace,
+ String prefix)
+ {
+ Document doc = root.getOwnerDocument();
+
+ for (int n = 0; n < children.length; ++n)
+ {
+ //
+ // create a QName using the user's URI/prefix and the
+ // local name created by XStream
+ //
+ QName qname = new QName(namespace, children[n].getLocalName(), prefix);
+
+ //
+ // now copy over the text and sub-child elements
+ //
+
+ Element childCopy = XmlUtils.createElement(doc, qname);
+ root.appendChild(childCopy);
+
+ String text = XmlUtils.extractText(children[n]);
+
+ if (text != null)
+ XmlUtils.setElementText(childCopy, text);
+
+ Element[] subChildren = XmlUtils.getAllElements(children[n]);
+ copySubTree(subChildren, childCopy, namespace, prefix);
+ }
+
+ return root;
+ }
+
+ /**
+ *
+ * @return A POJO representation of the given XML fragment.
+ *
+ */
+ public Object fromXML(Element xml)
+ {
+ return getXStream().unmarshal(new DomReader(xml));
+ }
+
+ /**
+ *
+ * @return The XStream API, initialized with the DOM parser/driver.
+ *
+ */
+ public final XStream getXStream()
+ {
+ return _xstream;
+ }
+
+ /**
+ *
+ * @return The XML representation of the object, with the root element
+ * having the given QName.
+ *
+ */
+ public Element toXML(Object result, QName qname)
+ {
+ Document doc = XmlUtils.createDocument();
+
+ //
+ // use marshal rather than toXML so we can serialize the object
+ // directly to DOM (toXML returns a string of XML)
+ //
+ getXStream().marshal(result, new DomWriter(doc));
+
+ //
+ // XStream creates DOM Level 1 - argh! we need qualified names
+ // to be schema-compliant, so we have to copy the whole DOM tree
+ // in a Level 2 way. DOM (both levels) does not permit the
+ // changing of the name(space) of nodes after their creation.
+ //
+ Element root = XmlUtils.getFirstElement(doc);
+ Element[] children = XmlUtils.getAllElements(root);
+
+ String namespace = qname.getNamespaceURI();
+ String prefix = qname.getPrefix();
+ Element qualifiedRoot = XmlUtils.createElement(doc, qname);
+
+ return copySubTree(children, qualifiedRoot, namespace, prefix);
+ }
+
+ /**
+ *
+ * MuseSerializerXStream is a version of XStream that uses our
+ * JavaFieldConverter class to map Java field names to XML elements.
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ */
+ private class MuseSerializerXStream extends XStream
+ {
+ public MuseSerializerXStream()
+ {
+ super(new DomDriver());
+ }
+
+ protected MapperWrapper wrapMapper(MapperWrapper next)
+ {
+ return new JavaFieldConverter(next);
+ }
+ }
+
+ /**
+ *
+ * JavaFieldConverter is a pluggable XStream component that allows us
+ * more control over the naming conventions XStream uses/accepts when
+ * serializing and deserializing XML. We use this component to achieve
+ * two goals:
+ * <ol>
+ * <li>Tolerate namespaces and prefixes in XML elements when XStream
+ * is deserializing XML into POJOs. Normally, it would balk at the
+ * prefixed-name of the element because it doesn't match the field
+ * name or any of its aliases.
+ * </li>
+ * <br>
+ * <li>Tolerate Java field naming conventions - camel casing (first
+ * letter lowercase) and underscore prefixes. We drop underscore prefixes
+ * from the name and convert the first letter to uppercase before using
+ * the name to create an XML element. This makes it impossible to tell
+ * that the XML came from a Java class.
+ * </li>
+ * <br>
+ * </ol>
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ */
+ private class JavaFieldConverter extends MapperWrapper
+ {
+ public JavaFieldConverter(ClassMapper wrapper)
+ {
+ super(wrapper);
+ }
+
+ /**
+ *
+ * This method returns Serializer.getSerializableType(). Because
+ * each XStreamSerializer-based serializer will have its own
+ * instance of XStream, we can assume it is serializing this type.
+ *
+ */
+ public Class realClass(String className)
+ {
+ return getSerializableType();
+ }
+
+ /**
+ *
+ * This method converts the XML element name to the Java field name.
+ *
+ */
+ public String realMember(Class theClass, String elementName)
+ {
+ //
+ // strip prefix from DOM element name
+ //
+ int colonIndex = elementName.indexOf(':');
+
+ if (colonIndex >= 0)
+ elementName = elementName.substring(colonIndex + 1);
+
+ //
+ // make two options - just camel case, or camel case with an
+ // underscore prefix. try 'em both
+ //
+ String withLowerCase = Character.toLowerCase(elementName.charAt(0)) + elementName.substring(1);
+ String withPrefix = '_' + withLowerCase;
+
+ try
+ {
+ theClass.getDeclaredField(withPrefix);
+ return withPrefix; // has the underscore - return it!
+ }
+
+ catch (NoSuchFieldException error)
+ {
+ //
+ // no underscore - return regular name
+ //
+ return withLowerCase;
+ }
+ }
+
+ /**
+ *
+ * This method returns the unqualified (no package) name of the
+ * Java class (com.example.myapp.MyClass becomes "MyClass").
+ *
+ */
+ public String serializedClass(Class theClass)
+ {
+ return ReflectUtils.getShortName(theClass);
+ }
+
+ /**
+ *
+ * This method strips an camel casing or underscore prefix from
+ * the given field name so it can be used as an XML element name.
+ *
+ */
+ public String serializedMember(Class theClass, String fieldName)
+ {
+ if (fieldName.charAt(0) == '_')
+ fieldName = fieldName.substring(1);
+
+ fieldName = Character.toUpperCase(fieldName.charAt(0)) + fieldName.substring(1);
+
+ return super.serializedMember(theClass, fieldName);
+ }
+ }
+}
Modified: webservices/muse/trunk/modules/muse-wsa-soap/src/org/apache/muse/ws/addressing/MessageHeaders.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsa-soap/src/org/apache/muse/ws/addressing/MessageHeaders.java?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsa-soap/src/org/apache/muse/ws/addressing/MessageHeaders.java (original)
+++ webservices/muse/trunk/modules/muse-wsa-soap/src/org/apache/muse/ws/addressing/MessageHeaders.java Tue Aug 1 18:15:51 2006
@@ -371,7 +371,7 @@
/**
*
* @return The identifier found after the last slash in the wsa:Action
- * URI. If the URI is 'http://ibm.com/spec/DoStuff', the value
+ * URI. If the URI is 'http://example.com/spec/DoStuff', the value
* that is returned is 'DoStuff'.
*
*/
Modified: webservices/muse/trunk/modules/muse-wsdm-muws-api/src/org/apache/muse/ws/dm/muws/Relationships.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws-api/src/org/apache/muse/ws/dm/muws/Relationships.java?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsdm-muws-api/src/org/apache/muse/ws/dm/muws/Relationships.java (original)
+++ webservices/muse/trunk/modules/muse-wsdm-muws-api/src/org/apache/muse/ws/dm/muws/Relationships.java Tue Aug 1 18:15:51 2006
@@ -42,7 +42,7 @@
/**
*
* Creates a new RelationshipResource resource with the given values, adds it
- * to the touchpoint's ResourceManager and the owner resource's WS-RP
+ * to Muse's ResourceManager and the owner resource's WS-RP
* container, and returns it to the caller.
*
* @param name
Modified: webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/Messages.properties?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/Messages.properties Tue Aug 1 18:15:51 2006
@@ -50,6 +50,6 @@
NullRelationship = The Relationship is null.
NullQueryTypes = The array of relationship types to query is null.
EmptyQueryTypes = The array of relationship types to query is empty.
-NoRelationshipEndpoint = There is no resource that implements the MUWS Relationship portType defined in touchpoint.xml. In order to use and manage relationships, a touchpoint must expose a resource of type com.ibm.ws.dm.muws.Relationship (or a sub-type); this resource will represent all new relationships created between the resource and other participants.
+NoRelationshipEndpoint = There is no resource that implements the MUWS Relationship portType defined in muse.xml. In order to use and manage relationships, an endpoint must expose a resource with a capability 'http://docs.oasis-open.org/wsdm/muws/capabilities/RelationshipResource'; this resource will represent all new relationships created between the resource and other participants.
FoundRelationshipEndpoint = Successfully found the Relationship endpoint at 'XXX' with resource name 'XXX'. All Relationship resources will be managed by this endpoint.
DuplicateCapability = The resource at XXX is trying to re-define the capability 'XXX'. The ManageabilityCharacteristics capability has already defined the following capability URIs: XXX
Modified: webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/listeners/AbstractChangeApprover.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/listeners/AbstractChangeApprover.java?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/listeners/AbstractChangeApprover.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/listeners/AbstractChangeApprover.java Tue Aug 1 18:15:51 2006
@@ -40,7 +40,7 @@
//
// The security token of the WS-RP container - we can compare this
// against other tokens to determine of the request is coming from
- // inside the touchpoint or from external requests.
+ // inside the application or from external requests.
//
private Object _securityToken = null;
Modified: webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/listeners/ResourcePropertyListeners.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/listeners/ResourcePropertyListeners.java?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/listeners/ResourcePropertyListeners.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/listeners/ResourcePropertyListeners.java Tue Aug 1 18:15:51 2006
@@ -18,6 +18,8 @@
import java.util.Iterator;
+import javax.xml.namespace.QName;
+
/**
*
* ResourcePropertyListeners defines operations for WS-RP documents
@@ -94,7 +96,7 @@
* The approvers are not guaranteed to be in a particular order.
*
*/
- Iterator getChangeApprovers();
+ Iterator getChangeApprovers(QName property);
/**
*
@@ -102,7 +104,7 @@
* The listeners are not guaranteed to be in a particular order.
*
*/
- Iterator getChangeListeners();
+ Iterator getChangeListeners(QName property);
/**
*
@@ -110,7 +112,7 @@
* The listeners are not guaranteed to be in a particular order.
*
*/
- Iterator getReadListeners();
+ Iterator getReadListeners(QName property);
/**
*
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/impl/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/impl/Messages.properties?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/impl/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/impl/Messages.properties Tue Aug 1 18:15:51 2006
@@ -3,20 +3,17 @@
NoEnvironment = The resource's environment must be set with setEnvironment() before it can be initialized (via initialize()). Make sure that a concrete Environment reference is provided right after the resource is instantiated.
NullLogger = The Logger is null. A resource must have a log, even if it is printing to the console.
NoLogger = The resource's log must be set with setLog() before it can be initialized (via initialize()). Make sure that a java.util.Logger reference is provided right after the resource is instantiated.
-NullSoapClient = The SoapClient is null. The touchpoint must have a valid way to make SOAP requests.
+NullSoapClient = The SoapClient is null. The endpoint must have a valid way to make SOAP requests.
NullResourceManager = The ResourceManager is null.
-NullFactoryCollection = The Collection of ResourceDefinition references is null. A touchpoint must have at least one resource type (factory) to instantiate.
-EmptyFactoryCollection = The Collection of ResourceDefinition references is empty. A touchpoint must have at least one resource type (factory) to instantiate.
-NoConstructionName = The ResourceType capability cannot be initialized until the resource's "construction name" is set with setConstructionName(). This name is the value defined in muse.xml under /touchpoint/resource/instance/name, and it will be used to set the actp:Name property. Make sure your instantiation code includes a call to setConstructionName().
-ConstructionNameExists = The resource's construction name has already been set with setConstructionName().
-NullConstructionName = The construction name is null.
+NullFactoryCollection = The Collection of ResourceDefinition references is null. An endpoint must have at least one resource type (factory) to instantiate.
+EmptyFactoryCollection = The Collection of ResourceDefinition references is empty. An endpoint must have at least one resource type (factory) to instantiate.
NullEndpointURL = The endpoint URL string is null. What is the resource type's unique endpoint value?
NullOperationsMap = The OperationsMap collection is null.
NoOperationsMap = The resource's operations (OperationsMap) must be set with setOperations() before you can try to lookup or invoke a resource's exposed operations. This collection allows the resource class to determine which of its methods should be exposed to the outside world.
NullOperationName = The Operation name being searched for is null.
NoPropertiesDefinition = The WS-RP definition identified in the WSDL portType's wsrp:ResourceProperties attribute could not be found. Check the name/namespace and sure the they map to one of the type definitions in the WSDL.
MethodNotFound = There is no method 'XXX' in XXX or any of its sub-components (capabilities, delegates, beans, etc.). Make sure the method name is typed correctly in muse.xml, and that the resource class specified is correct.
-EndpointNotFound = No resource definition was found for endpoint 'XXX'. The valid endpoints for this touchpoint (as described in muse.xml) are: XXX
+EndpointNotFound = No resource definition was found for endpoint 'XXX'. The valid endpoints for this endpoint (as described in muse.xml) are: XXX
NoInvoker = The resource's Invoker has not been constructed.
NullClassLoader = The ClassLoader is null. If you don't want to specify your own ClassLoader, use the default constructor, it will use the class' ClassLoader.
EndpointExists = There is already a resource type bound to the endpoint 'XXX'. You must provide a unique endpoint identifier for each resource type.
@@ -27,11 +24,11 @@
ResourceAlreadyDestroyed = The resource has already been destroyed. Make sure other resources do not hold stale references to it.
NoFactory = A resource must have its ResourceDefinition set with setResourceDefinition() before it can be initialized.
NullFactory = The ResourceDefinition is null.
-ActionNotSupported = The resource type at 'XXX' does not define an operation for the wsa:Action 'XXX'. Make sure the operation is described in muse.xml before the touchpoint is deployed.
+ActionNotSupported = The resource type at 'XXX' does not define an operation for the wsa:Action 'XXX'. Make sure the operation is described in muse.xml before the application is deployed.
NullLogFileName = The log file name is null.
NullClass = The Class is null.
ResourceDestroyed = The resource was destroyed successfully.
ExistingResourceEPR = The unique EPR of this resource instance (object) has already been set - once a resource has an identifying EPR, it cannot be changed over its lifetime.
NoRemoteCreate = The resource type at this endpoint cannot be instantiated by remote clients - all instances are (or have been) created through internal mechanisms. If this type is deployed with a service group, you can browse the group's wssg:Entry property to see what instances are already available.
-NoRequestContext = There was no context data for the current request. Every request for a touchpoint operation should have access to context data that allows the runtime to find the target EPR (resource). Make sure your service code uses Environment.addContext().
+NoRequestContext = There was no context data for the current request. Every request for a web service operation should have access to context data that allows the runtime to find the target EPR (resource). Make sure your service code uses Environment.addContext().
NoWSRPDocument = The resource type at 'XXX' does not have a WSRP document defined in its WSDL - XXX. WSRF resources usually have a WSRP document to represent their state to clients, so if your WSDL is supposed to have one, make sure the QName of the WSRP document is correct. All WSRP requests will be approved by Muse's OpenPropertiesSchema.
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/Messages.properties?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/Messages.properties Tue Aug 1 18:15:51 2006
@@ -1,6 +1,6 @@
NullWSDLDocument = The WSDL Document reference is null.
-NoPortTypesFound = There are no portType definitions in the touchpoint's WSDL. The WSDL must have one portType that defines the touchpoint's interface and includes attribute links to its WS-RP and WS-RMD documents.
-NoPropertiesAttribute = The WSDL portType that defines the touchpoint's interface does not have a wsrp:ResourceProperties attribute. This attribute is needed to find the WS-ResourceProperties definition in the WSDL's types section. The attribute value should be a QName that maps to one of the type definitions in the WSDL.
+NoPortTypesFound = There are no portType definitions in the resource's WSDL. The WSDL must have one portType that defines the resource's interface and includes attribute links to its WS-RP and WS-RMD documents.
+NoPropertiesAttribute = The WSDL portType that defines the resource's interface does not have a wsrp:ResourceProperties attribute. This attribute is needed to find the WS-ResourceProperties definition in the WSDL's types section. The attribute value should be a QName that maps to one of the type definitions in the WSDL.
NullQName = The QName reference is null.
NullQNameArray = The QName array is null.
NullTopic = The Topic reference is null.
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java Tue Aug 1 18:15:51 2006
@@ -16,7 +16,6 @@
package org.apache.muse.ws.resource.properties.impl;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -432,40 +431,21 @@
changeCompleted(qname, results[n], null);
}
- /**
- *
- * @param map
- *
- * @return A Collection containing a copy of all of the values in the
- * given MultiMap.
- *
- */
- private Collection getAllValues(MultiMap map)
- {
- int size = map.size();
- Collection all = new ArrayList(size);
-
- Iterator i = map.values().iterator();
-
- while (i.hasNext())
- all.addAll((Collection)i.next());
-
- return all;
- }
-
public WsResourceCapability getCapability(QName qname)
{
return getSchema().getCapability(qname);
}
- public synchronized final Iterator getChangeApprovers()
+ public synchronized final Iterator getChangeApprovers(QName property)
{
- return getAllValues(_approversByQName).iterator();
+ Collection approvers = (Collection)_approversByQName.get(property);
+ return approvers.iterator();
}
- public synchronized final Iterator getChangeListeners()
+ public synchronized final Iterator getChangeListeners(QName property)
{
- return getAllValues(_listenersByQName).iterator();
+ Collection listeners = (Collection)_listenersByQName.get(property);
+ return listeners.iterator();
}
public synchronized final MetadataDescriptor getMetadata()
@@ -544,9 +524,10 @@
return getSchema().getPropertyNames();
}
- public synchronized final Iterator getReadListeners()
+ public synchronized final Iterator getReadListeners(QName property)
{
- return getAllValues(_readersByQName).iterator();
+ Collection readers = (Collection)_readersByQName.get(property);
+ return readers.iterator();
}
/**
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/AbstractSetRequestComponent.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/AbstractSetRequestComponent.java?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/AbstractSetRequestComponent.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/AbstractSetRequestComponent.java Tue Aug 1 18:15:51 2006
@@ -51,7 +51,7 @@
//
// The token that the WS-RP container can use to determine if this
- // request was created from within the touchpoint instance or by
+ // request was created from within the resource instance or by
// an external request. The default is a unique, non-null token that
// will not map to any WS-RP container.
//
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/Messages.properties?rev=427831&r1=427830&r2=427831&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/Messages.properties Tue Aug 1 18:15:51 2006
@@ -8,7 +8,7 @@
NoServiceGroup = No ServiceGroup reference was specified for contacting the service group that contains this wssg:Entry. You must call setOwner() with this reference before calling initialize().
NullServiceGroup = The ServiceGroup reference is null.
NullMemberServiceEPR = The EPR for the wssg:Entry's member service is null.
-NoEntryEndpoint = There is no resource that implements the WS-SG ServiceGroupEntry portType defined in muse.xml. In order to manage service group entries, a touchpoint must expose a resource of type org.apache.muse.ws.resource.sg.Entry (or a sub-type); this resource will represent all new entries created in the service group.
+NoEntryEndpoint = There is no resource that implements the WS-SG ServiceGroupEntry portType defined in muse.xml. In order to manage service group entries, an endpoint must expose a resource of type org.apache.muse.ws.resource.sg.Entry (or a sub-type); this resource will represent all new entries created in the service group.
FoundEntryEndpoint = Successfully found the WS-SG ServiceGroupEntry endpoint at 'XXX' with resource name 'XXX'. All Entry resources will be managed by this endpoint.
EntryNotFound = The Entry reference was not found in the ServiceGroup, so it could not be removed.
ContentCreationFailed = The resource that this wssg:Entry represents could not be reached to get the value of the wssg:Content properties. It is possible that the resource has been destroyed.
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org