Author: kstam
Date: Mon Apr 15 19:37:30 2013
New Revision: 1468203
URL: http://svn.apache.org/r1468203
Log:
JUDDI-575, loading up the actual tModels that are referenced in the tests. Not
yet turning on validation by default.
Added:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/tModelKeyGen.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/tmodels.xml
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTestPerformance.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/Property.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
juddi/trunk/uddi-tck-base/src/main/resources/tck.properties
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
Mon Apr 15 19:37:30 2013
@@ -18,15 +18,14 @@ package org.apache.juddi.validation;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.AbstractSequentialList;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.xml.ws.Holder;
+
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
@@ -42,6 +41,7 @@ import org.apache.juddi.config.Property;
import org.apache.juddi.keygen.KeyGenerator;
import org.apache.juddi.keygen.KeyGeneratorFactory;
import org.apache.juddi.model.Publisher;
+import org.apache.juddi.model.Tmodel;
import org.apache.juddi.model.UddiEntity;
import org.apache.juddi.model.UddiEntityPublisher;
import org.apache.juddi.query.FindBusinessByPublisherQuery;
@@ -97,7 +97,6 @@ public class ValidatePublish extends Val
* This flag will add additional output to stdout for debugging purposes,
* set this to true if
*/
- private static final boolean DEBUG = false;
private Log log = LogFactory.getLog(this.getClass());
Set<String> buildInTmodels = null;
@@ -1104,8 +1103,8 @@ public class ValidatePublish extends Val
}
public void validateContact(org.uddi.api_v3.Contact contact, Configuration
config) throws DispositionReportFaultMessage {
- if (DEBUG) {
- System.out.println("validateContact");
+ if (log.isDebugEnabled()) {
+ log.debug("validateContact");
}
// A supplied contact can't be null
if (contact == null) {
@@ -1133,17 +1132,21 @@ public class ValidatePublish extends Val
validateKeyLength(address.getTModelKey());
validateLang(address.getLang());
validateUseType(address.getUseType());
+ boolean checked = true;
// Per section 4.4: keys must be case-folded
if (address.getTModelKey() != null) {
address.setTModelKey(address.getTModelKey().toLowerCase());
- verifyTModelKeyExists(address.getTModelKey(), config);
+ checked =
verifyTModelKeyExistsAndChecked(address.getTModelKey(), config);
}
if (address.getAddressLine() == null ||
address.getAddressLine().size() == 0) {
throw new ValueNotAllowedException(new
ErrorMessage("errors.contact.NoAddressLine"));
}
- validateAddressLines(address.getAddressLine(), config);
+
+ if (checked) {
+ validateAddressLines(address.getAddressLine(), config);
+ }
}
}
}
@@ -1215,8 +1218,8 @@ public class ValidatePublish extends Val
public void validateKeyedReferenceGroup(KeyedReferenceGroup krg,
Configuration config) throws DispositionReportFaultMessage {
// Keyed reference groups must contain a tModelKey
- if (DEBUG) {
- System.out.println("validateKeyedReferenceGroup");
+ if (log.isDebugEnabled()) {
+ log.debug("validateKeyedReferenceGroup");
}
if (krg.getTModelKey() == null || krg.getTModelKey().length() == 0) {
throw new ValueNotAllowedException(new
ErrorMessage("errors.keyedreference.NoTModelKey"));
@@ -1227,21 +1230,22 @@ public class ValidatePublish extends Val
krg.setTModelKey(tmodelKey);
validateKeyLength(tmodelKey);
- verifyTModelKeyExists(tmodelKey, config);
+ boolean checked = verifyTModelKeyExistsAndChecked(tmodelKey, config);
- List<KeyedReference> keyedRefs = krg.getKeyedReference();
- // Should being empty raise an error?
- if (keyedRefs != null && keyedRefs.size() > 0) {
- for (KeyedReference keyedRef : keyedRefs) {
- validateKeyedReference(keyedRef, config);
- }
+ if (checked) {
+ List<KeyedReference> keyedRefs = krg.getKeyedReference();
+ // Should being empty raise an error?
+ if (keyedRefs != null && keyedRefs.size() > 0) {
+ for (KeyedReference keyedRef : keyedRefs) {
+ validateKeyedReference(keyedRef, config);
+ }
+ }
}
-
}
public void validateKeyedReference(KeyedReference kr, Configuration
config) throws DispositionReportFaultMessage {
- if (DEBUG) {
- System.out.println("validateKeyedReference");
+ if (log.isDebugEnabled()) {
+ log.debug("validateKeyedReference");
}
String tmodelKey = kr.getTModelKey();
@@ -1260,8 +1264,6 @@ public class ValidatePublish extends Val
validateKeyValue(kr.getKeyValue());
validateKeyName(kr.getKeyName());
- verifyTModelKeyExists(tmodelKey, config);
-
String rootPublisherStr =
config.getString(Property.JUDDI_ROOT_PUBLISHER);
// Per section 6.2.2.1 of the specification, no publishers (except the
root) are allowed to use the node categorization tmodelKey
if
(Constants.NODE_CATEGORY_TMODEL.equalsIgnoreCase(kr.getTModelKey())) {
@@ -1272,8 +1274,8 @@ public class ValidatePublish extends Val
}
public void
validateTModelInstanceDetails(org.uddi.api_v3.TModelInstanceDetails
tmodelInstDetails, Configuration config) throws DispositionReportFaultMessage {
- if (DEBUG) {
- System.out.println("validateTModelInstanceDetails");
+ if (log.isDebugEnabled()) {
+ log.debug("validateTModelInstanceDetails");
}
// tModel Instance Details is optional
if (tmodelInstDetails == null) {
@@ -1306,12 +1308,10 @@ public class ValidatePublish extends Val
tmodelInstInfo.setTModelKey((tmodelInstInfo.getTModelKey().toLowerCase()));
validateInstanceDetails(tmodelInstInfo.getInstanceDetails());
- if (DEBUG) {
- System.out.println("validateTModelInstanceInfo");
+ if (log.isDebugEnabled()) {
+ log.debug("validateTModelInstanceInfo");
}
- verifyTModelKeyExists(tmodelInstInfo.getTModelKey(), config);
-
validateKeyLength(tmodelInstInfo.getTModelKey());
validateDescriptions(tmodelInstInfo.getDescription());
@@ -1508,8 +1508,8 @@ public class ValidatePublish extends Val
}
private void validateAccessPoint(EntityManager em, AccessPoint value,
Configuration config) throws ValueNotAllowedException {
- if (DEBUG) {
- System.out.println("validateAccessPoint");
+ if (log.isDebugEnabled()) {
+ log.debug("validateAccessPoint");
}
boolean checkRef = false;
@@ -1549,8 +1549,8 @@ public class ValidatePublish extends Val
}
private void validateHostingRedirector(EntityManager em, HostingRedirector
hostingRedirector, Configuration config) throws ValueNotAllowedException {
- if (DEBUG) {
- System.out.println("validateHostingRedirector");
+ if (log.isDebugEnabled()) {
+ log.debug("validateHostingRedirector");
}
if (hostingRedirector == null) {
return;
@@ -1595,13 +1595,13 @@ public class ValidatePublish extends Val
}
private void validateAddressLines(List<AddressLine> addressLine,
Configuration config) throws ValueNotAllowedException {
- if (DEBUG) {
- System.out.println("validateAddressLines");
+ if (log.isDebugEnabled()) {
+ log.debug("validateAddressLines");
}
if (addressLine != null) {
for (int i = 0; i < addressLine.size(); i++) {
validateKeyName(addressLine.get(i).getKeyName());
- verifyTModelKeyExists(addressLine.get(i).getKeyName(), config);
+
verifyTModelKeyExistsAndChecked(addressLine.get(i).getKeyName(), config);
validateKeyValue(addressLine.get(i).getKeyValue());
if (addressLine.get(i).getValue() == null ||
addressLine.get(i).getValue().length() == 0) {
@@ -1696,38 +1696,39 @@ public class ValidatePublish extends Val
* @throws ValueNotAllowedException
* @see org.apache.juddi.config.Install
*/
- private void verifyTModelKeyExists(String tmodelKey, Configuration config)
throws ValueNotAllowedException {
- if (tmodelKey == null || tmodelKey.length()==0) {
- return;
+ private boolean verifyTModelKeyExistsAndChecked(String tmodelKey,
Configuration config) throws ValueNotAllowedException {
+ boolean checked = true;
+ if (tmodelKey == null || tmodelKey.length()==0) {
+ return false;
}
if (tmodelKey.equalsIgnoreCase("uddi:uddi.org:categorization:types")) {
- return;
+ return false;
}
if (tmodelKey.equalsIgnoreCase("uddi:uddi.org:categorization:nodes")) {
- return;
+ return false;
}
if (tmodelKey.equalsIgnoreCase("uddi:uddi.org:v3_inquiry")) {
- return;
+ return false;
}
if (tmodelKey.equalsIgnoreCase("uddi:uddi.org:v3_publication")) {
- return;
+ return false;
}
if (tmodelKey.equalsIgnoreCase("uddi:uddi.org:v3_security")) {
- return;
+ return false;
}
if (tmodelKey.equalsIgnoreCase("uddi:uddi.org:v3_ownership_transfer"))
{
- return;
+ return false;
}
if (tmodelKey.equalsIgnoreCase("uddi:uddi.org:v3_subscription")) {
- return;
+ return false;
}
if
(tmodelKey.equalsIgnoreCase("uddi:uddi.org:v3_subscriptionlistener")) {
- return;
+ return false;
}
if (config == null) {
log.warn(new
ErrorMessage("errors.tmodel.ReferentialIntegrityNullConfig"));
- return;
+ return false;
}
boolean checkRef = false;
try {
@@ -1736,8 +1737,8 @@ public class ValidatePublish extends Val
log.warn("Error caught reading " +
Property.JUDDI_ENFORCE_REFERENTIAL_INTEGRITY + " from config file", ex);
}
if (checkRef) {
- if (DEBUG) {
- System.out.println("verifyTModelKeyExists " + tmodelKey);
+ if (log.isDebugEnabled()) {
+ log.debug("verifyTModelKeyExists " + tmodelKey);
}
EntityManager em = PersistenceManager.getEntityManager();
@@ -1746,15 +1747,25 @@ public class ValidatePublish extends Val
log.warn(new
ErrorMessage("errors.tmodel.ReferentialIntegrityNullEM"));
} else {
//Collections.sort(buildInTmodels);
- //if ((buildInTmodels, tmodelKey) == -1)
+ //if ((buildInTmodels, tmodelKey) == -1)
+ Tmodel modelTModel = null;
{
-
- org.apache.juddi.model.Tmodel modelTModel = null;
EntityTransaction tx = em.getTransaction();
try {
tx.begin();
modelTModel =
em.find(org.apache.juddi.model.Tmodel.class, tmodelKey);
+
+ if (modelTModel == null) checked = false;
+ else {
+ for (org.apache.juddi.model.KeyedReference ref
: modelTModel.getCategoryBag().getKeyedReferences()) {
+ if
("uddi-org:types:unchecked".equalsIgnoreCase(ref.getKeyName())) {
+ checked = false;
+ break;
+ }
+ }
+ }
+
tx.commit();
} finally {
@@ -1769,5 +1780,20 @@ public class ValidatePublish extends Val
}
}
}
+ return checked;
+ }
+
+ private boolean verifyTModelKeyChecked(Tmodel modelTModel) {
+ boolean checked = true;
+ if (modelTModel == null) checked = false;
+ else {
+ for (org.apache.juddi.model.KeyedReference ref :
modelTModel.getCategoryBag().getKeyedReferences()) {
+ if
("uddi-org:types:unchecked".equalsIgnoreCase(ref.getTmodelKeyRef())) {
+ checked = false;
+ break;
+ }
+ }
+ }
+ return checked;
}
}
Modified:
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
(original)
+++
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
Mon Apr 15 19:37:30 2013
@@ -975,7 +975,23 @@
</categoryBag>
</tModel>
-
+ <tModel tModelKey="uddi:uddi.org:ubr:postaladdress">
+ <name>ubr-uddi-org:postalAddress</name>
+ <description xml:lang="EN">Postal address structure</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#postal
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:postalAddress"
+ keyValue="postalAddress"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
<tModel tModelKey="uddi:tmodelkey:keygenerator"
xmlns="urn:uddi-org:api_v3">
@@ -995,7 +1011,10 @@
<description xml:lang="en">Identifies an address. This can be a
physical, mailing, or electric address.</description>
<categoryBag>
- <keyedReference keyName="uddi-org:types:categorization"
keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:categorization"
+ keyValue="categorization"
tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
tModelKey="uddi:uddi.org:categorization:types"/>
</categoryBag>
</tModel>
@@ -1007,10 +1026,8 @@
<keyedReference keyName="uddi-org:types:categorization"
keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
</categoryBag>
</tModel>
-
-
-
- <tModel tModelKey="uddi:tmodelkey:blank">
+
+ <tModel tModelKey="uddi:tmodelkey:blank">
<name>uddi:tmodelkey:blank</name>
<description xml:lang="en">Identifies a blank tModel</description>
@@ -1018,7 +1035,4 @@
<keyedReference keyName="uddi-org:types:categorization"
keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
</categoryBag>
</tModel>
-
-
-
</save_tModel>
\ No newline at end of file
Modified:
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
(original)
+++
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
Mon Apr 15 19:37:30 2013
@@ -56,6 +56,9 @@ public class API_030_BusinessEntityTest
UDDISecurityPortType security = new
UDDISecurityImpl();
authInfoJoe = TckSecurity.getAuthToken(security,
TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
authInfoSam = TckSecurity.getAuthToken(security,
TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+ String authInfoUDDI =
TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(),
TckPublisher.getUDDIPassword());
+ tckTModel.saveUDDIPublisherTmodel(authInfoUDDI);
+ tckTModel.saveTModels(authInfoUDDI,
TckTModel.TMODELS_XML);
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
@@ -71,8 +74,12 @@ public class API_030_BusinessEntityTest
public void testJoePublisherBusinessEntity() {
try {
tckTModel.saveJoePublisherTmodel(authInfoJoe);
+
tckBusiness.saveJoePublisherBusiness(authInfoJoe);
tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+ } catch (Exception e) {
+ e.printStackTrace();
+
} finally {
tckTModel.deleteJoePublisherTmodel(authInfoJoe);
}
Modified:
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
(original)
+++
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
Mon Apr 15 19:37:30 2013
@@ -57,6 +57,9 @@ public class API_040_BusinessServiceTest
UDDISecurityPortType security = new
UDDISecurityImpl();
authInfoJoe = TckSecurity.getAuthToken(security,
TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
authInfoSam = TckSecurity.getAuthToken(security,
TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+ String authInfoUDDI =
TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(),
TckPublisher.getUDDIPassword());
+ tckTModel.saveUDDIPublisherTmodel(authInfoUDDI);
+ tckTModel.saveTModels(authInfoUDDI,
TckTModel.TMODELS_XML);
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
Modified:
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTestPerformance.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTestPerformance.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTestPerformance.java
(original)
+++
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTestPerformance.java
Mon Apr 15 19:37:30 2013
@@ -64,6 +64,9 @@ public class API_040_BusinessServiceTest
api010.saveJoePublisher();
UDDISecurityPortType security = new
UDDISecurityImpl();
authInfoJoe = TckSecurity.getAuthToken(security,
TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+ String authInfoUDDI =
TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(),
TckPublisher.getUDDIPassword());
+ tckTModel.saveUDDIPublisherTmodel(authInfoUDDI);
+ tckTModel.saveTModels(authInfoUDDI,
TckTModel.TMODELS_XML);
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
Modified:
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
(original)
+++
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
Mon Apr 15 19:37:30 2013
@@ -31,6 +31,7 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.uddi.v3_service.UDDISecurityPortType;
/**
* @author <a href="mailto:[email protected]";>Jeff Faath</a>
@@ -56,6 +57,10 @@ public class API_050_BindingTemplateTest
try {
api010.saveJoePublisher();
authInfoJoe = TckSecurity.getAuthToken(new
UDDISecurityImpl(), TckPublisher.getJoePublisherId(),
TckPublisher.getJoePassword());
+ UDDISecurityPortType security = new
UDDISecurityImpl();
+ String authInfoUDDI =
TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(),
TckPublisher.getUDDIPassword());
+ tckTModel.saveUDDIPublisherTmodel(authInfoUDDI);
+ tckTModel.saveTModels(authInfoUDDI,
TckTModel.TMODELS_XML);
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
Modified:
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
(original)
+++
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
Mon Apr 15 19:37:30 2013
@@ -61,6 +61,9 @@ public class API_080_SubscriptionTest
api010.saveSamSyndicator();
authInfoSam = TckSecurity.getAuthToken(new
UDDISecurityImpl(), TckPublisher.getSamPublisherId(),
TckPublisher.getSamPassword());
+ String authInfoUDDI = TckSecurity.getAuthToken(new
UDDISecurityImpl(), TckPublisher.getUDDIPublisherId(),
TckPublisher.getUDDIPassword());
+ tckTModel.saveUDDIPublisherTmodel(authInfoUDDI);
+ tckTModel.saveTModels(authInfoUDDI,
TckTModel.TMODELS_XML);
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
Modified:
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/Property.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/Property.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/Property.java
(original)
+++
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/Property.java
Mon Apr 15 19:37:30 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/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
(original)
+++
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
Mon Apr 15 19:37:30 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);
Modified:
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
(original)
+++
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
Mon Apr 15 19:37:30 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);
}
Modified:
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
(original)
+++
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
Mon Apr 15 19:37:30 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);
}
Modified: juddi/trunk/uddi-tck-base/src/main/resources/tck.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/tck.properties?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/tck.properties (original)
+++ juddi/trunk/uddi-tck-base/src/main/resources/tck.properties Mon Apr 15
19:37:30 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
Modified:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml
(original)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml
Mon Apr 15 19:37:30 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/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml
(original)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml
Mon Apr 15 19:37:30 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/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml
(original)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml
Mon Apr 15 19:37:30 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/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml
(original)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml
Mon Apr 15 19:37:30 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>
Added:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/tModelKeyGen.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/tModelKeyGen.xml?rev=1468203&view=auto
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/tModelKeyGen.xml
(added)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/tModelKeyGen.xml
Mon Apr 15 19:37:30 2013
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<tModel tModelKey="uddi:tmodelkey:categories:keygenerator"
xmlns="urn:uddi-org:api_v3">
+ <name>tmodelkey:categories:keyGenerator</name>
+ <description>Key Generator for generic UDDI tModel Keys</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen</overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator"
keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+</tModel>
Added:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/tmodels.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/tmodels.xml?rev=1468203&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/tmodels.xml
(added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/tmodels.xml
Mon Apr 15 19:37:30 2013
@@ -0,0 +1,54 @@
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+ <save_tModel xmlns="urn:uddi-org:api_v3">
+
+ <tModel tModelKey="uddi:tmodelkey:categories:fruit"
xmlns="urn:uddi-org:api_v3">
+ <name>fruit categories</name>
+ <description>For testing purposes</description>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization"
keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:tmodelkey:categories:sports"
xmlns="urn:uddi-org:api_v3">
+ <name>fruit categories</name>
+ <description>For testing purposes</description>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization"
keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:tmodelkey:categories:music"
xmlns="urn:uddi-org:api_v3">
+ <name>fruit categories</name>
+ <description>For testing purposes</description>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization"
keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:tmodelkey:identifier" xmlns="urn:uddi-org:api_v3">
+ <name>fruit categories</name>
+ <description>For testing purposes</description>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:identifier"
keyValue="identifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:tmodelkey:categories:bindings"
xmlns="urn:uddi-org:api_v3">
+ <name>fruit categories</name>
+ <description>For testing purposes</description>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization"
keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+</save_tModel>
Modified:
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
(original)
+++
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
Mon Apr 15 19:37:30 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.");
Modified:
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
(original)
+++
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
Mon Apr 15 19:37:30 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.");
Modified:
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
(original)
+++
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
Mon Apr 15 19:37:30 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.");
Modified:
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java?rev=1468203&r1=1468202&r2=1468203&view=diff
==============================================================================
---
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
(original)
+++
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
Mon Apr 15 19:37:30 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.");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
