You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-dev@ws.apache.org by ip...@apache.org on 2004/11/24 03:59:01 UTC
svn commit: r106373 - in incubator/muse/trunk: . src/generated_override/registry/axis/com/hp/ws/generated/registry src/java/org/apache/ws/platform/axis/deployment/wsdd src/java/org/apache/ws/platform/axis/wsdl/toJava src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl src/java/org/apache/ws/resource src/java/org/apache/ws/resource/notification/impl/axis src/java/org/apache/ws/util src/test/org/apache/ws/resource/discovery/service src/test/org/apache/ws/resource/notification src/test/org/apache/ws/test
Author: ips
Date: Tue Nov 23 18:59:00 2004
New Revision: 106373
Modified:
incubator/muse/trunk/ (props changed)
incubator/muse/trunk/maven.xml
incubator/muse/trunk/project.xml
incubator/muse/trunk/src/generated_override/registry/axis/com/hp/ws/generated/registry/RegistryWsdmServiceWSResource.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/deployment/wsdd/WsddUpdater.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/AbstractOperationWriterFactory.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsResetAllImplWriter.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStartImplWriter.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStopImplWriter.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsdmOperationWriterFactory.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntGetCurrentMessageImplWriter.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntSubscribeImplWriter.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlDestroyImplWriter.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlSetTerminationTimeImplWriter.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetMultipleResourcePropertiesImplWriter.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetResourcePropertyImplWriter.java
incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpSetResourcePropertiesImplWriter.java
incubator/muse/trunk/src/java/org/apache/ws/resource/AbstractWSResource.java
incubator/muse/trunk/src/java/org/apache/ws/resource/notification/impl/axis/SubscriptionRequestImpl.java
incubator/muse/trunk/src/java/org/apache/ws/util/AxisGenTypesUtils.java
incubator/muse/trunk/src/test/org/apache/ws/resource/discovery/service/RegistryServiceTestCase.java
incubator/muse/trunk/src/test/org/apache/ws/resource/notification/SubscriptionRequestImplTestCase.java
incubator/muse/trunk/src/test/org/apache/ws/test/DiskServiceTestCase.java
Log:
upgraded to axis 1.2rc2
Modified: incubator/muse/trunk/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/maven.xml?view=diff&rev=106373&p1=incubator/muse/trunk/maven.xml&r1=106372&p2=incubator/muse/trunk/maven.xml&r2=106373
==============================================================================
--- incubator/muse/trunk/maven.xml (original)
+++ incubator/muse/trunk/maven.xml Tue Nov 23 18:59:00 2004
@@ -24,9 +24,9 @@
</preGoal>
<postGoal name="test:compile">
- <copy todir="${maven.test.dest}">
+ <copy todir="${maven.test.dest}" verbose="true">
<fileset dir="${maven.src.dir}/test" excludes="**/*.java, **/package.html" />
- </copy>
+ </copy>
</postGoal>
<postGoal name="test:test">
@@ -51,47 +51,17 @@
<path id="jmuws.classpath.id">
<pathelement location="${maven.build.dest}" />
<path refid="maven.dependency.classpath" />
- </path>
+ </path>
+ <copy todir="${maven.build.dir}/test-classes" overwrite="true" verbose="true">
+ <fileset dir="${maven.src.dir}/test">
+ <include name="*.wsdd" />
+ </fileset>
+ </copy>
+ <property name="test.server-config.wsdd" location="${maven.build.dir}/test-classes/server-config.wsdd" />
<attainGoal name="generate-submgr" />
<attainGoal name="generate-registry" />
</postGoal>
- <!-- ================================================================== -->
- <!-- G E N E R A T E - S U B M G R G O A L -->
- <!-- ================================================================== -->
- <!-- Generate Axis code to support the Subscription Manager web service -->
- <!-- ================================================================== -->
- <goal name="generate-submgr"
- description="generates skeletons, stubs and impls for the Subscription Manager web service">
-
- <taskdef name="wsdmwsdl2java" classname="org.apache.ws.tool.taskdef.WsdmWsdl2JavaTask" classpathref="jmuws.classpath.id" />
- <wsdmwsdl2java wsdl="${wsnt.submgr.wsdl.file}"
- srcDestDir="${maven.build.dest}"
- classesDestDir="${maven.build.dest}"
- classpathref="jmuws.classpath.id"
- wsdmWsdlLocation="/wsdl/jmuws"
- debug="off" />
-
- <!-- overlay generated source with override source files -->
- <copy todir="${maven.build.dest}"
- overwrite="true">
- <fileset dir="${maven.src.dir}/generated_override/submgr">
- <include name="**/*.java"/>
- </fileset>
- </copy>
-
- <!-- compile the source - it remains in maven.build.dest for the rest of maven processing -->
- <javac srcdir="${maven.build.dest}"
- destdir="${maven.build.dest}"
- classpathref="jmuws.classpath.id"
- debug="on" />
-
- <!-- deploy the subscription manager deploy.wsdd to target/server-config.wsdd -->
- <taskdef name="wsddUpdater" classname="org.apache.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
- <wsddUpdater deployWsdd="${maven.build.dest}/axis/com/hp/ws/generated/submgr/deploy.wsdd" configWsdd="${target.config.wsdd}" />
-
- </goal>
-
<!-- ================================================================== -->
<!-- D O C S G O A L -->
<!-- ================================================================== -->
@@ -159,6 +129,45 @@
</goal>
<!-- ================================================================== -->
+ <!-- G E N E R A T E - S U B M G R G O A L -->
+ <!-- ================================================================== -->
+ <!-- Generate Axis code to support the Subscription Manager web service -->
+ <!-- ================================================================== -->
+ <goal name="generate-submgr"
+ description="generates skeletons, stubs and impls for the Subscription Manager web service">
+
+ <taskdef name="wsdmwsdl2java" classname="org.apache.ws.tool.taskdef.WsdmWsdl2JavaTask" classpathref="jmuws.classpath.id" />
+ <wsdmwsdl2java wsdl="${wsnt.submgr.wsdl.file}"
+ srcDestDir="${maven.build.dest}"
+ classesDestDir="${maven.build.dest}"
+ classpathref="jmuws.classpath.id"
+ wsdmWsdlLocation="/wsdl/jmuws"
+ debug="off" />
+
+ <!-- overlay generated source with override source files -->
+ <copy todir="${maven.build.dest}"
+ overwrite="true">
+ <fileset dir="${maven.src.dir}/generated_override/submgr">
+ <include name="**/*.java"/>
+ </fileset>
+ </copy>
+
+ <!-- compile the source - it remains in maven.build.dest for the rest of maven processing -->
+ <javac srcdir="${maven.build.dest}"
+ destdir="${maven.build.dest}"
+ classpathref="jmuws.classpath.id"
+ debug="on" />
+
+ <!-- deploy the submgr deploy.wsdd to target/server-config.wsdd & target/test-classes/server-config.wsdd -->
+ <taskdef name="wsddUpdater" classname="org.apache.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
+ <wsddUpdater deployWsdd="${maven.build.dest}/axis/com/hp/ws/generated/submgr/deploy.wsdd" configWsdd="${target.config.wsdd}" />
+ <wsddUpdater deployWsdd="${maven.build.dest}/axis/com/hp/ws/generated/submgr/deploy.wsdd" configWsdd="${test.server-config.wsdd}" />
+ <echo>*********************</echo>
+ <concat><fileset dir="${maven.build.dir}/test-classes" includes="server-config.wsdd" /></concat>
+
+ </goal>
+
+ <!-- ================================================================== -->
<!-- G E N E R A T E - R E G I S T R Y G O A L -->
<!-- ================================================================== -->
<!-- Generate Axis code to support the Registry web service -->
@@ -191,9 +200,10 @@
classpathref="jmuws.classpath.id"
debug="on" />
- <!-- deploy the registry deploy.wsdd to target/server-config.wsdd -->
+ <!-- deploy the registry deploy.wsdd to target/server-config.wsdd & target/test-classes/server-config.wsdd -->
<taskdef name="wsddUpdater" classname="org.apache.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
<wsddUpdater deployWsdd="${maven.build.dest}/axis/com/hp/ws/generated/registry/deploy.wsdd" configWsdd="${target.config.wsdd}" />
+ <wsddUpdater deployWsdd="${maven.build.dest}/axis/com/hp/ws/generated/registry/deploy.wsdd" configWsdd="${test.server-config.wsdd}" />
</goal>
Modified: incubator/muse/trunk/project.xml
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/project.xml?view=diff&rev=106373&p1=incubator/muse/trunk/project.xml&r1=106372&p2=incubator/muse/trunk/project.xml&r2=106373
==============================================================================
--- incubator/muse/trunk/project.xml (original)
+++ incubator/muse/trunk/project.xml Tue Nov 23 18:59:00 2004
@@ -124,7 +124,37 @@
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
- <version>1.2-RC1</version>
+ <version>1.2-RC2</version>
+ <url>http://ws.apache.org/axis/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>1.2-RC2</version>
+ <url>http://ws.apache.org/axis/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-saaj</artifactId>
+ <version>1.2-RC2</version>
+ <url>http://ws.apache.org/axis/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>1.2-RC2</version>
<url>http://ws.apache.org/axis/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -186,7 +216,7 @@
<groupId>muse</groupId>
<artifactId>disk-types</artifactId>
<version>SNAPSHOT</version>
- <url>https://ws-rp.hpsen.com/</url>
+ <url>http://incubator.apache.org/muse/</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -196,7 +226,7 @@
<groupId>ws-fx</groupId>
<artifactId>wsdm-xmlbeans</artifactId>
<version>SNAPSHOT</version>
- <url>https://ws-rp.hpsen.com/</url>
+ <url>http://ws.apache.org/ws-fx/</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -205,8 +235,8 @@
<dependency>
<groupId>ws-fx</groupId>
<artifactId>wsdm-axis-types</artifactId>
- <version>SNAPSHOT</version>
- <url>https://ws-rp.hpsen.com/</url>
+ <version>1.2-RC2</version>
+ <url>http://ws.apache.org/ws-fx/</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -223,16 +253,6 @@
</dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.2-RC1</version>
- <url>http://ws.apache.org/axis/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -254,16 +274,6 @@
</dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.2-RC1</version>
- <url>http://ws.apache.org/axis/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
<groupId>servletapi</groupId>
<artifactId>servletapi</artifactId>
<version>2.3</version>
@@ -278,16 +288,6 @@
<artifactId>addressing</artifactId>
<version>SNAPSHOT</version>
<url>http://ws.apache.org/ws-fx/addressing/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>1.2-RC1</version>
- <url>http://ws.apache.org/axis/</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
Modified: incubator/muse/trunk/src/generated_override/registry/axis/com/hp/ws/generated/registry/RegistryWsdmServiceWSResource.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/generated_override/registry/axis/com/hp/ws/generated/registry/RegistryWsdmServiceWSResource.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/generated_override/registry/axis/com/hp/ws/generated/registry/RegistryWsdmServiceWSResource.java&r1=106372&p2=incubator/muse/trunk/src/generated_override/registry/axis/com/hp/ws/generated/registry/RegistryWsdmServiceWSResource.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/generated_override/registry/axis/com/hp/ws/generated/registry/RegistryWsdmServiceWSResource.java (original)
+++ incubator/muse/trunk/src/generated_override/registry/axis/com/hp/ws/generated/registry/RegistryWsdmServiceWSResource.java Tue Nov 23 18:59:00 2004
@@ -39,7 +39,6 @@
public RegistryWsdmServiceWSResource( ) throws Exception
{
super( null );
-
setSingleton(true);
}
@@ -92,44 +91,38 @@
/**
* Implementation of the WSDL operation named <code>findResourcesByServiceName</code>.
*/
- public axis.com.hp.ws.generated.registry._FindResponse findResourcesByServiceName(axis.com.hp.ws.generated.registry._FindRequest serviceName) throws java.rmi.RemoteException
+ public axis.com.hp.ws.generated.registry.FindResponse findResourcesByServiceName(axis.com.hp.ws.generated.registry.FindRequest serviceName) throws java.rmi.RemoteException
{
WSResource[] results = getRegistrationManager().find( serviceName.getServiceName( ) );
-
if ( results == null )
{
results = new WSResource[0];
}
-
EndpointReferenceType[] eprList = new EndpointReferenceType[results.length];
-
for ( int i = 0; i < results.length; i++ )
{
WSResource resource = results[i];
eprList[i] = resource.getEndpointReference( );
}
-
- return new axis.com.hp.ws.generated.registry._FindResponse( eprList );
+ return new axis.com.hp.ws.generated.registry.FindResponse( eprList );
}
/**
* Implementation of the WSDL operation named <code>findResource</code>.
*/
- public org.apache.axis.message.addressing.EndpointReferenceType findResource(axis.com.hp.ws.generated.registry._FindResourceRequest findResourceRequest) throws java.rmi.RemoteException
+ public org.apache.axis.message.addressing.EndpointReferenceType findResource(axis.com.hp.ws.generated.registry.FindResourceRequest findResourceRequest) throws java.rmi.RemoteException
{
WSResource result = getRegistrationManager().find( findResourceRequest.getServiceName( ), findResourceRequest.getId( ) );
-
return result.getEndpointReference( );
}
/**
* Implementation of the WSDL operation named <code>findAllServiceNames</code>.
*/
- public axis.com.hp.ws.generated.registry._FindAllServiceNamesResponse findAllServiceNames() throws java.rmi.RemoteException
+ public axis.com.hp.ws.generated.registry.FindAllServiceNamesResponse findAllServiceNames() throws java.rmi.RemoteException
{
String[] result = getRegistrationManager().findAllServiceNames( );
-
- return new _FindAllServiceNamesResponse( result );
+ return new FindAllServiceNamesResponse( result );
}
/**
@@ -150,4 +143,4 @@
}
//J+
-}
\ No newline at end of file
+}
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/deployment/wsdd/WsddUpdater.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/deployment/wsdd/WsddUpdater.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/deployment/wsdd/WsddUpdater.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/deployment/wsdd/WsddUpdater.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/deployment/wsdd/WsddUpdater.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/deployment/wsdd/WsddUpdater.java Tue Nov 23 18:59:00 2004
@@ -26,7 +26,6 @@
import java.io.File;
import java.net.ServerSocket;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.List;
/**
@@ -51,11 +50,6 @@
*/
private static final String DEFAULT_CONFIG_WSDD = "server-config.wsdd";
- /**
- * We use 28000, because ports 28000-30000 are unassigned by IANA, and hence more likely to be available.
- */
- private static final int AXIS_SERVER_PORT_RANGE_START = 28000;
-
static
{
//this is done because for some reason when run using Maven the ContextClassloader is not set.
@@ -98,7 +92,6 @@
*/
public WsddUpdater( String configWsdd )
{
- m_axisServerPort = getAvailablePort( );
if ( configWsdd != null )
{
m_configWsdd = configWsdd;
@@ -221,12 +214,14 @@
{
if ( m_simpleAxisServer == null )
{
- log( "Starting SimpleAxisServer on port " + m_axisServerPort + "...", Project.MSG_VERBOSE );
+ log( "Starting SimpleAxisServer...", Project.MSG_VERBOSE );
m_simpleAxisServer = new SimpleAxisServer( );
- m_serverSocket = new ServerSocket( m_axisServerPort );
+ m_serverSocket = new ServerSocket( 0 );
+ m_axisServerPort = m_serverSocket.getLocalPort();
m_simpleAxisServer.setServerSocket( m_serverSocket );
m_simpleAxisServer.setMyConfig( new FileProvider( m_configWsdd ) );
m_simpleAxisServer.start( );
+ log( "SimpleAxisServer started - listening on port " + m_axisServerPort + " ..." );
}
}
@@ -241,13 +236,6 @@
m_simpleAxisServer.stop( );
m_simpleAxisServer = null;
}
- }
-
- private int getAvailablePort( )
- {
- Calendar currentTime = Calendar.getInstance( );
- return AXIS_SERVER_PORT_RANGE_START + ( currentTime.get( Calendar.HOUR_OF_DAY ) * 60 )
- + currentTime.get( Calendar.MINUTE );
}
private void deployWsdd( File deployWsdd )
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/AbstractOperationWriterFactory.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/AbstractOperationWriterFactory.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/AbstractOperationWriterFactory.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/AbstractOperationWriterFactory.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/AbstractOperationWriterFactory.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/AbstractOperationWriterFactory.java Tue Nov 23 18:59:00 2004
@@ -15,11 +15,9 @@
*=============================================================================*/
package org.apache.ws.platform.axis.wsdl.toJava;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._GetResourcePropertyResponse;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._GetMultipleResourcePropertiesResponse;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._QueryResourcePropertiesRequest;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._SetResourceProperties;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._GetMultipleResourcePropertiesRequest;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.GetResourcePropertyResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.GetMultipleResourcePropertiesResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.QueryResourcePropertiesRequest;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.InvalidResourcePropertyQNameFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.ResourceUnknownFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.InvalidQueryExpressionFaultType;
@@ -28,29 +26,30 @@
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.UnableToModifyResourcePropertyFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.SetResourcePropertyRequestFailedFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.InvalidSetResourcePropertiesRequestContentFaultType;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._SubscribeResponse;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._GetCurrentMessageResponse;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._Subscribe;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._GetCurrentMessage;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.SetResourceProperties_Element;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.GetMultipleResourcePropertiesRequest;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.SubscribeResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.GetCurrentMessageResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.Subscribe;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.GetCurrentMessage;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.SubscribeCreationFailedFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.TopicPathDialectUnknownFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.NoCurrentMessageOnTopicFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.InvalidTopicExpressionFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.TopicNotSupportedFaultType;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime._DestroyResponse;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime._Destroy;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime._SetTerminationTimeResponse;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime._SetTerminationTime;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.DestroyResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.Destroy;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.SetTerminationTimeResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.SetTerminationTime;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.UnableToSetTerminationTimeFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.TerminationTimeChangeRejectedFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.ResourceNotDestroyedFaultType;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._StopOK;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._StartOK;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._ResetAllOK;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._Stop;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._Start;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._ResetAll;
-
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.StopOK;
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.StartOK;
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.ResetAllOK;
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.Stop;
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.Start;
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.ResetAll;
/**
* This is an abstract class for all Wsdm Operation Writers.
@@ -63,57 +62,57 @@
{
/** The Axis signature for the WSRP GetResourceProperty operation */
private static final String WSRP_GET_SIGNATURE =
- "public " + _GetResourcePropertyResponse.class.getName() + " getResourceProperty(" + ClassNames.QNAME + " getResourcePropertyRequest) throws " +
+ "public " + GetResourcePropertyResponse.class.getName() + " getResourceProperty(" + ClassNames.QNAME + " getResourcePropertyRequest) throws " +
ClassNames.REMOTE_EXCEPTION + ", " + InvalidResourcePropertyQNameFaultType.class.getName() + ", " + ResourceUnknownFaultType.class.getName();
/** The Axis signature for the WSRP GetMultipleResourceProperties operation */
private static final String WSRP_GET_MULTI_SIGNATURE =
- "public " + _GetMultipleResourcePropertiesResponse.class.getName() + " getMultipleResourceProperties(" + _GetMultipleResourcePropertiesRequest.class.getName() + " getMultipleResourcePropertiesRequest) throws " +
+ "public " + GetMultipleResourcePropertiesResponse.class.getName() + " getMultipleResourceProperties(" + GetMultipleResourcePropertiesRequest.class.getName() + " getMultipleResourcePropertiesRequest) throws " +
ClassNames.REMOTE_EXCEPTION + ", " + InvalidResourcePropertyQNameFaultType.class.getName() + ", " + ResourceUnknownFaultType.class.getName();
/** The Axis signature for the WSRP QueryResourceProperties operation */
private static final String WSRP_QUERY_SIGNATURE =
- "public " + ClassNames.OBJECT + " queryResourceProperties(" + _QueryResourcePropertiesRequest.class.getName() + " queryResourcePropertiesRequest) throws " +
+ "public " + ClassNames.OBJECT + " queryResourceProperties(" + QueryResourcePropertiesRequest.class.getName() + " queryResourcePropertiesRequest) throws " +
ClassNames.REMOTE_EXCEPTION + ", " + InvalidResourcePropertyQNameFaultType.class.getName() + ", " + InvalidQueryExpressionFaultType.class.getName() + ", " + QueryEvaluationErrorFaultType.class.getName() + ", " + ResourceUnknownFaultType.class.getName() + ", " + UnknownQueryExpressionDialectFaultType.class.getName();
/** The Axis signature for the WSRP SetResourceProperties operation */
private static final String WSRP_SET_SIGNATURE =
- "public void setResourceProperties(" + _SetResourceProperties.class.getName() + " setResourcePropertiesRequest) throws " +
+ "public void setResourceProperties(" + SetResourceProperties_Element.class.getName() + " setResourcePropertiesRequest) throws " +
ClassNames.REMOTE_EXCEPTION + ", " + InvalidResourcePropertyQNameFaultType.class.getName() + ", " + UnableToModifyResourcePropertyFaultType.class.getName() + ", " + SetResourcePropertyRequestFailedFaultType.class.getName() + ", " + ResourceUnknownFaultType.class.getName() + ", " + InvalidSetResourcePropertiesRequestContentFaultType.class.getName();
/** The Axis signature for the WSNT Subscribe operation */
private static final String WSNT_SUBSCRIBE_SIGNATURE =
- "public " + _SubscribeResponse.class.getName() + " subscribe(" + _Subscribe.class.getName() + " subscribeRequest) throws " +
+ "public " + SubscribeResponse.class.getName() + " subscribe(" + Subscribe.class.getName() + " subscribeRequest) throws " +
ClassNames.REMOTE_EXCEPTION + ", " + SubscribeCreationFailedFaultType.class.getName() + ", " + axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.ResourceUnknownFaultType.class.getName() + ", " + TopicPathDialectUnknownFaultType.class.getName();
/** The Axis signature for the WSNT GetCurrentMessage operation */
- private static final String WSNT_GETCURRENTMESSAGE_SIGNATURE =
- "public " + _GetCurrentMessageResponse.class.getName() + " getCurrentMessage(" + _GetCurrentMessage.class.getName() + " getCurrentMessageRequest) throws " +
+ private static final String WSNT_GET_CURRENT_MESSAGE_SIGNATURE =
+ "public " + GetCurrentMessageResponse.class.getName() + " getCurrentMessage(" + GetCurrentMessage.class.getName() + " getCurrentMessageRequest) throws " +
ClassNames.REMOTE_EXCEPTION + ", " + TopicNotSupportedFaultType.class.getName() + ", " + InvalidTopicExpressionFaultType.class.getName() + ", " + NoCurrentMessageOnTopicFaultType.class.getName() + ", " + axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.ResourceUnknownFaultType.class.getName();
/** The Axis signature for the WSRL Destroy operation */
private static final String WSRL_DESTROY_SIGNATURE =
- "public " + _DestroyResponse.class.getName() + " destroy(" + _Destroy.class.getName() + " destroyRequest) throws " +
+ "public " + DestroyResponse.class.getName() + " destroy(" + Destroy.class.getName() + " destroyRequest) throws " +
ClassNames.REMOTE_EXCEPTION + ", " + ResourceNotDestroyedFaultType.class.getName() + ", " + axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.ResourceUnknownFaultType.class.getName();
/** The Axis signature for the WSRL SetTerminationTime operation */
- private static final String WSRL_SETTERMINATIONTIME_SIGNATURE =
- "public " + _SetTerminationTimeResponse.class.getName() + " setTerminationTime(" + _SetTerminationTime.class.getName() + " setTerminationTimeRequest) throws " +
+ private static final String WSRL_SET_TERMINATION_TIME_SIGNATURE =
+ "public " + SetTerminationTimeResponse.class.getName() + " setTerminationTime(" + SetTerminationTime.class.getName() + " setTerminationTimeRequest) throws " +
ClassNames.REMOTE_EXCEPTION + ", " + UnableToSetTerminationTimeFaultType.class.getName() + ", " + axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.ResourceUnknownFaultType.class.getName() + ", " + TerminationTimeChangeRejectedFaultType.class.getName();
/** The Axis signature for the MuWS Stop operation */
private static final String MUWS_STOP_SIGNATURE =
- "public " + _StopOK.class.getName() + " stop(" + _Stop.class.getName() + " body) throws " +
+ "public " + StopOK.class.getName() + " stop(" + Stop.class.getName() + " body) throws " +
ClassNames.REMOTE_EXCEPTION;
/** The Axis signature for the MuWS Start operation */
private static final String MUWS_START_SIGNATURE =
- "public " + _StartOK.class.getName() + " start(" + _Start.class.getName() + " body) throws " +
+ "public " + StartOK.class.getName() + " start(" + Start.class.getName() + " body) throws " +
ClassNames.REMOTE_EXCEPTION;
/** The Axis signature for the MuWS ResetAll operation */
- private static final String MUWS_RESETALL_SIGNATURE =
- "public " + _ResetAllOK.class.getName() + " resetAll(" + _ResetAll.class.getName() + " body) throws " +
+ private static final String MUWS_RESET_ALL_SIGNATURE =
+ "public " + ResetAllOK.class.getName() + " resetAll(" + ResetAll.class.getName() + " body) throws " +
ClassNames.REMOTE_EXCEPTION;
/** Not an operation specified by a WS* spec */
@@ -135,7 +134,7 @@
protected static final int WSNT_SUBSCRIBE = 4;
/** The WS-NT Subscribe operation */
- protected static final int WSNT_GETCURRENTMESSAGE = 5;
+ protected static final int WSNT_GET_CURRENT_MESSAGE = 5;
/**
* The MUWS Start Operation.
@@ -160,7 +159,7 @@
/**
* The WS-RL SetTerminationTime Operation
*/
- public static final int WSRL_SETTERMINATIONTIME = 10;
+ public static final int WSRL_SET_TERMINATION_TIME = 10;
/**
* Get a WsdmOperationWriter based on an id.
@@ -183,12 +182,8 @@
*/
public static boolean isLifetimeOperation( String sig )
{
- boolean returnValue;
- int opId = getWsdmOperationId( sig );
-
- returnValue = ( ( opId == WSRL_DESTROY ) || ( opId == WSRL_SETTERMINATIONTIME ) );
-
- return returnValue;
+ int opId = getWsdmOperationId( sig );
+ return opId == WSRL_DESTROY || opId == WSRL_SET_TERMINATION_TIME;
}
/**
@@ -200,12 +195,8 @@
*/
public static boolean isNotificationOperation( String sig )
{
- boolean returnValue;
- int opId = getWsdmOperationId( sig );
-
- returnValue = ( ( opId == WSNT_GETCURRENTMESSAGE ) || ( opId == WSNT_SUBSCRIBE ) );
-
- return returnValue;
+ int opId = getWsdmOperationId( sig );
+ return opId == WSNT_GET_CURRENT_MESSAGE || opId == WSNT_SUBSCRIBE;
}
/**
@@ -244,64 +235,64 @@
*/
public static int getWsdmOperationId( String sig )
{
- int returnValue = NOT_SPEC_OP;
+ int opId = NOT_SPEC_OP;
if ( sig.trim( ).compareTo( WSRP_GET_SIGNATURE ) == 0 )
{
- returnValue = WSRP_GET;
+ opId = WSRP_GET;
}
else if ( sig.trim( ).compareTo( WSRP_GET_MULTI_SIGNATURE ) == 0 )
{
- returnValue = WSRP_GET_MULTI;
+ opId = WSRP_GET_MULTI;
}
else if ( sig.trim( ).compareTo( WSRP_QUERY_SIGNATURE ) == 0 )
{
- returnValue = WSRP_QUERY;
+ opId = WSRP_QUERY;
}
else if ( sig.trim( ).compareTo( WSRP_SET_SIGNATURE ) == 0 )
{
- returnValue = WSRP_SET;
+ opId = WSRP_SET;
}
else if ( sig.trim( ).compareTo( WSNT_SUBSCRIBE_SIGNATURE ) == 0 )
{
- returnValue = WSNT_SUBSCRIBE;
+ opId = WSNT_SUBSCRIBE;
}
- else if ( sig.trim( ).compareTo( WSNT_GETCURRENTMESSAGE_SIGNATURE ) == 0 )
+ else if ( sig.trim( ).compareTo( WSNT_GET_CURRENT_MESSAGE_SIGNATURE ) == 0 )
{
- returnValue = WSNT_GETCURRENTMESSAGE;
+ opId = WSNT_GET_CURRENT_MESSAGE;
}
- else if ( sig.trim( ).compareTo( MUWS_RESETALL_SIGNATURE ) == 0 )
+ else if ( sig.trim( ).compareTo( MUWS_RESET_ALL_SIGNATURE ) == 0 )
{
- returnValue = MUWS_RESET_ALL;
+ opId = MUWS_RESET_ALL;
}
else if ( sig.trim( ).compareTo( MUWS_START_SIGNATURE ) == 0 )
{
- returnValue = MUWS_START;
+ opId = MUWS_START;
}
else if ( sig.trim( ).compareTo( MUWS_STOP_SIGNATURE ) == 0 )
{
- returnValue = MUWS_STOP;
+ opId = MUWS_STOP;
}
else if ( sig.trim( ).compareTo( WSRL_DESTROY_SIGNATURE ) == 0 )
{
- returnValue = WSRL_DESTROY;
+ opId = WSRL_DESTROY;
}
- else if ( sig.trim( ).compareTo( WSRL_SETTERMINATIONTIME_SIGNATURE ) == 0 )
+ else if ( sig.trim( ).compareTo( WSRL_SET_TERMINATION_TIME_SIGNATURE ) == 0 )
{
- returnValue = WSRL_SETTERMINATIONTIME;
+ opId = WSRL_SET_TERMINATION_TIME;
}
//todo add lifetime
- return returnValue;
+ return opId;
}
}
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsResetAllImplWriter.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsResetAllImplWriter.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsResetAllImplWriter.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsResetAllImplWriter.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsResetAllImplWriter.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsResetAllImplWriter.java Tue Nov 23 18:59:00 2004
@@ -15,7 +15,7 @@
*=============================================================================*/
package org.apache.ws.platform.axis.wsdl.toJava.axisimpl;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._ResetAllOK;
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.ResetAllOK;
import org.apache.axis.wsdl.symbolTable.Parameters;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import java.io.PrintWriter;
@@ -33,6 +33,6 @@
SymbolTable st )
{
pw.println( "\t\t\t" + WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME + ".resetAll( );\n" );
- pw.print( "\t\t\treturn new " + _ResetAllOK.class.getName( ) + "();\n" );
+ pw.print( "\t\t\treturn new " + ResetAllOK.class.getName( ) + "();\n" );
}
}
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStartImplWriter.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStartImplWriter.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStartImplWriter.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStartImplWriter.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStartImplWriter.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStartImplWriter.java Tue Nov 23 18:59:00 2004
@@ -15,7 +15,7 @@
*=============================================================================*/
package org.apache.ws.platform.axis.wsdl.toJava.axisimpl;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._StartOK;
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.StartOK;
import org.apache.axis.wsdl.symbolTable.Parameters;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import java.io.PrintWriter;
@@ -33,6 +33,6 @@
SymbolTable st )
{
pw.println( "\t\t\t" + WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME + ".start( );\n" );
- pw.print( "\t\t\treturn new " + _StartOK.class.getName( ) + "();\n" );
+ pw.print( "\t\t\treturn new " + StartOK.class.getName( ) + "();\n" );
}
}
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStopImplWriter.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStopImplWriter.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStopImplWriter.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStopImplWriter.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStopImplWriter.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/MuwsStopImplWriter.java Tue Nov 23 18:59:00 2004
@@ -15,7 +15,7 @@
*=============================================================================*/
package org.apache.ws.platform.axis.wsdl.toJava.axisimpl;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._StopOK;
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.StopOK;
import org.apache.axis.wsdl.symbolTable.Parameters;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import java.io.PrintWriter;
@@ -40,6 +40,6 @@
SymbolTable st )
{
pw.println( "\t\t\t" + WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME + ".stop( );\n" );
- pw.print( "\t\t\treturn new " + _StopOK.class.getName( ) + "();\n" );
+ pw.print( "\t\t\treturn new " + StopOK.class.getName( ) + "();\n" );
}
}
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsdmOperationWriterFactory.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsdmOperationWriterFactory.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsdmOperationWriterFactory.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsdmOperationWriterFactory.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsdmOperationWriterFactory.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsdmOperationWriterFactory.java Tue Nov 23 18:59:00 2004
@@ -57,7 +57,7 @@
{
return new WsntSubscribeImplWriter( );
}
- else if ( id == WSNT_GETCURRENTMESSAGE )
+ else if ( id == WSNT_GET_CURRENT_MESSAGE )
{
return new WsntGetCurrentMessageImplWriter( );
}
@@ -77,7 +77,7 @@
{
return new WsrlDestroyImplWriter( );
}
- else if ( id == WSRL_SETTERMINATIONTIME )
+ else if ( id == WSRL_SET_TERMINATION_TIME )
{
return new WsrlSetTerminationTimeImplWriter( );
}
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntGetCurrentMessageImplWriter.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntGetCurrentMessageImplWriter.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntGetCurrentMessageImplWriter.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntGetCurrentMessageImplWriter.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntGetCurrentMessageImplWriter.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntGetCurrentMessageImplWriter.java Tue Nov 23 18:59:00 2004
@@ -23,6 +23,8 @@
import java.util.ArrayList;
import java.util.List;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.GetCurrentMessageResponse;
+
/**
* @author saf
*
@@ -40,7 +42,7 @@
SymbolTable st )
{
pw.println( "\t\t\t"
- + axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._GetCurrentMessageResponse.class.getName() + " expected_response_type = new " + axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._GetCurrentMessageResponse.class.getName() + "();" );
+ + GetCurrentMessageResponse.class.getName() + " expected_response_type = new " + GetCurrentMessageResponse.class.getName() + "();" );
pw.println( "\t\t\t" + ClassNames.SOAP_ELEMENT + "[] response ="
+ WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME + ".getCurrentMessage( "
+ AxisGenTypesUtils.class.getName( )
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntSubscribeImplWriter.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntSubscribeImplWriter.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntSubscribeImplWriter.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntSubscribeImplWriter.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntSubscribeImplWriter.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsntSubscribeImplWriter.java Tue Nov 23 18:59:00 2004
@@ -20,7 +20,7 @@
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import java.io.PrintWriter;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._SubscribeResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.SubscribeResponse;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.EndpointReferenceType;
/**
@@ -40,7 +40,7 @@
SymbolTable st )
{
pw.println( "\t\t\t"
- + _SubscribeResponse.class.getName() + " expected_response_type = new " + _SubscribeResponse.class.getName() + "( );" );
+ + SubscribeResponse.class.getName() + " expected_response_type = new " + SubscribeResponse.class.getName() + "( );" );
pw.println( "\t\t\t" + "org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType xmlBeansEprType ="
+ WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME
+ ".subscribe( new org.apache.ws.resource.notification.impl.axis.SubscriptionRequestImpl( subscribeRequest ) );" );
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlDestroyImplWriter.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlDestroyImplWriter.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlDestroyImplWriter.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlDestroyImplWriter.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlDestroyImplWriter.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlDestroyImplWriter.java Tue Nov 23 18:59:00 2004
@@ -15,7 +15,7 @@
*=============================================================================*/
package org.apache.ws.platform.axis.wsdl.toJava.axisimpl;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime._DestroyResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.DestroyResponse;
import org.apache.ws.platform.axis.wsdl.toJava.OperationWriter;
import org.apache.axis.wsdl.symbolTable.Parameters;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
@@ -34,6 +34,6 @@
SymbolTable st )
{
pw.println( "\t\t\t" + WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME + ".destroy( );\n" );
- pw.print( "\t\t\treturn new " + _DestroyResponse.class.getName( ) + "();\n" );
+ pw.print( "\t\t\treturn new " + DestroyResponse.class.getName( ) + "();\n" );
}
}
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlSetTerminationTimeImplWriter.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlSetTerminationTimeImplWriter.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlSetTerminationTimeImplWriter.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlSetTerminationTimeImplWriter.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlSetTerminationTimeImplWriter.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrlSetTerminationTimeImplWriter.java Tue Nov 23 18:59:00 2004
@@ -15,7 +15,7 @@
*=============================================================================*/
package org.apache.ws.platform.axis.wsdl.toJava.axisimpl;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime._SetTerminationTimeResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.SetTerminationTimeResponse;
import org.apache.ws.platform.axis.wsdl.toJava.OperationWriter;
import org.apache.axis.wsdl.symbolTable.Parameters;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
@@ -42,8 +42,8 @@
+ ".setTimeInMillis(setTerminationTimeRequest.getRequestedTerminationTime( ).getTimeInMillis( ));\n" );
pw.println( "\t\t\t" + WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME + ".setTerminationTime( "
+ newTermTimeVarName + " );\n" );
- pw.println( "\t\t\t" + _SetTerminationTimeResponse.class.getName( ) + " " + respVarName + " = new "
- + _SetTerminationTimeResponse.class.getName( ) + "( );\n" );
+ pw.println( "\t\t\t" + SetTerminationTimeResponse.class.getName( ) + " " + respVarName + " = new "
+ + SetTerminationTimeResponse.class.getName( ) + "( );\n" );
pw.println( "\t\t\t" + respVarName + ".setCurrentTime( " + Calendar.class.getName( )
+ ".getInstance( ));\n" );
pw.println( "\t\t\t" + respVarName + ".setNewTerminationTime( " + newTermTimeVarName + " );\n" );
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetMultipleResourcePropertiesImplWriter.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetMultipleResourcePropertiesImplWriter.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetMultipleResourcePropertiesImplWriter.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetMultipleResourcePropertiesImplWriter.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetMultipleResourcePropertiesImplWriter.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetMultipleResourcePropertiesImplWriter.java Tue Nov 23 18:59:00 2004
@@ -21,7 +21,7 @@
import java.io.PrintWriter;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._GetMultipleResourcePropertiesResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.GetMultipleResourcePropertiesResponse;
/**
* DOCUMENT_ME
@@ -40,7 +40,7 @@
SymbolTable st )
{
pw.println( "\t\t\t"
- + _GetMultipleResourcePropertiesResponse.class.getName() + " expected_response_type = new " + _GetMultipleResourcePropertiesResponse.class.getName() + "();" );
+ + GetMultipleResourcePropertiesResponse.class.getName() + " expected_response_type = new " + GetMultipleResourcePropertiesResponse.class.getName() + "();" );
pw.println( "\t\t\t" + ClassNames.SOAP_ELEMENT + "[] response = "
+ WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME
+ ".getMultipleResourceProperties( getMultipleResourcePropertiesRequest.getResourceProperty() );" );
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetResourcePropertyImplWriter.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetResourcePropertyImplWriter.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetResourcePropertyImplWriter.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetResourcePropertyImplWriter.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetResourcePropertyImplWriter.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpGetResourcePropertyImplWriter.java Tue Nov 23 18:59:00 2004
@@ -21,7 +21,7 @@
import java.io.PrintWriter;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._GetResourcePropertyResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.GetResourcePropertyResponse;
/**
* DOCUMENT_ME
@@ -49,7 +49,7 @@
SymbolTable st )
{
pw.println( "\t\t\t"
- + _GetResourcePropertyResponse.class.getName() + " expected_response_type = new " + _GetResourcePropertyResponse.class.getName() + "();" );
+ + GetResourcePropertyResponse.class.getName() + " expected_response_type = new " + GetResourcePropertyResponse.class.getName() + "();" );
pw.println( "\t\t\t" + ClassNames.SOAP_ELEMENT + "[] response = "
+ WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME
+ ".getResourceProperty( getResourcePropertyRequest );" );
Modified: incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpSetResourcePropertiesImplWriter.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpSetResourcePropertiesImplWriter.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpSetResourcePropertiesImplWriter.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpSetResourcePropertiesImplWriter.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpSetResourcePropertiesImplWriter.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/platform/axis/wsdl/toJava/axisimpl/WsrpSetResourcePropertiesImplWriter.java Tue Nov 23 18:59:00 2004
@@ -20,6 +20,9 @@
import java.io.PrintWriter;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.SetRequestComponentType;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.UpdateType;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.InsertType;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.DeleteType;
/**
* DOCUMENT_ME
@@ -40,21 +43,21 @@
+ SetRequestComponentType.class.getName() + "[] request_components = setResourcePropertiesRequest.getSetRequestComponent();" );
pw.println( "\t\t\t" + "for ( int i = 0; i < request_components.length; i++ ) {" );
pw.println( "\t\t\t\t"
- + "if ( request_components[i] instanceof axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.UpdateType ) {" );
+ + "if ( request_components[i] instanceof " + UpdateType.class.getName() + " ) {" );
pw.println( "\t\t\t\t\t" + WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME
- + ".updateResourceProperties((org.apache.axis.message.MessageElement [])( (axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.UpdateType) request_components[i] ).get_any());" );
+ + ".updateResourceProperties((org.apache.axis.message.MessageElement [])( (" + UpdateType.class.getName() + ") request_components[i] ).get_any());" );
pw.println( "\t\t\t\t" + "}" );
pw.println( "\t\t\t\t"
- + "if ( request_components[i] instanceof axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.InsertType ) {" );
+ + "if ( request_components[i] instanceof " + InsertType.class.getName() + " ) {" );
pw.println( "\t\t\t\t\t" + WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME
- + ".insertResourceProperties((org.apache.axis.message.MessageElement [])( (axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.InsertType) request_components[i] ).get_any());" );
+ + ".insertResourceProperties((org.apache.axis.message.MessageElement [])( (" + InsertType.class.getName() + ") request_components[i] ).get_any());" );
pw.println( "\t\t\t\t" + "}" );
pw.println( "\t\t\t\t"
- + "if ( request_components[i] instanceof axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.DeleteType ) {" );
+ + "if ( request_components[i] instanceof " + DeleteType.class.getName() + " ) {" );
pw.println( "\t\t\t\t\t" + WsdmJavaImplWriter.RESOURCE_MEMBER_VAR_NAME
- + ".deleteResourceProperty((javax.xml.namespace.QName)( (axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.DeleteType) request_components[i] ).getResourceProperty());" );
+ + ".deleteResourceProperty((javax.xml.namespace.QName)( (" + DeleteType.class.getName() + ") request_components[i] ).getResourceProperty());" );
pw.println( "\t\t\t\t" + "}" );
pw.println( "\t\t\t" + "}" );
}
Modified: incubator/muse/trunk/src/java/org/apache/ws/resource/AbstractWSResource.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/resource/AbstractWSResource.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/resource/AbstractWSResource.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/resource/AbstractWSResource.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/resource/AbstractWSResource.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/resource/AbstractWSResource.java Tue Nov 23 18:59:00 2004
@@ -183,7 +183,7 @@
public abstract QName getServiceQName( );
/**
- * @see com.hp.ws.resource.WSResource#isSingleton()
+ * @see WSResource#isSingleton()
*/
public boolean isSingleton( )
{
@@ -299,7 +299,7 @@
* if appropriate and should ensure they get unregistered from the registration manager
* (see {@link RegistrationManager#unregister(WSResource)}).
*
- * @see com.hp.ws.resource.WSResource#destroy()
+ * @see WSResource#destroy()
*/
public void destroy( )
throws Exception
@@ -386,7 +386,7 @@
* override this method should they need to do additional processing after they have been
* registered.
*
- * @see com.hp.ws.resource.WSResource#registered(RegistrationManager)
+ * @see WSResource#registered(RegistrationManager)
*/
public void registered( RegistrationManager manager )
{
@@ -435,7 +435,7 @@
* override this method should they need to do additional processing after they have been
* unregistered, so long as they also ensure that this method is called as well.
*
- * @see com.hp.ws.resource.WSResource#unregistered(RegistrationManager)
+ * @see WSResource#unregistered(RegistrationManager)
*/
public void unregistered( RegistrationManager manager )
{
Modified: incubator/muse/trunk/src/java/org/apache/ws/resource/notification/impl/axis/SubscriptionRequestImpl.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/resource/notification/impl/axis/SubscriptionRequestImpl.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/resource/notification/impl/axis/SubscriptionRequestImpl.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/resource/notification/impl/axis/SubscriptionRequestImpl.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/resource/notification/impl/axis/SubscriptionRequestImpl.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/resource/notification/impl/axis/SubscriptionRequestImpl.java Tue Nov 23 18:59:00 2004
@@ -15,7 +15,7 @@
*=============================================================================*/
package org.apache.ws.resource.notification.impl.axis;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._Subscribe;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.Subscribe;
import org.apache.ws.resource.notification.SubscriptionRequest;
import org.apache.ws.util.AxisGenTypesUtils;
import org.apache.ws.util.AxisUtils;
@@ -53,7 +53,7 @@
* com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._Subscribe type.
*
*/
- public SubscriptionRequestImpl( _Subscribe subscribeRequest )
+ public SubscriptionRequestImpl( Subscribe subscribeRequest )
{
this( AxisGenTypesUtils.toXMLBeanEndpointReference( subscribeRequest.getConsumerReference( ) ),
AxisGenTypesUtils.toXMLBeanTopicExpression( subscribeRequest.getTopicExpression( ) ),
Modified: incubator/muse/trunk/src/java/org/apache/ws/util/AxisGenTypesUtils.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/java/org/apache/ws/util/AxisGenTypesUtils.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/java/org/apache/ws/util/AxisGenTypesUtils.java&r1=106372&p2=incubator/muse/trunk/src/java/org/apache/ws/util/AxisGenTypesUtils.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/java/org/apache/ws/util/AxisGenTypesUtils.java (original)
+++ incubator/muse/trunk/src/java/org/apache/ws/util/AxisGenTypesUtils.java Tue Nov 23 18:59:00 2004
@@ -24,6 +24,7 @@
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.TerminationTimeChangeRejectedFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.UnableToSetTerminationTimeFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.BaseFaultType;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.BaseFaultTypeErrorCode;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.InvalidQueryExpressionFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.InvalidResourcePropertyQNameFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.InvalidSetResourcePropertiesRequestContentFaultType;
@@ -33,12 +34,17 @@
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.SetResourcePropertyRequestFailedFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.UnableToModifyResourcePropertyFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.UnknownQueryExpressionDialectFaultType;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._BaseFaultType_ErrorCode;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.AttributedQName;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.AttributedURI;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.EndpointReferenceType;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.ReferencePropertiesType;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.ServiceNameType;
+import com.ibm.xmlns.stdwip.webServices.wsBaseNotification.TopicDocument;
+import org.apache.axis.message.MessageElement;
+import org.apache.axis.types.NCName;
+import org.apache.axis.types.URI;
+import org.apache.axis.types.URI.MalformedURIException;
+import org.apache.axis.wsdl.symbolTable.Parameters;
import org.apache.ws.addressing.JMuwsAddressingConstants;
import org.apache.ws.notification.base.faults.InvalidTopicExpressionFaultException;
import org.apache.ws.notification.base.faults.NoCurrentMessageOnTopicFaultException;
@@ -59,14 +65,7 @@
import org.apache.ws.resource.properties.faults.UnableToModifyResourcePropertyFaultException;
import org.apache.ws.resource.properties.faults.UnknownQueryExpressionDialectFaultException;
import org.apache.ws.soap.NameUtils;
-import com.ibm.xmlns.stdwip.webServices.wsBaseNotification.TopicDocument;
-import org.apache.axis.message.MessageElement;
-import org.apache.axis.types.NCName;
-import org.apache.axis.types.URI;
-import org.apache.axis.types.URI.MalformedURIException;
-import org.apache.axis.wsdl.symbolTable.Parameters;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
import javax.xml.namespace.QName;
import javax.xml.soap.Node;
import javax.xml.soap.SOAPElement;
@@ -80,7 +79,7 @@
*/
public abstract class AxisGenTypesUtils
{
- private static final Log LOG = LogFactory.getLog( AxisGenTypesUtils.class );
+ //private static final Log LOG = LogFactory.getLog( AxisGenTypesUtils.class );
/** Map containing a mapping of BaseFaultException to Axis-Generated Fault. */
private static final Map BASE_FAULT_TO_AXIS_FAULT_MAP = new HashMap( );
@@ -418,9 +417,9 @@
* @param base_fault
* @return Axis-generated _BaseFaultType_ErrorCode
*/
- private static _BaseFaultType_ErrorCode toAxisErrorCode( BaseFaultException base_fault )
+ private static BaseFaultTypeErrorCode toAxisErrorCode( BaseFaultException base_fault )
{
- _BaseFaultType_ErrorCode axis_error_code = new _BaseFaultType_ErrorCode( );
+ BaseFaultTypeErrorCode axis_error_code = new BaseFaultTypeErrorCode( );
ErrorCode error_code = base_fault.getErrorCode( );
if ( error_code != null )
Modified: incubator/muse/trunk/src/test/org/apache/ws/resource/discovery/service/RegistryServiceTestCase.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/test/org/apache/ws/resource/discovery/service/RegistryServiceTestCase.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/test/org/apache/ws/resource/discovery/service/RegistryServiceTestCase.java&r1=106372&p2=incubator/muse/trunk/src/test/org/apache/ws/resource/discovery/service/RegistryServiceTestCase.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/test/org/apache/ws/resource/discovery/service/RegistryServiceTestCase.java (original)
+++ incubator/muse/trunk/src/test/org/apache/ws/resource/discovery/service/RegistryServiceTestCase.java Tue Nov 23 18:59:00 2004
@@ -18,18 +18,17 @@
import axis.com.hp.ws.generated.registry.RegistryPortType;
import axis.com.hp.ws.generated.registry.RegistryWsdmServiceLocator;
import axis.com.hp.ws.generated.registry.RegistryWsdmServiceWSResource;
-import axis.com.hp.ws.generated.registry._FindAllServiceNamesResponse;
-import axis.com.hp.ws.generated.registry._FindRequest;
-import axis.com.hp.ws.generated.registry._FindResourceRequest;
-import axis.com.hp.ws.generated.registry._FindResponse;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._GetResourcePropertyResponse;
+import axis.com.hp.ws.generated.registry.FindAllServiceNamesResponse;
+import axis.com.hp.ws.generated.registry.FindRequest;
+import axis.com.hp.ws.generated.registry.FindResourceRequest;
+import axis.com.hp.ws.generated.registry.FindResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.GetResourcePropertyResponse;
import junit.framework.Assert;
import org.apache.ws.addressing.JMuwsAddressingConstants;
import org.apache.ws.resource.discovery.RegistrationManagerFactory;
import org.apache.ws.test.AbstractOneAxisTestCase;
import org.apache.axis.message.MessageElement;
import org.apache.axis.message.addressing.EndpointReferenceType;
-import javax.xml.namespace.QName;
import java.rmi.RemoteException;
import java.util.Iterator;
@@ -52,7 +51,7 @@
public void testFindAllServiceNames( )
throws RemoteException
{
- _FindAllServiceNamesResponse names = m_stub.findAllServiceNames( );
+ FindAllServiceNamesResponse names = m_stub.findAllServiceNames( );
Assert.assertNotNull( names );
Assert.assertEquals( 2, names.getItem( ).length ); // 2 because there is the Registry WSresource itself too
Assert.assertTrue( "disk".equals( names.getItem( 0 ) ) || "disk".equals( names.getItem( 1 ) ) );
@@ -68,7 +67,7 @@
public void testFindResource( )
throws Exception
{
- EndpointReferenceType resource = m_stub.findResource( new _FindResourceRequest( "disk", "1234" ) );
+ EndpointReferenceType resource = m_stub.findResource( new FindResourceRequest( "disk", "1234" ) );
Assert.assertNotNull( resource );
MessageElement prop =
resource.getProperties( ).get( JMuwsAddressingConstants.REFERENCE_PROP_QNAME_RESOURCE_ID );
@@ -86,7 +85,7 @@
public void testFindResourcesByServiceName( )
throws Exception
{
- _FindResponse resources = m_stub.findResourcesByServiceName( new _FindRequest( "disk" ) );
+ FindResponse resources = m_stub.findResourcesByServiceName( new FindRequest( "disk" ) );
Assert.assertNotNull( resources );
Assert.assertEquals( 4, resources.getItem( ).length );
}
@@ -98,7 +97,7 @@
public void testGetVersion( )
throws RemoteException
{
- _GetResourcePropertyResponse vers =
+ GetResourcePropertyResponse vers =
m_stub.getResourceProperty( RegistryWsdmServiceWSResource.PropertyQNames.VERSION );
assertNotNull( vers );
assertNotNull( vers.get_any( ) );
Modified: incubator/muse/trunk/src/test/org/apache/ws/resource/notification/SubscriptionRequestImplTestCase.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/test/org/apache/ws/resource/notification/SubscriptionRequestImplTestCase.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/test/org/apache/ws/resource/notification/SubscriptionRequestImplTestCase.java&r1=106372&p2=incubator/muse/trunk/src/test/org/apache/ws/resource/notification/SubscriptionRequestImplTestCase.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/test/org/apache/ws/resource/notification/SubscriptionRequestImplTestCase.java (original)
+++ incubator/muse/trunk/src/test/org/apache/ws/resource/notification/SubscriptionRequestImplTestCase.java Tue Nov 23 18:59:00 2004
@@ -15,7 +15,7 @@
*=============================================================================*/
package org.apache.ws.resource.notification;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._Subscribe;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.Subscribe;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.AttributedQName;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.AttributedURI;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.EndpointReferenceType;
@@ -59,7 +59,7 @@
axis_endpoint.setReferenceProperties( ref_prop );
//axis_endpoint.set_any();
- _Subscribe subscribe = new _Subscribe( );
+ Subscribe subscribe = new Subscribe( );
subscribe.setConsumerReference( axis_endpoint );
subscribe.setInitialTerminationTime( termination );
Modified: incubator/muse/trunk/src/test/org/apache/ws/test/DiskServiceTestCase.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/test/org/apache/ws/test/DiskServiceTestCase.java?view=diff&rev=106373&p1=incubator/muse/trunk/src/test/org/apache/ws/test/DiskServiceTestCase.java&r1=106372&p2=incubator/muse/trunk/src/test/org/apache/ws/test/DiskServiceTestCase.java&r2=106373
==============================================================================
--- incubator/muse/trunk/src/test/org/apache/ws/test/DiskServiceTestCase.java (original)
+++ incubator/muse/trunk/src/test/org/apache/ws/test/DiskServiceTestCase.java Tue Nov 23 18:59:00 2004
@@ -20,13 +20,13 @@
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.SubscribeCreationFailedFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.TopicExpressionType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.TopicPathDialectUnknownFaultType;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._GetCurrentMessage;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._GetCurrentMessageResponse;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._Subscribe;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._SubscribeResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.GetCurrentMessage;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.GetCurrentMessageResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.Subscribe;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.SubscribeResponse;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.ResourceNotDestroyedFaultType;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime._Destroy;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime._SetTerminationTime;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.Destroy;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceLifetime.SetTerminationTime;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.DeleteType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.InsertType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.InvalidSetResourcePropertiesRequestContentFaultType;
@@ -34,15 +34,15 @@
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.ResourceUnknownFaultType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.SetRequestComponentType;
import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.UpdateType;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._GetMultipleResourcePropertiesRequest;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._GetMultipleResourcePropertiesResponse;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._GetResourcePropertyResponse;
-import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._SetResourceProperties;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.GetMultipleResourcePropertiesRequest;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.GetMultipleResourcePropertiesResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.GetResourcePropertyResponse;
+import axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties.SetResourceProperties_Element;
import axis.com.xyz.DiskSoapHttpBindingStub;
import axis.com.xyz.DiskWsdmServiceLocator;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._ResetAll;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._Start;
-import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema._Stop;
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.ResetAll;
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.Start;
+import axis.org.oasis_open.docs.wsdm._2004._04.muws_0_5.schema.Stop;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.AttributedQName;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.AttributedURI;
import axis.org.xmlsoap.schemas.ws._2003._03.addressing.EndpointReferenceType;
@@ -126,7 +126,7 @@
RemoteException,
MalformedURIException
{
- m_stub.destroy( new _Destroy( ) );
+ m_stub.destroy( new Destroy( ) );
// Should not be able to invoke any operation after immediate destruction has occurred.
try
@@ -153,7 +153,7 @@
{
// Subscribe to a TerminationNotification Notification
QName notifQName = ResourceLifetime11Constants.TOPIC_QNAME_RESOURCE_TERMINATION;
- _SubscribeResponse sub_response =
+ SubscribeResponse sub_response =
subscribe( notifQName, "http://127.0.0.1:" + NOTIFICATION_LISTENER_PORT );
EndpointReferenceType subRef = sub_response.getSubscriptionReference( );
assertNotNull( subRef );
@@ -163,7 +163,7 @@
PortListen notificationListener = new PortListen( NOTIFICATION_LISTENER_PORT, LISTENER_TIMEOUT );
// destroy the resource - a notification should get emitted!
- m_stub.destroy( new _Destroy( ) );
+ m_stub.destroy( new Destroy( ) );
// wait for that termination notification
String incomingMessage = notificationListener.waitForIncomingMessage( );
@@ -185,7 +185,7 @@
//test as a listener for events
PortListen notificationListener = new PortListen( NOTIFICATION_LISTENER_PORT, LISTENER_TIMEOUT );
- _SubscribeResponse sub_response =
+ SubscribeResponse sub_response =
subscribe( ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE,
"http://127.0.0.1:" + NOTIFICATION_LISTENER_PORT );
@@ -216,18 +216,14 @@
public void testDiskPortGetMultipleResourceProperties( )
throws Exception
{
- // Test operation
- _GetMultipleResourcePropertiesRequest request;
- _GetMultipleResourcePropertiesResponse response;
-
- request = new _GetMultipleResourcePropertiesRequest( );
+ GetMultipleResourcePropertiesRequest request = new GetMultipleResourcePropertiesRequest( );
request.setResourceProperty( new QName[]
{
ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE,
ExampleConstants.RESOURCE_PROP_QNAME_NUMBER_OF_BLOCKS
} );
- response = m_stub.getMultipleResourceProperties( request );
+ GetMultipleResourcePropertiesResponse response = m_stub.getMultipleResourceProperties( request );
// validate results
assertNotNull( response );
@@ -252,7 +248,7 @@
throws Exception
{
// Test operation
- _GetResourcePropertyResponse response =
+ GetResourcePropertyResponse response =
m_stub.getResourceProperty( ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE );
// validate results
@@ -272,8 +268,8 @@
throws Exception
{
// Test operation
- axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._SetResourceProperties request =
- new _SetResourceProperties( );
+ SetResourceProperties_Element request =
+ new SetResourceProperties_Element( );
MessageElement block_size_ele =
new MessageElement( ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE );
MessageElement num_blocks_ele =
@@ -307,7 +303,7 @@
} );
( (DeleteType) set_components[3] ).setResourceProperty( NameUtils.toQName( manu_ele.getElementName( ) ) );
- request.setUpdate( set_components );
+ request.setSetRequestComponent( set_components );
m_stub.setResourceProperties( request );
assertContainsExactlyOnePropertyWithValue( bsValue,
@@ -329,18 +325,18 @@
testDiskPortSetResourcePropertiesInsert( );
// Test operation
- _SetResourceProperties request = new _SetResourceProperties( );
+ SetResourceProperties_Element request = new SetResourceProperties_Element( );
DeleteType[] set_components = new DeleteType[1];
set_components[0] = new DeleteType( );
set_components[0].setResourceProperty( ExampleConstants.RESOURCE_PROP_QNAME_MANUFACTURER );
- request.setDelete( set_components );
+ request.setSetRequestComponent( set_components );
m_stub.setResourceProperties( request );
// no return value to validate; if no exceptions occurred, assume everything is OK
// cannot delete a non-existing property
set_components[0].setResourceProperty( ExampleConstants.RESOURCE_PROP_QNAME_MANUFACTURER );
- request.setDelete( set_components );
+ request.setSetRequestComponent( set_components );
try
{
@@ -354,7 +350,7 @@
// cannot delete a required property
set_components[0].setResourceProperty( ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE );
- request.setDelete( set_components );
+ request.setSetRequestComponent( set_components );
try
{
@@ -373,8 +369,8 @@
public void testDiskPortSetResourcePropertiesInsert( )
throws Exception
{
- _SetResourceProperties request =
- new axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._SetResourceProperties( );
+ SetResourceProperties_Element request =
+ new SetResourceProperties_Element( );
InsertType[] set_components = new InsertType[1];
MessageElement manuElem =
new MessageElement( ExampleConstants.RESOURCE_PROP_QNAME_MANUFACTURER );
@@ -385,7 +381,7 @@
manuElem
} );
- request.setInsert( set_components );
+ request.setSetRequestComponent( set_components );
try
{
@@ -405,7 +401,7 @@
throws Exception
{
// Test operation
- _SetResourceProperties request = new _SetResourceProperties( );
+ SetResourceProperties_Element request = new SetResourceProperties_Element( );
UpdateType[] set_components = new UpdateType[1];
MessageElement bsElem =
new MessageElement( ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE );
@@ -416,7 +412,7 @@
{
bsElem
} );
- request.setUpdate( set_components );
+ request.setSetRequestComponent( set_components );
m_stub.setResourceProperties( request );
assertContainsExactlyOnePropertyWithValue( bsValue,
getSimpleProperty( ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE,
@@ -460,7 +456,7 @@
throws Exception
{
deleteResourceProp( ExampleConstants.RESOURCE_PROP_QNAME_MANUFACTURER );
- _GetResourcePropertyResponse value =
+ GetResourcePropertyResponse value =
m_stub.getResourceProperty( ExampleConstants.RESOURCE_PROP_QNAME_MANUFACTURER );
assertNotNull( value );
assertNull( value.get_any( ) );
@@ -488,7 +484,7 @@
// The example Service, DiskWsdmServiceWSResource is written so as to emit this notification
// every 5 seconds.
QName badSectorQName = new QName( "http://com.xyz", "BadSector" );
- _SubscribeResponse sub_response =
+ SubscribeResponse sub_response =
subscribe( badSectorQName, "http://127.0.0.1:" + NOTIFICATION_LISTENER_PORT );
EndpointReferenceType subRef = sub_response.getSubscriptionReference( );
@@ -504,12 +500,12 @@
validateNotificationMessage( incomingMessage );
// Call GetCurrentMessage to assure that the BadSector message is available.
- _GetCurrentMessage request = new _GetCurrentMessage( );
+ GetCurrentMessage request = new GetCurrentMessage( );
TopicExpressionType topic = new TopicExpressionType( );
topic.setDialect( new URI( TopicsConstants.DIALECT_TOPIC_EXPRESSION_SIMPLE ) );
topic.set_any( this.buildTopicExpressionTypeAny( badSectorQName ) );
request.setTopic( topic );
- _GetCurrentMessageResponse messageResponse = m_stub.getCurrentMessage( request );
+ GetCurrentMessageResponse messageResponse = m_stub.getCurrentMessage( request );
assertNotNull( messageResponse );
MessageElement[] responseElements = messageResponse.get_any( );
assertNotNull( responseElements );
@@ -538,7 +534,7 @@
testGetCapacityMetric( );
// Now update the value of the ActiveTime metric
- _SetResourceProperties request = new _SetResourceProperties( );
+ SetResourceProperties_Element request = new SetResourceProperties_Element( );
UpdateType[] setComponents = new UpdateType[1];
MessageElement activeTimePropElem =
new MessageElement( ExampleConstants.RESOURCE_PROP_QNAME_ACTIVE_TIME );
@@ -549,7 +545,7 @@
{
activeTimePropElem
} );
- request.setUpdate( setComponents );
+ request.setSetRequestComponent( setComponents );
m_stub.setResourceProperties( request );
// Check again to see that ActiveTime has changed.
@@ -559,7 +555,7 @@
assertTrue( ExampleConstants.INITIAL_PROP_VALUE__ACTIVE_TIME.toString( ).compareTo( propElems[0].getValue( ) ) != 0 );
// Invoke resetAll
- m_stub.resetAll( new _ResetAll( ) );
+ m_stub.resetAll( new ResetAll( ) );
// Check to see that ActiveTime is back to its initial state
propElems = getComplexProperty( ExampleConstants.RESOURCE_PROP_QNAME_ACTIVE_TIME, RESOURCE_ID );
@@ -578,8 +574,8 @@
public void testMuwsStartStop( )
throws Exception
{
- m_stub.start( new _Start( ) );
- _GetResourcePropertyResponse resourceProperty =
+ m_stub.start( new Start( ) );
+ GetResourcePropertyResponse resourceProperty =
m_stub.getResourceProperty( Muws05Constants.RESOURCE_PROP_QNAME_RESOURCE_STATE );
MessageElement[] propElems = resourceProperty.get_any( );
assertEquals( new Integer( 1 ),
@@ -590,7 +586,7 @@
assertNotNull( stateElem );
assertEquals( Muws05Constants.RESOURCE_STATE_URI_AVAILABLE,
stateElem.getValue( ) );
- m_stub.stop( new _Stop( ) );
+ m_stub.stop( new Stop( ) );
resourceProperty = m_stub.getResourceProperty( Muws05Constants.RESOURCE_PROP_QNAME_RESOURCE_STATE );
propElems = resourceProperty.get_any( );
assertEquals( new Integer( 1 ),
@@ -618,7 +614,7 @@
throws Exception
{
// Subscribe to a MUWS ResourceState property change
- _SubscribeResponse sub_response =
+ SubscribeResponse sub_response =
subscribe( Muws05Constants.RESOURCE_PROP_QNAME_RESOURCE_STATE,
this.getAxisBaseUrl( ).toString( ) );
EndpointReferenceType rsSubRef = sub_response.getSubscriptionReference( );
@@ -649,12 +645,12 @@
validateNotificationMessage( incomingMessage );
// Call GetCurrentMessage to assure that the BlockSize message is available.
- _GetCurrentMessage request = new _GetCurrentMessage( );
+ GetCurrentMessage request = new GetCurrentMessage( );
TopicExpressionType topic = new TopicExpressionType( );
topic.setDialect( new URI( TopicsConstants.DIALECT_TOPIC_EXPRESSION_SIMPLE ) );
topic.set_any( this.buildTopicExpressionTypeAny( ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE ) );
request.setTopic( topic );
- _GetCurrentMessageResponse messageResponse = m_stub.getCurrentMessage( request );
+ GetCurrentMessageResponse messageResponse = m_stub.getCurrentMessage( request );
assertNotNull( messageResponse );
MessageElement[] responseElements = messageResponse.get_any( );
assertNotNull( responseElements );
@@ -674,7 +670,7 @@
//test as a listener for events
PortListen notificationListener = new PortListen( NOTIFICATION_LISTENER_PORT, 5000 );
- _SubscribeResponse sub_response =
+ SubscribeResponse sub_response =
subscribe( ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE,
"http://127.0.0.1:" + NOTIFICATION_LISTENER_PORT );
@@ -722,7 +718,7 @@
//test as a listener for events
PortListen notificationListener = new PortListen( NOTIFICATION_LISTENER_PORT, 15000 );
- _SubscribeResponse sub_response =
+ SubscribeResponse sub_response =
subscribe( ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE,
"http://127.0.0.1:" + NOTIFICATION_LISTENER_PORT );
@@ -736,7 +732,7 @@
subMgrBinding.setResourceId( AxisGenTypesUtils.getResourceId( subscriptionReference ) );
- _SetTerminationTime termTime = new _SetTerminationTime( );
+ SetTerminationTime termTime = new SetTerminationTime( );
Calendar calendar = Calendar.getInstance( );
//set to the start of time ;-) ..its already expired
@@ -762,7 +758,7 @@
throws Exception
{
// Test operation
- _GetResourcePropertyResponse response =
+ GetResourcePropertyResponse response =
m_stub.getResourceProperty( ExampleConstants.RESOURCE_PROP_QNAME_TOPIC_SPACE );
// validate results
@@ -808,7 +804,7 @@
while ( i.hasNext( ) )
{
QName q = (QName) i.next( );
- _SubscribeResponse sub_response = subscribe( q,
+ SubscribeResponse sub_response = subscribe( q,
this.getAxisBaseUrl( ).toString( ) );
EndpointReferenceType rsSubRef = sub_response.getSubscriptionReference( );
assertNotNull( rsSubRef );
@@ -826,7 +822,7 @@
throws Exception
{
// Test operation
- _GetResourcePropertyResponse response =
+ GetResourcePropertyResponse response =
m_stub.getResourceProperty( BaseNotification10Constants.RESOURCE_PROP_QNAME_TOPIC );
// validate results
@@ -853,7 +849,7 @@
while ( i.hasNext( ) )
{
QName q = (QName) i.next( );
- _SubscribeResponse sub_response = subscribe( q,
+ SubscribeResponse sub_response = subscribe( q,
this.getAxisBaseUrl( ).toString( ) );
EndpointReferenceType rsSubRef = sub_response.getSubscriptionReference( );
assertNotNull( rsSubRef );
@@ -876,7 +872,7 @@
MalformedURIException
{
// Subscribe to a BlockSize property change
- _SubscribeResponse sub_response =
+ SubscribeResponse sub_response =
subscribe( ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE,
this.getAxisBaseUrl( ).toString( ) );
EndpointReferenceType bsSubRef = sub_response.getSubscriptionReference( );
@@ -920,7 +916,7 @@
try
{
// Subscribe to a BlockSize property change
- _SubscribeResponse sub_response =
+ SubscribeResponse sub_response =
subscribe( ExampleConstants.RESOURCE_PROP_QNAME_BLOCK_SIZE,
this.getAxisBaseUrl( ).toString( ) );
fail( "Subscribe request succeeded on destroyed resource." );
@@ -1047,13 +1043,8 @@
String resourceID )
throws Exception
{
- DiskSoapHttpBindingStub binding;
- _GetResourcePropertyResponse value;
- MessageElement ele;
-
- binding = getStub( );
+ DiskSoapHttpBindingStub binding = getStub( );
binding.setResourceId( resourceID );
-
return binding.getResourceProperty( prop ).get_any( );
}
@@ -1188,14 +1179,12 @@
private void deleteResourceProp( QName prop_qname )
throws java.rmi.RemoteException
{
- axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._SetResourceProperties request =
- new axis.com.ibm.www.xmlns.stdwip.web_services.WS_ResourceProperties._SetResourceProperties( );
- DeleteType[] set_components =
- new DeleteType[1];
-
- set_components[0] = new DeleteType( );
- set_components[0].setResourceProperty( prop_qname );
- request.setDelete( set_components );
+ SetResourceProperties_Element request = new SetResourceProperties_Element();
+ DeleteType[] set_components = new DeleteType[]
+ {
+ new DeleteType( prop_qname )
+ };
+ request.setSetRequestComponent( set_components );
m_stub.setResourceProperties( request );
}
@@ -1209,17 +1198,15 @@
* @throws MalformedURIException
*
*/
- private _SubscribeResponse subscribe( QName propQname,
- String callback_url )
+ private SubscribeResponse subscribe( QName propQname,
+ String callback_url )
throws SubscribeCreationFailedFaultType,
ResourceUnknownFaultType,
TopicPathDialectUnknownFaultType,
RemoteException,
MalformedURIException
{
- // First the _Subscribe request must be setup.
- _Subscribe request = new _Subscribe( );
-
+ Subscribe request = new Subscribe( );
// Create an endpoint reference for the NotificationConsumer
// Note that since we are using PortListener to handle notifications,
// rather than a Web Service that implements NotificationConsumer this
@@ -1234,11 +1221,9 @@
// Set a couple of reference properties, including a ResourceID.
MessageElement[] prop = new MessageElement[2];
-
MessageElement propsResourceID =
new SOAPBodyElement( JMuwsAddressingConstants.REFERENCE_PROP_QNAME_RESOURCE_ID, "4444" );
prop[0] = propsResourceID;
-
MessageElement otherProp = new SOAPBodyElement( new QName( "http://com.xyz/props", "myprop" ),
"foo" );
prop[1] = otherProp;
@@ -1267,7 +1252,7 @@
request.setUseNotify( new Boolean( true ) );
// Issue the actual request to subscribe
- _SubscribeResponse response = m_stub.subscribe( request );
+ SubscribeResponse response = m_stub.subscribe( request );
return response;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org