Author: ips
Date: Thu Apr 7 14:21:47 2005
New Revision: 160473
URL: http://svn.apache.org/viewcvs?view=rev&rev=160473
Log:
fixed MOWS capability names
Added:
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/IdentificationCapability.java
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/MetricsCapability.java
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStateCapability.java
Removed:
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/EndpointIdentificationCapability.java
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/EndpointMetricsCapability.java
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/EndpointOperationalStateCapability.java
Modified:
incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationResource.java
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java
Added:
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/IdentificationCapability.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/IdentificationCapability.java?view=auto&rev=160473
==============================================================================
---
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/IdentificationCapability.java
(added)
+++
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/IdentificationCapability.java
Thu Apr 7 14:21:47 2005
@@ -0,0 +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 );
+
+}
Added:
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/MetricsCapability.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/MetricsCapability.java?view=auto&rev=160473
==============================================================================
---
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/MetricsCapability.java
(added)
+++
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/MetricsCapability.java
Thu Apr 7 14:21:47 2005
@@ -0,0 +1,78 @@
+/*
+ * 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 );
+
+}
Added:
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStateCapability.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStateCapability.java?view=auto&rev=160473
==============================================================================
---
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStateCapability.java
(added)
+++
incubator/muse/trunk/src/java/org/apache/ws/mows/v1_0/capability/OperationalStateCapability.java
Thu Apr 7 14:21:47 2005
@@ -0,0 +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 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 );
+
+}
Modified:
incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationResource.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationResource.java?view=diff&r1=160472&r2=160473
==============================================================================
---
incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationResource.java
(original)
+++
incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationResource.java
Thu Apr 7 14:21:47 2005
@@ -1,14 +1,13 @@
package org.everestWeather.wsdm.samples.x2005.x04.schema;
import org.apache.ws.mows.v1_0.MowsConstants;
-import org.apache.ws.mows.v1_0.capability.EndpointIdentificationCapability;
-import org.apache.ws.mows.v1_0.capability.EndpointMetricsCapability;
+import org.apache.ws.mows.v1_0.capability.IdentificationCapability;
+import org.apache.ws.mows.v1_0.capability.MetricsCapability;
import org.apache.ws.mows.v1_0.capability.ManageabilityReferencesCapability;
import org.apache.ws.mows.v1_0.capability.RequestProcessingStateCapability;
import org.apache.ws.muws.v1_0.MuwsConstants;
import org.apache.ws.muws.v1_0.capability.CorrelatablePropertiesCapability;
import org.apache.ws.muws.v1_0.capability.IdentityCapability;
-import org.apache.ws.muws.v1_0.capability.MetricsCapability;
import org.apache.ws.muws.v1_0.capability.OperationalStatusCapability;
import org.apache.ws.muws.v1_0.capability.RelationshipsCapability;
import org.apache.ws.muws.v1_0.topics.ManagementEventTopic;
@@ -137,18 +136,18 @@
//Identification Capability
manageabilityCapabilityDocument =
ManageabilityCapabilityDocument.Factory.newInstance();
- manageabilityCapabilityDocument.setManageabilityCapability(
EndpointIdentificationCapability.URI );
+ manageabilityCapabilityDocument.setManageabilityCapability(
IdentificationCapability.URI );
resourceProperty.add( manageabilityCapabilityDocument );
//MUWS2 Metrics Capability
manageabilityCapabilityDocument =
ManageabilityCapabilityDocument.Factory.newInstance();
- manageabilityCapabilityDocument.setManageabilityCapability(
MetricsCapability.URI );
+ manageabilityCapabilityDocument.setManageabilityCapability(
org.apache.ws.muws.v1_0.capability.MetricsCapability.URI );
resourceProperty.add( manageabilityCapabilityDocument );
//MOWS Metrics Capability
manageabilityCapabilityDocument =
ManageabilityCapabilityDocument.Factory.newInstance();
- manageabilityCapabilityDocument.setManageabilityCapability(
EndpointMetricsCapability.URI );
+ manageabilityCapabilityDocument.setManageabilityCapability(
MetricsCapability.URI );
resourceProperty.add( manageabilityCapabilityDocument );
Modified:
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java?view=diff&r1=160472&r2=160473
==============================================================================
---
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java
(original)
+++
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java
Thu Apr 7 14:21:47 2005
@@ -17,14 +17,13 @@
import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.ws.mows.v1_0.MowsConstants;
-import org.apache.ws.mows.v1_0.capability.EndpointIdentificationCapability;
-import org.apache.ws.mows.v1_0.capability.EndpointMetricsCapability;
+import org.apache.ws.mows.v1_0.capability.IdentificationCapability;
+import org.apache.ws.mows.v1_0.capability.MetricsCapability;
import org.apache.ws.mows.v1_0.capability.RequestProcessingStateCapability;
import org.apache.ws.muws.v1_0.MuwsConstants;
import org.apache.ws.muws.v1_0.capability.CorrelatablePropertiesCapability;
import org.apache.ws.muws.v1_0.capability.IdentityCapability;
import
org.apache.ws.muws.v1_0.capability.ManageabilityCharacteristicsCapability;
-import org.apache.ws.muws.v1_0.capability.MetricsCapability;
import org.apache.ws.muws.v1_0.capability.RelationshipsCapability;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.test.PortListen;
@@ -101,13 +100,13 @@
public void testMowsIdentification() throws FaultException, WSDLException
{
XmlObject[] capabilityElems = m_resource.getResourceProperty(
ManageabilityCharacteristicsCapability.PROP_NAME_MANAGEABILITY_CAPABILITY );
- assertContainsURI( capabilityElems,
EndpointIdentificationCapability.URI );
- XmlObject eprPropElem = getSingleProperty( m_resource,
EndpointIdentificationCapability.PROP_NAME_ENDPOINT_REFERENCE );
+ assertContainsURI( capabilityElems, IdentificationCapability.URI );
+ XmlObject eprPropElem = getSingleProperty( m_resource,
IdentificationCapability.PROP_NAME_ENDPOINT_REFERENCE );
assertTrue( eprPropElem instanceof EndpointReferenceType );
EndpointReferenceType epr = (EndpointReferenceType) eprPropElem;
assertTrue( "mows-xs:EndpointReference element is not valid",
epr.validate() );
String address = epr.getAddress().getStringValue();
- XmlObject epDescsPropElem = getSingleProperty( m_resource,
EndpointIdentificationCapability.PROP_NAME_ENDPOINT_DESCRIPTIONS );
+ XmlObject epDescsPropElem = getSingleProperty( m_resource,
IdentificationCapability.PROP_NAME_ENDPOINT_DESCRIPTIONS );
assertTrue( epDescsPropElem instanceof
EndpointDescriptionsDocument.EndpointDescriptions );
EndpointDescriptionsDocument.EndpointDescriptions epDescs =
(EndpointDescriptionsDocument.EndpointDescriptions)epDescsPropElem;
assertTrue( "mows-xs:EndpointDescriptions element is not valid",
epDescs.validate() );
@@ -138,45 +137,45 @@
assertTrue( idPropElem instanceof XmlAnyURI );
XmlObject[] capabilityElems = mgmtResource.getResourceProperty(
ManageabilityCharacteristicsCapability.PROP_NAME_MANAGEABILITY_CAPABILITY );
- assertContainsURI( capabilityElems,
EndpointIdentificationCapability.URI );
+ assertContainsURI( capabilityElems, IdentificationCapability.URI );
}
}
public void testMowsMetrics() throws FaultException
{
XmlObject[] capabilityElems = m_resource.getResourceProperty(
ManageabilityCharacteristicsCapability.PROP_NAME_MANAGEABILITY_CAPABILITY );
+ assertContainsURI( capabilityElems,
org.apache.ws.muws.v1_0.capability.MetricsCapability.URI );
assertContainsURI( capabilityElems, MetricsCapability.URI );
- assertContainsURI( capabilityElems, EndpointMetricsCapability.URI );
- XmlObject currentTimePropElem = getSingleProperty( m_resource,
MetricsCapability.PROP_NAME_CURRENT_TIME );
+ XmlObject currentTimePropElem = getSingleProperty( m_resource,
org.apache.ws.muws.v1_0.capability.MetricsCapability.PROP_NAME_CURRENT_TIME );
assertTrue( currentTimePropElem instanceof XmlDateTime );
- XmlObject numRequestsPropElem = getSingleProperty( m_resource,
EndpointMetricsCapability.PROP_NAME_NUMBER_OF_REQUESTS );
+ XmlObject numRequestsPropElem = getSingleProperty( m_resource,
MetricsCapability.PROP_NAME_NUMBER_OF_REQUESTS );
assertTrue( numRequestsPropElem instanceof IntegerCounter );
IntegerCounter numRequestsMetric =
((IntegerCounter)numRequestsPropElem);
long numRequests = numRequestsMetric.getBigIntegerValue().longValue();
assertTrue( "ResetAt metadata attribute is not set",
numRequestsMetric.isSetResetAt() );
assertFalse( "Duration metadata attribute is set",
numRequestsMetric.isSetDuration() );
- XmlObject numFailedRequestsPropElem = getSingleProperty( m_resource,
EndpointMetricsCapability.PROP_NAME_NUMBER_OF_FAILED_REQUESTS );
+ XmlObject numFailedRequestsPropElem = getSingleProperty( m_resource,
MetricsCapability.PROP_NAME_NUMBER_OF_FAILED_REQUESTS );
assertTrue( numFailedRequestsPropElem instanceof IntegerCounter );
IntegerCounter numFailedRequestsMetric =
((IntegerCounter)numFailedRequestsPropElem);
long numFailedRequests =
numFailedRequestsMetric.getBigIntegerValue().longValue();
assertTrue( "ResetAt metadata attribute is not set",
numFailedRequestsMetric.isSetResetAt() );
assertFalse( "Duration metadata attribute is set",
numFailedRequestsMetric.isSetDuration() );
- XmlObject numSuccessfulRequestsPropElem = getSingleProperty(
m_resource, EndpointMetricsCapability.PROP_NAME_NUMBER_OF_SUCCESSFUL_REQUESTS );
+ XmlObject numSuccessfulRequestsPropElem = getSingleProperty(
m_resource, MetricsCapability.PROP_NAME_NUMBER_OF_SUCCESSFUL_REQUESTS );
assertTrue( numSuccessfulRequestsPropElem instanceof IntegerCounter );
IntegerCounter numSuccessfulRequestsMetric =
((IntegerCounter)numSuccessfulRequestsPropElem);
long numSuccessfulRequests =
numSuccessfulRequestsMetric.getBigIntegerValue().longValue();
assertTrue( "ResetAt metadata attribute is not set",
numSuccessfulRequestsMetric.isSetResetAt() );
assertFalse( "Duration metadata attribute is set",
numSuccessfulRequestsMetric.isSetDuration() );
assertTrue( numRequests >= numFailedRequests + numSuccessfulRequests );
- XmlObject serviceTimePropElem = getSingleProperty( m_resource,
EndpointMetricsCapability.PROP_NAME_SERVICE_TIME );
+ XmlObject serviceTimePropElem = getSingleProperty( m_resource,
MetricsCapability.PROP_NAME_SERVICE_TIME );
assertTrue( serviceTimePropElem instanceof DurationMetric );
DurationMetric serviceTimeMetric =
((DurationMetric)serviceTimePropElem);
assertTrue( "Duration metadata attribute is not set",
serviceTimeMetric.isSetDuration() );
- XmlObject maxResponseTimePropElem = getSingleProperty( m_resource,
EndpointMetricsCapability.PROP_NAME_MAX_RESPONSE_TIME );
+ XmlObject maxResponseTimePropElem = getSingleProperty( m_resource,
MetricsCapability.PROP_NAME_MAX_RESPONSE_TIME );
assertTrue( maxResponseTimePropElem instanceof DurationMetric );
DurationMetric maxResponseTimeMetric =
((DurationMetric)maxResponseTimePropElem);
assertTrue( "Duration metadata attribute is not set",
maxResponseTimeMetric.isSetDuration() );
- XmlObject lastResponseTimePropElem = getSingleProperty( m_resource,
EndpointMetricsCapability.PROP_NAME_LAST_RESPONSE_TIME );
+ XmlObject lastResponseTimePropElem = getSingleProperty( m_resource,
MetricsCapability.PROP_NAME_LAST_RESPONSE_TIME );
assertTrue( lastResponseTimePropElem instanceof DurationMetric );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
