You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/03/25 03:37:01 UTC
svn commit: r1460511 [1/7] - in /juddi/trunk:
juddi-core-openjpa/src/test/resources/
juddi-core/src/main/java/org/apache/juddi/config/
juddi-core/src/main/java/org/apache/juddi/mapping/
juddi-core/src/main/java/org/apache/juddi/model/ juddi-core/src/ma...
Author: alexoree
Date: Mon Mar 25 02:37:00 2013
New Revision: 1460511
URL: http://svn.apache.org/r1460511
Log:
adding test cases for
JUDDI-574, findTmodel search results does not return the Lang element, however there is no current solution and this will break the build
adding test cases and solutions for:
JUDDI-566, Using service/binding/hostingDirector causes a NPE
JUDDI-565, Binding template validation rules are incorrect
JUDDI-561, Transaction rollback when PersonName Lang is greater than 5 characters
Note: These fixes may cause data loss from previous versions due to database fields shrinking in size to become spec compliant.
adding test case for
JUDDI-571, find_services lang issue
JUDDI-575 implemented but disabled by default. Flip the setting in juddiv3.properties to enable, however almost all of the existing unit test will fail because they use undefined tmodel keys
Added:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidationConstants.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_131_NegativePublicationIntegrationTest.java
Modified:
juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.properties
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLine.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/AuthToken.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryBag.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescr.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescr.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessName.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescr.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Email.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescr.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescr.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDocDescr.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/PersonName.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescr.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceName.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescr.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifier.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescr.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
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/main/resources/messages.properties
juddi/trunk/juddi-core/src/test/resources/juddiv3.properties
juddi/trunk/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java
juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.properties
juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml
juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/AccessPointType.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BindingTemplate.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessEntity.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessService.java
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/TModel.java
Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.properties?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.properties (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.properties Mon Mar 25 02:37:00 2013
@@ -77,6 +77,14 @@ juddi.notification.interval=5000
juddi.notification.start.buffer=0
-
+# As of 3.1.5
# Duration of time for tokens to expire
-juddi.auth.token.Timeout=15
\ No newline at end of file
+juddi.auth.token.Timeout=15
+
+# As of 3.1.5
+# This setting will force referential integrity for all tModels (except keyGenerators),
+# category bags, bindingTemplate/AccessPoint/hostingRedirector (referencing another host),
+# tModelinstanceparms and anything else that references a KeyName
+# default value is true.
+# set to false for backword compatability or for a more lax registry
+juddi.validation.enforceReferentialIntegrity=false
\ No newline at end of file
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java Mon Mar 25 02:37:00 2013
@@ -330,7 +330,7 @@ public class Install {
validatePublish.validateNames(businessEntity.getName());
validatePublish.validateDiscoveryUrls(businessEntity.getDiscoveryURLs());
- validatePublish.validateContacts(businessEntity.getContacts());
+ validatePublish.validateContacts(businessEntity.getContacts(),config);
validatePublish.validateCategoryBag(businessEntity.getCategoryBag(),config);
validatePublish.validateIdentifierBag(businessEntity.getIdentifierBag(),config);
@@ -435,7 +435,7 @@ public class Install {
ValidatePublish validatePublish = new ValidatePublish(rootPublisher);
validatePublish.validateCategoryBag(bindingTemplate.getCategoryBag(), config);
- validatePublish.validateTModelInstanceDetails(bindingTemplate.getTModelInstanceDetails());
+ validatePublish.validateTModelInstanceDetails(bindingTemplate.getTModelInstanceDetails(),config);
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java Mon Mar 25 02:37:00 2013
@@ -1,65 +1,64 @@
package org.apache.juddi.config;
-public interface Property
-{
- public final static String JUDDI_ROOT_PUBLISHER ="juddi.root.publisher";
- public final static String JUDDI_LOAD_INSTALL_DATA ="juddi.load.install.data";
- public final static String JUDDI_PERSISTENCEUNIT_NAME ="juddi.persistenceunit.name";
- public final static String JUDDI_AUTHENTICATOR ="juddi.authenticator";
- public final static String JUDDI_AUTHENTICATOR_URL ="juddi.authenticator.url";
- public final static String JUDDI_CONFIGURATION_RELOAD_DELAY ="juddi.configuration.reload.delay";
- public final static String JUDDI_LOCALE ="juddi.locale";
- public final static String JUDDI_OPERATOR_EMAIL_ADDRESS ="juddi.operatorEmailAddress";
- public final static String JUDDI_MAX_LENGTH ="juddi.maxNameLength";
- public final static String JUDDI_MAX_NAME_ELEMENTS ="juddi.maxNameElementsAllowed";
- public final static String JUDDI_MAX_BUSINESSES_PER_PUBLISHER="juddi.maxBusinessesPerPublisher";
- public final static String JUDDI_MAX_SERVICES_PER_BUSINESS ="juddi.maxServicesPerBusiness";
- public final static String JUDDI_MAX_BINDINGS_PER_SERVICE ="juddi.maxBindingsPerService";
- public final static String JUDDI_MAX_TMODELS_PER_PUBLISHER ="juddi.maxTModelsPerPublisher";
- public final static String JUDDI_CRYPTOR ="juddi.cryptor";
- public final static String JUDDI_KEYGENERATOR ="juddi.keygenerator";
- public final static String JUDDI_SECURITY_DOMAIN ="juddi.securityDomain";
- public final static String JUDDI_USERSFILE ="juddi.usersfile";
- public final static String JUDDI_MAX_ROWS ="juddi.maxRows";
- public final static String JUDDI_MAX_IN_CLAUSE ="juddi.maxInClause";
- public final static String JUDDI_ROOT_PARTITION ="juddi.rootPartition";
- public final static String JUDDI_NODE_ID ="juddi.nodeId";
- public final static String JUDDI_TRANSFER_EXPIRATION_DAYS ="juddi.transfer.expiration.days";
- public final static String JUDDI_AUTHENTICATE_INQUIRY ="juddi.authenticate.Inquiry";
- public final static String JUDDI_AUTH_TOKEN_EXPIRATION ="juddi.auth.token.Expiration";
- public final static String JUDDI_AUTH_TOKEN_TIMEOUT ="juddi.auth.token.Timeout";
- public final static String JUDDI_SUBSCRIPTION_EXPIRATION_DAYS="juddi.subscription.expiration.days";
- public final static String JUDDI_NOTIFICATION_START_BUFFER ="juddi.notification.start.buffer";
- public final static String JUDDI_NOTIFICATION_INTERVAL ="juddi.notification.interval";
- public final static String JUDDI_NOTIFICATION_ACCEPTABLE_LAGTIME ="juddi.notification.acceptable.lagtime";
- public final static String JUDDI_NOTIFICATION_MAX_TRIES ="juddi.notification.max.tries";
- public final static String JUDDI_NOTIFICATION_LIST_RESET_INTERVAL ="juddi.notification.list.reset.interval";
- public final static String JUDDI_SUBSCRIPTION_CHUNKEXPIRATION_MINUTES="juddi.subscription.chunkexpiration.minutes";
- public final static String JUDDI_JNDI_REGISTRATION ="juddi.jndi.registration";
- public final static String JUDDI_RMI_PORT ="juddi.rmi.port";
- public final static String JUDDI_RMI_REGISTRATION ="juddi.rmi.registration";
- public final static String JUDDI_RMI_REGISTRY_PORT ="juddi.rmi.registry.port";
- public final static String JUDDI_SUBSCRIPTION_NOTIFICATION ="juddi.subscription.notification";
- public final static String JUDDI_EMAIL_HOST ="juddi.email.host";
- public final static String JUDDI_EMAIL_PORT ="juddi.email.port";
- public final static String JUDDI_EMAIL_AUTH ="juddi.email.auth";
- public final static String JUDDI_EMAIL_USER ="juddi.email.user";
- public final static String JUDDI_EMAIL_PASSWORD ="juddi.email.password";
- public final static String JUDDI_EMAIL_TRANSPORT ="juddi.email.transport";
- public final static String JUDDI_EMAIL_FROM ="juddi.email.from";
-
- public final static String DEFAULT_CRYPTOR ="org.apache.juddi.cryptor.DefaultCryptor";
- public final static String DEFAULT_USERSFILE ="juddi-users.properties";
- public final static String DEFAULT_XML_USERSFILE ="juddi-users.xml";
- public final static String DEFAULT_ENCRYPTED_XML_USERSFILE ="juddi-users-encrypted.xml";
- public final static String DEFAULT_SECURITY_DOMAIN ="java:/jaas/other";
- public final static boolean DEFAULT_LOAD_INSTALL_DATA =true;
- public final static String DEFAULT_BASE_URL ="http://localhost:8080/juddiv3";
-
- /* Allowing the the user to override jpa persistence properties in the juddi.properties file */
- public final static String PERSISTENCE_PROVIDER ="persistenceProvider";
- public final static String DATASOURCE ="hibernate.connection.datasource";
- public final static String HBM_DDL_AUTO ="hibernate.hbm2ddl.auto";
- public final static String DEFAULT_SCHEMA ="hibernate.default_schema";
- public final static String HIBERNATE_DIALECT ="hibernate.dialect";
+public interface Property {
+
+ public final static String JUDDI_ROOT_PUBLISHER = "juddi.root.publisher";
+ public final static String JUDDI_LOAD_INSTALL_DATA = "juddi.load.install.data";
+ public final static String JUDDI_PERSISTENCEUNIT_NAME = "juddi.persistenceunit.name";
+ public final static String JUDDI_AUTHENTICATOR = "juddi.authenticator";
+ public final static String JUDDI_AUTHENTICATOR_URL = "juddi.authenticator.url";
+ public final static String JUDDI_CONFIGURATION_RELOAD_DELAY = "juddi.configuration.reload.delay";
+ public final static String JUDDI_LOCALE = "juddi.locale";
+ public final static String JUDDI_OPERATOR_EMAIL_ADDRESS = "juddi.operatorEmailAddress";
+ public final static String JUDDI_MAX_LENGTH = "juddi.maxNameLength";
+ public final static String JUDDI_MAX_NAME_ELEMENTS = "juddi.maxNameElementsAllowed";
+ public final static String JUDDI_MAX_BUSINESSES_PER_PUBLISHER = "juddi.maxBusinessesPerPublisher";
+ public final static String JUDDI_MAX_SERVICES_PER_BUSINESS = "juddi.maxServicesPerBusiness";
+ public final static String JUDDI_MAX_BINDINGS_PER_SERVICE = "juddi.maxBindingsPerService";
+ public final static String JUDDI_MAX_TMODELS_PER_PUBLISHER = "juddi.maxTModelsPerPublisher";
+ public final static String JUDDI_CRYPTOR = "juddi.cryptor";
+ public final static String JUDDI_KEYGENERATOR = "juddi.keygenerator";
+ public final static String JUDDI_SECURITY_DOMAIN = "juddi.securityDomain";
+ public final static String JUDDI_USERSFILE = "juddi.usersfile";
+ public final static String JUDDI_MAX_ROWS = "juddi.maxRows";
+ public final static String JUDDI_MAX_IN_CLAUSE = "juddi.maxInClause";
+ public final static String JUDDI_ROOT_PARTITION = "juddi.rootPartition";
+ public final static String JUDDI_NODE_ID = "juddi.nodeId";
+ public final static String JUDDI_TRANSFER_EXPIRATION_DAYS = "juddi.transfer.expiration.days";
+ public final static String JUDDI_AUTHENTICATE_INQUIRY = "juddi.authenticate.Inquiry";
+ public final static String JUDDI_AUTH_TOKEN_EXPIRATION = "juddi.auth.token.Expiration";
+ public final static String JUDDI_AUTH_TOKEN_TIMEOUT = "juddi.auth.token.Timeout";
+ public final static String JUDDI_ENFORCE_REFERENTIAL_INTEGRITY = "juddi.validation.enforceReferentialIntegrity";
+ public final static String JUDDI_SUBSCRIPTION_EXPIRATION_DAYS = "juddi.subscription.expiration.days";
+ public final static String JUDDI_NOTIFICATION_START_BUFFER = "juddi.notification.start.buffer";
+ public final static String JUDDI_NOTIFICATION_INTERVAL = "juddi.notification.interval";
+ public final static String JUDDI_NOTIFICATION_ACCEPTABLE_LAGTIME = "juddi.notification.acceptable.lagtime";
+ public final static String JUDDI_NOTIFICATION_MAX_TRIES = "juddi.notification.max.tries";
+ public final static String JUDDI_NOTIFICATION_LIST_RESET_INTERVAL = "juddi.notification.list.reset.interval";
+ public final static String JUDDI_SUBSCRIPTION_CHUNKEXPIRATION_MINUTES = "juddi.subscription.chunkexpiration.minutes";
+ public final static String JUDDI_JNDI_REGISTRATION = "juddi.jndi.registration";
+ public final static String JUDDI_RMI_PORT = "juddi.rmi.port";
+ public final static String JUDDI_RMI_REGISTRATION = "juddi.rmi.registration";
+ public final static String JUDDI_RMI_REGISTRY_PORT = "juddi.rmi.registry.port";
+ public final static String JUDDI_SUBSCRIPTION_NOTIFICATION = "juddi.subscription.notification";
+ public final static String JUDDI_EMAIL_HOST = "juddi.email.host";
+ public final static String JUDDI_EMAIL_PORT = "juddi.email.port";
+ public final static String JUDDI_EMAIL_AUTH = "juddi.email.auth";
+ public final static String JUDDI_EMAIL_USER = "juddi.email.user";
+ public final static String JUDDI_EMAIL_PASSWORD = "juddi.email.password";
+ public final static String JUDDI_EMAIL_TRANSPORT = "juddi.email.transport";
+ public final static String JUDDI_EMAIL_FROM = "juddi.email.from";
+ public final static String DEFAULT_CRYPTOR = "org.apache.juddi.cryptor.DefaultCryptor";
+ public final static String DEFAULT_USERSFILE = "juddi-users.properties";
+ public final static String DEFAULT_XML_USERSFILE = "juddi-users.xml";
+ public final static String DEFAULT_ENCRYPTED_XML_USERSFILE = "juddi-users-encrypted.xml";
+ public final static String DEFAULT_SECURITY_DOMAIN = "java:/jaas/other";
+ public final static boolean DEFAULT_LOAD_INSTALL_DATA = true;
+ public final static String DEFAULT_BASE_URL = "http://localhost:8080/juddiv3";
+ /* Allowing the the user to override jpa persistence properties in the juddi.properties file */
+ public final static String PERSISTENCE_PROVIDER = "persistenceProvider";
+ public final static String DATASOURCE = "hibernate.connection.datasource";
+ public final static String HBM_DDL_AUTO = "hibernate.hbm2ddl.auto";
+ public final static String DEFAULT_SCHEMA = "hibernate.default_schema";
+ public final static String HIBERNATE_DIALECT = "hibernate.dialect";
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Mon Mar 25 02:37:00 2013
@@ -17,7 +17,6 @@
package org.apache.juddi.mapping;
-import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -60,8 +59,6 @@ import org.w3._2000._09.xmldsig_.X509Dat
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
import org.w3c.dom.ls.DOMImplementationLS;
import org.w3c.dom.ls.LSException;
import org.w3c.dom.ls.LSSerializer;
@@ -500,7 +497,7 @@ public class MappingApiToModel {
modelBindingTemplate.setBusinessService(modelBusinessService);
modelBindingTemplate.setEntityKey(apiBindingTemplate.getBindingKey());
- if (apiBindingTemplate.getAccessPoint()!=null)
+ if (apiBindingTemplate.getAccessPoint()!=null)
{
modelBindingTemplate.setAccessPointType(apiBindingTemplate.getAccessPoint().getUseType());
modelBindingTemplate.setAccessPointUrl(apiBindingTemplate.getAccessPoint().getValue());
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLine.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLine.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLine.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLine.java Mon Mar 25 02:37:00 2013
@@ -81,7 +81,7 @@ public class AddressLine implements java
this.line = line;
}
- @Column(name = "key_name")
+ @Column(name = "key_name", length=255)
public String getKeyName() {
return this.keyName;
}
@@ -89,7 +89,7 @@ public class AddressLine implements java
this.keyName = keyName;
}
- @Column(name = "key_value")
+ @Column(name = "key_value", length=255)
public String getKeyValue() {
return this.keyValue;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/AuthToken.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/AuthToken.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/AuthToken.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/AuthToken.java Mon Mar 25 02:37:00 2013
@@ -16,14 +16,12 @@ package org.apache.juddi.model;
*/
import java.util.Date;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
*/
@@ -38,6 +36,7 @@ public class AuthToken implements java.i
private Date lastUsed;
private int numberOfUses;
private int tokenState;
+
public AuthToken() {
}
@@ -78,7 +77,7 @@ public class AuthToken implements java.i
public void setCreated(Date created) {
this.created = created;
}
-
+
@Temporal(TemporalType.TIMESTAMP)
@Column(name = "last_used", nullable = false, length = 29)
public Date getLastUsed() {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryBag.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryBag.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryBag.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryBag.java Mon Mar 25 02:37:00 2013
@@ -28,25 +28,25 @@ import javax.persistence.Table;
@Table(name = "j3_binding_category_bag")
public class BindingCategoryBag extends CategoryBag {
- private static final long serialVersionUID = 328415084782176174L;
- private BindingTemplate bindingTemplate;
+ private static final long serialVersionUID = 328415084782176174L;
+ private BindingTemplate bindingTemplate;
- public BindingCategoryBag() {
- super();
- }
-
- public BindingCategoryBag(BindingTemplate bindingTemplate) {
- super();
- this.bindingTemplate = bindingTemplate;
- }
-
- @OneToOne(optional=false, fetch = FetchType.LAZY)
+ public BindingCategoryBag() {
+ super();
+ }
+
+ public BindingCategoryBag(BindingTemplate bindingTemplate) {
+ super();
+ this.bindingTemplate = bindingTemplate;
+ }
+
+ @OneToOne(optional = false, fetch = FetchType.LAZY)
@JoinColumn(name = "entity_key")
- public BindingTemplate getBindingTemplate() {
- return bindingTemplate;
- }
+ public BindingTemplate getBindingTemplate() {
+ return bindingTemplate;
+ }
- public void setBindingTemplate(BindingTemplate bindingTemplate) {
- this.bindingTemplate = bindingTemplate;
- }
+ public void setBindingTemplate(BindingTemplate bindingTemplate) {
+ this.bindingTemplate = bindingTemplate;
+ }
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescr.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescr.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescr.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescr.java Mon Mar 25 02:37:00 2013
@@ -72,7 +72,7 @@ public class BindingDescr implements jav
this.bindingTemplate = bindingTemplate;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
@@ -80,12 +80,12 @@ public class BindingDescr implements jav
this.langCode = langCode;
}
- @Column(name = "descr", nullable = false, length = 1024)
+ @Column(name = "descr", nullable = false, length = 255)
public String getDescr() {
return this.descr;
}
public void setDescr(String descr) {
- this.descr = descr;
+ this.descr = descr;
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java Mon Mar 25 02:37:00 2013
@@ -18,7 +18,6 @@ package org.apache.juddi.model;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -90,7 +89,7 @@ public class BindingTemplate extends Udd
this.accessPointType = accessPointType;
}
- @Column(name = "access_point_url", length = 4000)
+ @Column(name = "access_point_url", length = 4096)
public String getAccessPointUrl() {
return this.accessPointUrl;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescr.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescr.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescr.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescr.java Mon Mar 25 02:37:00 2013
@@ -72,7 +72,7 @@ public class BusinessDescr implements ja
this.businessEntity = businessEntity;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
@@ -80,7 +80,7 @@ public class BusinessDescr implements ja
this.langCode = langCode;
}
- @Column(name = "descr", nullable = false, length = 1024)
+ @Column(name = "descr", nullable = false, length = 255)
public String getDescr() {
return this.descr;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessName.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessName.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessName.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessName.java Mon Mar 25 02:37:00 2013
@@ -72,7 +72,7 @@ public class BusinessName implements jav
this.businessEntity = businessEntity;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
@@ -80,7 +80,7 @@ public class BusinessName implements jav
this.langCode = langCode;
}
- @Column(name = "name", nullable = false)
+ @Column(name = "name", nullable = false, length=255)
public String getName() {
return this.name;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescr.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescr.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescr.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescr.java Mon Mar 25 02:37:00 2013
@@ -71,7 +71,7 @@ public class ContactDescr implements jav
this.contact = contact;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
@@ -79,7 +79,7 @@ public class ContactDescr implements jav
this.langCode = langCode;
}
- @Column(name = "descr", nullable = false, length = 1024)
+ @Column(name = "descr", nullable = false, length = 255)
public String getDescr() {
return this.descr;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java Mon Mar 25 02:37:00 2013
@@ -67,7 +67,7 @@ public class DiscoveryUrl implements jav
this.businessEntity = businessEntity;
}
- @Column(name = "use_type", nullable = false)
+ @Column(name = "use_type", nullable = false, length=255)
public String getUseType() {
return this.useType;
}
@@ -75,7 +75,7 @@ public class DiscoveryUrl implements jav
this.useType = useType;
}
- @Column(name = "url", nullable = false)
+ @Column(name = "url", nullable = false, length=4096)
public String getUrl() {
return this.url;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Email.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Email.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Email.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Email.java Mon Mar 25 02:37:00 2013
@@ -71,7 +71,7 @@ public class Email implements java.io.Se
this.contact = contact;
}
- @Column(name = "use_type")
+ @Column(name = "use_type", length=255)
public String getUseType() {
return this.useType;
}
@@ -79,7 +79,7 @@ public class Email implements java.io.Se
this.useType = useType;
}
- @Column(name = "email_address", nullable = false)
+ @Column(name = "email_address", nullable = false, length=4096)
public String getEmailAddress() {
return this.emailAddress;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescr.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescr.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescr.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescr.java Mon Mar 25 02:37:00 2013
@@ -71,7 +71,7 @@ public class InstanceDetailsDescr implem
this.tmodelInstanceInfo = tmodelInstanceInfo;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
@@ -79,7 +79,7 @@ public class InstanceDetailsDescr implem
this.langCode = langCode;
}
- @Column(name = "descr", nullable = false, length = 1024)
+ @Column(name = "descr", nullable = false, length = 255)
public String getDescr() {
return this.descr;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescr.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescr.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescr.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescr.java Mon Mar 25 02:37:00 2013
@@ -75,7 +75,7 @@ public class InstanceDetailsDocDescr imp
this.tmodelInstanceInfo = tmodelInstanceInfo;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
@@ -83,7 +83,7 @@ public class InstanceDetailsDocDescr imp
this.langCode = langCode;
}
- @Column(name = "descr", nullable = false, length = 1024)
+ @Column(name = "descr", nullable = false, length = 255)
public String getDescr() {
return this.descr;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java Mon Mar 25 02:37:00 2013
@@ -99,7 +99,7 @@ public class KeyedReference implements j
this.tmodelKeyRef = tmodelKeyRef;
}
- @Column(name = "key_name")
+ @Column(name = "key_name", length = 255)
public String getKeyName() {
return this.keyName;
}
@@ -107,7 +107,7 @@ public class KeyedReference implements j
this.keyName = keyName;
}
- @Column(name = "key_value", nullable = false)
+ @Column(name = "key_value", nullable = false, length = 255)
public String getKeyValue() {
return this.keyValue;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDocDescr.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDocDescr.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDocDescr.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDocDescr.java Mon Mar 25 02:37:00 2013
@@ -73,7 +73,7 @@ public class OverviewDocDescr implements
this.overviewDoc = overviewDoc;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/PersonName.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/PersonName.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/PersonName.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/PersonName.java Mon Mar 25 02:37:00 2013
@@ -70,7 +70,7 @@ public class PersonName implements java.
this.contact = contact;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescr.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescr.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescr.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescr.java Mon Mar 25 02:37:00 2013
@@ -70,7 +70,7 @@ public class ServiceDescr implements jav
this.businessService = businessService;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceName.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceName.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceName.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceName.java Mon Mar 25 02:37:00 2013
@@ -71,7 +71,7 @@ public class ServiceName implements java
this.businessService = businessService;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java Mon Mar 25 02:37:00 2013
@@ -73,7 +73,7 @@ public class Tmodel extends UddiEntity i
this.categoryBag = categoryBag;
}
- @Column(name = "name", nullable = false)
+ @Column(name = "name", nullable = false, length = 255)
public String getName() {
return this.name;
}
@@ -81,7 +81,7 @@ public class Tmodel extends UddiEntity i
this.name = name;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescr.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescr.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescr.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescr.java Mon Mar 25 02:37:00 2013
@@ -71,7 +71,7 @@ public class TmodelDescr implements java
this.tmodel = tmodel;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
@@ -79,7 +79,7 @@ public class TmodelDescr implements java
this.langCode = langCode;
}
- @Column(name = "descr", nullable = false, length = 1024)
+ @Column(name = "descr", nullable = false, length = 255)
public String getDescr() {
return this.descr;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifier.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifier.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifier.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifier.java Mon Mar 25 02:37:00 2013
@@ -75,7 +75,7 @@ public class TmodelIdentifier implements
this.tmodel = tmodel;
}
- @Column(name = "tmodel_key_ref")
+ @Column(name = "tmodel_key_ref", length = 255)
public String getTmodelKeyRef() {
return this.tmodelKeyRef;
}
@@ -83,7 +83,7 @@ public class TmodelIdentifier implements
this.tmodelKeyRef = tmodelKeyRef;
}
- @Column(name = "key_name")
+ @Column(name = "key_name", length = 255)
public String getKeyName() {
return this.keyName;
}
@@ -91,7 +91,7 @@ public class TmodelIdentifier implements
this.keyName = keyName;
}
- @Column(name = "key_value", nullable = false)
+ @Column(name = "key_value", nullable = false, length = 255)
public String getKeyValue() {
return this.keyValue;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java Mon Mar 25 02:37:00 2013
@@ -95,7 +95,7 @@ public class TmodelInstanceInfo implemen
this.tmodelKey = tmodelKey;
}
- @Column(name = "instance_parms", length = 512)
+ @Column(name = "instance_parms", length = 8192)
public String getInstanceParms() {
return this.instanceParms;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescr.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescr.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescr.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescr.java Mon Mar 25 02:37:00 2013
@@ -70,7 +70,7 @@ public class TmodelInstanceInfoDescr imp
this.tmodelInstanceInfo = tmodelInstanceInfo;
}
- @Column(name = "lang_code", length = 5)
+ @Column(name = "lang_code", length = 26)
public String getLangCode() {
return this.langCode;
}
@@ -78,7 +78,7 @@ public class TmodelInstanceInfoDescr imp
this.langCode = langCode;
}
- @Column(name = "descr", nullable = false, length = 1024)
+ @Column(name = "descr", nullable = false, length = 255)
public String getDescr() {
return this.descr;
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java Mon Mar 25 02:37:00 2013
@@ -315,6 +315,7 @@ public class ValidateInquiry extends Val
for (Name n : names) {
if (n.getValue() == null || n.getValue().length() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.names.NoValue"));
+ ValidatePublish.validateLang(n.getLang());
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org