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 wi...@apache.org on 2005/08/29 19:12:49 UTC
svn commit: r264171 - in /webservices/muse/trunk/src/examples/client/src:
java-old/ java-old/org/ java-old/org/apache/ java-old/org/apache/ws/
java-old/org/apache/ws/client/ java-old/org/apache/ws/client/async/
java-old/org/apache/ws/client/util/ java/...
Author: wire
Date: Mon Aug 29 10:12:38 2005
New Revision: 264171
URL: http://svn.apache.org/viewcvs?rev=264171&view=rev
Log:
Removed a large amount of older code. Am reqbuilding from scratch test first.
Added:
webservices/muse/trunk/src/examples/client/src/java-old/
webservices/muse/trunk/src/examples/client/src/java-old/WsdmExplorer.java
- copied unchanged from r240338, webservices/muse/trunk/src/examples/client/src/java/WsdmExplorer.java
webservices/muse/trunk/src/examples/client/src/java-old/WsdmSwingExplorer.java
- copied, changed from r240338, webservices/muse/trunk/src/examples/client/src/java/WsdmSwingExplorer.java
webservices/muse/trunk/src/examples/client/src/java-old/org/
webservices/muse/trunk/src/examples/client/src/java-old/org/apache/
webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/
webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/
webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/DynamicSchemaClassBuilder.java
- copied, changed from r240338, webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/DynamicSchemaClassBuilder.java
webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/DynamicSoapClient.java
- copied, changed from r240338, webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/DynamicSoapClient.java
webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/async/
- copied from r240338, webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/async/
webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/
- copied from r240338, webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/util/
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/stubs/
webservices/muse/trunk/src/examples/client/src/test/
webservices/muse/trunk/src/examples/client/src/test/org/
webservices/muse/trunk/src/examples/client/src/test/org/apache/
webservices/muse/trunk/src/examples/client/src/test/org/apache/ws/
Removed:
webservices/muse/trunk/src/examples/client/src/java/WsdmExplorer.java
webservices/muse/trunk/src/examples/client/src/java/WsdmSwingExplorer.java
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/DynamicSchemaClassBuilder.java
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/DynamicSoapClient.java
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/async/
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/model/
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/util/
webservices/muse/trunk/src/examples/client/src/test1/org/apache/ws/http/
webservices/muse/trunk/src/examples/client/src/test1/org/apache/ws/test/AbstractAxisTestCase.java
webservices/muse/trunk/src/examples/client/src/test1/org/apache/ws/test/AbstractMultipleAxisTestCase.java
webservices/muse/trunk/src/examples/client/src/test1/org/apache/ws/test/AbstractNoAxisTestCase.java
webservices/muse/trunk/src/examples/client/src/test1/org/apache/ws/test/AbstractOneAxisTestCase.java
webservices/muse/trunk/src/examples/client/src/test1/org/apache/ws/test/AbstractSerializationTestCase.java
Modified:
webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/Consumer.java
webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/EnvelopeWrapper.java
webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/Subscriber.java
Copied: webservices/muse/trunk/src/examples/client/src/java-old/WsdmSwingExplorer.java (from r240338, webservices/muse/trunk/src/examples/client/src/java/WsdmSwingExplorer.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java-old/WsdmSwingExplorer.java?p2=webservices/muse/trunk/src/examples/client/src/java-old/WsdmSwingExplorer.java&p1=webservices/muse/trunk/src/examples/client/src/java/WsdmSwingExplorer.java&r1=240338&r2=264171&rev=264171&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java/WsdmSwingExplorer.java (original)
+++ webservices/muse/trunk/src/examples/client/src/java-old/WsdmSwingExplorer.java Mon Aug 29 10:12:38 2005
@@ -18,8 +18,8 @@
import javax.swing.tree.TreePath;
import javax.wsdl.WSDLException;
-import org.apache.ws.client.model.impl.WsdmInstanceImpl;
-import org.apache.ws.client.model.impl.WsdmClientImpl;
+import org.apache.ws.client.model.oldimpl.WsdmClientImpl;
+import org.apache.ws.client.model.oldimpl.WsdmInstanceImpl;
import org.apache.ws.client.model.swing.GetServerFrame;
import org.apache.ws.client.model.swing.OperationsTableModel;
import org.apache.ws.client.model.swing.PropertiesTableModel;
Copied: webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/DynamicSchemaClassBuilder.java (from r240338, webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/DynamicSchemaClassBuilder.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/DynamicSchemaClassBuilder.java?p2=webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/DynamicSchemaClassBuilder.java&p1=webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/DynamicSchemaClassBuilder.java&r1=240338&r2=264171&rev=264171&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/DynamicSchemaClassBuilder.java (original)
+++ webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/DynamicSchemaClassBuilder.java Mon Aug 29 10:12:38 2005
@@ -21,16 +21,14 @@
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPElement;
+import org.apache.ws.resource.tool.Wsdl2Java;
+import org.apache.ws.util.IoUtils;
+import org.apache.ws.util.WsdlUtils;
+import org.apache.ws.util.XmlBeanNameUtils;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.common.XmlErrorPrinter;
import org.apache.xmlbeans.impl.tool.SchemaCompiler;
-import org.apache.commons.io.IoUtils;
-import org.apache.ws.MuseConstants;
-import org.apache.ws.platform.axis.wsdl.WsdmWsdl2Java;
-import org.apache.ws.util.XmlBeansUtils;
-import org.apache.ws.wsdl.WsdlUtils;
-
/**
* This class takes a WSDL's schema and converts it into a set of XMLBeans.
* These XMLBeans can then be used to create requests and deliver responses to
@@ -168,7 +166,7 @@
// Build a definition
//System.err.println("Attemted to load def for "+m_wsdlURL);
- m_definition = WsdlUtils.loadWsdlDefinition(m_wsdlURL );
+ // This must be repaired m_definition = WsdlUtils.loadWsdlDefinition(m_wsdlURL );
// m_localWsdl =
@@ -214,7 +212,7 @@
return;
}
- compileWsdlSchema( WsdlUtils.getAllWsdlFiles( m_wsdlURL, m_tempDir, MuseConstants.WS_SPEC_NSURIS ) );
+ // This must be fixed compileWsdlSchema( WsdlUtils.getAllWsdlFiles( m_wsdlURL, m_tempDir, MuseConstants.WS_SPEC_NSURIS ) );
m_compiled = true;
}
@@ -225,7 +223,7 @@
*/
public static void dispose( )
{
- IoUtils.deleteDir( m_tempDir );
+ //IoUtils.deleteDir( m_tempDir ); This must be restored
try {
buildTempDirs();
} catch (IOException e) {
@@ -248,7 +246,7 @@
+ resoucePropsDocElemQName + "." );
}
- String resourcePropertiesClassName = XmlBeansUtils.getElementXmlBeanClassName( resoucePropsDocElemQName );
+ String resourcePropertiesClassName = XmlBeanNameUtils.getElementXmlBeanClassName( resoucePropsDocElemQName );
if ( resourcePropertiesClassName == null )
{
@@ -504,7 +502,7 @@
{
classesURL
},
- WsdmWsdl2Java.class.getClassLoader( ) );
+ Wsdl2Java.class.getClassLoader( ) );
}
/**
@@ -574,5 +572,14 @@
Properties props = System.getProperties();
//sCompParams.setCompiler("C:\\java\\j2sdk1.4.2_05\\bin\\javac");
SchemaCompiler.compile( sCompParams );
+ }
+
+ /**
+ * Clears the cache of generated classes in the users home directory;
+ * Should be used in unit tests and to flush generated classes if a wsdl on the
+ * server has changed and the client classes should be re-generated.
+ */
+ public static void clearGeneratedClassCache(){
+ dispose();
}
}
Copied: webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/DynamicSoapClient.java (from r240338, webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/DynamicSoapClient.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/DynamicSoapClient.java?p2=webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/DynamicSoapClient.java&p1=webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/DynamicSoapClient.java&r1=240338&r2=264171&rev=264171&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/DynamicSoapClient.java (original)
+++ webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/DynamicSoapClient.java Mon Aug 29 10:12:38 2005
@@ -32,7 +32,6 @@
import org.apache.axis.message.addressing.AddressingHeaders;
import org.apache.axis.message.addressing.ReferencePropertiesType;
-import org.apache.commons.xml.JaxpUtils;
import org.apache.ws.client.util.BodyWrapper;
import org.apache.ws.client.util.EnvelopeWrapper;
import org.apache.xmlbeans.XmlCursor;
@@ -448,7 +447,7 @@
}
addHeader.toEnvelope(envelope,"http://schemas.xmlsoap.org/soap/actor/next");
SOAPBody body = envelope.getBody();
- body.addDocument(JaxpUtils.toDocument(xmlText));
+ // THis must be restored body.addDocument(JaxpUtils.toDocument(xmlText));
SOAPConnection soapConn = SOAPConnectionFactory.newInstance()
.createConnection();
Modified: webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/Consumer.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/Consumer.java?rev=264171&r1=240338&r2=264171&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/Consumer.java (original)
+++ webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/Consumer.java Mon Aug 29 10:12:38 2005
@@ -3,16 +3,15 @@
*=============================================================================*/
package org.apache.ws.client.util;
-import org.apache.ws.client.model.ManagabilityConsumer;
-import org.apache.ws.client.model.ManagabilityConsumerFactory;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
import org.apache.ws.client.model.ManagableResourceInstance;
-import org.apache.ws.client.model.ManageableResource;
-import com.ibm.xmlns.stdwip.webServices.wsBaseNotification.NotifyDocument;
-import com.ibm.xmlns.stdwip.webServices.wsBaseNotification.TopicExpressionType;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import javax.xml.namespace.QName;
-import java.net.URL;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.NotifyDocument;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
/**
* Object that represents a notification consumer. This object will take care of
@@ -68,12 +67,13 @@
public ManagableResourceInstance getMyInstance( )
throws Exception
{
- ManagabilityConsumer wc =
- ManagabilityConsumerFactory.create( ManagabilityConsumerFactory.AXIS_CLIENT_TYPE, "localhost:8080", "wsdm" );
- ManageableResource wr = wc.getResource( "sensor" );
- ManagableResourceInstance[] wi = wr.getInstances( );
+// ManagabilityConsumer wc =
+// ManagabilityConsumerFactory.create( ManagabilityConsumerFactory.AXIS_CLIENT_TYPE, "localhost:8080", "wsdm" );
+// ManageableResource wr = wc.getResource( "sensor" );
+// ManagableResourceInstance[] wi = wr.getInstances( );
- return wi[0];
+ // return wi[0];
+ return null;
}
/** */
@@ -115,7 +115,7 @@
ManagableResourceInstance notifProducer = new Util( ).getMyInstance( );
TopicExpressionType tet = new Util( ).getMyTopicExpressionType( notifProducer );
- getSubscriber( ).subscribe( notifProducer, tet );
+ //getSubscriber( ).subscribe( notifProducer, tet );
}
catch ( Exception e )
{
@@ -133,7 +133,7 @@
ManagableResourceInstance notifProducer = new Util( ).getMyInstance( );
TopicExpressionType tet = new Util( ).getMyTopicExpressionType( notifProducer );
- c.getSubscriber( ).subscribe( notifProducer, tet );
+ // c.getSubscriber( ).subscribe( notifProducer, tet );
c.stop( );
}
Modified: webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/EnvelopeWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/EnvelopeWrapper.java?rev=264171&r1=240338&r2=264171&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/EnvelopeWrapper.java (original)
+++ webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/EnvelopeWrapper.java Mon Aug 29 10:12:38 2005
@@ -3,17 +3,18 @@
*=============================================================================*/
package org.apache.ws.client.util;
-import org.apache.commons.io.IoUtils;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+
+import org.apache.ws.util.IoUtils;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.xmlsoap.schemas.soap.envelope.Envelope;
import org.xmlsoap.schemas.soap.envelope.EnvelopeDocument;
-
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
/**
* Wraps an XmlBean Envelope (or a javax.xml.soap.SOAPMessage class) to provide
Modified: webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/Subscriber.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/Subscriber.java?rev=264171&r1=240338&r2=264171&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/Subscriber.java (original)
+++ webservices/muse/trunk/src/examples/client/src/java-old/org/apache/ws/client/util/Subscriber.java Mon Aug 29 10:12:38 2005
@@ -6,8 +6,8 @@
import org.apache.ws.client.model.ManagabilityConsumer;
import org.apache.ws.client.model.ManagableResourceInstance;
import org.apache.ws.client.model.ResourceOperation;
-import com.ibm.xmlns.stdwip.webServices.wsBaseNotification.TopicExpressionType;
import org.apache.xmlbeans.XmlObject;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
import java.net.URL;
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org