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 [5/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...
Modified: juddi/trunk/juddi-core/src/main/resources/messages.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/messages.properties?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/resources/messages.properties (original)
+++ juddi/trunk/juddi-core/src/main/resources/messages.properties Mon Mar 25 02:37:00 2013
@@ -66,7 +66,7 @@ errors.Unsupported.findQualifier=Invalid
errors.configuration.Retrieval=An error occurred attempting to retrieve configuration information
errors.install.AlreadyInstalled=It appears that the application is already installed. Please un-install before proceeding.
errors.NullInput=No input was provided for this API call
-errors.keyunavailable.BadPartition=The proposed key is not within the partition defined by owning publisher
+errors.keyunavailable.BadPartition=The proposed key is not within the partition defined by owning publisher. If you're tring to create a new tModel in a new partition, try creating a tModel that ends in :keyGenerator
errors.keyunavailable.KeyExists=The key used for the save operation already exists. Another key must be chosen
errors.invalidkey.NullKey=The key cannot be null
errors.invalidkey.MalformedKey=The passed key does not conform to UDDI v3 rules
@@ -93,7 +93,9 @@ errors.invalidkey.NodeNotFound=The node
errors.invalidprojection.ParentMismatch=The supplied business key doesn't match the actual business key of the service being projected
errors.usermismatch.InvalidOwner=The user is not authorized to access the given entity
errors.usermismatch.InvalidOwnerParent=The user is not authorized to access the given parent entity
-
+errors.config.InvalidTokenExpirationSetting=The authentication token expiration setting is missing or invalid, will default to 15 minutes. See juddiv3.properties file
+errors.accessPoint.bindingtemplateRedirect.keynotexist=The access point contains a useType specifying a referenced binding template which does not exist.
+errors.accessPoint.hostingRedirector.notaurl=The access point value is not a valid URL. This URL should be a URL to another UDDI registry
#-- Error messages related to entities and other data structures
errors.savebusiness.NoInput=At least one BusinessEntity must be provided
errors.saveservice.NoInput=At least one BusinessService must be provided
@@ -106,11 +108,11 @@ errors.addpublisherassertions.NoInput=At
errors.businessentity.NullInput=The businessEntity structure cannot be blank
errors.businessservice.NullInput=The businessService structure cannot be blank
errors.bindingtemplate.NullInput=The bindingTemplate structure cannot be blank
-errors.bindingtemplate.NoAccessPoint=A binding template must contain an access point
+errors.bindingtemplate.NoAccessPoint=A binding template must contain either an access point or a hosting redirector element, but not both
errors.tmodel.NullInput=The tModel structure cannot be blank
errors.tmodel.NoName=A tModel must contain a name
-errors.tmodel.keygenerator.BadCategory=A Key Generator tModel must have exactly one 'types' category whose value is 'keyGenerator'
-errors.tmodel.keygenerator.RootKeyGen=A Key Generator cannot be added for the root publisher
+errors.tmodel.keygenerator.BadCategory=A Key Generator tModel must have exactly one 'types' category (categoryBag/keyedReference/value) whose value is 'keyGenerator'
+errors.tmodel.keygenerator.RootKeyGen=A Key Generator cannot be added for the root publisher. Try signing in as a different user
errors.pubassertion.NullInput=The publisherAssertion structure cannot be blank
errors.pubassertion.BlankKeyedRef=The keyedReference of the publisherAssertion cannot be blank. All fields must contain content.
errors.pubassertion.BlankFromKey=The fromKey of the publisherAssertion cannot be blank.
@@ -122,7 +124,30 @@ errors.pubassertion.AssertionNotFound=Th
errors.businessservices.NoInput=A businessServices collection must contain at least one businessService
errors.bindingtemplates.NoInput=A bindingTemplates collection must contain at least one bindingTemplate
errors.names.NoInput=At least one name is required
+errors.names.TooLong=At least one name is required
errors.names.NoValue=A name was provided with no value
+errors.names.LangTooLong=A name language was provided that is too long, only 26 characters are permitted.
+errors.names.UseTypeTooLong=The field 'useType' must be less than 256 characters
+errors.DescriptionTooLong=The field 'useType' must be less than 256 characters
+errors.keys.TooLong=Key lengths are limited to 255 characters or less
+errors.url.overviewTooLong=Overview URLs are limited to 4096 characters
+errors.accessPoint.TooLong=Access points are limited to 4096 characters
+errors.sortCode.TooLong=Sort codes are limited to 10 characters
+errors.keyname.TooLong=Key Names are limited to 255 characters
+errors.phone.noinput=No input provided for phone value
+errors.phone.TooLong=Phone numbers are limited to 50 characters
+errors.email.TooLong=Email addresses are limited to 4096 characters
+errors.email.noinput=No input provided for email
+errors.hostingredirector.noinput=No input provided for hosting redirector
+errors.hostingredirector.TooLong=The input provided for hosting redirector is too long, only 255 characters are allowed
+errors.addressline.noinput=No input provided for address lines
+errors.addressline.TooLong=Address lines are limited to 80 characters
+errors.hostingredirector.keynotexist=When specifying a hosting redirector field, the referenced binding template must exist already
+errors.keyvalue.TooLong=Key values are limited to 255 characters
+errors.tmodel.ReferencedKeyDoesNotExist=The referenced tModel key does not exist. This can be caused when specifying a tModel key that is not defined and when jUDDI's referential integrity validation is enabled.
+errors.tmodel.ReferentialIntegrityNullConfig=Configuration object is null, I won't be able to process referential integrity checks on tmodel keys
+errors.tmodel.ReferentialIntegrityNullEM=The entity manager is null, I won't be able to process referential integrity checks on tmodel keys
+
errors.contacts.NoInput=At least one contact is required
errors.contact.NullInput=The contact structure cannot be blank
errors.contact.NoPersonName=The contact structure must contain at least one personName
@@ -140,10 +165,10 @@ errors.tmodelinstinfo.NoTModelKey=The tM
errors.instdetails.NoOverviewOrParms=The instanceDetails structure must contain either an overviewDoc or instanceParms
errors.overviewdoc.NullInput=The overviewDoc structure cannot be blank
errors.overviewdoc.NoDescOrUrl=The overviewDoc structure must contain either a description or overviewURL
-errors.findqualifiers.NoInput=The findQualifier collection must contain at least one findQualifier
+errors.findqualifiers.NoInput=The findQualifier collection must contain at least one findQualifier. Try 'approximateMatch'
errors.findqualifiers.DuplicateValue=A duplicate findQualifier was passed. No duplicates are allowed
errors.findqualifiers.InvalidCombo=An invalid findQualifier combination occurred
-errors.findbusiness.NoInput=At least one search criterion must be supplied
+errors.findbusiness.NoInput=At least one search criterion must be supplied. Try using '%' as a wild card with the a 'approximateMatch' find qualifer for everything
errors.findservice.NoInput=At least one name, categoryBag, find_tModel or tModelBag or name must be supplied
errors.findbinding.NoInput=At least one categoryBag, find_tModel or tModelBag must be supplied
errors.findtmodel.NoInput=At least one categoryBag, identifierBag or name must be supplied
@@ -197,6 +222,7 @@ errors.node.NoNameA valid node name was
#-- Authentication error messages
errors.auth.AuthRequired=Authentication is required for this API call
errors.auth.AuthInvalid=Invalid authentication information
+errors.auth.AuthTokenExpired=The authentication token is expired
errors.auth.InvalidUserId=An invalid user identification was passed
errors.auth.InvalidCredentials=Invalid credentials were passed
errors.auth.NoPublisher=The user provided does not have a publishing account
@@ -216,6 +242,5 @@ errors.local.responseobject.unknown=The
errors.local.registryunavailable=The registry is currently unavailable
errors.local.operation.notidentified=The UDDI service operation could not be identified
errors.local.inquiry.notsupported=The operation is not supported by the UDDI version 3 Inquiry API
-errors.local.publish.notsupported=The operation is not supported by the UDDI ver
-sion 3 Publish API
+errors.local.publish.notsupported=The operation is not supported by the UDDI version 3 Publish API
errors.local.security.notsupported=The operation is not supported by the UDDI version 3 Security API
Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3.properties?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3.properties (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3.properties Mon Mar 25 02:37:00 2013
@@ -78,5 +78,14 @@ 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-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java (original)
+++ juddi/trunk/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java Mon Mar 25 02:37:00 2013
@@ -19,6 +19,7 @@ package org.apache.juddi.example.browse;
import java.util.List;
import java.util.Properties;
+import org.apache.juddi.api_v3.AccessPointType;
import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
@@ -235,13 +236,32 @@ public class SimpleBrowse {
//An access point could be a URL, a reference to another UDDI binding key, a hosting redirector (which is
//esscentially a pointer to another UDDI registry) or a WSDL Deployment
//From an end client's perspective, all you really want is the endpoint.
-
+ //http://uddi.org/pubs/uddi_v3.htm#_Ref8977716
//So if you have a wsdlDeployment useType, fetch the wsdl and parse for the invocation URL
//If its hosting director, you'll have to fetch that data from uddi recursively until the leaf node is found
//Consult the UDDI specification for more information
if (bindingTemplates.getBindingTemplate().get(i).getAccessPoint() != null) {
System.out.println("Access Point: " + bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getValue() + " type " + bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getUseType());
+ if (bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getUseType()!=null)
+ {
+ if (bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getUseType().equalsIgnoreCase(AccessPointType.END_POINT.toString()))
+ {
+ System.out.println("Use this access point value as an invocation endpoint.");
+ }
+ if (bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getUseType().equalsIgnoreCase(AccessPointType.BINDING_TEMPLATE.toString()))
+ {
+ System.out.println("Use this access point value as a reference to another binding template.");
+ }
+ if (bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getUseType().equalsIgnoreCase(AccessPointType.WSDL_DEPLOYMENT.toString()))
+ {
+ System.out.println("Use this access point value as a URL to a WSDL document, which presumably will have a real access point defined.");
+ }
+ if (bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getUseType().equalsIgnoreCase(AccessPointType.HOSTING_REDIRECTOR.toString()))
+ {
+ System.out.println("Use this access point value as an Inquiry URL of another UDDI registry, look up the same binding template there (usage varies).");
+ }
+ }
}
}
@@ -311,7 +331,7 @@ public class SimpleBrowse {
System.out.println("Business Key: " + businessInfos.getBusinessInfo().get(i).getBusinessKey());
System.out.println("Name: " + ListToString(businessInfos.getBusinessInfo().get(i).getName()));
- System.out.println("Name: " + ListToDescString(businessInfos.getBusinessInfo().get(i).getDescription()));
+ System.out.println("Description: " + ListToDescString(businessInfos.getBusinessInfo().get(i).getDescription()));
System.out.println("Services:");
PrintServiceInfo(businessInfos.getBusinessInfo().get(i).getServiceInfos());
}
Modified: juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.properties?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.properties (original)
+++ juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.properties Mon Mar 25 02:37:00 2013
@@ -88,4 +88,17 @@ juddi.server.port=8080
# 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
+# Duration of time for tokens to expire
+juddi.auth.token.Timeout=15
+
+# As of 3.1.5
+# This setting will force referential integrity for all tModels (except keyGenerators),
+# category bags, bindingTemplate/AccessPoint/hostingRedirector (referencing another host),
+# tModelinstanceparms and anything else that references a KeyName
+# default value is true.
+# set to false for backword compatability or for a more lax registry
+juddi.validation.enforceReferentialIntegrity=false
\ No newline at end of file
Modified: juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties Mon Mar 25 02:37:00 2013
@@ -43,10 +43,10 @@ juddi.maxInClause=1000
# per publisher. A value of '-1' indicates any
# number of artifacts is valid (These values can be
# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
+juddi.maxBusinessesPerPublisher=1001
+juddi.maxServicesPerBusiness=1001
+juddi.maxBindingsPerService=101
+juddi.maxTModelsPerPublisher=1001
#
# Days before a transfer request expires
juddi.transfer.expiration.days=3
@@ -87,4 +87,17 @@ juddi.rmi.port=0
# 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
+# Duration of time for tokens to expire
+juddi.auth.token.Timeout=15
+
+# As of 3.1.5
+# This setting will force referential integrity for all tModels (except keyGenerators),
+# category bags, bindingTemplate/AccessPoint/hostingRedirector (referencing another host),
+# tModelinstanceparms and anything else that references a KeyName
+# default value is true.
+# set to false for backword compatability or for a more lax registry
+juddi.validation.enforceReferentialIntegrity=false
\ No newline at end of file
Modified: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml?rev=1460511&r1=1460510&r2=1460511&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml (original)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml Mon Mar 25 02:37:00 2013
@@ -40,10 +40,10 @@
<phone useType="mobile">987-654-3210</phone>
<email useType="work">jdoe@businessone.com</email>
<address xml:lang="en" useType="headquarters" sortCode="1" tModelKey="uddi:tmodelKey:address">
- <addressLine keyName="suite" keyValue="suite">Suite 1500</addressLine>
- <addressLine keyName="street" keyValue="street">1515 Main St.</addressLine>
- <addressLine keyName="citystatezip" keyValue="citystatezip">Chicago, IL 60614</addressLine>
- <addressLine keyName="country" keyValue="country">USA</addressLine>
+ <addressLine keyName="" keyValue="suite">Suite 1500</addressLine>
+ <addressLine keyName="" keyValue="street">1515 Main St.</addressLine>
+ <addressLine keyName="" keyValue="citystatezip">Chicago, IL 60614</addressLine>
+ <addressLine keyName="" keyValue="country">USA</addressLine>
</address>
</contact>
<contact useType="engineer">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org