Author: alexoree
Date: Sat Jan 4 19:00:39 2014
New Revision: 1555401
URL: http://svn.apache.org/r1555401
Log:
JUDDI-755 updating tModel helper functions, WADL and WSDL2UDDI integrated, all
examples updated
JUDDI-714 adding build instructions, removing the warning
Removed:
juddi/trunk/juddi-client.net/warning.txt
Modified:
juddi/trunk/juddi-client.net/readme.txt
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLinaUDDIRegistryTest.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
juddi/trunk/juddi-examples/service-version/src/main/java/org/apache/juddi/examples/service/version/ServiceVersioningExample.java
juddi/trunk/juddi-examples/simple-publish/src/main/java/org/apache/juddi/example/publish/SimplePublish.java
Modified: juddi/trunk/juddi-client.net/readme.txt
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/readme.txt?rev=1555401&r1=1555400&r2=1555401&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/readme.txt (original)
+++ juddi/trunk/juddi-client.net/readme.txt Sat Jan 4 19:00:39 2014
@@ -1,18 +1,27 @@
-This is a on going effort to port the entire juddi-client and uddi-ws over to
.NET
+juddi-client.net
-Goals
--Public APIs should mirror the juddi-client as much as possible
--WSDL and WADL to UDDI models
--Use the juddi-client configuration file if possible
--Inclusive of UDDI API documentation
--Hopefully work in both Microsoft's .NET and with Mono
--Use WCF behaviors and annotations to add the necessary hooks
-
-It is not yet complete!
-
-Mono users, make sure you use juddi-client.net-mono.sln when building!
-
-Notes:
--embedded mode is not supported
--transport is via ASP.NET (System.Web.Services)
--digital signature support is not yet supported
+This project is a complete port of the Java juddi-client project.
+
+Prerequists
+-.NET 3.5
+-Nunit 2.6.1 or better
+
+Build Instructions
+msbuild.exe juddi-client.net\juddi-client.net.sln /p:Configuration=Debug
/p:Platform="Any CPU" /m
+
+Tests
+"%NUNIT_HOME%\bin\nunit-console.exe"
juddi-client.net\juddi-client.net.test\bin\Debug\juddi-client.net.test.dll
+
+Integration Tests
+Start Tomcat or a container with jUDDIv3.war deployed (and working!)
+"%NUNIT_HOME%\bin\nunit-console.exe"
juddi-client.net-integration.test\bin\Debug\juddi-client.net-integration.test.dll
+
+
+Some quick notes on usage.
+
+This assembly is not signed (mostly to make portability easier). You'll
probably need to sign it at somepoint. Consult Microsoft documentation on how
to do this.
+
+Start your own .NET project
+Add a reference to juddi-client.net.dll
+Add a copy of juddi-client.net-sample\uddi.xml (set it to copy to output
directory always)
+Follow the patterns in the example projects and consult the documentation
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java?rev=1555401&r1=1555400&r2=1555401&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java
Sat Jan 4 19:00:39 2014
@@ -47,6 +47,7 @@ import org.apache.juddi.api_v3.AccessPoi
import org.apache.juddi.jaxb.PrintUDDI;
import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.config.UDDIClerk;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIKeyConvention;
import org.apache.juddi.v3.client.transport.TransportException;
import org.uddi.api_v3.AccessPoint;
@@ -247,7 +248,10 @@ public class WSDL2UDDI {
//delete all tModels assuming they are the
portType and Binding tModels.
if (tModelDetail.getTModel() != null &&
tModelDetail.getTModel().size() > 0) {
for (TModel tModel : tModelDetail.getTModel())
{
-
clerk.unRegisterTModel(tModel.getTModelKey());
+ if
(!tModel.getTModelKey().startsWith("uddi:uddi.org:"))
+
clerk.unRegisterTModel(tModel.getTModelKey());
+ else
+ log.info("Skipping the removal
of " + tModel.getTModelKey() + " because it starts with uddi.org");
}
}
}
@@ -941,7 +945,8 @@ public class WSDL2UDDI {
log.error("Could not find Service with serviceName: " +
serviceQName.getLocalPart());
}
- return bindingTemplate;
+
+ return UDDIClient.addSOAPtModels(bindingTemplate);
}
/**
Modified:
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLinaUDDIRegistryTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLinaUDDIRegistryTest.java?rev=1555401&r1=1555400&r2=1555401&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLinaUDDIRegistryTest.java
(original)
+++
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLinaUDDIRegistryTest.java
Sat Jan 4 19:00:39 2014
@@ -199,7 +199,7 @@ public class WSDLinaUDDIRegistryTest {
Assert.assertEquals(specBindingTemplate.getBindingKey(),
bindingTemplate.getBindingKey());
Assert.assertEquals(specBindingTemplate.getServiceKey(),
bindingTemplate.getServiceKey());
Assert.assertEquals(specBindingTemplate.getAccessPoint().getValue(),
bindingTemplate.getAccessPoint().getValue());
-
Assert.assertEquals(2,bindingTemplate.getTModelInstanceDetails().getTModelInstanceInfo().size());
+ Assert.assertTrue(2 <=
bindingTemplate.getTModelInstanceDetails().getTModelInstanceInfo().size());
//first binding/tmodelInstanceDetails
Assert.assertEquals(specBindingTemplate.getTModelInstanceDetails().getTModelInstanceInfo().get(0).getTModelKey(),
bindingTemplate.getTModelInstanceDetails().getTModelInstanceInfo().get(0).getTModelKey());
Modified:
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java?rev=1555401&r1=1555400&r2=1555401&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
(original)
+++
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
Sat Jan 4 19:00:39 2014
@@ -88,6 +88,7 @@ public class BusinessServiceKeymismatch
bs.setBindingTemplates(new BindingTemplates());
BindingTemplate bt = new BindingTemplate();
bt.setAccessPoint(new AccessPoint("http://localhost";,
"wsdlDeployment"));
+ bt = UDDIClient.addSOAPtModels(bt);
bs.getBindingTemplates().getBindingTemplate().add(bt);
be.getBusinessServices().getBusinessService().add(bs);
sb.getBusinessEntity().add(be);
Modified:
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java?rev=1555401&r1=1555400&r2=1555401&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
(original)
+++
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
Sat Jan 4 19:00:39 2014
@@ -4,33 +4,19 @@
*/
package org.apache.juddi.samples;
-import java.io.File;
-import java.net.URL;
-import java.rmi.RemoteException;
-import java.util.List;
import java.util.Properties;
-import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.xml.namespace.QName;
import org.apache.juddi.jaxb.PrintUDDI;
-import static org.apache.juddi.samples.WadlImport.properties;
import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
-import org.apache.juddi.v3.client.mapping.WADL2UDDI;
-import org.apache.juddi.v3.client.mappings.wadl.Application;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3_service.JUDDIApiPortType;
-import org.uddi.api_v3.AuthToken;
import org.uddi.api_v3.BusinessDetail;
import org.uddi.api_v3.BusinessEntity;
import org.uddi.api_v3.BusinessInfos;
import org.uddi.api_v3.BusinessList;
-import org.uddi.api_v3.BusinessService;
-import org.uddi.api_v3.BusinessServices;
import org.uddi.api_v3.Contact;
import org.uddi.api_v3.Contacts;
import org.uddi.api_v3.DeleteBusiness;
@@ -45,7 +31,6 @@ import org.uddi.api_v3.PersonName;
import org.uddi.api_v3.SaveBusiness;
import org.uddi.api_v3.SaveTModel;
import org.uddi.api_v3.TModel;
-import org.uddi.v3_service.DispositionReportFaultMessage;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
Modified:
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java?rev=1555401&r1=1555400&r2=1555401&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java
(original)
+++
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java
Sat Jan 4 19:00:39 2014
@@ -302,6 +302,7 @@ public class SearchByQos {
tii.setInstanceDetails(new InstanceDetails());
tii.getInstanceDetails().setInstanceParms("400");
+ bt = UDDIClient.addSOAPtModels(bt);
bt.getTModelInstanceDetails().getTModelInstanceInfo().add(tii);
bs.getBindingTemplates().getBindingTemplate().add(bt);
be.getBusinessServices().getBusinessService().add(bs);
Modified:
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java?rev=1555401&r1=1555400&r2=1555401&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
(original)
+++
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
Sat Jan 4 19:00:39 2014
@@ -166,6 +166,7 @@ public class UddiCreatebulk {
BindingTemplates myBindingTemplates = new
BindingTemplates();
+ myBindingTemplate =
UDDIClient.addSOAPtModels(myBindingTemplate);
myBindingTemplates.getBindingTemplate().add(myBindingTemplate);
myService.setBindingTemplates(myBindingTemplates);
try {
Modified:
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java?rev=1555401&r1=1555400&r2=1555401&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
(original)
+++
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
Sat Jan 4 19:00:39 2014
@@ -182,6 +182,7 @@ public class UddiCustodyTransfer {
bt.setAccessPoint(new AccessPoint());
bt.getAccessPoint().setValue("http://localhost:9999/"; + user);
bt.getAccessPoint().setUseType("endPoint");
+ bt = UDDIClient.addSOAPtModels(bt);
bs.getBindingTemplates().getBindingTemplate().add(bt);
return bs;
}
Modified:
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java?rev=1555401&r1=1555400&r2=1555401&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
(original)
+++
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
Sat Jan 4 19:00:39 2014
@@ -174,6 +174,7 @@ public class UddiSubscribe {
bt.setTModelInstanceDetails(new TModelInstanceDetails());
bt.getTModelInstanceDetails().getTModelInstanceInfo().add(instanceInfo);
+ bt = UDDIClient.addSOAPtModels(bt);
bs.getBindingTemplates().getBindingTemplate().add(bt);
Modified:
juddi/trunk/juddi-examples/service-version/src/main/java/org/apache/juddi/examples/service/version/ServiceVersioningExample.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/service-version/src/main/java/org/apache/juddi/examples/service/version/ServiceVersioningExample.java?rev=1555401&r1=1555400&r2=1555401&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/service-version/src/main/java/org/apache/juddi/examples/service/version/ServiceVersioningExample.java
(original)
+++
juddi/trunk/juddi-examples/service-version/src/main/java/org/apache/juddi/examples/service/version/ServiceVersioningExample.java
Sat Jan 4 19:00:39 2014
@@ -95,7 +95,9 @@ public class ServiceVersioningExample {
bt1.setAccessPoint(new AccessPoint("http://localhost";, "wsdl"));
bt1.setTModelInstanceDetails(new TModelInstanceDetails());
bt1.getTModelInstanceDetails().getTModelInstanceInfo().add(UDDIClerk.createServiceInterfaceVersion(version,
lang));
+ bt1 = UDDIClient.addSOAPtModels(bt1);
bs.getBindingTemplates().getBindingTemplate().add(bt1);
+
//version 2
@@ -105,6 +107,7 @@ public class ServiceVersioningExample {
bt2.setAccessPoint(new AccessPoint("http://localhost";, "wsdl"));
bt2.setTModelInstanceDetails(new TModelInstanceDetails());
bt2.getTModelInstanceDetails().getTModelInstanceInfo().add(UDDIClerk.createServiceInterfaceVersion(version2,
lang));
+ bt2 = UDDIClient.addSOAPtModels(bt2);
bs.getBindingTemplates().getBindingTemplate().add(bt2);
be.getBusinessServices().getBusinessService().add(bs);
Modified:
juddi/trunk/juddi-examples/simple-publish/src/main/java/org/apache/juddi/example/publish/SimplePublish.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-publish/src/main/java/org/apache/juddi/example/publish/SimplePublish.java?rev=1555401&r1=1555400&r2=1555401&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/simple-publish/src/main/java/org/apache/juddi/example/publish/SimplePublish.java
(original)
+++
juddi/trunk/juddi-examples/simple-publish/src/main/java/org/apache/juddi/example/publish/SimplePublish.java
Sat Jan 4 19:00:39 2014
@@ -109,7 +109,10 @@ public class SimplePublish {
accessPoint.setValue("http://example.org/services/myservice?wsdl";);
myBindingTemplate.setAccessPoint(accessPoint);
BindingTemplates myBindingTemplates = new BindingTemplates();
+ //optional but recommended step, this annotations our binding with
all the standard SOAP tModel instance infos
+ myBindingTemplate = UDDIClient.addSOAPtModels(myBindingTemplate);
myBindingTemplates.getBindingTemplate().add(myBindingTemplate);
+
myService.setBindingTemplates(myBindingTemplates);
// Adding the service to the "save" structure, using our
publisher's authentication info and saving away.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
