Repository: juddi Updated Branches: refs/heads/master 1b9d1b902 -> 3e354954d
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java index ebb1d46..ae0bdf8 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java @@ -39,7 +39,7 @@ public class FindBusinessByIdentifierQuery { private static final String ENTITY_NAME_CHILD = "BusinessIdentifier"; - private static FindEntityByIdentifierQuery findQuery; + private static final FindEntityByIdentifierQuery findQuery; static { findQuery = new FindEntityByIdentifierQuery(BusinessEntityQuery.ENTITY_NAME, http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java index 1ae0d32..06568fc 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java @@ -47,7 +47,7 @@ public class FindBusinessByNameQuery { public static final String ENTITY_NAME_CHILD = "BusinessName"; - private static FindEntityByNamesQuery findQuery; + private final static FindEntityByNamesQuery findQuery; static { findQuery = new FindEntityByNamesQuery(BusinessEntityQuery.ENTITY_NAME, http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java index 2f18e2b..ebcb21c 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java @@ -34,7 +34,7 @@ import org.apache.juddi.model.UddiEntityPublisher; public class FindBusinessByPublisherQuery { - private static FindEntityByPublisherQuery findQuery; + private final static FindEntityByPublisherQuery findQuery; static { findQuery = new FindEntityByPublisherQuery( http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java index 1f6c382..88da9c1 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java @@ -50,11 +50,11 @@ import org.uddi.api_v3.TModelBag; public class FindBusinessByTModelKeyQuery extends BusinessEntityQuery { @SuppressWarnings("unused") - private static Log log = LogFactory.getLog(FindBusinessByTModelKeyQuery.class); + private final static Log log = LogFactory.getLog(FindBusinessByTModelKeyQuery.class); public static final String ENTITY_NAME_CHILD = "TmodelInstanceInfo"; - protected static String entityAliasChild; + protected static final String entityAliasChild; static { entityAliasChild = buildAlias(ENTITY_NAME_CHILD); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java index 7ffeca4..fe55a46 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java @@ -54,7 +54,7 @@ import org.uddi.api_v3.KeyedReferenceGroup; public class FindEntityByCategoryGroupQuery extends EntityQuery { @SuppressWarnings("unused") - private static Log log = LogFactory.getLog(FindEntityByCategoryGroupQuery.class); + private final static Log log = LogFactory.getLog(FindEntityByCategoryGroupQuery.class); private static final String ENTITY_KEYEDREFERENCEGROUP = "KeyedReferenceGroup"; private static final String ALIAS_KEYEDREFERENCEGROUP = "krg"; @@ -64,13 +64,13 @@ public class FindEntityByCategoryGroupQuery extends EntityQuery { private static final String ALIAS_KEYEDREFERENCE = buildAlias(ENTITY_KEYEDREFERENCE); private static final String FIELD_KEYEDREFERENCEGROUP = "keyedReferenceGroup"; - private String entityName; - private String entityAlias; - private String keyName; - private String entityField; - private String entityNameChild; - private String entityAliasChild; - private String selectSQL; + private final String entityName; + private final String entityAlias; + private final String keyName; + private final String entityField; + private final String entityNameChild; + private final String entityAliasChild; + private final String selectSQL; private String signaturePresent; public FindEntityByCategoryGroupQuery(String entityName, String entityAlias, String keyName, http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java index 4c70dd4..99d831a 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java @@ -51,7 +51,7 @@ import org.uddi.api_v3.KeyedReference; public class FindEntityByCategoryQuery extends EntityQuery { @SuppressWarnings("unused") - private static Log log = LogFactory.getLog(FindEntityByCategoryQuery.class); + private final static Log log = LogFactory.getLog(FindEntityByCategoryQuery.class); private static final String ENTITY_KEYEDREFERENCE = "KeyedReference"; private static final String ALIAS_KEYEDREFERENCE = buildAlias(ENTITY_KEYEDREFERENCE); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java index a8c1ae9..a19f737 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java @@ -76,7 +76,7 @@ import org.uddi.api_v3.KeyedReference; public class FindEntityByCombinedCategoryQuery extends FindEntityByCategoryQuery { @SuppressWarnings("unused") - private static Log log = LogFactory.getLog(FindEntityByCombinedCategoryQuery.class); + private final static Log log = LogFactory.getLog(FindEntityByCombinedCategoryQuery.class); protected String entityField2; protected String entityNameChild2; @@ -86,7 +86,6 @@ public class FindEntityByCombinedCategoryQuery extends FindEntityByCategoryQuery protected String entityNameChild3; protected String entityAliasChild3; - protected String signaturePresent; public FindEntityByCombinedCategoryQuery(String entityName, String entityAlias, String keyName, String entityField, String entityNameChild, String signaturePresent) { @@ -179,6 +178,7 @@ public class FindEntityByCombinedCategoryQuery extends FindEntityByCategoryQuery resultingEntityKeys = map.get(keyValue); firstTime = false; } else { + //FIXME this is wrong resultingEntityKeys.retainAll(map.get(keyValue)); } } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java index ad01f26..31251e2 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java @@ -50,15 +50,15 @@ import org.uddi.api_v3.KeyedReference; public class FindEntityByIdentifierQuery extends EntityQuery { @SuppressWarnings("unused") - private static Log log = LogFactory.getLog(FindEntityByIdentifierQuery.class); + private final static Log log = LogFactory.getLog(FindEntityByIdentifierQuery.class); - private String entityName; - private String entityAlias; - private String keyName; - private String entityField; - private String entityNameChild; - private String entityAliasChild; - private String selectSQL; + private final String entityName; + private final String entityAlias; + private final String keyName; + private final String entityField; + private final String entityNameChild; + private final String entityAliasChild; + private final String selectSQL; private String signaturePresent; public FindEntityByIdentifierQuery(String entityName, String entityAlias, String keyName, @@ -71,8 +71,8 @@ public class FindEntityByIdentifierQuery extends EntityQuery { this.entityAliasChild = buildAlias(entityNameChild); this.signaturePresent = signaturePresent; - StringBuffer sql = new StringBuffer(200); - sql.append("select distinct " + entityAlias + "." + keyName + " from " + entityName + " " + entityAlias + " "); + StringBuilder sql = new StringBuilder(200); + sql.append("select distinct ").append(entityAlias).append(".").append(keyName).append(" from ").append(entityName).append(" ").append(entityAlias).append(" "); selectSQL = sql.toString(); } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java index 1fb8818..5915783 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java @@ -39,13 +39,13 @@ public class FindEntityByNamesQuery extends EntityQuery { @SuppressWarnings("unused") private static Log log = LogFactory.getLog(FindEntityByNamesQuery.class); - private String entityName; - private String entityAlias; - private String keyName; - private String entityField; - private String entityNameChild; - private String entityAliasChild; - private String selectSQL; + private final String entityName; + private final String entityAlias; + private final String keyName; + private final String entityField; + private final String entityNameChild; + private final String entityAliasChild; + private final String selectSQL; private String signaturePresent; public FindEntityByNamesQuery(String entityName, String entityAlias, String keyName, String entityField, http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java index 95ce436..2f42d83 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java @@ -35,10 +35,10 @@ public class FindEntityByPublisherQuery extends EntityQuery { public static final String AUTHORIZED_NAME_FIELD = "authorizedName"; - private String entityName; - private String entityAlias; - private String keyName; - private String selectSQL; + private final String entityName; + private final String entityAlias; + private final String keyName; + private final String selectSQL; private String signaturePresent; public FindEntityByPublisherQuery(String entityName, String entityAlias, String keyName, String signaturePresent) { http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryGroupQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryGroupQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryGroupQuery.java index a37130d..acbc2b4 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryGroupQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryGroupQuery.java @@ -46,7 +46,7 @@ public class FindServiceByCategoryGroupQuery { private static final String ENTITY_NAME_CHILD = "ServiceCategoryBag"; - private static FindEntityByCategoryGroupQuery findQuery; + private static final FindEntityByCategoryGroupQuery findQuery; static { findQuery = new FindEntityByCategoryGroupQuery(BusinessServiceQuery.ENTITY_NAME, http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryQuery.java index 525e1dd..bbdb1d3 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryQuery.java @@ -40,7 +40,7 @@ public class FindServiceByCategoryQuery { private static final String ENTITY_NAME_CHILD = "ServiceCategoryBag"; - private static FindEntityByCategoryQuery findQuery; + private static final FindEntityByCategoryQuery findQuery; static { findQuery = new FindEntityByCategoryQuery(BusinessServiceQuery.ENTITY_NAME, http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCombinedCategoryQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCombinedCategoryQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCombinedCategoryQuery.java index f6e0e96..ab87a9d 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCombinedCategoryQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCombinedCategoryQuery.java @@ -61,7 +61,7 @@ public class FindServiceByCombinedCategoryQuery { private static final String ENTITY_FIELD2 = "bindingTemplate." + BusinessServiceQuery.ENTITY_FIELD; private static final String ENTITY_NAME_CHILD2 = "BindingCategoryBag"; - private static FindEntityByCombinedCategoryQuery findQuery; + private static final FindEntityByCombinedCategoryQuery findQuery; static { findQuery = new FindEntityByCombinedCategoryQuery(BusinessServiceQuery.ENTITY_NAME, http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java index 1dae306..bb52bec 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java @@ -47,7 +47,7 @@ public class FindServiceByNameQuery { public static final String ENTITY_NAME_CHILD = "ServiceName"; - private static FindEntityByNamesQuery findQuery; + private static final FindEntityByNamesQuery findQuery; static { findQuery = new FindEntityByNamesQuery(BusinessServiceQuery.ENTITY_NAME, http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java index a470371..5c855f9 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java @@ -56,7 +56,7 @@ public class FindServiceByTModelKeyQuery extends BusinessServiceQuery { public static final String ENTITY_NAME_CHILD = "TmodelInstanceInfo"; - protected static String entityAliasChild; + protected static final String entityAliasChild; static { entityAliasChild = buildAlias(ENTITY_NAME_CHILD); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryGroupQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryGroupQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryGroupQuery.java index 31beb74..487a90e 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryGroupQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryGroupQuery.java @@ -47,7 +47,7 @@ public class FindTModelByCategoryGroupQuery { private static final String ENTITY_NAME_CHILD = "TmodelCategoryBag"; - private static FindEntityByCategoryGroupQuery findQuery; + private static final FindEntityByCategoryGroupQuery findQuery; static { findQuery = new FindEntityByCategoryGroupQuery(TModelQuery.ENTITY_NAME, http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryQuery.java index 570dab8..6e5237c 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryQuery.java @@ -41,7 +41,7 @@ public class FindTModelByCategoryQuery { private static final String ENTITY_NAME_CHILD = "TmodelCategoryBag"; - private static FindEntityByCategoryQuery findQuery; + private static final FindEntityByCategoryQuery findQuery; static { findQuery = new FindEntityByCategoryQuery(TModelQuery.ENTITY_NAME, http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java index 3e9d833..fe7d53a 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java @@ -40,7 +40,7 @@ public class FindTModelByIdentifierQuery { private static final String ENTITY_NAME_CHILD = "TmodelIdentifier"; - private static FindEntityByIdentifierQuery findQuery; + private static final FindEntityByIdentifierQuery findQuery; static { findQuery = new FindEntityByIdentifierQuery(TModelQuery.ENTITY_NAME, http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByPublisherQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByPublisherQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByPublisherQuery.java index 6ba4377..fd7954c 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByPublisherQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByPublisherQuery.java @@ -34,7 +34,7 @@ import org.apache.juddi.model.UddiEntityPublisher; public class FindTModelByPublisherQuery { - private static FindEntityByPublisherQuery findQuery; + private static final FindEntityByPublisherQuery findQuery; static { findQuery = new FindEntityByPublisherQuery( http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java index 5e2e89a..8817cd8 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java @@ -27,8 +27,8 @@ public class PublisherAssertionQuery extends EntityQuery { public static final String FROM_KEY_NAME = "businessEntityByFromKey." + KEY_NAME; public static final String TO_KEY_NAME = "businessEntityByToKey." + KEY_NAME; - protected static String selectSQL; - protected static String deleteSQL; + protected static final String selectSQL; + protected static final String deleteSQL; static { StringBuilder sql = new StringBuilder(200); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/SubscriptionQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/SubscriptionQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/SubscriptionQuery.java index 1a31783..2f5b02c 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/SubscriptionQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/SubscriptionQuery.java @@ -25,7 +25,7 @@ public class SubscriptionQuery extends EntityQuery { public static final String ENTITY_NAME = "Subscription"; public static final String ENTITY_ALIAS = "ss"; - protected static String selectSQL; + protected static final String selectSQL; static { StringBuilder sql = new StringBuilder(200); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java index b7bdcd1..bb4a4a5 100644 --- a/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java +++ b/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java @@ -27,7 +27,7 @@ public class TModelQuery extends EntityQuery { public static final String ENTITY_FIELD = "tmodel"; public static final String SIGNATURE_PRESENT = ENTITY_ALIAS + "." + SIGNATURE_FIELD + " IS NOT EMPTY "; - protected static String selectSQL; + protected static final String selectSQL; static { StringBuilder sql = new StringBuilder(200); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java index 4a51df1..4426cc7 100644 --- a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java +++ b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java @@ -76,7 +76,10 @@ public class ReplicationNotifier extends TimerTask { * @throws ConfigurationException */ public ReplicationNotifier() throws ConfigurationException { - super(); + super(); + init(); + } + private synchronized void init() throws ConfigurationException { timer = new Timer(true); startBuffer=AppConfig.getConfiguration().getLong(Property.JUDDI_REPLICATION_START_BUFFER, 5000l); interval = AppConfig.getConfiguration().getLong(Property.JUDDI_REPLICATION_INTERVAL, 5000l); @@ -288,7 +291,7 @@ public class ReplicationNotifier extends TimerTask { return false; } - class PrimaryAlternate { + private static class PrimaryAlternate { String primaryUrl = null; List<String> alternateUrls = new ArrayList<String>(); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java b/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java index cdfd79d..549e16c 100644 --- a/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java +++ b/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java @@ -61,23 +61,23 @@ import org.uddi.v3_service.DispositionReportFaultMessage; */ public class SubscriptionNotifier extends TimerTask { - private Log log = LogFactory.getLog(this.getClass()); + private static final Log log = LogFactory.getLog(SubscriptionNotifier.class); private Timer timer = null; - private long startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default - private long interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default - private long acceptableLagTime = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_ACCEPTABLE_LAGTIME, 1000l); //1000 milliseconds - private int maxTries = AppConfig.getConfiguration().getInt(Property.JUDDI_NOTIFICATION_MAX_TRIES, 3); - private long badListResetInterval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_LIST_RESET_INTERVAL, 1000l * 3600); //one hour + private final long startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default + private final long interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default + private final long acceptableLagTime = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_ACCEPTABLE_LAGTIME, 1000l); //1000 milliseconds + private final int maxTries = AppConfig.getConfiguration().getInt(Property.JUDDI_NOTIFICATION_MAX_TRIES, 3); + private final long badListResetInterval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_LIST_RESET_INTERVAL, 1000l * 3600); //one hour /** * @since 3.2 */ - private boolean sendToken = AppConfig.getConfiguration().getBoolean(Property.JUDDI_NOTIFICATION_SENDAUTHTOKEN, false); - private UDDISubscriptionImpl subscriptionImpl = new UDDISubscriptionImpl(); - private Boolean alwaysNotify = false; + private final boolean sendToken = AppConfig.getConfiguration().getBoolean(Property.JUDDI_NOTIFICATION_SENDAUTHTOKEN, false); + private final UDDISubscriptionImpl subscriptionImpl = new UDDISubscriptionImpl(); + private final Boolean alwaysNotify = false; private Date desiredDate = null; private int lastUpdateCounter; - private UDDIServiceCounter serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIPublicationImpl.class); - private String[] attributes = { + private final UDDIServiceCounter serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIPublicationImpl.class); + private final String[] attributes = { "save_business", "save_service", "save_binding", "save_tmodel", "delete_business", "delete_service", "delete_binding", "delete_tmodel", "add_publisherassertions", "set_publisherassertions", "delete_publisherassertions" @@ -137,6 +137,7 @@ public class SubscriptionNotifier extends TimerTask { return isUpdated; } + @Override public synchronized void run() { if (badListResetInterval > 0 && new Date().getTime() > lastBadNotificationReset.getTime() + badListResetInterval) { badNotifications = new ConcurrentHashMap<String, Integer>(); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java b/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java index 1e9787d..66884dd 100644 --- a/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java +++ b/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java @@ -14,7 +14,6 @@ * limitations under the License. * */ - package org.apache.juddi.v3.auth; import java.io.File; @@ -49,110 +48,122 @@ import org.apache.juddi.v3.error.FatalErrorException; import org.apache.juddi.v3.error.UnknownUserException; /** - * This is a simple implementation of jUDDI's Authenticator interface. The credential - * store is simply an unencrypted xml document called 'juddi.users' that can be - * found in jUDDI's config directory. Below is an example of what you might find - * in this document. + * This is a simple implementation of jUDDI's Authenticator interface. The + * credential store is simply an unencrypted xml document called 'juddi.users' + * that can be found in jUDDI's config directory. Below is an example of what + * you might find in this document. * - * Example juddi.users document: - * ============================= - * <?xml version="1.0" encoding="UTF-8"?> - * <juddi-users> - * <user userid="sviens" password="password" /> - * <user userid="griddell" password="password" /> - * <user userid="bhablutzel" password="password" /> - * </juddi-users> + * Example juddi.users document: ============================= + * <?xml version="1.0" encoding="UTF-8"?> + * <juddi-users> + * <user userid="sviens" password="password" /> + * <user userid="griddell" password="password" /> + * <user userid="bhablutzel" password="password" /> + * </juddi-users> * * @author Steve Viens ([email protected]) * @author <a href="mailto:[email protected]";>Kurt T Stam</a> * @author <a href="mailto:[email protected]";>Jeff Faath</a> */ -public class XMLDocAuthenticator implements Authenticator -{ - protected static Log log = LogFactory.getLog(AuthenticatorFactory.class); - /** Container for the user credentials */ - Map<String,User> userTable; - - /** - * - */ - public XMLDocAuthenticator() throws JAXBException, IOException, ConfigurationException { - readUserFile(); - } - +public class XMLDocAuthenticator implements Authenticator { + + protected final static Log log = LogFactory.getLog(AuthenticatorFactory.class); + /** + * Container for the user credentials + */ + Map<String, User> userTable; + /** - * an empty constructor - */ - public XMLDocAuthenticator(boolean b) { - - } - - protected String getFilename() throws ConfigurationException { - return AppConfig.getConfiguration().getString(Property.JUDDI_USERSFILE, Property.DEFAULT_XML_USERSFILE); - } - /** - * Read user data from the juddi-users file. - * - * @throws IOException when the file cannot be opened - * JAXBException when the content is misformed. - * @throws ConfigurationException - */ - public synchronized void readUserFile() throws JAXBException, IOException, ConfigurationException - { - - userTable = new HashMap<String, User> (); - String usersFileName = getFilename(); - if (usersFileName==null || usersFileName.length()==0) - throw new ConfigurationException("usersFileName value is null!"); - File file = new File(usersFileName); - InputStream stream = null; - if (file.exists()) { - log.info("Reading jUDDI Users File: " + usersFileName + "..."); - stream = new FileInputStream(file); - } else { - URL resource = ClassUtil.getResource(usersFileName, this.getClass()); - if (resource!=null) - log.info("Reading jUDDI Users File: " + usersFileName + "...from " + resource.toExternalForm()); - else - log.info("Reading jUDDI Users File: " + usersFileName + "..."); - stream = ClassUtil.getResource(usersFileName, this.getClass()).openStream(); + * + */ + public XMLDocAuthenticator() throws JAXBException, IOException, ConfigurationException { + readUserFile(); } - JAXBContext jaxbContext=JAXBContext.newInstance(JuddiUsers.class); - Unmarshaller unMarshaller = jaxbContext.createUnmarshaller(); - JAXBElement<JuddiUsers> element = unMarshaller.unmarshal(new StreamSource(stream),JuddiUsers.class); - JuddiUsers users = element.getValue(); - for (User user : users.getUser()) { - userTable.put(user.getUserid(), user); - log.debug("Loading user credentials for user: " + user.getUserid()); - } - } - - /** - * + + /** + * an empty constructor + */ + public XMLDocAuthenticator(boolean b) { + + } + + protected String getFilename() throws ConfigurationException { + return AppConfig.getConfiguration().getString(Property.JUDDI_USERSFILE, Property.DEFAULT_XML_USERSFILE); + } + + /** + * Read user data from the juddi-users file. + * + * @throws IOException when the file cannot be opened JAXBException when + * the content is malformed. + * @throws ConfigurationException + */ + public synchronized void readUserFile() throws JAXBException, IOException, ConfigurationException { + + userTable = new HashMap<String, User>(); + String usersFileName = getFilename(); + if (usersFileName == null || usersFileName.length() == 0) { + throw new ConfigurationException("usersFileName value is null!"); + } + File file = new File(usersFileName); + InputStream stream = null; + try { + if (file.exists()) { + log.info("Reading jUDDI Users File: " + usersFileName + "..."); + stream = new FileInputStream(file); + } else { + URL resource = ClassUtil.getResource(usersFileName, this.getClass()); + if (resource != null) { + log.info("Reading jUDDI Users File: " + usersFileName + "...from " + resource.toExternalForm()); + } else { + log.info("Reading jUDDI Users File: " + usersFileName + "..."); + } + stream = ClassUtil.getResource(usersFileName, this.getClass()).openStream(); + } + JAXBContext jaxbContext = JAXBContext.newInstance(JuddiUsers.class); + Unmarshaller unMarshaller = jaxbContext.createUnmarshaller(); + JAXBElement<JuddiUsers> element = unMarshaller.unmarshal(new StreamSource(stream), JuddiUsers.class); + JuddiUsers users = element.getValue(); + for (User user : users.getUser()) { + userTable.put(user.getUserid(), user); + log.debug("Loading user credentials for user: " + user.getUserid()); + } + } catch (IOException ex) { + log.warn("io exception", ex); + } finally { + if (stream != null) { + stream.close(); + } + } + } + + /** + * * @param userID * @param credential - */ - public String authenticate(String userID,String credential) - throws AuthenticationException, FatalErrorException - { - // a userID must be specified. - if (userID == null) - throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidUserId")); - - // credential (password) must be specified. - if (credential == null) - throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidCredentials")); - - if (userTable.containsKey(userID)) - { - User user = (User)userTable.get(userID); - if ((user.getPassword() == null) || (!credential.equals(user.getPassword()))) - throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidCredentials")); - } - else - throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidUserId", userID)); - - int MaxBindingsPerService = -1; + */ + public String authenticate(String userID, String credential) + throws AuthenticationException, FatalErrorException { + // a userID must be specified. + if (userID == null) { + throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidUserId")); + } + + // credential (password) must be specified. + if (credential == null) { + throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidCredentials")); + } + + if (userTable.containsKey(userID)) { + User user = (User) userTable.get(userID); + if ((user.getPassword() == null) || (!credential.equals(user.getPassword()))) { + throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidCredentials")); + } + } else { + throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidUserId", userID)); + } + + int MaxBindingsPerService = -1; int MaxServicesPerBusiness = -1; int MaxTmodels = -1; int MaxBusinesses = -1; @@ -193,28 +204,29 @@ public class XMLDocAuthenticator implements Authenticator } em.close(); } - return userID; - } - - @Override - public UddiEntityPublisher identify(String authInfo, String authorizedName, WebServiceContext ctx) throws AuthenticationException { - - EntityManager em = PersistenceManager.getEntityManager(); - EntityTransaction tx = em.getTransaction(); - try { - tx.begin(); - Publisher publisher = em.find(Publisher.class, authorizedName); - if (publisher == null) - throw new UnknownUserException(new ErrorMessage("errors.auth.NoPublisher", authorizedName)); - - return publisher; - } finally { - if (tx.isActive()) { - tx.rollback(); - } - em.close(); - } - - } - -} \ No newline at end of file + return userID; + } + + @Override + public UddiEntityPublisher identify(String authInfo, String authorizedName, WebServiceContext ctx) throws AuthenticationException { + + EntityManager em = PersistenceManager.getEntityManager(); + EntityTransaction tx = em.getTransaction(); + try { + tx.begin(); + Publisher publisher = em.find(Publisher.class, authorizedName); + if (publisher == null) { + throw new UnknownUserException(new ErrorMessage("errors.auth.NoPublisher", authorizedName)); + } + + return publisher; + } finally { + if (tx.isActive()) { + tx.rollback(); + } + em.close(); + } + + } + +} http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/validation/ValidateCustodyTransfer.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateCustodyTransfer.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateCustodyTransfer.java index 55d51e3..cbb5500 100644 --- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateCustodyTransfer.java +++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateCustodyTransfer.java @@ -16,6 +16,7 @@ */ package org.apache.juddi.validation; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -24,6 +25,7 @@ import java.util.Vector; import javax.persistence.EntityManager; import javax.persistence.Query; +import static org.apache.juddi.api.impl.AuthenticatedService.UTF8; import org.apache.juddi.model.TransferTokenKey; import org.apache.juddi.model.UddiEntity; @@ -32,6 +34,7 @@ import org.apache.juddi.query.util.DynamicQuery; import org.apache.juddi.v3.error.ErrorMessage; import org.apache.juddi.v3.error.FatalErrorException; import org.apache.juddi.v3.error.InvalidKeyPassedException; +import org.apache.juddi.v3.error.InvalidValueException; import org.apache.juddi.v3.error.TokenAlreadyExistsException; import org.apache.juddi.v3.error.TransferNotAllowedException; import org.apache.juddi.v3.error.UserMismatchException; @@ -228,7 +231,12 @@ public class ValidateCustodyTransfer extends ValidateUDDIApi { throw new ValueNotAllowedException(new ErrorMessage("errors.keybag.NoInput")); } - String transferTokenId = new String(apiTransferToken.getOpaqueToken()); + String transferTokenId = null; + try{ + transferTokenId = new String(apiTransferToken.getOpaqueToken(), UTF8); + } catch (UnsupportedEncodingException ex) { + throw new InvalidValueException(new ErrorMessage("errors.stringEncoding")); + } if (nodeID.equals(apiTransferToken.getNodeID())) { validateTransferLocalEntities(em, transferTokenId, apiKeyList); } else { http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java index 6ec27f1..2d788e9 100644 --- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java +++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java @@ -2166,11 +2166,15 @@ public class ValidatePublish extends ValidateUDDIApi { */ private List<String> TModelContains(String key, TModel ref) { - log.debug("looking for key=" + key + " from tModel " + ref.getTModelKey()); - List<String> ret = new ArrayList<String>(); - if (ref == null) { + if (key == null) { return null; } + if (ref == null || ref.getTModelKey()==null) { + return null; + } + log.debug("looking for key=" + key + " from tModel " + ref.getTModelKey()); + List<String> ret = new ArrayList<String>(); + if (ref.getCategoryBag() != null) { for (int i = 0; i < ref.getCategoryBag().getKeyedReference().size(); i++) { if (ref.getCategoryBag().getKeyedReference().get(i).getTModelKey().equalsIgnoreCase(key)) { @@ -2209,24 +2213,24 @@ public class ValidatePublish extends ValidateUDDIApi { * @param addressLine */ private void validatedAddressLinesIfKeyDefined(List<AddressLine> addressLine) throws ValueNotAllowedException { - String err = ""; + StringBuilder err = new StringBuilder(); for (int i = 0; i < addressLine.size(); i++) { if (addressLine.get(i).getKeyName() == null || addressLine.get(i).getKeyName().trim().length() == 0) { - err += "addressLine(" + i + ").keyName,"; + err.append("addressLine(").append(i).append(").keyName,"); } if (addressLine.get(i).getKeyValue() == null || addressLine.get(i).getKeyValue().trim().length() == 0) { - err += "addressLine(" + i + ").keyValue,"; + err.append("addressLine(").append(i).append(").keyValue,"); } if (addressLine.get(i).getValue() == null || addressLine.get(i).getValue().trim().length() == 0) { - err += "addressLine(" + i + ").value,"; + err.append("addressLine(").append(i).append(").value,"); } } if (err.length() > 0) { - throw new ValueNotAllowedException(new ErrorMessage("E_invalidValueAddressLine", err)); + throw new ValueNotAllowedException(new ErrorMessage("E_invalidValueAddressLine", err.toString())); } } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java index d9131c9..45bc82d 100644 --- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java +++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java @@ -16,17 +16,21 @@ */ package org.apache.juddi.validation; +import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.security.cert.CertificateException; import java.util.List; import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.persistence.EntityManager; import javax.xml.ws.WebServiceContext; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import static org.apache.juddi.api.impl.AuthenticatedService.UTF8; import org.apache.juddi.config.AppConfig; import org.apache.juddi.config.Property; import org.apache.juddi.model.Node; @@ -305,7 +309,12 @@ public class ValidateReplication extends ValidateUDDIApi { TransferEntities x = new TransferEntities(); x.setKeyBag(body.getKeyBag()); x.setTransferToken(body.getTransferToken()); - String transferTokenId = new String(body.getTransferToken().getOpaqueToken()); + String transferTokenId; + try { + transferTokenId = new String(body.getTransferToken().getOpaqueToken(), UTF8); + } catch (UnsupportedEncodingException ex) { + throw new InvalidValueException(new ErrorMessage("errors.stringEncoding")); + } new ValidateCustodyTransfer(null).validateTransferLocalEntities(em, transferTokenId, body.getKeyBag().getKey()); } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java index 6d067da..ad4148d 100644 --- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java +++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java @@ -36,8 +36,8 @@ public class ValidateUDDIKey { if (key == null) throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.NullKey")); if (key.toLowerCase().startsWith("uuid:")) { - return; - } + return; + } if (! key.contains(KeyGenerator.PARTITION_SEPARATOR)) return; //v2 style key; no other validation rules apply String keyToTest = key.trim(); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java index 1662a9f..f9e651e 100644 --- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java +++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java @@ -28,7 +28,6 @@ import org.apache.juddi.v3.error.ValueNotAllowedException; import org.uddi.api_v3.BindingTemplate; import org.uddi.api_v3.BusinessEntity; import org.uddi.api_v3.BusinessService; -import org.uddi.api_v3.DispositionReport; import org.uddi.api_v3.PublisherAssertion; import org.uddi.api_v3.TModel; import org.uddi.v3_service.UDDIValueSetValidationPortType; @@ -51,7 +50,7 @@ import org.uddi.vs_v3.ValidateValues; */ public class ValidateValuesFromWebService { - static final Log log = LogFactory.getLog(ValidateValuesFromWebService.class); + private static final Log log = LogFactory.getLog(ValidateValuesFromWebService.class); private static UDDIValueSetValidationPortType getPort(String url) throws ValueNotAllowedException { UDDIService svc = new UDDIService(); @@ -96,7 +95,7 @@ public class ValidateValuesFromWebService { req.getTModel().addAll(obj); try { - DispositionReport validateValues = vsv.validateValues(req); + vsv.validateValues(req); } catch (Exception ex) { log.warn(ex.getMessage()); log.debug(ex.getMessage(),ex); @@ -111,7 +110,7 @@ public class ValidateValuesFromWebService { req.getBindingTemplate().addAll(obj); try { - DispositionReport validateValues = vsv.validateValues(req); + vsv.validateValues(req); } catch (Exception ex) { log.warn(ex.getMessage()); log.debug(ex.getMessage(),ex); @@ -126,7 +125,7 @@ public class ValidateValuesFromWebService { req.getBusinessService().addAll(obj); try { - DispositionReport validateValues = vsv.validateValues(req); + vsv.validateValues(req); } catch (Exception ex) { log.warn(ex.getMessage()); log.debug(ex.getMessage(),ex); @@ -142,7 +141,7 @@ public class ValidateValuesFromWebService { req.getBusinessEntity().addAll(obj); try { - DispositionReport validateValues = vsv.validateValues(req); + vsv.validateValues(req); } catch (Exception ex) { log.warn(ex.getMessage()); log.debug(ex.getMessage(),ex); @@ -156,7 +155,7 @@ public class ValidateValuesFromWebService { ValidateValues req = new ValidateValues(); req.getPublisherAssertion().add(obj); try { - DispositionReport validateValues = vsv.validateValues(req); + vsv.validateValues(req); } catch (Exception ex) { log.warn(ex.getMessage()); log.debug(ex.getMessage(),ex); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/validation/vsv/AbstractSimpleValidator.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/AbstractSimpleValidator.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/AbstractSimpleValidator.java index 301719a..cbdae0e 100644 --- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/AbstractSimpleValidator.java +++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/AbstractSimpleValidator.java @@ -113,7 +113,7 @@ public abstract class AbstractSimpleValidator implements ValueSetValidator { return; } //StringBuilder badvalues=new StringBuilder(); - String err = ""; + StringBuilder err = new StringBuilder(); for (int i = 0; i < items.size(); i++) { if (items.get(i).getTModelKey().equalsIgnoreCase(getMyKey())) { List<String> validValues = getValidValues(); @@ -129,13 +129,13 @@ public abstract class AbstractSimpleValidator implements ValueSetValidator { } if (!localfound) { //badvalues.append(items.get(i).getKeyValue()).append(" "); - err += xpath + "keyedReference(" + i + ")=" + items.get(i).getKeyValue() + " "; + err.append(xpath).append("keyedReference(").append(i).append(")=").append(items.get(i).getKeyValue()).append(" "); } } } } if (err.length() > 0) { - throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", err + getPrintableValidValues())); + throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", err.toString() + getPrintableValidValues())); } } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationderivedfrom.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationderivedfrom.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationderivedfrom.java index 114048b..02504f5 100644 --- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationderivedfrom.java +++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgcategorizationderivedfrom.java @@ -148,7 +148,7 @@ public class Uddiuddiorgcategorizationderivedfrom implements ValueSetValidator { if (items == null) { return; } - String err = ""; + StringBuilder err = new StringBuilder(); for (int i = 0; i < items.size(); i++) { List<String> validValues = getValidValues(); if (validValues != null) { @@ -160,12 +160,12 @@ public class Uddiuddiorgcategorizationderivedfrom implements ValueSetValidator { } } if (!valid) { - err += xpath + "keyedReference(" + i + ") "; + err.append(xpath + "keyedReference(" + i + ") "); } } } if (err.length() > 0) { - throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", err)); + throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", err.toString())); } } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgidentifierisreplacedby.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgidentifierisreplacedby.java b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgidentifierisreplacedby.java index 33b4620..52f5969 100644 --- a/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgidentifierisreplacedby.java +++ b/juddi-core/src/main/java/org/apache/juddi/validation/vsv/Uddiuddiorgidentifierisreplacedby.java @@ -295,30 +295,6 @@ public class Uddiuddiorgidentifierisreplacedby implements ValueSetValidator { } } - private void validatedValuesKeyRef(List<KeyedReference> items, String xpath) throws DispositionReportFaultMessage { - if (items == null) { - return; - } - String err = ""; - for (int i = 0; i < items.size(); i++) { - List<String> validValues = getValidValues(); - if (validValues != null) { - //ok we have some work to do - boolean valid = false; - for (int k = 0; k < validValues.size(); k++) { - if (validValues.get(k).equals(items.get(i).getKeyValue())) { - valid = true; - } - } - if (!valid) { - err += xpath + "keyedReference(" + i + ") "; - } - } - } - if (err.length() > 0) { - throw new InvalidValueException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", err)); - } - } @Override public void validateTmodelInstanceDetails(List<TModelInstanceInfo> tModelInstanceInfo, String xpath) throws DispositionReportFaultMessage { http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/resources/messages.properties ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/resources/messages.properties b/juddi-core/src/main/resources/messages.properties index 10f2828..0306a17 100644 --- a/juddi-core/src/main/resources/messages.properties +++ b/juddi-core/src/main/resources/messages.properties @@ -63,6 +63,7 @@ E_valueNotAllowed=A value did not pass validation because of contextual issues. #-- General error messages +errors.stringEncoding=non-UTF8 token errors.DatatypeFactor=Can't create a DatatypeFactory instance. errors.Unspecified=An unspecified error occurred errors.Unsupported=This version does not support this feature or API http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/examples/vsv/valuesetvalidator/App.java ---------------------------------------------------------------------- diff --git a/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/examples/vsv/valuesetvalidator/App.java b/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/examples/vsv/valuesetvalidator/App.java index df5d2d1..0392150 100644 --- a/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/examples/vsv/valuesetvalidator/App.java +++ b/juddi-examples/ValueSetValidator/src/main/java/org/apache/juddi/examples/vsv/valuesetvalidator/App.java @@ -34,7 +34,7 @@ public class App { public static void main(String[] args) throws ConfigurationException { System.out.println("Notice! before running this, build this project and copy the jar file into juddi-tomcat/target/tomcat/apache-tomcat.../juddiv3.war/WEB-INF/lib and restart!"); - System.out.println(UDDIValueSetValidationImpl.ConvertKeyToClass("uddi:www.bob.com:verified-tmodel")); + System.out.println(UDDIValueSetValidationImpl.convertKeyToClass("uddi:www.bob.com:verified-tmodel")); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6f9f54e..372c305 100644 --- a/pom.xml +++ b/pom.xml @@ -293,7 +293,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.4</version> + <version>2.19.1</version> </plugin> </plugins> </pluginManagement> @@ -412,13 +412,14 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.15</version> + <version>2.19.1</version> <configuration> <!-- Sets the VM argument line used when unit tests are run. --> <argLine>${surefireArgLine}</argLine> <!-- Skips unit tests if the value of skip.unit.tests property is true --> <skipTests>${skipTests}</skipTests> <!-- Excludes integration tests when unit tests are run. --> + <skipAfterFailureCount>1</skipAfterFailureCount> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/uddi-client-dist/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-client-dist/pom.xml b/uddi-client-dist/pom.xml index c63a253..3acb2c9 100644 --- a/uddi-client-dist/pom.xml +++ b/uddi-client-dist/pom.xml @@ -1,45 +1,45 @@ <?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. * */ --> +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. * */ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi-parent</artifactId> - <version>3.3.5-SNAPSHOT</version> - </parent> - <artifactId>uddi-client-dist</artifactId> - <name>UDDI Client Distribution Assembly</name> - <packaging>pom</packaging> - <dependencies> - <!-- binary archives --> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi-client</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-ws</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-tck-base</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-tck</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.juddi</groupId> + <artifactId>juddi-parent</artifactId> + <version>3.3.5-SNAPSHOT</version> + </parent> + <artifactId>uddi-client-dist</artifactId> + <name>UDDI Client Distribution Assembly</name> + <packaging>pom</packaging> + <dependencies> + <!-- binary archives --> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>juddi-client</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-ws</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-tck-base</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-tck</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> <groupId>org.apache.juddi</groupId> <artifactId>uddi-tck-runner</artifactId> <version>${project.parent.version}</version> @@ -50,85 +50,85 @@ <version>${project.parent.version}</version> <classifier>jar-with-dependencies</classifier> </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-migration-tool</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-migration-tool</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> <groupId>org.apache.juddi</groupId> <artifactId>juddi-gui-dsig</artifactId> <version>${project.parent.version}</version> </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-migration-tool</artifactId> - <version>${project.parent.version}</version> - <classifier>jar-with-dependencies</classifier> - </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-tck</artifactId> - <type>test-jar</type> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi-gui-war</artifactId> - <version>${project.parent.version}</version> - <type>war</type> - </dependency> - <dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-migration-tool</artifactId> + <version>${project.parent.version}</version> + <classifier>jar-with-dependencies</classifier> + </dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-tck</artifactId> + <type>test-jar</type> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>juddi-gui-war</artifactId> + <version>${project.parent.version}</version> + <type>war</type> + </dependency> + <dependency> <groupId>org.apache.juddi</groupId> <artifactId>juddi-client-cli</artifactId> <version>${project.parent.version}</version> <classifier>jar-with-dependencies</classifier> </dependency> - <!-- source archives --> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi-client</artifactId> - <version>${project.parent.version}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-ws</artifactId> - <version>${project.parent.version}</version> - <classifier>sources</classifier> - </dependency> - <dependency> + <!-- source archives --> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>juddi-client</artifactId> + <version>${project.parent.version}</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-ws</artifactId> + <version>${project.parent.version}</version> + <classifier>sources</classifier> + </dependency> + <dependency> <groupId>org.apache.juddi</groupId> <artifactId>uddi-migration-tool</artifactId> <version>${project.parent.version}</version> <classifier>sources</classifier> </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-tck-base</artifactId> - <version>${project.parent.version}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-tck</artifactId> - <version>${project.parent.version}</version> - <classifier>sources</classifier> - </dependency> - <dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-tck-base</artifactId> + <version>${project.parent.version}</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-tck</artifactId> + <version>${project.parent.version}</version> + <classifier>sources</classifier> + </dependency> + <dependency> <groupId>org.apache.juddi</groupId> <artifactId>uddi-tck-runner</artifactId> <version>${project.parent.version}</version> <classifier>sources</classifier> </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-tck</artifactId> - <version>${project.parent.version}</version> - <type>jar</type> - <classifier>test-sources</classifier> - </dependency> - <dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-tck</artifactId> + <version>${project.parent.version}</version> + <type>jar</type> + <classifier>test-sources</classifier> + </dependency> + <dependency> <groupId>org.apache.juddi</groupId> <artifactId>juddi-gui-dsig</artifactId> <version>${project.parent.version}</version> @@ -147,51 +147,51 @@ <version>${project.parent.version}</version> <classifier>sources</classifier> </dependency> - <!-- javadoc archives --> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi-client</artifactId> - <version>${project.parent.version}</version> - <classifier>javadoc</classifier> - </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-ws</artifactId> - <version>${project.parent.version}</version> - <classifier>javadoc</classifier> - </dependency> - <dependency> + <!-- javadoc archives --> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>juddi-client</artifactId> + <version>${project.parent.version}</version> + <classifier>javadoc</classifier> + </dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-ws</artifactId> + <version>${project.parent.version}</version> + <classifier>javadoc</classifier> + </dependency> + <dependency> <groupId>org.apache.juddi</groupId> <artifactId>uddi-migration-tool</artifactId> <version>${project.parent.version}</version> <classifier>javadoc</classifier> </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-tck-base</artifactId> - <version>${project.parent.version}</version> - <classifier>javadoc</classifier> - </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-tck</artifactId> - <version>${project.parent.version}</version> - <classifier>javadoc</classifier> - </dependency> - <dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-tck-base</artifactId> + <version>${project.parent.version}</version> + <classifier>javadoc</classifier> + </dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-tck</artifactId> + <version>${project.parent.version}</version> + <classifier>javadoc</classifier> + </dependency> + <dependency> <groupId>org.apache.juddi</groupId> <artifactId>uddi-tck-runner</artifactId> <version>${project.parent.version}</version> <classifier>javadoc</classifier> </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-tck</artifactId> - <version>${project.parent.version}</version> - <classifier>test-javadoc</classifier> - <type>jar</type> - </dependency> - <dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-tck</artifactId> + <version>${project.parent.version}</version> + <classifier>test-javadoc</classifier> + <type>jar</type> + </dependency> + <dependency> <groupId>org.apache.juddi</groupId> <artifactId>juddi-gui-dsig</artifactId> <version>${project.parent.version}</version> @@ -211,20 +211,20 @@ <type>jar</type> <classifier>javadoc</classifier> </dependency> - <!-- documentation --> + <!-- documentation --> <dependency> <groupId>org.apache.juddi.juddi-docs</groupId> <artifactId>juddi-client-guide</artifactId> <version>${project.parent.version}</version> <type>jdocbook</type> </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <dependencies> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> <dependency> <!-- Entry needed to enable jdocbook unzipping --> <groupId>org.jboss.maven.plugins</groupId> @@ -232,37 +232,37 @@ <version>2.3.8</version> </dependency> </dependencies> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>uddi-client-distro-${project.version}</finalName> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <appendAssemblyId>false</appendAssemblyId> - <archiverConfig> - <defaultDirectoryMode>0755</defaultDirectoryMode> - </archiverConfig> - </configuration> - </execution> - </executions> - </plugin> - <!-- dist is not very useful from a maven repo, so don't put it there --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>uddi-client-distro-${project.version}</finalName> + <descriptors> + <descriptor>src/main/assembly/assembly.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + <appendAssemblyId>false</appendAssemblyId> + <archiverConfig> + <defaultDirectoryMode>0755</defaultDirectoryMode> + </archiverConfig> + </configuration> + </execution> + </executions> + </plugin> + <!-- dist is not very useful from a maven repo, so don't put it there --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> - <skip>true</skip> - </configuration> - </plugin> + <skip>true</skip> + </configuration> + </plugin> - </plugins> - </build> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/uddi-tck/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/pom.xml b/uddi-tck/pom.xml index ed929a9..aa97f6b 100644 --- a/uddi-tck/pom.xml +++ b/uddi-tck/pom.xml @@ -218,7 +218,7 @@ <cargo.logging>high</cargo.logging> <cargo.hostname>localhost</cargo.hostname> <cargo.servlet.port>8880</cargo.servlet.port> - <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password</cargo.jvmargs> + <cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5000 -Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password</cargo.jvmargs> </properties> </configuration> </configuration> @@ -244,7 +244,7 @@ <cargo.logging>high</cargo.logging> <cargo.hostname>localhost</cargo.hostname> <cargo.servlet.port>8980</cargo.servlet.port> - <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/node2/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password</cargo.jvmargs> + <cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5001 -Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/node2/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password</cargo.jvmargs> </properties> </configuration> </configuration> @@ -321,6 +321,7 @@ </goals> <configuration> <skip>false</skip> + <skipAfterFailureCount>1</skipAfterFailureCount> <systemProperties> <property> <name>cactus.contextURL</name> http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java index e52e58c..68be4e8 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java @@ -769,7 +769,7 @@ public class JUDDI_300_MultiNodeIntegrationTest { logger.info("testReplicationServiceBindingAddRemove"); try { - TckCommon.PrintMarker(); + //TckCommon.PrintMarker(); resetBusinesses(); resetTmodels(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
