ws-muse-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r227038 [1/4] - in /webservices/muse/trunk: ./ src/java/org/apache/ws/mows/tool/v1_0/ src/java/org/apache/ws/mows/v1_0/ src/java/org/apache/ws/mows/v1_0/capability/ src/java/org/apache/ws/muws/ src/java/org/apache/ws/muws/impl/ src/java/org...
Date Tue, 02 Aug 2005 16:48:40 GMT
Author: scamp
Date: Tue Aug  2 09:48:21 2005
New Revision: 227038

URL: http://svn.apache.org/viewcvs?rev=227038&view=rev
Log:
jalopy

Modified:
    webservices/muse/trunk/project.properties
    webservices/muse/trunk/project.xml
    webservices/muse/trunk/src/java/org/apache/ws/mows/tool/v1_0/ManageabilityReferencesPortType2JavaInfo.java
    webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/MowsConstants.java
    webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/IdentificationCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/ManageabilityReferencesCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/MetricsCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStateCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStatusCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/RequestProcessingStateCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/Category.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/MuwsUtils.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/WsdmNamespaceVersionHolder.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/impl/CategoryImpl.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/tool/MuwsWsdl2Java.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/tool/MuwsWsdl2JavaTask.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/tool/v1_0/RelationshipsPortType2JavaInfo.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/MuwsConstants.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/AdvertisementCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/ConfigurationCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/CorrelatablePropertiesCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/DescriptionCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/IdentityCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/ManageabilityCharacteristicsCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/MetricsCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/OperationalStatusCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/RelationshipAccessCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/RelationshipResourceCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/RelationshipsCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/StateCapability.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/capability/impl/RelationshipsCapabilityImpl.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/events/LangString.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/events/ManagementEvent.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/events/Situation.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/events/SubstitutableMsg.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/events/impl/LangStringImpl.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/events/impl/SituationImpl.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/events/impl/SubstitutableMsgImpl.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/events/impl/XmlBeansManagementEvent.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/impl/WsdmNamespaceVersionHolderImpl.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/impl/XmlBeansRelationshipResourceProperty.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/impl/advertiser/AbstractResourceAdvertiserResource.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/impl/advertiser/AbstractResourceAdvertiserService.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/impl/advertiser/ResourceAdvertiserCustomOperationsPortType.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/impl/advertiser/ResourceAdvertiserHome.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/impl/advertiser/ResourceAdvertiserPropertyQNames.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/impl/advertiser/ResourceAdvertiserResource.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/impl/advertiser/ResourceAdvertiserService.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/topics/ManagementEventTopic.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/topics/MuwsTopicsConstants.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/topics/impl/XmlBeansAdvertisementTopicImpl.java
    webservices/muse/trunk/src/java/org/apache/ws/muws/v1_0/topics/impl/XmlBeansManagementEventTopicImpl.java

Modified: webservices/muse/trunk/project.properties
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/project.properties?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/project.properties (original)
+++ webservices/muse/trunk/project.properties Tue Aug  2 09:48:21 2005
@@ -33,6 +33,7 @@
 #################
 # Jalopy code style configuration file
 maven.jalopy.style = jalopy-config.xml
+maven.jalopy.fileFormat = UNIX
 
 # XDOC PLUGIN
 ###############

Modified: webservices/muse/trunk/project.xml
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/project.xml?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/project.xml (original)
+++ webservices/muse/trunk/project.xml Tue Aug  2 09:48:21 2005
@@ -11,7 +11,7 @@
   <id>muse</id>
   <name>Muse</name>
   <groupId>muse</groupId>
-  <currentVersion>1.0-SNAPSHOT</currentVersion>
+  <currentVersion>1.0</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://www.apache.org/</url>
@@ -121,7 +121,7 @@
     <dependency>
       <groupId>wsrf</groupId>
       <artifactId>wsrf</artifactId>
-      <version>1.0-SNAPSHOT</version>    
+      <version>1.0</version>    
       <url>http://ws.apache.org/ws-fx/wsrf/</url>
       <properties>
 	<license>ApacheLicense-2.0.txt</license>
@@ -422,7 +422,7 @@
     <dependency> 
 	<groupId>pubscribe</groupId>
 	<artifactId>pubscribe</artifactId>
-	<version>1.0-SNAPSHOT</version>
+	<version>1.0</version>
 	<url>http://ws.apache.org/ws-fx/pubscribe/</url>
 	<properties>
 	    <license>ApacheLicense-2.0.txt</license>

Modified: webservices/muse/trunk/src/java/org/apache/ws/mows/tool/v1_0/ManageabilityReferencesPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/mows/tool/v1_0/ManageabilityReferencesPortType2JavaInfo.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/mows/tool/v1_0/ManageabilityReferencesPortType2JavaInfo.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/mows/tool/v1_0/ManageabilityReferencesPortType2JavaInfo.java Tue Aug  2 09:48:21 2005
@@ -1,28 +1,57 @@
-package org.apache.ws.mows.tool.v1_0;
-
-import org.apache.ws.mows.v1_0.capability.ManageabilityReferencesCapability;
-import org.apache.ws.resource.tool.PortType2JavaInfo;
-
-import javax.xml.namespace.QName;
-
-
-/**
- * @author Sal Campana
- */
-public class ManageabilityReferencesPortType2JavaInfo extends PortType2JavaInfo
-{
-    public QName getName()
-    {
-        return ManageabilityReferencesCapability.PORT_TYPE_NAME;
-    }
- 
-    public String getServiceInterfaceName()
-    {
-        return ManageabilityReferencesCapability.class.getName();
-    }
-
-    public String getServiceTemplateFileName()
-    {
-        return "templates/v2004_12/ManageabilityReferences.txt";
-    }
-}
+/*=============================================================================*
+ *  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.mows.tool.v1_0;
+
+import org.apache.ws.mows.v1_0.capability.ManageabilityReferencesCapability;
+import org.apache.ws.resource.tool.PortType2JavaInfo;
+import javax.xml.namespace.QName;
+
+/**
+ * @author Sal Campana
+ */
+public class ManageabilityReferencesPortType2JavaInfo
+   extends PortType2JavaInfo
+{
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public QName getName(  )
+   {
+      return ManageabilityReferencesCapability.PORT_TYPE_NAME;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public String getServiceInterfaceName(  )
+   {
+      return ManageabilityReferencesCapability.class.getName(  );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public String getServiceTemplateFileName(  )
+   {
+      return "templates/v2004_12/ManageabilityReferences.txt";
+   }
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/MowsConstants.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/MowsConstants.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/MowsConstants.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/MowsConstants.java Tue Aug  2 09:48:21 2005
@@ -1,64 +1,63 @@
-/*=============================================================================*
- *  Copyright 2005 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.mows.v1_0;
-
-/**
- * Constants for names defined by the MOWS 1.0 specification.
- */
-public interface MowsConstants
-{
-
-    /**
-     * The base URI for all URIs defined by the MOWS spec.
-     */
-    String BASE_URI_MOWS = "http://docs.oasis-open.org/wsdm/2004/12/mows/";
-
-    /**
-     * The base URI for all manageability capability URIs defined by the MOWS spec.
-     */
-    String BASE_URI_MOWS_CAPABILITIES = BASE_URI_MOWS + "capabilities/";
-
-    /**
-     * Namespace URI for MOWS schema.
-     */
-    String NSURI_MOWS_SCHEMA = BASE_URI_MOWS + "wsdm-mows.xsd";
-
-    /**
-     * Namespace prefix for MOWS schema.
-     */
-    String NSPREFIX_MOWS_SCHEMA = "mows-xs";
-
-    /**
-     * Namespace URI for MOWS WSDL.
-     */
-    String NSURI_MOWS_WSDL = BASE_URI_MOWS + "wsdm-mows.wsdl";
-
-    /**
-     * Namespace prefix for MOWS WSDL.
-     */
-    String NSPREFIX_MOWS_WSDL = "mows-wsdl";
-
-    /**
-     * Namespace URI for MOWS topics.
-     */
-    String NSURI_MOWS_TOPICS = BASE_URI_MOWS + "wsdm-mows-events.xml";
-
-    /**
-     * Namespace prefix for MOWS topics.
-     */
-    String NSPREFIX_MOWS_TOPICS = "mows-events";
-    
-}
+/*=============================================================================*
+ *  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.mows.v1_0;
+
+
+/**
+ * Constants for names defined by the MOWS 1.0 specification.
+ */
+public interface MowsConstants
+{
+   /**
+    * The base URI for all URIs defined by the MOWS spec.
+    */
+   String BASE_URI_MOWS = "http://docs.oasis-open.org/wsdm/2004/12/mows/";
+
+   /**
+    * The base URI for all manageability capability URIs defined by the MOWS spec.
+    */
+   String BASE_URI_MOWS_CAPABILITIES = BASE_URI_MOWS + "capabilities/";
+
+   /**
+    * Namespace URI for MOWS schema.
+    */
+   String NSURI_MOWS_SCHEMA = BASE_URI_MOWS + "wsdm-mows.xsd";
+
+   /**
+    * Namespace prefix for MOWS schema.
+    */
+   String NSPREFIX_MOWS_SCHEMA = "mows-xs";
+
+   /**
+    * Namespace URI for MOWS WSDL.
+    */
+   String NSURI_MOWS_WSDL = BASE_URI_MOWS + "wsdm-mows.wsdl";
+
+   /**
+    * Namespace prefix for MOWS WSDL.
+    */
+   String NSPREFIX_MOWS_WSDL = "mows-wsdl";
+
+   /**
+    * Namespace URI for MOWS topics.
+    */
+   String NSURI_MOWS_TOPICS = BASE_URI_MOWS + "wsdm-mows-events.xml";
+
+   /**
+    * Namespace prefix for MOWS topics.
+    */
+   String NSPREFIX_MOWS_TOPICS = "mows-events";
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/IdentificationCapability.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/IdentificationCapability.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/IdentificationCapability.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/IdentificationCapability.java Tue Aug  2 09:48:21 2005
@@ -1,58 +1,58 @@
-/*
- * Copyright 2004-2005 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.mows.v1_0.capability;
-
-import org.apache.ws.mows.v1_0.MowsConstants;
-
-import javax.xml.namespace.QName;
-
-/**
- * The MOWS Identification manageability capability.
- */
-public interface IdentificationCapability
-{
-
-    /**
-     * Name of this capability.
-     */
-    String NAME = "Identification";
-
-    /**
-     * Manageability capability URI.
-     */ 
-    String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
-
-    /**
-     * Port type name.
-     */
-    QName PORT_TYPE_NAME = new QName( MowsConstants.NSURI_MOWS_WSDL, "EndpointIdentification", MowsConstants.NSPREFIX_MOWS_WSDL );
-
-    /**
-     * Topic name.
-     */
-    String TOPIC_NAME = NAME + "Capability";
-            
-    /**
-     * EndpointReference property name.
-     */
-    QName PROP_NAME_ENDPOINT_REFERENCE = new QName( MowsConstants.NSURI_MOWS_SCHEMA, "EndpointReference", MowsConstants.NSPREFIX_MOWS_SCHEMA );
-
-    /**
-     * EndpointDescriptions property name.
-     */
-    QName PROP_NAME_ENDPOINT_DESCRIPTIONS = new QName( MowsConstants.NSURI_MOWS_SCHEMA, "EndpointDescriptions", MowsConstants.NSPREFIX_MOWS_SCHEMA );
-
-}
+/*=============================================================================*
+ *  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.mows.v1_0.capability;
+
+import org.apache.ws.mows.v1_0.MowsConstants;
+import javax.xml.namespace.QName;
+
+/**
+ * The MOWS Identification manageability capability.
+ */
+public interface IdentificationCapability
+{
+   /**
+    * Name of this capability.
+    */
+   String NAME = "Identification";
+
+   /**
+    * Manageability capability URI.
+    */
+   String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
+
+   /**
+    * Port type name.
+    */
+   QName PORT_TYPE_NAME =
+      new QName( MowsConstants.NSURI_MOWS_WSDL, "EndpointIdentification", MowsConstants.NSPREFIX_MOWS_WSDL );
+
+   /**
+    * Topic name.
+    */
+   String TOPIC_NAME = NAME + "Capability";
+
+   /**
+    * EndpointReference property name.
+    */
+   QName PROP_NAME_ENDPOINT_REFERENCE =
+      new QName( MowsConstants.NSURI_MOWS_SCHEMA, "EndpointReference", MowsConstants.NSPREFIX_MOWS_SCHEMA );
+
+   /**
+    * EndpointDescriptions property name.
+    */
+   QName PROP_NAME_ENDPOINT_DESCRIPTIONS =
+      new QName( MowsConstants.NSURI_MOWS_SCHEMA, "EndpointDescriptions", MowsConstants.NSPREFIX_MOWS_SCHEMA );
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/ManageabilityReferencesCapability.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/ManageabilityReferencesCapability.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/ManageabilityReferencesCapability.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/ManageabilityReferencesCapability.java Tue Aug  2 09:48:21 2005
@@ -1,45 +1,42 @@
-/*
- * Copyright 2004-2005 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.mows.v1_0.capability;
-
-import org.apache.ws.mows.v1_0.MowsConstants;
-import org.oasisOpen.docs.wsdm.x2004.x12.mows.wsdmMows.GetManageabilityReferencesResponseDocument;
-import org.oasisOpen.docs.wsdm.x2004.x12.mows.wsdmMows.GetManageabilityReferencesDocument;
-
-import javax.xml.namespace.QName;
-
-/**
- * The MOWS ManageabilityReferences manageability capability.
- */
-public interface ManageabilityReferencesCapability
-{
-
-    /**
-     * Name of this capability.
-     */
-    String NAME = "ManageabilityReferences";
-
-    /**
-     * Manageability capability URI.
-     */ 
-    String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
-
-    /**
-     * Port type name.
-     */
-    QName PORT_TYPE_NAME = new QName( MowsConstants.NSURI_MOWS_WSDL, NAME, MowsConstants.NSPREFIX_MOWS_WSDL );
-        
-}
+/*=============================================================================*
+ *  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.mows.v1_0.capability;
+
+import org.apache.ws.mows.v1_0.MowsConstants;
+import org.oasisOpen.docs.wsdm.x2004.x12.mows.wsdmMows.GetManageabilityReferencesDocument;
+import org.oasisOpen.docs.wsdm.x2004.x12.mows.wsdmMows.GetManageabilityReferencesResponseDocument;
+import javax.xml.namespace.QName;
+
+/**
+ * The MOWS ManageabilityReferences manageability capability.
+ */
+public interface ManageabilityReferencesCapability
+{
+   /**
+    * Name of this capability.
+    */
+   String NAME = "ManageabilityReferences";
+
+   /**
+    * Manageability capability URI.
+    */
+   String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
+
+   /**
+    * Port type name.
+    */
+   QName PORT_TYPE_NAME = new QName( MowsConstants.NSURI_MOWS_WSDL, NAME, MowsConstants.NSPREFIX_MOWS_WSDL );
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/MetricsCapability.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/MetricsCapability.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/MetricsCapability.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/MetricsCapability.java Tue Aug  2 09:48:21 2005
@@ -1,78 +1,82 @@
-/*
- * Copyright 2004-2005 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.mows.v1_0.capability;
-
-import org.apache.ws.mows.v1_0.MowsConstants;
-
-import javax.xml.namespace.QName;
-
-/**
- * The MOWS Metrics manageability capability. 
- */
-public interface MetricsCapability
-{
-
-    /**
-     * Name of this capability.
-     */
-    String NAME = "Metrics";
-
-    /**
-     * Manageability capability URI.
-     */ 
-    String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
-
-    /**
-     * Port type name.
-     */
-    QName PORT_TYPE_NAME = new QName( MowsConstants.NSURI_MOWS_WSDL, "EndpointMetrics", MowsConstants.NSPREFIX_MOWS_WSDL );
-
-    /**
-     * Topic name.
-     */
-    String TOPIC_NAME = NAME + "Capability";
-            
-    /**
-     * NumberOfRequests property name.
-     */
-    QName PROP_NAME_NUMBER_OF_REQUESTS = new QName( MowsConstants.NSURI_MOWS_SCHEMA, "NumberOfRequests", MowsConstants.NSPREFIX_MOWS_SCHEMA );
-
-    /**
-     * NumberOfSuccessfulRequests property name.
-     */
-    QName PROP_NAME_NUMBER_OF_SUCCESSFUL_REQUESTS = new QName( MowsConstants.NSURI_MOWS_SCHEMA, "NumberOfSuccessfulRequests", MowsConstants.NSPREFIX_MOWS_SCHEMA );
-
-    /**
-     * NumberOfFailedRequests property name.
-     */
-    QName PROP_NAME_NUMBER_OF_FAILED_REQUESTS = new QName( MowsConstants.NSURI_MOWS_SCHEMA, "NumberOfFailedRequests", MowsConstants.NSPREFIX_MOWS_SCHEMA );
-
-    /**
-     * ServiceTime property name.
-     */
-    QName PROP_NAME_SERVICE_TIME = new QName( MowsConstants.NSURI_MOWS_SCHEMA, "ServiceTime", MowsConstants.NSPREFIX_MOWS_SCHEMA );
-
-    /**
-     * MaxResponseTime property name.
-     */
-    QName PROP_NAME_MAX_RESPONSE_TIME = new QName( MowsConstants.NSURI_MOWS_SCHEMA, "MaxResponseTime", MowsConstants.NSPREFIX_MOWS_SCHEMA );
-
-    /**
-     * LastResponseTime property name.
-     */
-    QName PROP_NAME_LAST_RESPONSE_TIME = new QName( MowsConstants.NSURI_MOWS_SCHEMA, "LastResponseTime", MowsConstants.NSPREFIX_MOWS_SCHEMA );
-
-}
+/*=============================================================================*
+ *  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.mows.v1_0.capability;
+
+import org.apache.ws.mows.v1_0.MowsConstants;
+import javax.xml.namespace.QName;
+
+/**
+ * The MOWS Metrics manageability capability.
+ */
+public interface MetricsCapability
+{
+   /**
+    * Name of this capability.
+    */
+   String NAME = "Metrics";
+
+   /**
+    * Manageability capability URI.
+    */
+   String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
+
+   /**
+    * Port type name.
+    */
+   QName PORT_TYPE_NAME =
+      new QName( MowsConstants.NSURI_MOWS_WSDL, "EndpointMetrics", MowsConstants.NSPREFIX_MOWS_WSDL );
+
+   /**
+    * Topic name.
+    */
+   String TOPIC_NAME = NAME + "Capability";
+
+   /**
+    * NumberOfRequests property name.
+    */
+   QName PROP_NAME_NUMBER_OF_REQUESTS =
+      new QName( MowsConstants.NSURI_MOWS_SCHEMA, "NumberOfRequests", MowsConstants.NSPREFIX_MOWS_SCHEMA );
+
+   /**
+    * NumberOfSuccessfulRequests property name.
+    */
+   QName PROP_NAME_NUMBER_OF_SUCCESSFUL_REQUESTS =
+      new QName( MowsConstants.NSURI_MOWS_SCHEMA, "NumberOfSuccessfulRequests", MowsConstants.NSPREFIX_MOWS_SCHEMA );
+
+   /**
+    * NumberOfFailedRequests property name.
+    */
+   QName PROP_NAME_NUMBER_OF_FAILED_REQUESTS =
+      new QName( MowsConstants.NSURI_MOWS_SCHEMA, "NumberOfFailedRequests", MowsConstants.NSPREFIX_MOWS_SCHEMA );
+
+   /**
+    * ServiceTime property name.
+    */
+   QName PROP_NAME_SERVICE_TIME =
+      new QName( MowsConstants.NSURI_MOWS_SCHEMA, "ServiceTime", MowsConstants.NSPREFIX_MOWS_SCHEMA );
+
+   /**
+    * MaxResponseTime property name.
+    */
+   QName PROP_NAME_MAX_RESPONSE_TIME =
+      new QName( MowsConstants.NSURI_MOWS_SCHEMA, "MaxResponseTime", MowsConstants.NSPREFIX_MOWS_SCHEMA );
+
+   /**
+    * LastResponseTime property name.
+    */
+   QName PROP_NAME_LAST_RESPONSE_TIME =
+      new QName( MowsConstants.NSURI_MOWS_SCHEMA, "LastResponseTime", MowsConstants.NSPREFIX_MOWS_SCHEMA );
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStateCapability.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStateCapability.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStateCapability.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStateCapability.java Tue Aug  2 09:48:21 2005
@@ -1,58 +1,59 @@
-/*
- * Copyright 2004-2005 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.mows.v1_0.capability;
-
-import org.apache.ws.mows.v1_0.MowsConstants;
-
-import javax.xml.namespace.QName;
-
-/**
- * The MOWS OperationalState manageability capability.
- */
-public interface OperationalStateCapability
-{
-
-    /**
-     * Name of this capability.
-     */
-    String NAME = "OperationalState";
-
-    /**
-     * Manageability capability URI.
-     */ 
-    String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
-
-    /**
-     * Port type name.
-     */
-    QName PORT_TYPE_NAME = new QName( MowsConstants.NSURI_MOWS_WSDL, "EndpointOperationalState", MowsConstants.NSPREFIX_MOWS_WSDL );
-
-    /**
-     * Topic name.
-     */
-    String TOPIC_NAME = NAME + "Capability";
-            
-    /**
-     * CurrentOperationalState property name.
-     */
-    QName PROP_NAME_CURRENT_OPERATIONAL_STATE = new QName( MowsConstants.NSURI_MOWS_SCHEMA, "CurrentOperationalState", MowsConstants.NSPREFIX_MOWS_SCHEMA );
-
-    /**
-     * LastOperationalStateTransition property name.
-     */
-    QName PROP_NAME_LAST_OPERATIONAL_STATE_TRANSITION = new QName( MowsConstants.NSURI_MOWS_SCHEMA, "LastOperationalStateTransition", MowsConstants.NSPREFIX_MOWS_SCHEMA );
-
-}
+/*=============================================================================*
+ *  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.mows.v1_0.capability;
+
+import org.apache.ws.mows.v1_0.MowsConstants;
+import javax.xml.namespace.QName;
+
+/**
+ * The MOWS OperationalState manageability capability.
+ */
+public interface OperationalStateCapability
+{
+   /**
+    * Name of this capability.
+    */
+   String NAME = "OperationalState";
+
+   /**
+    * Manageability capability URI.
+    */
+   String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
+
+   /**
+    * Port type name.
+    */
+   QName PORT_TYPE_NAME =
+      new QName( MowsConstants.NSURI_MOWS_WSDL, "EndpointOperationalState", MowsConstants.NSPREFIX_MOWS_WSDL );
+
+   /**
+    * Topic name.
+    */
+   String TOPIC_NAME = NAME + "Capability";
+
+   /**
+    * CurrentOperationalState property name.
+    */
+   QName PROP_NAME_CURRENT_OPERATIONAL_STATE =
+      new QName( MowsConstants.NSURI_MOWS_SCHEMA, "CurrentOperationalState", MowsConstants.NSPREFIX_MOWS_SCHEMA );
+
+   /**
+    * LastOperationalStateTransition property name.
+    */
+   QName PROP_NAME_LAST_OPERATIONAL_STATE_TRANSITION =
+      new QName( MowsConstants.NSURI_MOWS_SCHEMA, "LastOperationalStateTransition",
+                 MowsConstants.NSPREFIX_MOWS_SCHEMA );
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStatusCapability.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStatusCapability.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStatusCapability.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStatusCapability.java Tue Aug  2 09:48:21 2005
@@ -1,41 +1,39 @@
-/*
- * Copyright 2004-2005 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.mows.v1_0.capability;
-
-import org.apache.ws.mows.v1_0.MowsConstants;
-
-/**
- * The MOWS OperationalStatus manageability capability.
- */
-public interface OperationalStatusCapability
-{
-
-    /**
-     * Name of this capability.
-     */
-    String NAME = "OperationalStatus";
-
-    /**
-     * Manageability capability URI.
-     */ 
-    String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
-
-    /**
-     * Topic name.
-     */
-    String TOPIC_NAME = NAME + "Capability";
-
-}
+/*=============================================================================*
+ *  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.mows.v1_0.capability;
+
+import org.apache.ws.mows.v1_0.MowsConstants;
+
+/**
+ * The MOWS OperationalStatus manageability capability.
+ */
+public interface OperationalStatusCapability
+{
+   /**
+    * Name of this capability.
+    */
+   String NAME = "OperationalStatus";
+
+   /**
+    * Manageability capability URI.
+    */
+   String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
+
+   /**
+    * Topic name.
+    */
+   String TOPIC_NAME = NAME + "Capability";
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/RequestProcessingStateCapability.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/RequestProcessingStateCapability.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/RequestProcessingStateCapability.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/RequestProcessingStateCapability.java Tue Aug  2 09:48:21 2005
@@ -1,41 +1,39 @@
-/*
- * Copyright 2004-2005 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.mows.v1_0.capability;
-
-import org.apache.ws.mows.v1_0.MowsConstants;
-
-/**
- * The MOWS RequestProcessingState manageability capability.
- */
-public interface RequestProcessingStateCapability
-{
-
-    /**
-     * Name of this capability.
-     */
-    String NAME = "RequestProcessingState";
-
-    /**
-     * Manageability capability URI.
-     */ 
-    String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
-
-    /**
-     * Topic name.
-     */
-    String TOPIC_NAME = NAME + "Capability";
-
-}
+/*=============================================================================*
+ *  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.mows.v1_0.capability;
+
+import org.apache.ws.mows.v1_0.MowsConstants;
+
+/**
+ * The MOWS RequestProcessingState manageability capability.
+ */
+public interface RequestProcessingStateCapability
+{
+   /**
+    * Name of this capability.
+    */
+   String NAME = "RequestProcessingState";
+
+   /**
+    * Manageability capability URI.
+    */
+   String URI = MowsConstants.BASE_URI_MOWS_CAPABILITIES + NAME;
+
+   /**
+    * Topic name.
+    */
+   String TOPIC_NAME = NAME + "Capability";
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/muws/Category.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/muws/Category.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/muws/Category.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/muws/Category.java Tue Aug  2 09:48:21 2005
@@ -1,51 +1,49 @@
-/*=============================================================================*
- *  Copyright 2005 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.muws;
-
-import javax.xml.namespace.QName;
-
-/**
- * A category, as defined by part 2 of the MUWS specification. 
- */
-public interface Category
-{
-
-    /**
-     * Returns the name of this category.
-     *
-     * @return the name of this category
-     */
-    QName getName();
-
-    /**
-     * Returns the next most general category in the categorization taxonomy.
-     *
-     * @return the next most general category in the categorization taxonomy
-     *
-     * @exception java.util.NoSuchElementException if the category does not have any generalizations
-     */
-    Category getGeneralization();
-
-    /**
-     * Returns <tt>true</tt> if the category has a generalization. (In other
-     * words, returns <tt>true</tt> if <tt>getGeneralization</tt> would return a more
-     * general category rather than throwing an exception.)
-     *
-     * @return <tt>true</tt> if the category
-     */
-    boolean hasGeneralization();
-
-}
+/*=============================================================================*
+ *  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.muws;
+
+import javax.xml.namespace.QName;
+
+/**
+ * A category, as defined by part 2 of the MUWS specification.
+ */
+public interface Category
+{
+   /**
+    * Returns the next most general category in the categorization taxonomy.
+    *
+    * @return the next most general category in the categorization taxonomy
+    *
+    * @exception java.util.NoSuchElementException if the category does not have any generalizations
+    */
+   Category getGeneralization(  );
+
+   /**
+    * Returns the name of this category.
+    *
+    * @return the name of this category
+    */
+   QName getName(  );
+
+   /**
+    * Returns <tt>true</tt> if the category has a generalization. (In other
+    * words, returns <tt>true</tt> if <tt>getGeneralization</tt> would return a more
+    * general category rather than throwing an exception.)
+    *
+    * @return <tt>true</tt> if the category
+    */
+   boolean hasGeneralization(  );
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/muws/MuwsUtils.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/muws/MuwsUtils.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/muws/MuwsUtils.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/muws/MuwsUtils.java Tue Aug  2 09:48:21 2005
@@ -1,145 +1,164 @@
-package org.apache.ws.muws;
-
-import org.apache.commons.id.IdentifierUtils;
-import org.apache.commons.id.uuid.UUID;
-import org.apache.ws.muws.v1_0.MuwsConstants;
-import org.apache.ws.muws.v1_0.capability.IdentityCapability;
-import org.apache.ws.muws.v1_0.capability.RelationshipsCapability;
-import org.apache.ws.notification.topics.Topic;
-import org.apache.ws.notification.topics.TopicSpace;
-import org.apache.ws.notification.topics.TopicSpaceSet;
-import org.apache.ws.notification.topics.impl.TopicSpaceImpl;
-import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.ResourcePropertySet;
-import org.apache.ws.resource.Resource;
-import org.apache.ws.resource.PropertiesResource;
-import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart1.ResourceIdDocument;
-
-import javax.xml.namespace.QName;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLEncoder;
-
-/**
- * A set of utility methods to aid in initializing MUWS manageable resources.
- *
- * @author Sal Campana
- */
-public class MuwsUtils
-{
-
-    /**
-     * Replaces the Relationship resource property in the specified property set with a
-     * special {@link org.apache.ws.muws.v1_0.impl.XmlBeansRelationshipResourceProperty}.
-     *
-     * @param propSet
-     */
-    public static void updateRelationshipResourceProperty(ResourcePropertySet propSet, org.apache.ws.notification.base.NotificationProducerResource notifResource)
-    {
-        if (propSet.get(org.apache.ws.muws.v1_0.capability.RelationshipsCapability.PROP_NAME_RELATIONSHIP) != null)
-        {
-            org.apache.ws.muws.v1_0.impl.XmlBeansRelationshipResourceProperty relationshipResourceProperty = new org.apache.ws.muws.v1_0.impl.XmlBeansRelationshipResourceProperty(propSet.getMetaData().getPropertyMetaData(org.apache.ws.muws.v1_0.capability.RelationshipsCapability.PROP_NAME_RELATIONSHIP),
-                                                                                                                                                                                   (org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet) propSet, notifResource);
-            ((org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet) propSet).set(relationshipResourceProperty);
-        }
-    }
-
-    /**
-     * Adds the MUWS RelationshipCreated/Deleted topics to the specified topic set.
-     *
-     * @param topicSet
-     */
-    public static TopicSpace addRelationshipTopics(TopicSpaceSet topicSet)
-    {
-        TopicSpace topicSpace = new TopicSpaceImpl(MuwsConstants.NSURI_MUWS_PART2_TOPICS);
-        Topic topic = topicSpace.addTopic(RelationshipsCapability.TOPIC_NAME);
-        topic.addTopic(RelationshipsCapability.SUBTOPIC_NAME_RELATIONSHIP_CREATED);
-        topic.addTopic(RelationshipsCapability.SUBTOPIC_NAME_RELATIONSHIP_DELETED);
-        return topicSet.addTopicSpace(topicSpace);
-    }
-
-    /**
-     * Utility method for initializing the MUWS Identity ResourceId property.
-     *
-     * @param resource The resource to add the property to.
-     */
-    public static void initResourceIdProperty(Resource resource)
-    {
-        if (resource instanceof PropertiesResource)
-        {
-            ResourceProperty resourceProperty = ((PropertiesResource)resource).getResourcePropertySet().get(IdentityCapability.PROP_NAME_RESOURCE_ID);
-            if (resourceProperty != null)
-            {
-                if (resourceProperty.isEmpty())  // ResourceId prop is immutable, so it only needs to be set once
-                {
-                    URI idURI = toURI(resource.getID());
-                    ResourceIdDocument propElem = ResourceIdDocument.Factory.newInstance();
-                    propElem.setResourceId(idURI.toString());
-                    resourceProperty.add(propElem);
-                }
-            }
-        }
-    }
-
-    /**
-     * Converts the specified resource identifier into a globally unique URI that can
-     * be used as the value for the MUWS ResourceId property.
-     *
-     * @param resourceId a resource identifier
-     * @return URI that can be used as the value for the MUWS ResourceId property
-     */
-    private static URI toURI(Object resourceId)
-    {
-        try
-        {
-            return new URI(String.valueOf(resourceId));
-        }
-        catch (URISyntaxException urise)
-        {
-            // resource identifier is not already a URI - convert it to one...
-        }
-        String idString;
-        if (resourceId != null)
-        {
-            idString = resourceId.toString();
-            // URL-encode the id in case it contains any unsafe characters
-            try
-            {
-                idString = URLEncoder.encode(idString, "UTF-8");
-            }
-            catch (UnsupportedEncodingException uee)
-            {
-                // will never happen - all JDKs support UTF-8
-                throw new IllegalStateException(uee.getLocalizedMessage());
-            }
-        }
-        else
-        {
-            idString = "SINGLETON";
-        }
-        return URI.create(getBaseURI() + "/" + idString);
-    }
-
-    /**
-     * Returns the base URI to which {@link #toURI} will append a stringified version
-     * of a resource identifier. The default implementation returns a URN representation
-     * of a v4 UUID.
-     *
-     * @return the base URI to which {@link #toURI} will append a stringified version
-     *         of a resource identifier
-     */
-    private static String getBaseURI()
-    {
-        try
-        {
-            return ((UUID) IdentifierUtils.UUID_VERSION_FOUR_GENERATOR.nextIdentifier()).toUrn();
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException("Failed to generate UUID.", e);
-        }
-    }
-
-
-}
+/*=============================================================================*
+ *  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.muws;
+
+import org.apache.commons.id.IdentifierUtils;
+import org.apache.commons.id.uuid.UUID;
+import org.apache.ws.muws.v1_0.MuwsConstants;
+import org.apache.ws.muws.v1_0.capability.IdentityCapability;
+import org.apache.ws.muws.v1_0.capability.RelationshipsCapability;
+import org.apache.ws.notification.topics.Topic;
+import org.apache.ws.notification.topics.TopicSpace;
+import org.apache.ws.notification.topics.TopicSpaceSet;
+import org.apache.ws.notification.topics.impl.TopicSpaceImpl;
+import org.apache.ws.resource.PropertiesResource;
+import org.apache.ws.resource.Resource;
+import org.apache.ws.resource.properties.ResourceProperty;
+import org.apache.ws.resource.properties.ResourcePropertySet;
+import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart1.ResourceIdDocument;
+import javax.xml.namespace.QName;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+
+/**
+ * A set of utility methods to aid in initializing MUWS manageable resources.
+ *
+ * @author Sal Campana
+ */
+public class MuwsUtils
+{
+   /**
+    * Adds the MUWS RelationshipCreated/Deleted topics to the specified topic set.
+    *
+    * @param topicSet
+    */
+   public static TopicSpace addRelationshipTopics( TopicSpaceSet topicSet )
+   {
+      TopicSpace topicSpace = new TopicSpaceImpl( MuwsConstants.NSURI_MUWS_PART2_TOPICS );
+      Topic      topic = topicSpace.addTopic( RelationshipsCapability.TOPIC_NAME );
+      topic.addTopic( RelationshipsCapability.SUBTOPIC_NAME_RELATIONSHIP_CREATED );
+      topic.addTopic( RelationshipsCapability.SUBTOPIC_NAME_RELATIONSHIP_DELETED );
+      return topicSet.addTopicSpace( topicSpace );
+   }
+
+   /**
+    * Utility method for initializing the MUWS Identity ResourceId property.
+    *
+    * @param resource The resource to add the property to.
+    */
+   public static void initResourceIdProperty( Resource resource )
+   {
+      if ( resource instanceof PropertiesResource )
+      {
+         ResourceProperty resourceProperty =
+            ( (PropertiesResource) resource ).getResourcePropertySet(  ).get( IdentityCapability.PROP_NAME_RESOURCE_ID );
+         if ( resourceProperty != null )
+         {
+            if ( resourceProperty.isEmpty(  ) ) // ResourceId prop is immutable, so it only needs to be set once
+            {
+               URI                idURI    = toURI( resource.getID(  ) );
+               ResourceIdDocument propElem = ResourceIdDocument.Factory.newInstance(  );
+               propElem.setResourceId( idURI.toString(  ) );
+               resourceProperty.add( propElem );
+            }
+         }
+      }
+   }
+
+   /**
+    * Replaces the Relationship resource property in the specified property set with a
+    * special {@link org.apache.ws.muws.v1_0.impl.XmlBeansRelationshipResourceProperty}.
+    *
+    * @param propSet
+    */
+   public static void updateRelationshipResourceProperty( ResourcePropertySet                                          propSet,
+                                                          org.apache.ws.notification.base.NotificationProducerResource notifResource )
+   {
+      if ( propSet.get( org.apache.ws.muws.v1_0.capability.RelationshipsCapability.PROP_NAME_RELATIONSHIP ) != null )
+      {
+         org.apache.ws.muws.v1_0.impl.XmlBeansRelationshipResourceProperty relationshipResourceProperty =
+            new org.apache.ws.muws.v1_0.impl.XmlBeansRelationshipResourceProperty( propSet.getMetaData(  )
+                                                                                          .getPropertyMetaData( org.apache.ws.muws.v1_0.capability.RelationshipsCapability.PROP_NAME_RELATIONSHIP ),
+                                                                                   (org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet) propSet,
+                                                                                   notifResource );
+         ( (org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet) propSet ).set( relationshipResourceProperty );
+      }
+   }
+
+   /**
+    * Returns the base URI to which {@link #toURI} will append a stringified version
+    * of a resource identifier. The default implementation returns a URN representation
+    * of a v4 UUID.
+    *
+    * @return the base URI to which {@link #toURI} will append a stringified version
+    *         of a resource identifier
+    */
+   private static String getBaseURI(  )
+   {
+      try
+      {
+         return ( (UUID) IdentifierUtils.UUID_VERSION_FOUR_GENERATOR.nextIdentifier(  ) ).toUrn(  );
+      }
+      catch ( Exception e )
+      {
+         throw new RuntimeException( "Failed to generate UUID.", e );
+      }
+   }
+
+   /**
+    * Converts the specified resource identifier into a globally unique URI that can
+    * be used as the value for the MUWS ResourceId property.
+    *
+    * @param resourceId a resource identifier
+    * @return URI that can be used as the value for the MUWS ResourceId property
+    */
+   private static URI toURI( Object resourceId )
+   {
+      try
+      {
+         return new URI( String.valueOf( resourceId ) );
+      }
+      catch ( URISyntaxException urise )
+      {
+         // resource identifier is not already a URI - convert it to one...
+      }
+
+      String idString;
+      if ( resourceId != null )
+      {
+         idString = resourceId.toString(  );
+
+         // URL-encode the id in case it contains any unsafe characters
+         try
+         {
+            idString = URLEncoder.encode( idString, "UTF-8" );
+         }
+         catch ( UnsupportedEncodingException uee )
+         {
+            // will never happen - all JDKs support UTF-8
+            throw new IllegalStateException( uee.getLocalizedMessage(  ) );
+         }
+      }
+      else
+      {
+         idString = "SINGLETON";
+      }
+
+      return URI.create( getBaseURI(  ) + "/" + idString );
+   }
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/muws/WsdmNamespaceVersionHolder.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/muws/WsdmNamespaceVersionHolder.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/muws/WsdmNamespaceVersionHolder.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/muws/WsdmNamespaceVersionHolder.java Tue Aug  2 09:48:21 2005
@@ -1,13 +1,46 @@
-package org.apache.ws.muws;
-
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
-
-/**
- * @author Sal Campana
- */
-public interface WsdmNamespaceVersionHolder extends NamespaceVersionHolder
-{
-    String getMuwsPart1XsdNamespace();
-    String getMuwsPart2XsdNamespace();
-    String getMowsXsdNamespace();
-}
+/*=============================================================================*
+ *  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.muws;
+
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+
+/**
+ * @author Sal Campana
+ */
+public interface WsdmNamespaceVersionHolder
+   extends NamespaceVersionHolder
+{
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   String getMowsXsdNamespace(  );
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   String getMuwsPart1XsdNamespace(  );
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   String getMuwsPart2XsdNamespace(  );
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/muws/impl/CategoryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/muws/impl/CategoryImpl.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/muws/impl/CategoryImpl.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/muws/impl/CategoryImpl.java Tue Aug  2 09:48:21 2005
@@ -1,77 +1,115 @@
-/*=============================================================================*
- *  Copyright 2005 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.muws.impl;
-
-import org.apache.ws.muws.Category;
-import org.apache.ws.util.XmlBeanUtils;
-import org.apache.ws.XmlObjectWrapper;
-import org.apache.xmlbeans.XmlObject;
-import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.CategoryType;
-
-import javax.xml.namespace.QName;
-
-/**
- * An XMLBeans-based implementation of a MUWS {@link Category}.
- */
-public class CategoryImpl implements Category, XmlObjectWrapper
-{
-
-    private QName m_name;
-    private Category m_generalization;
-
-    public CategoryImpl( QName name )
-    {
-        m_name = name;
-    }
-
-    public CategoryImpl( QName name, Category generalization )
-    {
-        m_name = name;
-        m_generalization = generalization;
-    }
-
-    public QName getName()
-    {
-        return m_name;
-    }
-
-    public Category getGeneralization()
-    {
-        return m_generalization;
-    }
-
-    public boolean hasGeneralization()
-    {
-        return m_generalization != null;
-    }
-
-    public void setGeneralization( Category category )
-    {
-        m_generalization = category;
-    }
-
-    public XmlObject getXmlObject()
-    {
-        XmlObject categoryXBean = XmlObject.Factory.newInstance();
-        XmlObject xBean = categoryXBean;
-        for ( Category category = this; category != null; category = category.getGeneralization() )
-        {
-            xBean = XmlBeanUtils.addChildElement( xBean, category.getName() );
-        }
-        return categoryXBean;
-    }
-
-}
+/*=============================================================================*
+ *  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.muws.impl;
+
+import org.apache.ws.XmlObjectWrapper;
+import org.apache.ws.muws.Category;
+import org.apache.ws.util.XmlBeanUtils;
+import org.apache.xmlbeans.XmlObject;
+import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.CategoryType;
+import javax.xml.namespace.QName;
+
+/**
+ * An XMLBeans-based implementation of a MUWS {@link Category}.
+ */
+public class CategoryImpl
+   implements Category,
+              XmlObjectWrapper
+{
+   private QName    m_name;
+   private Category m_generalization;
+
+   /**
+    * Creates a new {@link CategoryImpl} object.
+    *
+    * @param name DOCUMENT_ME
+    */
+   public CategoryImpl( QName name )
+   {
+      m_name = name;
+   }
+
+   /**
+    * Creates a new {@link CategoryImpl} object.
+    *
+    * @param name DOCUMENT_ME
+    * @param generalization DOCUMENT_ME
+    */
+   public CategoryImpl( QName    name,
+                        Category generalization )
+   {
+      m_name              = name;
+      m_generalization    = generalization;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param category DOCUMENT_ME
+    */
+   public void setGeneralization( Category category )
+   {
+      m_generalization = category;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public Category getGeneralization(  )
+   {
+      return m_generalization;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public QName getName(  )
+   {
+      return m_name;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public XmlObject getXmlObject(  )
+   {
+      XmlObject categoryXBean = XmlObject.Factory.newInstance(  );
+      XmlObject xBean = categoryXBean;
+      for ( Category category = this; category != null; category = category.getGeneralization(  ) )
+      {
+         xBean = XmlBeanUtils.addChildElement( xBean,
+                                               category.getName(  ) );
+      }
+
+      return categoryXBean;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public boolean hasGeneralization(  )
+   {
+      return m_generalization != null;
+   }
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/muws/tool/MuwsWsdl2Java.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/muws/tool/MuwsWsdl2Java.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/muws/tool/MuwsWsdl2Java.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/muws/tool/MuwsWsdl2Java.java Tue Aug  2 09:48:21 2005
@@ -1,71 +1,103 @@
-/*=============================================================================*
- *  Copyright 2005 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.muws.tool;
-
-import org.apache.ws.muws.tool.v1_0.RelationshipsPortType2JavaInfo;
-import org.apache.ws.muws.v1_0.impl.WsdmNamespaceVersionHolderImpl;
-import org.apache.ws.notification.tool.WsnWsdl2Java;
-import org.apache.ws.mows.tool.v1_0.ManageabilityReferencesPortType2JavaInfo;
-import org.apache.ws.resource.tool.velocity.ServiceProperties;
-import org.apache.ws.resource.ResourceDefinition;
-import org.apache.velocity.VelocityContext;
-
-import java.io.File;
-
-/**
- * Generates Java Web service types and skeletons from a WSRF/WSN/MUWS WSDL.
- *
- * @author Sal Campana
- */
-public class MuwsWsdl2Java extends WsnWsdl2Java
-{
-    protected String WEBAPP_NAME = "muse";
-
-    public MuwsWsdl2Java( File[] wsdlFiles, File outputDir, File[] classpath, Wsdl2JavaOptions options )
-            throws Exception
-    {
-        super( wsdlFiles, outputDir, classpath, options );
-        initPortTypeInfoMap();
-    }
-    protected String getWebbappName()
-    {
-        return WEBAPP_NAME;
-    }
-
-    private void initPortTypeInfoMap()
-    {
-        addPortType2JavaInfo( new RelationshipsPortType2JavaInfo() );
-        addPortType2JavaInfo( new ManageabilityReferencesPortType2JavaInfo() );
-    }
-
-    protected ServiceProperties buildServiceProperties(ResourceDefinition resourceDefinition, File file, File file1)
-    {
-        ServiceProperties serviceProperties = super.buildServiceProperties(resourceDefinition, file, file1);
-        serviceProperties.setNamespaceVersionHolder(WsdmNamespaceVersionHolderImpl.class);//make sure to add different ones as new versions comeout
-        return serviceProperties;
-    }
-
-    /**
-     * Provides a hook for adding to the Velocity Context.
-     *
-     * @param context
-     * @return VelocityContext
-     */
-    protected VelocityContext updateVelocityContext(VelocityContext context, ResourceDefinition resourceDef)
-    {
-        return super.updateVelocityContext(context, resourceDef);
-    }
-}
+/*=============================================================================*
+ *  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.muws.tool;
+
+import org.apache.velocity.VelocityContext;
+import org.apache.ws.mows.tool.v1_0.ManageabilityReferencesPortType2JavaInfo;
+import org.apache.ws.muws.tool.v1_0.RelationshipsPortType2JavaInfo;
+import org.apache.ws.muws.v1_0.impl.WsdmNamespaceVersionHolderImpl;
+import org.apache.ws.notification.tool.WsnWsdl2Java;
+import org.apache.ws.resource.ResourceDefinition;
+import org.apache.ws.resource.tool.velocity.ServiceProperties;
+import java.io.File;
+
+/**
+ * Generates Java Web service types and skeletons from a WSRF/WSN/MUWS WSDL.
+ *
+ * @author Sal Campana
+ */
+public class MuwsWsdl2Java
+   extends WsnWsdl2Java
+{
+   /** DOCUMENT_ME */
+   protected String WEBAPP_NAME = "muse";
+
+   /**
+    * Creates a new {@link MuwsWsdl2Java} object.
+    *
+    * @param wsdlFiles DOCUMENT_ME
+    * @param outputDir DOCUMENT_ME
+    * @param classpath DOCUMENT_ME
+    * @param options DOCUMENT_ME
+    *
+    * @throws Exception DOCUMENT_ME
+    */
+   public MuwsWsdl2Java( File[]           wsdlFiles,
+                         File             outputDir,
+                         File[]           classpath,
+                         Wsdl2JavaOptions options )
+   throws Exception
+   {
+      super( wsdlFiles, outputDir, classpath, options );
+      initPortTypeInfoMap(  );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   protected String getWebbappName(  )
+   {
+      return WEBAPP_NAME;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param resourceDefinition DOCUMENT_ME
+    * @param file DOCUMENT_ME
+    * @param file1 DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   protected ServiceProperties buildServiceProperties( ResourceDefinition resourceDefinition,
+                                                       File               file,
+                                                       File               file1 )
+   {
+      ServiceProperties serviceProperties = super.buildServiceProperties( resourceDefinition, file, file1 );
+      serviceProperties.setNamespaceVersionHolder( WsdmNamespaceVersionHolderImpl.class ); //make sure to add different ones as new versions comeout
+      return serviceProperties;
+   }
+
+   /**
+    * Provides a hook for adding to the Velocity Context.
+    *
+    * @param context
+    * @return VelocityContext
+    */
+   protected VelocityContext updateVelocityContext( VelocityContext    context,
+                                                    ResourceDefinition resourceDef )
+   {
+      return super.updateVelocityContext( context, resourceDef );
+   }
+
+   private void initPortTypeInfoMap(  )
+   {
+      addPortType2JavaInfo( new RelationshipsPortType2JavaInfo(  ) );
+      addPortType2JavaInfo( new ManageabilityReferencesPortType2JavaInfo(  ) );
+   }
+}
\ No newline at end of file

Modified: webservices/muse/trunk/src/java/org/apache/ws/muws/tool/MuwsWsdl2JavaTask.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/muws/tool/MuwsWsdl2JavaTask.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/muws/tool/MuwsWsdl2JavaTask.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/muws/tool/MuwsWsdl2JavaTask.java Tue Aug  2 09:48:21 2005
@@ -1,61 +1,61 @@
-/*=============================================================================*
- *  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.muws.tool;
-
-import org.apache.ws.resource.tool.Wsdl2Java;
-import org.apache.ws.notification.tool.WsnWsdl2JavaTask;
-
-import java.io.File;
-
-/**
- *
- * Ant task that wraps {@link org.apache.ws.notification.tool.WsnWsdl2JavaTask}.
- *
- * @author Sal Campana
- */
-public class MuwsWsdl2JavaTask extends WsnWsdl2JavaTask
-{
-   /**
-    * DOCUMENT_ME
-    *
-    * @return DOCUMENT_ME
-    */
-   public String toString(  )
-   {
-      return "MuwsWsdl2JavaTask Ant task";
-   }
-
-   /**
-    * DOCUMENT_ME
-    *
-    * @param wsdlFiles DOCUMENT_ME
-    * @param outputDir DOCUMENT_ME
-    * @param classpathFiles DOCUMENT_ME
-    * @param options DOCUMENT_ME
-    *
-    * @return DOCUMENT_ME
-    *
-    * @throws Exception DOCUMENT_ME
-    */
-   protected Wsdl2Java createWsdl2Java( File[]                     wsdlFiles,
-                                        File                       outputDir,
-                                        File[]                     classpathFiles,
-                                        Wsdl2Java.Wsdl2JavaOptions options )
-   throws Exception
-   {
-      return new MuwsWsdl2Java( wsdlFiles, outputDir, classpathFiles, options );
-   }
+/*=============================================================================*
+ *  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.muws.tool;
+
+import org.apache.ws.notification.tool.WsnWsdl2JavaTask;
+import org.apache.ws.resource.tool.Wsdl2Java;
+import java.io.File;
+
+/**
+ *
+ * Ant task that wraps {@link org.apache.ws.notification.tool.WsnWsdl2JavaTask}.
+ *
+ * @author Sal Campana
+ */
+public class MuwsWsdl2JavaTask
+   extends WsnWsdl2JavaTask
+{
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public String toString(  )
+   {
+      return "MuwsWsdl2JavaTask Ant task";
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @param wsdlFiles DOCUMENT_ME
+    * @param outputDir DOCUMENT_ME
+    * @param classpathFiles DOCUMENT_ME
+    * @param options DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    *
+    * @throws Exception DOCUMENT_ME
+    */
+   protected Wsdl2Java createWsdl2Java( File[]                     wsdlFiles,
+                                        File                       outputDir,
+                                        File[]                     classpathFiles,
+                                        Wsdl2Java.Wsdl2JavaOptions options )
+   throws Exception
+   {
+      return new MuwsWsdl2Java( wsdlFiles, outputDir, classpathFiles, options );
+   }
 }

Modified: webservices/muse/trunk/src/java/org/apache/ws/muws/tool/v1_0/RelationshipsPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/java/org/apache/ws/muws/tool/v1_0/RelationshipsPortType2JavaInfo.java?rev=227038&r1=227037&r2=227038&view=diff
==============================================================================
--- webservices/muse/trunk/src/java/org/apache/ws/muws/tool/v1_0/RelationshipsPortType2JavaInfo.java (original)
+++ webservices/muse/trunk/src/java/org/apache/ws/muws/tool/v1_0/RelationshipsPortType2JavaInfo.java Tue Aug  2 09:48:21 2005
@@ -1,47 +1,67 @@
-/*=============================================================================*
- *  Copyright 2005 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.muws.tool.v1_0;
-
-import org.apache.ws.muws.v1_0.capability.RelationshipsCapability;
-import org.apache.ws.resource.tool.PortType2JavaInfo;
-
-import javax.xml.namespace.QName;
-
-/**
- * PortType2JavaInfo for the MUWS 1.0 Relationships portType.
- */
-public class RelationshipsPortType2JavaInfo extends PortType2JavaInfo
-{
-    public QName getName()
-    {
-        return RelationshipsCapability.PORT_TYPE_NAME;
-    }
-
-    public String getServiceInterfaceName()
-    {
-        return RelationshipsCapability.class.getName();
-    }
-
-    public String getServiceTemplateFileName()
-    {
-        return "templates/v2004_12/Relationships.txt";
-    }
-
-    public String getAbstractResourceInitMethodIncludeLocation()
-    {
-        return "templates/v2004_12/Relationships-AbstractResource_init.txt";
-    }
-}
+/*=============================================================================*
+ *  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.muws.tool.v1_0;
+
+import org.apache.ws.muws.v1_0.capability.RelationshipsCapability;
+import org.apache.ws.resource.tool.PortType2JavaInfo;
+import javax.xml.namespace.QName;
+
+/**
+ * PortType2JavaInfo for the MUWS 1.0 Relationships portType.
+ */
+public class RelationshipsPortType2JavaInfo
+   extends PortType2JavaInfo
+{
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public String getAbstractResourceInitMethodIncludeLocation(  )
+   {
+      return "templates/v2004_12/Relationships-AbstractResource_init.txt";
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public QName getName(  )
+   {
+      return RelationshipsCapability.PORT_TYPE_NAME;
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public String getServiceInterfaceName(  )
+   {
+      return RelationshipsCapability.class.getName(  );
+   }
+
+   /**
+    * DOCUMENT_ME
+    *
+    * @return DOCUMENT_ME
+    */
+   public String getServiceTemplateFileName(  )
+   {
+      return "templates/v2004_12/Relationships.txt";
+   }
+}
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org


Mime
View raw message