Return-Path: Delivered-To: apmail-ws-wsrf-commits-archive@www.apache.org Received: (qmail 20028 invoked from network); 2 Aug 2005 16:32:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Aug 2005 16:32:53 -0000 Received: (qmail 30008 invoked by uid 500); 2 Aug 2005 16:32:46 -0000 Delivered-To: apmail-ws-wsrf-commits-archive@ws.apache.org Received: (qmail 29527 invoked by uid 500); 2 Aug 2005 16:32:43 -0000 Mailing-List: contact wsrf-commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: wsrf-dev@ws.apache.org Delivered-To: mailing list wsrf-commits@ws.apache.org Received: (qmail 29047 invoked by uid 500); 2 Aug 2005 16:32:39 -0000 Delivered-To: apmail-ws-wsrf-cvs@ws.apache.org Received: (qmail 28923 invoked by uid 99); 2 Aug 2005 16:32:26 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 02 Aug 2005 09:32:02 -0700 Received: (qmail 19605 invoked by uid 65534); 2 Aug 2005 16:31:57 -0000 Message-ID: <20050802163157.19604.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r227033 [14/27] - in /webservices/wsrf/trunk: ./ src/java/org/apache/ws/ src/java/org/apache/ws/addressing/ src/java/org/apache/ws/addressing/v2003_03/ src/java/org/apache/ws/addressing/v2004_08_10/ src/java/org/apache/ws/resource/ src/java... Date: Tue, 02 Aug 2005 16:30:44 -0000 To: wsrf-cvs@ws.apache.org From: scamp@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java?rev=227033&r1=227032&r2=227033&view=diff ============================================================================== --- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java (original) +++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java Tue Aug 2 09:28:49 2005 @@ -1,64 +1,97 @@ -package org.apache.ws.resource.properties.v2004_11.porttype.impl; - -import org.apache.ws.resource.ResourceContext; -import org.apache.ws.resource.properties.NamespaceVersionHolder; -import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType; -import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent; -import org.apache.ws.resource.properties.v2004_11.porttype.UpdateResourcePropertiesPortType; -import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl; -import org.apache.ws.resource.properties.v2004_11.impl.XmlBeansResourcePropertyValueChangeEvent; -import org.apache.ws.util.XmlBeanUtils; -import org.apache.xmlbeans.XmlObject; -import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesDocument; -import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesResponseDocument; - -/** - * @author Ian Springer - */ -public class UpdateResourcePropertiesPortTypeImpl extends AbstractSetResourcePropertiesPortType implements UpdateResourcePropertiesPortType -{ - - private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl() ; - - /** - * Creates a new {@link UpdateResourcePropertiesPortTypeImpl} object. - * - * @param resourceContext DOCUMENT_ME - */ - public UpdateResourcePropertiesPortTypeImpl(ResourceContext resourceContext) - { - super(resourceContext); - } - - /** - * DOCUMENT_ME - * - * @param requestDoc DOCUMENT_ME - * @return DOCUMENT_ME - */ - public UpdateResourcePropertiesResponseDocument updateResourceProperties(UpdateResourcePropertiesDocument requestDoc) - { - UpdateResourcePropertiesResponseDocument responseDoc = createResponseDocument(); - UpdateResourcePropertiesDocument.UpdateResourceProperties requestElem = requestDoc.getUpdateResourceProperties(); - XmlObject[] newPropElems = XmlBeanUtils.getChildElements( requestElem.getUpdate() ); - updateResourceProperty( newPropElems ); - return responseDoc; - } - - private UpdateResourcePropertiesResponseDocument createResponseDocument() - { - UpdateResourcePropertiesResponseDocument responseDoc = UpdateResourcePropertiesResponseDocument.Factory.newInstance(); - responseDoc.addNewUpdateResourcePropertiesResponse(); - return responseDoc; - } - - protected NamespaceVersionHolder getNamespaceSet() - { - return NAMESPACE_SET; - } - - protected AbstractXmlBeansResourcePropertyValueChangeEvent getResourcePropertyValueChangeEvent(Object[] oldValue, Object[] newValue) - { - return new XmlBeansResourcePropertyValueChangeEvent(oldValue,newValue); - } -} +/*=============================================================================* + * Copyright 2004 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.ws.resource.properties.v2004_11.porttype.impl; + +import org.apache.ws.resource.ResourceContext; +import org.apache.ws.resource.properties.NamespaceVersionHolder; +import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType; +import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent; +import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl; +import org.apache.ws.resource.properties.v2004_11.impl.XmlBeansResourcePropertyValueChangeEvent; +import org.apache.ws.resource.properties.v2004_11.porttype.UpdateResourcePropertiesPortType; +import org.apache.ws.util.XmlBeanUtils; +import org.apache.xmlbeans.XmlObject; +import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesDocument; +import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesResponseDocument; + +/** + * @author Ian Springer + */ +public class UpdateResourcePropertiesPortTypeImpl + extends AbstractSetResourcePropertiesPortType + implements UpdateResourcePropertiesPortType +{ + private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl( ); + + /** + * Creates a new {@link UpdateResourcePropertiesPortTypeImpl} object. + * + * @param resourceContext DOCUMENT_ME + */ + public UpdateResourcePropertiesPortTypeImpl( ResourceContext resourceContext ) + { + super( resourceContext ); + } + + /** + * DOCUMENT_ME + * + * @param requestDoc DOCUMENT_ME + * @return DOCUMENT_ME + */ + public UpdateResourcePropertiesResponseDocument updateResourceProperties( UpdateResourcePropertiesDocument requestDoc ) + { + UpdateResourcePropertiesResponseDocument responseDoc = createResponseDocument( ); + UpdateResourcePropertiesDocument.UpdateResourceProperties requestElem = + requestDoc.getUpdateResourceProperties( ); + XmlObject[] newPropElems = + XmlBeanUtils.getChildElements( requestElem.getUpdate( ) ); + updateResourceProperty( newPropElems ); + return responseDoc; + } + + /** + * DOCUMENT_ME + * + * @return DOCUMENT_ME + */ + protected NamespaceVersionHolder getNamespaceSet( ) + { + return NAMESPACE_SET; + } + + /** + * DOCUMENT_ME + * + * @param oldValue DOCUMENT_ME + * @param newValue DOCUMENT_ME + * + * @return DOCUMENT_ME + */ + protected AbstractXmlBeansResourcePropertyValueChangeEvent getResourcePropertyValueChangeEvent( Object[] oldValue, + Object[] newValue ) + { + return new XmlBeansResourcePropertyValueChangeEvent( oldValue, newValue ); + } + + private UpdateResourcePropertiesResponseDocument createResponseDocument( ) + { + UpdateResourcePropertiesResponseDocument responseDoc = + UpdateResourcePropertiesResponseDocument.Factory.newInstance( ); + responseDoc.addNewUpdateResourcePropertiesResponse( ); + return responseDoc; + } +} \ No newline at end of file Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/ServiceGroupConstants.java URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/ServiceGroupConstants.java?rev=227033&r1=227032&r2=227033&view=diff ============================================================================== --- webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/ServiceGroupConstants.java (original) +++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/ServiceGroupConstants.java Tue Aug 2 09:28:49 2005 @@ -22,25 +22,23 @@ */ public interface ServiceGroupConstants { + /** + * Namespace URI for WS-ServiceGroup schema. + */ + String NSURI_WSSG_SCHEMA = WsrfConstants.BASE_URI_WSRF + "wsrf-WS-ServiceGroup-1.2-draft-01.xsd"; - /** - * Namespace URI for WS-ServiceGroup schema. - */ - String NSURI_WSSG_SCHEMA = WsrfConstants.BASE_URI_WSRF + "wsrf-WS-ServiceGroup-1.2-draft-01.xsd"; + /** + * Namespace prefix for WS-ServiceGroup schema. + */ + String NSPREFIX_WSSG_SCHEMA = "wssg"; - /** - * Namespace prefix for WS-ServiceGroup schema. - */ - String NSPREFIX_WSSG_SCHEMA = "wssg"; - - /** - * Namespace URI for WS-ServiceGroup WSDL. - */ - String NSURI_WSSG_WSDL = WsrfConstants.BASE_URI_WSRF + "wsrf-WS-ServiceGroup-1.2-draft-01.wsdl"; - - /** - * Namespace prefix for WS-ServiceGroup WSDL. - */ - String NSPREFIX_WSSG_WSDL = "wssgw"; + /** + * Namespace URI for WS-ServiceGroup WSDL. + */ + String NSURI_WSSG_WSDL = WsrfConstants.BASE_URI_WSRF + "wsrf-WS-ServiceGroup-1.2-draft-01.wsdl"; + /** + * Namespace prefix for WS-ServiceGroup WSDL. + */ + String NSPREFIX_WSSG_WSDL = "wssgw"; } Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupEntryPortType.java URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupEntryPortType.java?rev=227033&r1=227032&r2=227033&view=diff ============================================================================== --- webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupEntryPortType.java (original) +++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupEntryPortType.java Tue Aug 2 09:28:49 2005 @@ -1,23 +1,22 @@ -/* - * Copyright 2004 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 - * +/*=============================================================================* + * Copyright 2004 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. - */ + * + * 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.ws.resource.servicegroup.v2004_06.porttype; import org.apache.ws.resource.properties.v2004_06.porttype.GetResourcePropertyPortType; import org.apache.ws.resource.servicegroup.v2004_06.ServiceGroupConstants; - import javax.xml.namespace.QName; /** @@ -25,24 +24,30 @@ * * @author Ian P. Springer (Hewlett-Packard Company) */ -public interface ServiceGroupEntryPortType extends GetResourcePropertyPortType +public interface ServiceGroupEntryPortType + extends GetResourcePropertyPortType { - - QName NAME = new QName( ServiceGroupConstants.NSURI_WSSG_WSDL, "ServiceGroupEntry", ServiceGroupConstants.NSPREFIX_WSSG_WSDL ); - - /** - * "ServiceGroupEPR" property (type="wsa:EndpointReferenceType", minOccurs="1", maxOccurs="1"). - */ - QName PROP_NAME_SERVICE_GROUP_EPR = new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "ServiceGroupEPR", ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); - - /** - * "MemberEPR" property (type="wsa:EndpointReferenceType", minOccurs="1", maxOccurs="1"). - */ - QName PROP_NAME_MEMBER_EPR = new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "MemberEPR", ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); - - /** - * "Content" property (type="xsd:anyType", minOccurs="1", maxOccurs="1"). - */ - QName PROP_NAME_CONTENT = new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "Content", ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); - -} + /** DOCUMENT_ME */ + QName NAME = + new QName( ServiceGroupConstants.NSURI_WSSG_WSDL, "ServiceGroupEntry", + ServiceGroupConstants.NSPREFIX_WSSG_WSDL ); + + /** + * "ServiceGroupEPR" property (type="wsa:EndpointReferenceType", minOccurs="1", maxOccurs="1"). + */ + QName PROP_NAME_SERVICE_GROUP_EPR = + new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "ServiceGroupEPR", + ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); + + /** + * "MemberEPR" property (type="wsa:EndpointReferenceType", minOccurs="1", maxOccurs="1"). + */ + QName PROP_NAME_MEMBER_EPR = + new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "MemberEPR", ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); + + /** + * "Content" property (type="xsd:anyType", minOccurs="1", maxOccurs="1"). + */ + QName PROP_NAME_CONTENT = + new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "Content", ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); +} \ No newline at end of file Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupPortType.java URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupPortType.java?rev=227033&r1=227032&r2=227033&view=diff ============================================================================== --- webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupPortType.java (original) +++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupPortType.java Tue Aug 2 09:28:49 2005 @@ -1,23 +1,22 @@ -/* - * Copyright 2004 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 - * +/*=============================================================================* + * Copyright 2004 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. - */ + * + * 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.ws.resource.servicegroup.v2004_06.porttype; import org.apache.ws.resource.properties.v2004_06.porttype.GetResourcePropertyPortType; import org.apache.ws.resource.servicegroup.v2004_06.ServiceGroupConstants; - import javax.xml.namespace.QName; /** @@ -25,19 +24,23 @@ * * @author Ian P. Springer (Hewlett-Packard Company) */ -public interface ServiceGroupPortType extends GetResourcePropertyPortType +public interface ServiceGroupPortType + extends GetResourcePropertyPortType { - - QName NAME = new QName( ServiceGroupConstants.NSURI_WSSG_WSDL, "ServiceGroup", ServiceGroupConstants.NSPREFIX_WSSG_WSDL ); - - /** - * "MembershipContent" property (type="wsa:EndpointReferenceType", minOccurs="0", maxOccurs="unbounded"). - */ - QName PROP_NAME_MEMBERSHIP_CONTENT_RULE = new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "MembershipContentRule", ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); - - /** - * "Entry" property (type="wssg:EntryType", minOccurs="0", maxOccurs="unbounded") - */ - QName PROP_NAME_ENTRY = new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "Entry", ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); - -} + /** DOCUMENT_ME */ + QName NAME = + new QName( ServiceGroupConstants.NSURI_WSSG_WSDL, "ServiceGroup", ServiceGroupConstants.NSPREFIX_WSSG_WSDL ); + + /** + * "MembershipContent" property (type="wsa:EndpointReferenceType", minOccurs="0", maxOccurs="unbounded"). + */ + QName PROP_NAME_MEMBERSHIP_CONTENT_RULE = + new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "MembershipContentRule", + ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); + + /** + * "Entry" property (type="wssg:EntryType", minOccurs="0", maxOccurs="unbounded") + */ + QName PROP_NAME_ENTRY = + new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "Entry", ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); +} \ No newline at end of file Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupRegistrationPortType.java URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupRegistrationPortType.java?rev=227033&r1=227032&r2=227033&view=diff ============================================================================== --- webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupRegistrationPortType.java (original) +++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_06/porttype/ServiceGroupRegistrationPortType.java Tue Aug 2 09:28:49 2005 @@ -1,25 +1,24 @@ -/* - * Copyright 2004 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 - * +/*=============================================================================* + * Copyright 2004 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. - */ + * + * 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.ws.resource.servicegroup.v2004_06.porttype; import org.apache.ws.resource.properties.v2004_06.porttype.GetResourcePropertyPortType; import org.apache.ws.resource.servicegroup.v2004_06.ServiceGroupConstants; import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSServiceGroup12Draft01.AddDocument; import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSServiceGroup12Draft01.AddResponseDocument; - import javax.xml.namespace.QName; /** @@ -27,26 +26,31 @@ * * @author Ian P. Springer (Hewlett-Packard Company) */ -public interface ServiceGroupRegistrationPortType extends GetResourcePropertyPortType +public interface ServiceGroupRegistrationPortType + extends GetResourcePropertyPortType { - - QName NAME = new QName( ServiceGroupConstants.NSURI_WSSG_WSDL, "ServiceGroupRegistration", ServiceGroupConstants.NSPREFIX_WSSG_WSDL ); - - /** - * "MembershipContent" property (type="wsa:EndpointReferenceType", minOccurs="0", maxOccurs="unbounded"). - */ - QName PROP_NAME_MEMBERSHIP_CONTENT_RULE = new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "MembershipContentRule", ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); - - /** - * "Entry" property (type="wssg:EntryType", minOccurs="0", maxOccurs="unbounded") - */ - QName PROP_NAME_ENTRY = new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "Entry", ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); - - /** - * - * @param requestDoc - * @return - */ - AddResponseDocument add( AddDocument requestDoc ); - -} + /** DOCUMENT_ME */ + QName NAME = + new QName( ServiceGroupConstants.NSURI_WSSG_WSDL, "ServiceGroupRegistration", + ServiceGroupConstants.NSPREFIX_WSSG_WSDL ); + + /** + * "MembershipContent" property (type="wsa:EndpointReferenceType", minOccurs="0", maxOccurs="unbounded"). + */ + QName PROP_NAME_MEMBERSHIP_CONTENT_RULE = + new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "MembershipContentRule", + ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); + + /** + * "Entry" property (type="wssg:EntryType", minOccurs="0", maxOccurs="unbounded") + */ + QName PROP_NAME_ENTRY = + new QName( ServiceGroupConstants.NSURI_WSSG_SCHEMA, "Entry", ServiceGroupConstants.NSPREFIX_WSSG_SCHEMA ); + + /** + * + * @param requestDoc + * @return + */ + AddResponseDocument add( AddDocument requestDoc ); +} \ No newline at end of file Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_11/ServiceGroupConstants.java URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_11/ServiceGroupConstants.java?rev=227033&r1=227032&r2=227033&view=diff ============================================================================== --- webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_11/ServiceGroupConstants.java (original) +++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/servicegroup/v2004_11/ServiceGroupConstants.java Tue Aug 2 09:28:49 2005 @@ -1,46 +1,44 @@ -/*=============================================================================* - * Copyright 2004 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.ws.resource.servicegroup.v2004_11; - -import org.apache.ws.resource.v2004_11.WsrfConstants; - -/** - * Constants for namespaces defined by the 2004/11 version of the WSRF ServiceGroup specification. - */ -public interface ServiceGroupConstants -{ - - /** - * Namespace URI for WS-ServiceGroup schema. - */ - String NSURI_WSSG_SCHEMA = WsrfConstants.BASE_URI_WSRF + "wsrf-WS-ServiceGroup-1.2-draft-03.xsd"; - - /** - * Namespace prefix for WS-ServiceGroup schema. - */ - String NSPREFIX_WSSG_SCHEMA = "wsrf-sg"; - - /** - * Namespace URI for WS-ServiceGroup WSDL. - */ - String NSURI_WSSG_WSDL = WsrfConstants.BASE_URI_WSRF + "wsrf-WS-ServiceGroup-1.2-draft-03.wsdl"; - - /** - * Namespace prefix for WS-ServiceGroup WSDL. - */ - String NSPREFIX_WSSG_WSDL = "wsrf-sgw"; - +/*=============================================================================* + * Copyright 2004 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.ws.resource.servicegroup.v2004_11; + +import org.apache.ws.resource.v2004_11.WsrfConstants; + +/** + * Constants for namespaces defined by the 2004/11 version of the WSRF ServiceGroup specification. + */ +public interface ServiceGroupConstants +{ + /** + * Namespace URI for WS-ServiceGroup schema. + */ + String NSURI_WSSG_SCHEMA = WsrfConstants.BASE_URI_WSRF + "wsrf-WS-ServiceGroup-1.2-draft-03.xsd"; + + /** + * Namespace prefix for WS-ServiceGroup schema. + */ + String NSPREFIX_WSSG_SCHEMA = "wsrf-sg"; + + /** + * Namespace URI for WS-ServiceGroup WSDL. + */ + String NSURI_WSSG_WSDL = WsrfConstants.BASE_URI_WSRF + "wsrf-WS-ServiceGroup-1.2-draft-03.wsdl"; + + /** + * Namespace prefix for WS-ServiceGroup WSDL. + */ + String NSPREFIX_WSSG_WSDL = "wsrf-sgw"; } Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java?rev=227033&r1=227032&r2=227033&view=diff ============================================================================== --- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java (original) +++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java Tue Aug 2 09:28:49 2005 @@ -1,141 +1,157 @@ -/*=============================================================================* - * Copyright 2004 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.ws.resource.tool; - -import org.apache.ws.resource.ResourceDefinition; -import org.apache.ws.util.OperationInfo; -import org.apache.xmlbeans.impl.common.NameUtil; - -import javax.wsdl.Operation; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Map; - -/** - * A set of utility methods that are utilized by Wsdl2Java. - * - * @author Ian Springer (ian DOT springer AT hp DOT com) - */ -public abstract class GenerationUtils -{ - - private static Map s_nsToPrefixMap = new Hashtable(); - - public static String getJavaPackageName( String nsURI ) - { - return NameUtil.getPackageFromNamespace( nsURI ); - } - - /** - * Generates a valid concise prefix for the specified namespace URI. Guaranteed to never return the same prefix for - * two different namespaces. - * - * @param nsURI the namespace URI - * - * @return the prefix - */ - public static String getPrefix( String nsURI ) - { - if ( nsURI == null ) - { - return ( "" ); - } - - synchronized ( s_nsToPrefixMap ) - { - if ( s_nsToPrefixMap.containsKey( nsURI ) ) - { - return (String) s_nsToPrefixMap.get( nsURI ); - } - } - - String chompedNsURI = nsURI; - - while ( chompedNsURI.length() > 0 && - !Character.isLetterOrDigit( chompedNsURI.charAt( chompedNsURI.length() - 1 ) ) ) - { - chompedNsURI = chompedNsURI.substring( 0, chompedNsURI.length() - 1 ); - } - - int prefixStartIndex = chompedNsURI.lastIndexOf( '/' ); - - if ( prefixStartIndex == -1 ) - { - prefixStartIndex = chompedNsURI.lastIndexOf( '.' ); - } - - if ( prefixStartIndex == -1 ) - { - prefixStartIndex = chompedNsURI.lastIndexOf( ':' ); - } - - String prefix = chompedNsURI.substring( prefixStartIndex + 1 ); - - for ( int i = 0; i < prefix.length(); i++ ) - { - char currentChar = prefix.charAt( i ); - if ( !isValidPrefixChar( currentChar ) ) - { - prefix = prefix.replace( currentChar, '-' ); - } - } - - synchronized ( s_nsToPrefixMap ) - { - if ( s_nsToPrefixMap.containsValue( prefix ) ) - { - prefix = manglePrefix( prefix ); - } - s_nsToPrefixMap.put( nsURI, prefix ); - } - return ( prefix ); - } - - public static Map getOperationInfoMap( ResourceDefinition resourceDef ) - { - Map opInfoMap = new HashMap(); - String[] opNames = resourceDef.getCustomOperationNames(); - for ( int i = 0; i < opNames.length; i++ ) - { - Operation op = resourceDef.getPortType().getOperation( opNames[i], null, null ); - OperationInfo opInfo = new OperationInfo( op, resourceDef.getDefinition().getTargetNamespace() ); - opInfoMap.put( opInfo.getRequestElementName(), opInfo ); - } - return opInfoMap; - } - - private static String manglePrefix( String prefix ) - { - String uniquePrefix; - synchronized ( s_nsToPrefixMap ) - { - int i = 1; - do - { - uniquePrefix = prefix + ++i; - } - while ( s_nsToPrefixMap.containsValue( uniquePrefix ) ); - } - return uniquePrefix; - } - - private static boolean isValidPrefixChar( char c ) - { - return ( Character.isLetterOrDigit( c ) ) || ( c == '-' ) - || ( c == '_' ) || ( c == '.' ); - } - -} +/*=============================================================================* + * Copyright 2004 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.ws.resource.tool; + +import org.apache.ws.resource.ResourceDefinition; +import org.apache.ws.util.OperationInfo; +import org.apache.xmlbeans.impl.common.NameUtil; +import javax.wsdl.Operation; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Map; + +/** + * A set of utility methods that are utilized by Wsdl2Java. + * + * @author Ian Springer (ian DOT springer AT hp DOT com) + */ +public abstract class GenerationUtils +{ + private static Map s_nsToPrefixMap = new Hashtable( ); + + /** + * DOCUMENT_ME + * + * @param nsURI DOCUMENT_ME + * + * @return DOCUMENT_ME + */ + public static String getJavaPackageName( String nsURI ) + { + return NameUtil.getPackageFromNamespace( nsURI ); + } + + /** + * DOCUMENT_ME + * + * @param resourceDef DOCUMENT_ME + * + * @return DOCUMENT_ME + */ + public static Map getOperationInfoMap( ResourceDefinition resourceDef ) + { + Map opInfoMap = new HashMap( ); + String[] opNames = resourceDef.getCustomOperationNames( ); + for ( int i = 0; i < opNames.length; i++ ) + { + Operation op = resourceDef.getPortType( ).getOperation( opNames[i], null, null ); + OperationInfo opInfo = new OperationInfo( op, + resourceDef.getDefinition( ).getTargetNamespace( ) ); + opInfoMap.put( opInfo.getRequestElementName( ), + opInfo ); + } + + return opInfoMap; + } + + /** + * Generates a valid concise prefix for the specified namespace URI. Guaranteed to never return the same prefix for + * two different namespaces. + * + * @param nsURI the namespace URI + * + * @return the prefix + */ + public static String getPrefix( String nsURI ) + { + if ( nsURI == null ) + { + return ( "" ); + } + + synchronized ( s_nsToPrefixMap ) + { + if ( s_nsToPrefixMap.containsKey( nsURI ) ) + { + return (String) s_nsToPrefixMap.get( nsURI ); + } + } + + String chompedNsURI = nsURI; + + while ( ( chompedNsURI.length( ) > 0 ) + && !Character.isLetterOrDigit( chompedNsURI.charAt( chompedNsURI.length( ) - 1 ) ) ) + { + chompedNsURI = chompedNsURI.substring( 0, chompedNsURI.length( ) - 1 ); + } + + int prefixStartIndex = chompedNsURI.lastIndexOf( '/' ); + + if ( prefixStartIndex == -1 ) + { + prefixStartIndex = chompedNsURI.lastIndexOf( '.' ); + } + + if ( prefixStartIndex == -1 ) + { + prefixStartIndex = chompedNsURI.lastIndexOf( ':' ); + } + + String prefix = chompedNsURI.substring( prefixStartIndex + 1 ); + + for ( int i = 0; i < prefix.length( ); i++ ) + { + char currentChar = prefix.charAt( i ); + if ( !isValidPrefixChar( currentChar ) ) + { + prefix = prefix.replace( currentChar, '-' ); + } + } + + synchronized ( s_nsToPrefixMap ) + { + if ( s_nsToPrefixMap.containsValue( prefix ) ) + { + prefix = manglePrefix( prefix ); + } + + s_nsToPrefixMap.put( nsURI, prefix ); + } + + return ( prefix ); + } + + private static boolean isValidPrefixChar( char c ) + { + return ( Character.isLetterOrDigit( c ) ) || ( c == '-' ) || ( c == '_' ) || ( c == '.' ); + } + + private static String manglePrefix( String prefix ) + { + String uniquePrefix; + synchronized ( s_nsToPrefixMap ) + { + int i = 1; + do + { + uniquePrefix = prefix + ++i; + } + while ( s_nsToPrefixMap.containsValue( uniquePrefix ) ); + } + + return uniquePrefix; + } +} \ No newline at end of file Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/PortType2JavaInfo.java URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/PortType2JavaInfo.java?rev=227033&r1=227032&r2=227033&view=diff ============================================================================== --- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/PortType2JavaInfo.java (original) +++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/PortType2JavaInfo.java Tue Aug 2 09:28:49 2005 @@ -1,107 +1,105 @@ -/*=============================================================================* - * Copyright 2004 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.ws.resource.tool; - -import javax.xml.namespace.QName; - -/** - * Contains the info needed to generate Java artifacts for a particular portType. - * - * @author Ian Springer (ian DOT springer AT hp DOT com) - */ -public abstract class PortType2JavaInfo -{ - - /** - * Returns the name of the portType that this object corresponds to. - * - * @return the name of the portType that this object corresponds to - */ - public abstract QName getName(); - - /** - * Returns the name of an interface that the generated resource should implement, - * or null if no interface should be implemented. - * - * @return the name of an interface that the generated resource should implement, - * or null if no interface should be implemented - */ - public String getResourceInterfaceName() - { - return null; - } - - /** - * Returns the name of an interface that the generated service should implement, - * or null if no interface should be implemented. - * - * @return the name of an interface that the generated service should implement, - * or null if no interface should be implemented - */ - public String getServiceInterfaceName() - { - return null; - } - - /** - * Returns the name of a Velocity template file that should be parsed and - * included in the body of the generated resource class, or null if no - * template should be parsed and included. - * - * @return the name of a Velocity template file that should be parsed and - * included in the body of the generated resource class, or null if no - * template should be parsed and included - */ - public String getResourceTemplateFileName() - { - return null; - } - - /** - * Returns the name of a Velocity template file that should be parsed and - * included in the body of the generated service class, or null if no - * template should be parsed and included. - * - * @return the name of a Velocity template file that should be parsed and - * included in the body of the generated service class, or null if no - * template should be parsed and included - */ - public String getServiceTemplateFileName() - { - return null; - } - - /** - * Returns the name of a file containing text to be inserted into the body of the abstract resource's init() method. - * - * @return the name of a file containing text to be inserted into the body of the abstract resource's init() method - */ - public String getAbstractResourceInitMethodIncludeLocation() - { - return null; - } - - /** - * Returns the name of a file containing text to be inserted into the body of the concrete resource's init() method. - * - * @return the name of a file containing text to be inserted into the body of the concrete resource's init() method - */ - public String getResourceInitMethodIncludeLocation() - { - return null; - } - -} +/*=============================================================================* + * Copyright 2004 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.ws.resource.tool; + +import javax.xml.namespace.QName; + +/** + * Contains the info needed to generate Java artifacts for a particular portType. + * + * @author Ian Springer (ian DOT springer AT hp DOT com) + */ +public abstract class PortType2JavaInfo +{ + /** + * Returns the name of the portType that this object corresponds to. + * + * @return the name of the portType that this object corresponds to + */ + public abstract QName getName( ); + + /** + * Returns the name of a file containing text to be inserted into the body of the abstract resource's init() method. + * + * @return the name of a file containing text to be inserted into the body of the abstract resource's init() method + */ + public String getAbstractResourceInitMethodIncludeLocation( ) + { + return null; + } + + /** + * Returns the name of a file containing text to be inserted into the body of the concrete resource's init() method. + * + * @return the name of a file containing text to be inserted into the body of the concrete resource's init() method + */ + public String getResourceInitMethodIncludeLocation( ) + { + return null; + } + + /** + * Returns the name of an interface that the generated resource should implement, + * or null if no interface should be implemented. + * + * @return the name of an interface that the generated resource should implement, + * or null if no interface should be implemented + */ + public String getResourceInterfaceName( ) + { + return null; + } + + /** + * Returns the name of a Velocity template file that should be parsed and + * included in the body of the generated resource class, or null if no + * template should be parsed and included. + * + * @return the name of a Velocity template file that should be parsed and + * included in the body of the generated resource class, or null if no + * template should be parsed and included + */ + public String getResourceTemplateFileName( ) + { + return null; + } + + /** + * Returns the name of an interface that the generated service should implement, + * or null if no interface should be implemented. + * + * @return the name of an interface that the generated service should implement, + * or null if no interface should be implemented + */ + public String getServiceInterfaceName( ) + { + return null; + } + + /** + * Returns the name of a Velocity template file that should be parsed and + * included in the body of the generated service class, or null if no + * template should be parsed and included. + * + * @return the name of a Velocity template file that should be parsed and + * included in the body of the generated service class, or null if no + * template should be parsed and included + */ + public String getServiceTemplateFileName( ) + { + return null; + } +} \ No newline at end of file