Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp (original) +++ juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp Tue Apr 23 22:19:34 2013 @@ -69,15 +69,21 @@ out.write("</td><td>"); out.write(StringEscapeUtils.escapeHtml(list.get(i).getExpiresAfter().toString())); out.write("</td><td>"); - out.write("<i class=\"icon-edit\"></i> "); - out.write("<i class=\"icon-remove\"></i> "); - out.write("<i class=\"icon-zoom-in\"></i> "); -out.write(list.get(i).getBindingKey()); -out.write(list.get(i).getMaxEntities()); -out.write(list.get(i).getNotificationInterval().toString()); + out.write(StringEscapeUtils.escapeHtml(list.get(i).getBindingKey())); + out.write("</td><td>"); + + + out.write("<i class=\"icon-edit icon-large\"></i> "); + out.write("<i class=\"icon-remove icon-large\"></i> "); + out.write("<i class=\"icon-zoom-in icon-large\"></i> "); + out.write(list.get(i).getBindingKey()); + if (list.get(i).getMaxEntities() != null) + out.write(list.get(i).getMaxEntities().toString()); + if (list.get(i).getNotificationInterval()!=null) + out.write(list.get(i).getNotificationInterval().toString()); //out.write(list.get(i).getSubscriptionFilter()); out.write("</td></tr>"); - out.write("<tr><td colspan=\"3\"><div id=\"" + StringEscapeUtils.escapeHtml(list.get(i).getSubscriptionKey()) + "\"></div></td></tr>"); + // out.write("<tr><td colspan=\"3\"><div id=\"" + StringEscapeUtils.escapeHtml(list.get(i).getSubscriptionKey()) + "\"></div></td></tr>"); } %> </table>
Modified: juddi/branches/juddi-3.2.x/juddiv3-war/pom.xml URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddiv3-war/pom.xml?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/juddiv3-war/pom.xml (original) +++ juddi/branches/juddi-3.2.x/juddiv3-war/pom.xml Tue Apr 23 22:19:34 2013 @@ -210,7 +210,12 @@ <artifactId>cglib</artifactId> </exclusion> </exclusions> - </dependency> + </dependency> + <dependency> + <groupId>org.apache.geronimo.javamail</groupId> + <artifactId>geronimo-javamail_1.4_mail</artifactId> + <version>1.8.2</version> + </dependency> </dependencies> </profile> <profile> @@ -265,7 +270,12 @@ <artifactId>cglib</artifactId> </exclusion> </exclusions> - </dependency> + </dependency> + <dependency> + <groupId>org.apache.geronimo.javamail</groupId> + <artifactId>geronimo-javamail_1.4_mail</artifactId> + <version>1.8.2</version> + </dependency> </dependencies> </profile> </profiles> Modified: juddi/branches/juddi-3.2.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties (original) +++ juddi/branches/juddi-3.2.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties Tue Apr 23 22:19:34 2013 @@ -89,15 +89,10 @@ juddi.rmi.port=0 # Duration of time for tokens to expire juddi.auth.token.Timeout=15 - -# As of 3.1.5 -# Duration of time for tokens to expire -juddi.auth.token.Timeout=15 - # As of 3.1.5 # This setting will force referential integrity for all tModels (except keyGenerators), # category bags, bindingTemplate/AccessPoint/hostingRedirector (referencing another host), # tModelinstanceparms and anything else that references a KeyName # default value is true. -# set to false for backword compatability or for a more lax registry -juddi.validation.enforceReferentialIntegrity=false \ No newline at end of file +# set to false for backwards compatibility or for a more lax registry +juddi.validation.enforceReferentialIntegrity=true \ No newline at end of file Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/Property.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/Property.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/Property.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/Property.java Tue Apr 23 22:19:34 2013 @@ -4,6 +4,8 @@ public class Property { public static String ROOT_PUBLISHER = "root.publisher"; public static String ROOT_PASSWORD = "root.password"; + public static String UDDI_PUBLISHER = "uddi.publisher"; + public static String UDDI_PASSWORD = "uddi.password"; public static String JOE_PUBLISHER = "joe.publisher"; public static String JOE_PASSWORD = "joe.password"; public static String SAM_PUBLISHER = "sam.publisher"; @@ -12,5 +14,7 @@ public class Property { public static String MARY_PASSWORD = "mary.password"; public static String RIFTSAW_PUBLISHER = "riftsaw.publisher"; public static String RIFTSAW_PASSWORD = "riftsaw.password"; + public static String TMODEL_PUBLISHER = "tmodel.publisher"; + public static String TMODEL_PASSWORD = "tmodel.password"; } Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java Tue Apr 23 22:19:34 2013 @@ -292,7 +292,6 @@ public class TckBusiness SaveBusiness sb = new SaveBusiness(); sb.setAuthInfo(authInfo); - BusinessEntity beIn = (BusinessEntity)EntityCreator.buildFromDoc(businessXML, "org.uddi.api_v3"); sb.getBusinessEntity().add(beIn); Propchange: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java ------------------------------------------------------------------------------ Merged /juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java:r1467813-1470373 Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java Tue Apr 23 22:19:34 2013 @@ -25,9 +25,10 @@ import java.util.Properties; public class TckPublisher { private static Properties tckProperties = new Properties(); - public final static String JOE_PUBLISHER_XML = "uddi_data/joepublisher/publisher.xml"; - public final static String SAM_SYNDICATOR_XML = "uddi_data/samsyndicator/publisher.xml"; - public final static String MARY_PUBLISHER_XML = "uddi_data/marypublisher/publisher.xml"; + public final static String JOE_PUBLISHER_XML = "uddi_data/joepublisher/publisher.xml"; + public final static String TMODEL_PUBLISHER_XML = "uddi_data/tmodels/publisher.xml"; + public final static String SAM_SYNDICATOR_XML = "uddi_data/samsyndicator/publisher.xml"; + public final static String MARY_PUBLISHER_XML = "uddi_data/marypublisher/publisher.xml"; static { try { @@ -47,6 +48,14 @@ public class TckPublisher return tckProperties.getProperty(Property.ROOT_PASSWORD); } + public final static String getUDDIPublisherId() { + return tckProperties.getProperty(Property.UDDI_PUBLISHER); + } + + public final static String getUDDIPassword() { + return tckProperties.getProperty(Property.UDDI_PASSWORD); + } + public final static String getJoePublisherId() { return tckProperties.getProperty(Property.JOE_PUBLISHER); } @@ -55,6 +64,14 @@ public class TckPublisher return tckProperties.getProperty(Property.JOE_PASSWORD); } + public final static String getTModelPublisherId() { + return tckProperties.getProperty(Property.TMODEL_PUBLISHER); + } + + public final static String getTModelPassword() { + return tckProperties.getProperty(Property.TMODEL_PASSWORD); + } + public final static String getSamPublisherId() { return tckProperties.getProperty(Property.SAM_PUBLISHER); } Propchange: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java ------------------------------------------------------------------------------ Merged /juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java:r1460934-1470373 Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java Tue Apr 23 22:19:34 2013 @@ -40,12 +40,16 @@ import org.uddi.v3_service.UDDISubscript */ public class TckSubscriptionListener { - public String LISTENER_SERVICE_XML = "uddi_data/subscriptionnotifier/listenerService.xml"; - public String LISTENER_SERVICE_KEY = "uddi:uddi.joepublisher.com:listenerone"; + public static String LISTENER_HTTP_SERVICE_XML = "uddi_data/subscriptionnotifier/listenerService.xml"; + public static String LISTENER_SMTP_SERVICE_XML = "uddi_data/subscriptionnotifier/listenerServiceSMTP.xml"; + public static String LISTENER_RMI_SERVICE_XML = "uddi_data/subscriptionnotifier/listenerServiceRMI.xml"; + public static String LISTENER_SERVICE_KEY = "uddi:uddi.joepublisher.com:listenerone"; /** note that the subscription1.xml contains the binding template for the UDDI server to call back into */ - public String SUBSCRIPTION_XML = "uddi_data/subscriptionnotifier/subscription1.xml"; - public String SUBSCRIPTION_KEY = "uddi:uddi.joepublisher.com:subscriptionone"; + public static String SUBSCRIPTION_XML = "uddi_data/subscriptionnotifier/subscription1.xml"; + public static String SUBSCRIPTION_SMTP_XML = "uddi_data/subscriptionnotifier/subscription1SMTP.xml"; + public static String SUBSCRIPTION_KEY = "uddi:uddi.joepublisher.com:subscriptionone"; + public static String SUBSCRIPTION_SMTP_KEY = "uddi:uddi.joepublisher.com:subscriptiononesmtp"; private Log logger = LogFactory.getLog(this.getClass()); private UDDIPublicationPortType publication = null; @@ -60,11 +64,13 @@ public class TckSubscriptionListener this.publication = publication; } - public void saveNotifierBinding(String authInfo, String bindingXML, String bindingKey) { + public void saveNotifierBinding(String authInfo, String bindingXML, String bindingKey, Integer port) { try { SaveBinding sb = new SaveBinding(); sb.setAuthInfo(authInfo); BindingTemplate btIn = (BindingTemplate)EntityCreator.buildFromDoc(bindingXML, "org.uddi.api_v3"); + String value = btIn.getAccessPoint().getValue(); + value = value.replace("{randomPort}", port.toString()); sb.getBindingTemplate().add(btIn); publication.saveBinding(sb); } @@ -90,13 +96,20 @@ public class TckSubscriptionListener } - public void saveService(String authInfo) { + public void saveService(String authInfo, String listenerService, Integer port) { try { // First save the entity ss = new SaveService(); ss.setAuthInfo(authInfo); - org.uddi.api_v3.BusinessService bsIn = (org.uddi.api_v3.BusinessService)EntityCreator.buildFromDoc(LISTENER_SERVICE_XML, "org.uddi.api_v3"); + org.uddi.api_v3.BusinessService bsIn = (org.uddi.api_v3.BusinessService)EntityCreator.buildFromDoc(listenerService, "org.uddi.api_v3"); + if (port > 0) { + for (BindingTemplate btIn: bsIn.getBindingTemplates().getBindingTemplate()) { + String value = btIn.getAccessPoint().getValue(); + value = value.replace("{randomPort}", port.toString()); + btIn.getAccessPoint().setValue(value); + } + } ss.getBusinessService().add(bsIn); publication.saveService(ss); @@ -107,12 +120,12 @@ public class TckSubscriptionListener } } - public void saveNotifierSubscription(String authInfo) { - saveSubscription(authInfo, SUBSCRIPTION_XML, SUBSCRIPTION_KEY); + public void saveNotifierSubscription(String authInfo, String subscriptionXML) { + saveSubscription(authInfo, subscriptionXML, SUBSCRIPTION_KEY); } - public void deleteNotifierSubscription(String authInfo) { - deleteSubscription(authInfo, SUBSCRIPTION_KEY); + public void deleteNotifierSubscription(String authInfo, String subscriptionKey) { + deleteSubscription(authInfo, subscriptionKey); } public void saveSubscription(String authInfo, String subscriptionXML, String subscriptionKey) { @@ -132,7 +145,7 @@ public class TckSubscriptionListener Assert.assertNotNull(outSubscriptionList); Subscription subOut = outSubscriptionList.get(0); - assertEquals(subIn.getSubscriptionKey(), subOut.getSubscriptionKey()); + //assertEquals(subIn.getSubscriptionKey(), subOut.getSubscriptionKey()); assertEquals(subDirectOut.getExpiresAfter().getMonth(), subOut.getExpiresAfter().getMonth()); assertEquals(subDirectOut.getExpiresAfter().getDay(), subOut.getExpiresAfter().getDay()); assertEquals(subDirectOut.getExpiresAfter().getYear(), subOut.getExpiresAfter().getYear()); Propchange: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java ------------------------------------------------------------------------------ Merged /juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java:r1460934-1470373 Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListenerRMI.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListenerRMI.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListenerRMI.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListenerRMI.java Tue Apr 23 22:19:34 2013 @@ -14,23 +14,6 @@ package org.apache.juddi.v3.tck; * See the License for the specific language governing permissions and * limitations under the License. */ -import static junit.framework.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.ws.Holder; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.juddi.jaxb.EntityCreator; -import org.junit.Assert; -import org.uddi.api_v3.BindingTemplate; -import org.uddi.api_v3.DeleteBinding; -import org.uddi.api_v3.SaveBinding; -import org.uddi.api_v3.SaveService; -import org.uddi.sub_v3.DeleteSubscription; -import org.uddi.sub_v3.Subscription; import org.uddi.v3_service.UDDIPublicationPortType; import org.uddi.v3_service.UDDISubscriptionPortType; @@ -53,7 +36,7 @@ public class TckSubscriptionListenerRMI super(subscription, publication); this.LISTENER_SERVICE_KEY = LISTENER_SERVICE_KEY_RMI; - this.LISTENER_SERVICE_XML = LISTENER_SERVICE_XML_RMI; + this.LISTENER_HTTP_SERVICE_XML = LISTENER_SERVICE_XML_RMI; this.SUBSCRIPTION_KEY = SUBSCRIPTION_KEY_RMI; this.SUBSCRIPTION_XML = SUBSCRIPTION_XML_RMI; Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java Tue Apr 23 22:19:34 2013 @@ -43,8 +43,11 @@ public class TckTModel final static String MARY_PUBLISHER_TMODEL_KEY = "uddi:uddi.marypublisher.com:keygenerator"; final static String SAM_SYNDICATOR_TMODEL_XML = "uddi_data/samsyndicator/tModelKeyGen.xml"; final static String SAM_SYNDICATOR_TMODEL_KEY = "uddi:www.samco.com:keygenerator"; + final static String TMODEL_PUBLISHER_TMODEL_XML = "uddi_data/tmodels/tModelKeyGen.xml"; + final static String TMODEL_PUBLISHER_TMODEL_KEY = "uddi:tmodelkey:categories:keygenerator"; final static String FIND_TMODEL_XML = "uddi_data/find/findTModel1.xml"; final static String FIND_TMODEL_XML_BY_CAT = "uddi_data/find/findTModelByCategoryBag.xml"; + public final static String TMODELS_XML = "uddi_data/tmodels/tmodels.xml"; public final static String RIFTSAW_PUBLISHER_TMODEL_XML = "uddi_data/bpel/riftsaw/tModelKeyGen.xml"; public final static String RIFTSAW_PUBLISHER_TMODEL_KEY = "uddi:riftsaw.jboss.org:keygenerator"; @@ -67,6 +70,20 @@ public class TckTModel this.publication = publication; this.inquiry = inquiry; } + + public void saveTModels(String authInfo, String tModelXml) { + + // Add tModels + try { + SaveTModel st = (org.uddi.api_v3.SaveTModel)EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v3"); + st.setAuthInfo(authInfo); + publication.saveTModel(st); + + } catch(Exception e) { + logger.error(e.getMessage(),e); + Assert.fail("No exception should be thrown"); + } + } public void saveTModel(String authInfo, String tModelXml, String tModelKey) { @@ -171,6 +188,14 @@ public class TckTModel saveTModel(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY); } + public void saveUDDIPublisherTmodel(String authInfoTM) { + saveTModel(authInfoTM, TMODEL_PUBLISHER_TMODEL_XML, TMODEL_PUBLISHER_TMODEL_KEY); + } + + public void saveTmodels(String authInfoJoe) { + saveTModels(authInfoJoe, TMODELS_XML); + } + public void deleteJoePublisherTmodel(String authInfoJoe) { deleteTModel(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY); } Propchange: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java ------------------------------------------------------------------------------ Merged /juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java:r1460934-1470373 Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/tck.properties URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/tck.properties?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/tck.properties (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/tck.properties Tue Apr 23 22:19:34 2013 @@ -1,5 +1,7 @@ root.publisher = root -root.password = "" +root.password = +uddi.publisher = uddi +uddi.password = uddi joe.publisher = joepublisher joe.password = joepublisher sam.publisher = ssyndicator Propchange: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/ ------------------------------------------------------------------------------ Merged /juddi/trunk/uddi-tck-base/src/main/resources/uddi_data:r1467813-1470373 Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml Tue Apr 23 22:19:34 2013 @@ -21,8 +21,8 @@ </findQualifiers> <name xml:lang="en">Service One</name> <categoryBag> - <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" /> - <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" /> + <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="peaches" /> + <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="plums" /> <keyedReferenceGroup tModelKey="uddi:tmodelkey:group"> <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" /> </keyedReferenceGroup> Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml Tue Apr 23 22:19:34 2013 @@ -40,10 +40,10 @@ <phone useType="mobile">987-654-3210</phone> <email useType="work">[email protected]</email> <address xml:lang="en" useType="headquarters" sortCode="1" tModelKey="uddi:tmodelKey:address"> - <addressLine keyName="" keyValue="suite">Suite 1500</addressLine> - <addressLine keyName="" keyValue="street">1515 Main St.</addressLine> - <addressLine keyName="" keyValue="citystatezip">Chicago, IL 60614</addressLine> - <addressLine keyName="" keyValue="country">USA</addressLine> + <addressLine keyName="Suite" keyValue="suite">Suite 1500</addressLine> + <addressLine keyName="Street" keyValue="street">1515 Main St.</addressLine> + <addressLine keyName="ZipCode" keyValue="citystatezip">Chicago, IL 60614</addressLine> + <addressLine keyName="Country" keyValue="country">USA</addressLine> </address> </contact> <contact useType="engineer"> Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml Tue Apr 23 22:19:34 2013 @@ -43,8 +43,8 @@ </bindingTemplate> </bindingTemplates> <categoryBag> - <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" /> - <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" /> + <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="peaches" /> + <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="plums" /> <keyedReferenceGroup tModelKey="uddi:tmodelkey:group"> <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" /> </keyedReferenceGroup> Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml Tue Apr 23 22:19:34 2013 @@ -25,8 +25,8 @@ </findQualifiers> <name xml:lang="en">Service One</name> <categoryBag> - <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" /> - <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" /> + <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="peaches" /> + <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="plums" /> <keyedReferenceGroup tModelKey="uddi:tmodelkey:group"> <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" /> </keyedReferenceGroup> Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml (original) +++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml Tue Apr 23 22:19:34 2013 @@ -24,7 +24,7 @@ <bindingTemplates> <bindingTemplate xmlns="urn:uddi-org:api_v3" bindingKey="uddi:uddi.joepublisher.com:bindinglistenerrmi"> <description xml:lang="en">This is the endpoint for the RMI subscription listener</description> - <accessPoint useType="endPoint">rmi://localhost:9876/tck/rmisubscriptionlistener</accessPoint> + <accessPoint useType="endPoint">rmi://localhost:{randomPort}/tck/rmisubscriptionlistener</accessPoint> <tModelInstanceDetails> <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:rmi" /> </tModelInstanceDetails> Modified: juddi/branches/juddi-3.2.x/uddi-tck/pom.xml URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/pom.xml?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck/pom.xml (original) +++ juddi/branches/juddi-3.2.x/uddi-tck/pom.xml Tue Apr 23 22:19:34 2013 @@ -82,8 +82,11 @@ <version>2.0</version> <scope>test</scope> </dependency> - - + <dependency> + <groupId>dumbster</groupId> + <artifactId>dumbster</artifactId> + <version>1.5</version> + </dependency> </dependencies> <build> <plugins> Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java Tue Apr 23 22:19:34 2013 @@ -17,6 +17,7 @@ package org.apache.juddi.v3.tck; import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; +import java.util.Random; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.logging.Log; @@ -50,6 +51,7 @@ public class JUDDI_091_RMISubscriptionLi private static UDDIClerkManager manager; private static UDDISubscriptionListenerImpl rmiSubscriptionListenerService = null; private static Registry registry; + private static Integer randomPort = null; @AfterClass public static void stopManager() throws ConfigurationException { @@ -63,7 +65,11 @@ public class JUDDI_091_RMISubscriptionLi try { //bring up the RMISubscriptionListener - URI rmiEndPoint = new URI("rmi://localhost:9876/tck/rmisubscriptionlistener"); + //random port + randomPort = 19800 + new Random().nextInt(99); + System.out.println("RMI Random port=" + randomPort); + //bring up the RMISubscriptionListener + URI rmiEndPoint = new URI("rmi://localhost:" + randomPort + "/tck/rmisubscriptionlistener"); registry = LocateRegistry.createRegistry(rmiEndPoint.getPort()); String path = rmiEndPoint.getPath(); @@ -114,9 +120,9 @@ public class JUDDI_091_RMISubscriptionLi tckTModel.saveJoePublisherTmodel(authInfoJoe); tckBusiness.saveJoePublisherBusiness(authInfoJoe); tckBusinessService.saveJoePublisherService(authInfoJoe); - rmiSubscriptionListener.saveService(authInfoJoe); + rmiSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_RMI_SERVICE_XML, randomPort); - rmiSubscriptionListener.saveNotifierSubscription(authInfoJoe); + rmiSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListenerRMI.SUBSCRIPTION_XML_RMI); tckBusinessService.updateJoePublisherService(authInfoJoe, "foo"); @@ -144,7 +150,7 @@ public class JUDDI_091_RMISubscriptionLi Assert.fail(); } finally { - rmiSubscriptionListener.deleteNotifierSubscription(authInfoJoe); + rmiSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListenerRMI.SUBSCRIPTION_KEY_RMI); tckBusinessService.deleteJoePublisherService(authInfoJoe); tckBusiness.deleteJoePublisherBusiness(authInfoJoe); tckTModel.deleteJoePublisherTmodel(authInfoJoe); Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java Tue Apr 23 22:19:34 2013 @@ -66,7 +66,9 @@ public class UDDI_030_BusinessEntityInte tckTModel = new TckTModel(publication, inquiry); tckBusiness = new TckBusiness(publication, inquiry); tckFindEntity = new TckFindEntity(inquiry); - + String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); + tckTModel.saveUDDIPublisherTmodel(authInfoUDDI); + tckTModel.saveTModels(authInfoUDDI, TckTModel.TMODELS_XML); } catch (Exception e) { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); Propchange: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java ------------------------------------------------------------------------------ Merged /juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java:r1460934-1470373 Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java Tue Apr 23 22:19:34 2013 @@ -68,7 +68,9 @@ public class UDDI_040_BusinessServiceInt tckTModel = new TckTModel(publication, inquiry); tckBusiness = new TckBusiness(publication, inquiry); tckBusinessService = new TckBusinessService(publication, inquiry); - + String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); + tckTModel.saveUDDIPublisherTmodel(authInfoUDDI); + tckTModel.saveTModels(authInfoUDDI, TckTModel.TMODELS_XML); } catch (Exception e) { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); Propchange: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java ------------------------------------------------------------------------------ Merged /juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java:r1460934-1470373 Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java Tue Apr 23 22:19:34 2013 @@ -67,7 +67,9 @@ public class UDDI_050_BindingTemplateInt tckBusinessService = new TckBusinessService(publication, inquiry); tckBindingTemplate = new TckBindingTemplate(publication, inquiry); tckFindEntity = new TckFindEntity(inquiry); - + String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); + tckTModel.saveUDDIPublisherTmodel(authInfoUDDI); + tckTModel.saveTModels(authInfoUDDI, TckTModel.TMODELS_XML); } catch (Exception e) { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); Propchange: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java ------------------------------------------------------------------------------ Merged /juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java:r1467813-1470373 Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java Tue Apr 23 22:19:34 2013 @@ -73,7 +73,9 @@ public class UDDI_080_SubscriptionIntegr tckBindingTemplate = new TckBindingTemplate(publication, inquiry); tckSubscription = new TckSubscription(subscription, security); - + String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); + tckTModel.saveUDDIPublisherTmodel(authInfoUDDI); + tckTModel.saveTModels(authInfoUDDI, TckTModel.TMODELS_XML); } catch (Exception e) { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); Propchange: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java ------------------------------------------------------------------------------ Merged /juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java:r1460934-1470373 Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java Tue Apr 23 22:19:34 2013 @@ -14,11 +14,18 @@ package org.apache.juddi.v3.tck; * See the License for the specific language governing permissions and * limitations under the License. */ +import java.io.File; +import java.io.FileOutputStream; +import java.util.Iterator; +import java.util.Properties; +import java.util.Random; + import javax.xml.ws.Endpoint; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.juddi.v3.client.Release; import org.apache.juddi.v3.client.config.UDDIClerkManager; import org.apache.juddi.v3.client.transport.Transport; import org.junit.AfterClass; @@ -30,6 +37,9 @@ import org.uddi.v3_service.UDDIPublicati import org.uddi.v3_service.UDDISecurityPortType; import org.uddi.v3_service.UDDISubscriptionPortType; +import com.dumbster.smtp.SimpleSmtpServer; +import com.dumbster.smtp.SmtpMessage; + /** * @author <a href="mailto:[email protected]";>Tom Cunningham</a> */ @@ -46,6 +56,8 @@ public class UDDI_090_SubscriptionListen private static Endpoint endPoint; private static String authInfoJoe = null; private static UDDIClerkManager manager; + private static SimpleSmtpServer mailServer; + private static Integer smtpPort = 25; @AfterClass public static void stopManager() throws ConfigurationException { @@ -58,6 +70,24 @@ public class UDDI_090_SubscriptionListen @BeforeClass public static void startManager() throws ConfigurationException { try { + smtpPort = 9700 + new Random().nextInt(99); + Properties properties = new Properties(); + properties.setProperty("juddi.mail.smtp.host", "localhost"); + properties.setProperty("juddi.mail.smtp.port", String.valueOf(smtpPort)); + properties.setProperty("juddi.mail.smtp.from", "[email protected]"); + String version = Release.getRegistryVersion().replaceAll(".SNAPSHOT", "-SNAPSHOT"); + String curDir = System.getProperty("user.dir"); + if (! curDir.endsWith("uddi-tck")) curDir += "/uddi-tck"; + String path = curDir + "/target/juddi-tomcat-" + version + "/temp/"; + System.out.println("Saving jUDDI email properties to " + path); + File tmpDir = new File(path); + File tmpFile = new File(tmpDir + "/juddi-mail.properties"); + if (! tmpFile.createNewFile()) { + tmpFile.delete(); + tmpFile.createNewFile(); + } + properties.store(new FileOutputStream(tmpFile), "tmp email settings"); + //bring up the TCK SubscriptionListener endPoint = Endpoint.publish("http://localhost:12345/tcksubscriptionlistener";, new UDDISubscriptionListenerImpl()); @@ -87,34 +117,33 @@ public class UDDI_090_SubscriptionListen } @Test - public void joePublisherUpdateService() { + public void joePublisherUpdateService_HTTP() { try { + tckTModel.saveJoePublisherTmodel(authInfoJoe); tckBusiness.saveJoePublisherBusiness(authInfoJoe); + //Saving the binding template that will be called by the server for a subscription event tckBusinessService.saveJoePublisherService(authInfoJoe); - //Saving the Listener Service - tckSubscriptionListener.saveService(authInfoJoe); - //Saving the Subscription - tckSubscriptionListener.saveNotifierSubscription(authInfoJoe); + //Saving the HTTP Listener Service + tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, 0); + //Saving the HTTP Subscription + tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_XML); //Changing the service we subscribed to "JoePublisherService" Thread.sleep(1000); logger.info("Updating Service ********** "); tckBusinessService.updateJoePublisherService(authInfoJoe, "foo"); //waiting up to 100 seconds for the listener to notice the change. - String test=""; for (int i=0; i<200; i++) { Thread.sleep(500); System.out.print("."); if (UDDISubscriptionListenerImpl.notificationCount > 0) { - logger.info("Received Notification"); + logger.info("Received HTTP Notification"); break; - } else { - System.out.print(test); } } if (UDDISubscriptionListenerImpl.notificationCount == 0) { - Assert.fail("No Notification was sent"); + Assert.fail("No HttpNotification was sent"); } if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name xml:lang=\"en\">Service One</name>")) { Assert.fail("Notification does not contain the correct service"); @@ -126,7 +155,7 @@ public class UDDI_090_SubscriptionListen Assert.fail(); } finally { - tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe); + tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_KEY); tckBusinessService.deleteJoePublisherService(authInfoJoe); tckBusiness.deleteJoePublisherBusiness(authInfoJoe); tckTModel.deleteJoePublisherTmodel(authInfoJoe); @@ -134,15 +163,69 @@ public class UDDI_090_SubscriptionListen } @Test - public void joePublisherUpdateBusiness() { + public void joePublisherUpdateService_SMTP() { + try { + mailServer = SimpleSmtpServer.start(smtpPort); + + tckTModel.saveJoePublisherTmodel(authInfoJoe); + tckBusiness.saveJoePublisherBusiness(authInfoJoe); + //Saving the binding template that will be called by the server for a subscription event + tckBusinessService.saveJoePublisherService(authInfoJoe); + //Saving the SMTP Listener Service + tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_XML, 0); + //Saving the SMTP Subscription + tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_XML); + //Changing the service we subscribed to "JoePublisherService" + Thread.sleep(1000); + logger.info("Updating Service ********** "); + tckBusinessService.updateJoePublisherService(authInfoJoe, "foo"); + + //waiting up to 100 seconds for the listener to notice the change. + for (int i=0; i<200; i++) { + Thread.sleep(500); + System.out.print("."); + if (mailServer.getReceivedEmailSize() > 0) { + logger.info("Received Email Notification"); + break; + } + } + if (mailServer.getReceivedEmailSize() == 0) { + Assert.fail("No SmtpNotification was sent"); + } + @SuppressWarnings("rawtypes") + Iterator emailIter = mailServer.getReceivedEmail(); + SmtpMessage email = (SmtpMessage)emailIter.next(); + System.out.println(email.getHeaderValue("Subject")); + System.out.println(email.getBody().equals("Test Body")); + if (!email.getBody().contains("<name xml:lang=\"en\">Service One</name>")) { + Assert.fail("Notification does not contain the correct service"); + } + + } catch (Exception e) { + logger.error("No exceptions please."); + e.printStackTrace(); + + Assert.fail(); + } finally { + tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_KEY); + tckBusinessService.deleteJoePublisherService(authInfoJoe); + tckBusiness.deleteJoePublisherBusiness(authInfoJoe); + tckTModel.deleteJoePublisherTmodel(authInfoJoe); + mailServer.stop(); + } + } + + + @Test + public void joePublisherUpdateBusiness_HTTP() { try { tckTModel.saveJoePublisherTmodel(authInfoJoe); tckBusiness.saveJoePublisherBusiness(authInfoJoe); tckBusinessService.saveJoePublisherService(authInfoJoe); //Saving the Listener Service - tckSubscriptionListener.saveService(authInfoJoe); + tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, 0); //Saving the Subscription - tckSubscriptionListener.saveNotifierSubscription(authInfoJoe); + tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_XML); //Changing the service we subscribed to "JoePublisherService" Thread.sleep(1000); logger.info("Deleting Business ********** "); @@ -173,9 +256,10 @@ public class UDDI_090_SubscriptionListen Assert.fail(); } finally { - tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe); + tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_KEY); tckTModel.deleteJoePublisherTmodel(authInfoJoe); } - } + } + } Propchange: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java ------------------------------------------------------------------------------ Merged /juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java:r1467813-1470373 Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java (original) +++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java Tue Apr 23 22:19:34 2013 @@ -82,12 +82,14 @@ public class UDDI_140_NegativePublicatio static UDDISecurityPortType security = null; static UDDIInquiryPortType inquiry = null; static UDDIPublicationPortType publication = null; + static TckTModel tckTModel = null; + protected static String authInfoJoe = null; protected static String authInfoSam = null; private static UDDIClerkManager manager; static final String str256 = "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"; - static final String str255 = "111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"; - static final String strkey256 = "uddi:11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"; + static final String str255 = "uddi:tmodelkey:categories:1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"; + static final String strkey256 = "uddi:tmodelkey:categories:11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"; static final String strkey256_1 = "uddi:org.apache:omething.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.somethi.com"; static final String str26 = "11111111111111111111111111"; static final String str27 = "111111111111111111111111110"; @@ -123,8 +125,12 @@ public class UDDI_140_NegativePublicatio publication = transport.getUDDIPublishService(); inquiry = transport.getUDDIInquiryService(); - - + tckTModel = new TckTModel(publication, inquiry); + + String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); + tckTModel.saveUDDIPublisherTmodel(authInfoUDDI); + tckTModel.saveTModels(authInfoUDDI, TckTModel.TMODELS_XML); + tckTModel.saveJoePublisherTmodel(authInfoJoe); } catch (Exception e) { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); @@ -2180,8 +2186,7 @@ public class UDDI_140_NegativePublicatio tm.getName().setValue("Key gen name"); tm.getName().setLang("en"); Description d = new Description(); - d.setLang("en"); - d.setLang(str256); + d.setValue(str256); tm.getDescription().add(d); tm.setCategoryBag(new CategoryBag()); KeyedReference kr = new KeyedReference(); @@ -2189,7 +2194,7 @@ public class UDDI_140_NegativePublicatio kr.setKeyName("uddi-org:keyGenerator"); kr.setKeyValue("keyGenerator"); tm.getCategoryBag().getKeyedReference().add(kr); - tm.setTModelKey("uddi:" + UUID.randomUUID().toString() + ":customkey"); + tm.setTModelKey("uddi:uddi.joepublisher.com:mycustomkey"); st.getTModel().add(tm); try { @SuppressWarnings("unused") @@ -2221,7 +2226,7 @@ public class UDDI_140_NegativePublicatio kr.setKeyName("uddi-org:keyGenerator"); kr.setKeyValue("keyGenerator"); tm.getCategoryBag().getKeyedReference().add(kr); - String key = "uddi:" + UUID.randomUUID().toString() + ":customkey"; + String key = UUID.randomUUID().toString(); tm.setTModelKey(key); st.getTModel().add(tm); try { @@ -2278,7 +2283,7 @@ public class UDDI_140_NegativePublicatio tm.getName().setValue("My Cool Company's tmodel"); tm.getName().setLang("en"); - tm.setTModelKey("uddi:" + UUID.randomUUID().toString() + ":customkey"); + tm.setTModelKey("uddi:uddi.joepublisher.com:nokeygenerator:customkey"); st.getTModel().add(tm); try { @SuppressWarnings("unused") Modified: juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java (original) +++ juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java Tue Apr 23 22:19:34 2013 @@ -42,6 +42,7 @@ public class JAXBMarshaller { public static final String PACKAGE_UDDIAPI = "org.uddi.api_v3"; public static final String PACKAGE_SUBSCRIPTION = "org.uddi.sub_v3"; + public static final String PACKAGE_SUBSCR_RES = "org.uddi.subr_v3"; public static final String PACKAGE_JUDDIAPI = "org.apache.juddi.api_v3"; public static final String PACKAGE_JUDDI = "org.apache.juddi"; private static final Map<String, JAXBContext> JAXBContexts = new HashMap<String, JAXBContext>(); Propchange: juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java ------------------------------------------------------------------------------ Merged /juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java:r1460934-1470373 Modified: juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/uddi/v3_service/UDDICustodyTransferPortType.java URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/uddi/v3_service/UDDICustodyTransferPortType.java?rev=1471182&r1=1471181&r2=1471182&view=diff ============================================================================== --- juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/uddi/v3_service/UDDICustodyTransferPortType.java (original) +++ juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/uddi/v3_service/UDDICustodyTransferPortType.java Tue Apr 23 22:19:34 2013 @@ -72,14 +72,16 @@ public interface UDDICustodyTransferPort throws DispositionReportFaultMessage, RemoteException ; + /** * - * @param nodeID - * @param opaqueToken + * @param authInfo * @param keyBag + * @param nodeID * @param expirationTime - * @param authInfo - * @throws DispositionReportFaultMessage, RemoteException + * @param opaqueToken + * @throws DispositionReportFaultMessage + * @throws RemoteException */ @WebMethod(operationName = "get_transferToken", action = "get_transferToken") @RequestWrapper(localName = "get_transferToken", targetNamespace = "urn:uddi-org:custody_v3", className = "org.uddi.custody_v3.GetTransferToken") --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
