You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by sv...@apache.org on 2006/06/28 22:09:56 UTC
svn commit: r417863 - in /webservices/juddi/trunk:
src/java/org/apache/juddi/datastore/jdbc/
src/java/org/apache/juddi/datatype/publisher/
src/java/org/apache/juddi/handler/ src/java/org/apache/juddi/registry/
src/java/org/apache/juddi/util/ webapp/WEB...
Author: sviens
Date: Wed Jun 28 13:09:55 2006
New Revision: 417863
URL: http://svn.apache.org/viewvc?rev=417863&view=rev
Log:
Implemented support for determining the number of allowable businesses, services, bindings and tmodels allowed for a publisher. Enforsement of these maximum values within the UDDI functions has not yet been implemented however.
Modified:
webservices/juddi/trunk/src/java/org/apache/juddi/datastore/jdbc/PublisherTable.java
webservices/juddi/trunk/src/java/org/apache/juddi/datatype/publisher/Publisher.java
webservices/juddi/trunk/src/java/org/apache/juddi/handler/PublisherHandler.java
webservices/juddi/trunk/src/java/org/apache/juddi/registry/RegistryEngine.java
webservices/juddi/trunk/src/java/org/apache/juddi/util/Config.java
webservices/juddi/trunk/webapp/WEB-INF/juddi.properties
Modified: webservices/juddi/trunk/src/java/org/apache/juddi/datastore/jdbc/PublisherTable.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/src/java/org/apache/juddi/datastore/jdbc/PublisherTable.java?rev=417863&r1=417862&r2=417863&view=diff
==============================================================================
--- webservices/juddi/trunk/src/java/org/apache/juddi/datastore/jdbc/PublisherTable.java (original)
+++ webservices/juddi/trunk/src/java/org/apache/juddi/datastore/jdbc/PublisherTable.java Wed Jun 28 13:09:55 2006
@@ -52,8 +52,8 @@
sql.append("IS_ADMIN, ");
sql.append("IS_ENABLED), ");
sql.append("MAX_BUSINESSES), ");
- sql.append("MAX_SERVICES), ");
- sql.append("MAX_BINDINGS), ");
+ sql.append("MAX_SERVICES_PER_BUSINESS), ");
+ sql.append("MAX_BINDINGS_PER_SERVICE), ");
sql.append("MAX_TMODELS) ");
sql.append("VALUES (?,?,?,?,?,?,?,?,?)");
insertSQL = sql.toString();
@@ -66,8 +66,8 @@
sql.append("IS_ADMIN,");
sql.append("IS_ENABLED,");
sql.append("MAX_BUSINESSES,");
- sql.append("MAX_SERVICES,");
- sql.append("MAX_BINDINGS,");
+ sql.append("MAX_SERVICES_PER_BUSINESS,");
+ sql.append("MAX_BINDINGS_PER_SERVICE,");
sql.append("MAX_TMODELS ");
sql.append("FROM PUBLISHER ");
sql.append("WHERE PUBLISHER_ID=?");
@@ -87,8 +87,8 @@
sql.append("IS_ADMIN=?,");
sql.append("IS_ENABLED=?,");
sql.append("MAX_BUSINESSES=?,");
- sql.append("MAX_SERVICES=?,");
- sql.append("MAX_BINDINGS=?,");
+ sql.append("MAX_SERVICES_PER_BUSINESS=?,");
+ sql.append("MAX_BINDINGS_PER_SERVICE=?,");
sql.append("MAX_TMODELS=? ");
sql.append("WHERE PUBLISHER_ID=?");
updateSQL = sql.toString();
@@ -118,8 +118,8 @@
statement.setString(4,String.valueOf(publisher.isAdmin()));
statement.setString(5,String.valueOf(publisher.isEnabled()));
statement.setInt(6,publisher.getMaxBusinesses());
- statement.setInt(7,publisher.getMaxServices());
- statement.setInt(8,publisher.getMaxBindings());
+ statement.setInt(7,publisher.getMaxServicesPerBusiness());
+ statement.setInt(8,publisher.getMaxBindingsPerService());
statement.setInt(9,publisher.getMaxTModels());
log.debug("insert into PUBLISHER table:\n\n\t" + insertSQL +
@@ -129,8 +129,8 @@
"\n\t IS_ADMIN=" + publisher.isAdmin() +
"\n\t IS_ENABLED=" + publisher.isEnabled() +
"\n\t MAX_BUSINESSES=" + publisher.getMaxBusinesses() +
- "\n\t MAX_SERVICES=" + publisher.getMaxServices() +
- "\n\t MAX_BINDINGS=" + publisher.getMaxBindings() +
+ "\n\t MAX_SERVICES_PER_BUSINESS=" + publisher.getMaxServicesPerBusiness() +
+ "\n\t MAX_BINDINGS_PER_SERVICE=" + publisher.getMaxBindingsPerService() +
"\n\t MAX_TMODELS=" + publisher.getMaxTModels() + "\n");
// insert
@@ -184,8 +184,8 @@
publisher.setAdminValue(resultSet.getString(3));//("IS_ADMIN"));
publisher.setEnabledValue(resultSet.getString(4));//("IS_ENABLED"));
publisher.setMaxBusinesses(resultSet.getInt(5));//("MAX_BUSINESSES"));
- publisher.setMaxServices(resultSet.getInt(6));//("MAX_SERVICES"));
- publisher.setMaxBindings(resultSet.getInt(7));//("MAX_BINDINGS"));
+ publisher.setMaxServicesPerBusiness(resultSet.getInt(6));//("MAX_SERVICES_PER_BUSINESS"));
+ publisher.setMaxBindingsPerService(resultSet.getInt(7));//("MAX_BINDINGS_PER_SERVICE"));
publisher.setMaxTModels(resultSet.getInt(8));//("MAX_TMODELS"));
}
@@ -259,8 +259,8 @@
statement.setString(3,String.valueOf(publisher.isAdmin()));
statement.setString(4,String.valueOf(publisher.isEnabled()));
statement.setInt(5,publisher.getMaxBusinesses());
- statement.setInt(6,publisher.getMaxServices());
- statement.setInt(7,publisher.getMaxBindings());
+ statement.setInt(6,publisher.getMaxServicesPerBusiness());
+ statement.setInt(7,publisher.getMaxBindingsPerService());
statement.setInt(8,publisher.getMaxTModels());
statement.setString(9,publisher.getPublisherID());
@@ -270,8 +270,8 @@
"\n\t IS_ADMIN=" + publisher.isAdmin() +
"\n\t IS_ENABLED=" + publisher.isEnabled() +
"\n\t MAX_BUSINESSES=" + publisher.getMaxBusinesses() +
- "\n\t MAX_SERVICES=" + publisher.getMaxServices() +
- "\n\t MAX_BINDINGS=" + publisher.getMaxBindings() +
+ "\n\t MAX_SERVICES_PER_BUSINESS=" + publisher.getMaxServicesPerBusiness() +
+ "\n\t MAX_BINDINGS_PER_SERVICE=" + publisher.getMaxBindingsPerService() +
"\n\t MAX_TMODELS=" + publisher.getMaxTModels() +
"\n\t PUBLISHER_ID=" + publisher.getPublisherID() + "\n");
Modified: webservices/juddi/trunk/src/java/org/apache/juddi/datatype/publisher/Publisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/src/java/org/apache/juddi/datatype/publisher/Publisher.java?rev=417863&r1=417862&r2=417863&view=diff
==============================================================================
--- webservices/juddi/trunk/src/java/org/apache/juddi/datatype/publisher/Publisher.java (original)
+++ webservices/juddi/trunk/src/java/org/apache/juddi/datatype/publisher/Publisher.java Wed Jun 28 13:09:55 2006
@@ -29,8 +29,8 @@
private boolean admin;
private boolean enabled;
private int maxBusinesses;
- private int maxServices;
- private int maxBindings;
+ private int maxServicesPerBusiness;
+ private int maxBindingsPerService;
private int maxTModels;
/**
@@ -196,33 +196,33 @@
/**
*
*/
- public void setMaxServices(int max)
+ public void setMaxServicesPerBusiness(int max)
{
- this.maxServices = max;
+ this.maxServicesPerBusiness = max;
}
/**
*
*/
- public int getMaxServices()
+ public int getMaxServicesPerBusiness()
{
- return this.maxServices;
+ return this.maxServicesPerBusiness;
}
/**
*
*/
- public void setMaxBindings(int max)
+ public void setMaxBindingsPerService(int max)
{
- this.maxBindings = max;
+ this.maxBindingsPerService = max;
}
/**
*
*/
- public int getMaxBindings()
+ public int getMaxBindingsPerService()
{
- return this.maxBindings;
+ return this.maxBindingsPerService;
}
/**
Modified: webservices/juddi/trunk/src/java/org/apache/juddi/handler/PublisherHandler.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/src/java/org/apache/juddi/handler/PublisherHandler.java?rev=417863&r1=417862&r2=417863&view=diff
==============================================================================
--- webservices/juddi/trunk/src/java/org/apache/juddi/handler/PublisherHandler.java (original)
+++ webservices/juddi/trunk/src/java/org/apache/juddi/handler/PublisherHandler.java Wed Jun 28 13:09:55 2006
@@ -17,6 +17,7 @@
import org.apache.juddi.datatype.RegistryObject;
import org.apache.juddi.datatype.publisher.Publisher;
+import org.apache.juddi.util.Config;
import org.apache.juddi.util.xml.XMLUtils;
import org.w3c.dom.Element;
@@ -57,7 +58,59 @@
String emailAddress = element.getAttribute("emailAddress");
if ((emailAddress != null) && (emailAddress.length() > 0))
obj.setEmailAddress(emailAddress);
-
+
+ // maxBusinesses
+ try {
+ String attrValue = element.getAttribute("maxBusinesses");
+ if ((attrValue != null) && (attrValue.length() > 0))
+ obj.setMaxBusinesses(Integer.parseInt(attrValue));
+ else
+ obj.setMaxBusinesses(Config.getMaxBusinessesPerPublisher());
+ }
+ catch (Exception ex) {
+ obj.setMaxBusinesses(
+ Config.getMaxBusinessesPerPublisher());
+ }
+
+ // maxServicesPerBusiness
+ try {
+ String attrValue = element.getAttribute("maxServicesPerBusiness");
+ if ((attrValue != null) && (attrValue.length() > 0))
+ obj.setMaxServicesPerBusiness(Integer.parseInt(attrValue));
+ else
+ obj.setMaxServicesPerBusiness(Config.getMaxServicesPerBusiness());
+ }
+ catch (Exception ex) {
+ obj.setMaxServicesPerBusiness(
+ Config.getMaxServicesPerBusiness());
+ }
+
+ // maxBindingsPerService
+ try {
+ String attrValue = element.getAttribute("maxBindingsPerService");
+ if ((attrValue != null) && (attrValue.length() > 0))
+ obj.setMaxBindingsPerService(Integer.parseInt(attrValue));
+ else
+ obj.setMaxBindingsPerService(Config.getMaxBindingsPerService());
+ }
+ catch (Exception ex) {
+ obj.setMaxBindingsPerService(
+ Config.getMaxBindingsPerService());
+ }
+
+ // maxTModels
+ try {
+ String attrValue = element.getAttribute("maxTModels");
+ if ((attrValue != null) && (attrValue.length() > 0))
+ obj.setMaxTModels(Integer.parseInt(attrValue));
+ else
+ obj.setMaxTModels(Config.getMaxTModelsPerPublisher());
+ }
+ catch (Exception ex) {
+ obj.setMaxTModels(
+ Config.getMaxTModelsPerPublisher());
+ }
+
// Text Node Value
// {none}
@@ -92,6 +145,11 @@
if ((emailAddress != null) && (emailAddress.length() > 0))
element.setAttribute("emailAddress",emailAddress);
+ element.setAttribute("maxBusinessEntities",String.valueOf(publisher.getMaxBusinessEntities()));
+ element.setAttribute("maxServicesPerBusiness",String.valueOf(publisher.getMaxServicesPerBusiness()));
+ element.setAttribute("maxBindingsPerService",String.valueOf(publisher.getMaxBindingsPerService()));
+ element.setAttribute("maxTModels",String.valueOf(publisher.getMaxTModels()));
+
// Text Node Value
// {none}
@@ -121,6 +179,10 @@
publisher.setEmailAddress("bcrosby@juddi.org");
publisher.setAdmin(true);
publisher.setEnabled(true);
+ publisher.setMaxBusinesses(5);
+ publisher.setMaxServicesPerBusiness(10);
+ publisher.setMaxBindingsPerService(25);
+ publisher.setMaxTModels(10);
System.out.println();
Modified: webservices/juddi/trunk/src/java/org/apache/juddi/registry/RegistryEngine.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/src/java/org/apache/juddi/registry/RegistryEngine.java?rev=417863&r1=417862&r2=417863&view=diff
==============================================================================
--- webservices/juddi/trunk/src/java/org/apache/juddi/registry/RegistryEngine.java (original)
+++ webservices/juddi/trunk/src/java/org/apache/juddi/registry/RegistryEngine.java Wed Jun 28 13:09:55 2006
@@ -58,12 +58,14 @@
public static final String PROPNAME_VALIDATOR_CLASS_NAME = "juddi.validator";
public static final String PROPNAME_MAX_NAME_ELEMENTS = "juddi.maxNameElementsAllowed";
- public static final String PROPNAME_MAX_NAME_LENGTH = "juddi.maxNameLengthAllowed";
- public static final String PROPNAME_MAX_MESSAGE_SIZE = "juddi.maxMessageSize"; // unused
- public static final String PROPNAME_MAX_BUSINESS_ENTITIES_PER_PUBLISHER = "juddi.maxBusinessEntitiesPerPublisher";
- public static final String PROPNAME_MAX_BUSINESS_SERVICES_PER_BUSINESS_ENTITY = "juddi.maxBusinessServicesPerBusinessEntity";
- public static final String PROPNAME_MAX_BINDING_TEMPLATES_PER_BUSINESS_SERVICE = "juddi.maxBindingTemplatesPerBusinessService";
+ public static final String PROPNAME_MAX_NAME_LENGTH = "juddi.maxNameLengthAllowed";
+
+ public static final String PROPNAME_MAX_BUSINESSES_PER_PUBLISHER = "juddi.maxBusinessesPerPublisher";
+ public static final String PROPNAME_MAX_SERVICES_PER_BUSINESS = "juddi.maxServicesPerBusiness";
+ public static final String PROPNAME_MAX_BINDINGS_PER_SERVICE = "juddi.maxBindingsPerService";
public static final String PROPNAME_MAX_TMODELS_PER_PUBLISHER = "juddi.maxTModelsPerPublisher";
+
+ public static final String PROPNAME_MAX_MESSAGE_SIZE = "juddi.maxMessageSize"; // unused
public static final String PROPNAME_MAX_ROWS_LIMIT = "juddi.maxRowsLimit"; // unused
// Registry Default Property Values
@@ -86,9 +88,9 @@
public static final int DEFAULT_MAX_NAME_ELEMENTS = 5;
public static final int DEFAULT_MAX_NAME_LENGTH = 255;
public static final int DEFAULT_MAX_MESSAGE_SIZE = 2097152; // unused
- public static final int DEFAULT_MAX_BUSINESS_ENTITIES_PER_PUBLISHER = -1; // unused
- public static final int DEFAULT_MAX_BUSINESS_SERVICES_PER_BUSINESS_ENTITY = -1; // unused
- public static final int DEFAULT_MAX_BINDING_TEMPLATES_PER_BUSINESS_SERVICE = -1; // unused
+ public static final int DEFAULT_MAX_BUSINESSES_PER_PUBLISHER = -1; // unused
+ public static final int DEFAULT_MAX_SERVICES_PER_BUSINESS = -1; // unused
+ public static final int DEFAULT_MAX_BINDINGS_PER_SERVICE = -1; // unused
public static final int DEFAULT_MAX_TMODELS_PER_PUBLISHER = -1; // unused
public static final int DEFAULT_MAX_ROWS_LIMIT = 10; // unused
Modified: webservices/juddi/trunk/src/java/org/apache/juddi/util/Config.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/src/java/org/apache/juddi/util/Config.java?rev=417863&r1=417862&r2=417863&view=diff
==============================================================================
--- webservices/juddi/trunk/src/java/org/apache/juddi/util/Config.java (original)
+++ webservices/juddi/trunk/src/java/org/apache/juddi/util/Config.java Wed Jun 28 13:09:55 2006
@@ -113,28 +113,28 @@
/**
*
*/
- public static int getMaxBusinessEntitiesPerPublisher()
+ public static int getMaxBusinessesPerPublisher()
{
- return getIntProperty(RegistryEngine.PROPNAME_MAX_BUSINESS_ENTITIES_PER_PUBLISHER,
- RegistryEngine.DEFAULT_MAX_BUSINESS_ENTITIES_PER_PUBLISHER);
+ return getIntProperty(RegistryEngine.PROPNAME_MAX_BUSINESSES_PER_PUBLISHER,
+ RegistryEngine.DEFAULT_MAX_BUSINESSES_PER_PUBLISHER);
}
/**
*
*/
- public static int getMaxBusinessServicesPerBusinessEntity()
+ public static int getMaxServicesPerBusiness()
{
- return getIntProperty(RegistryEngine.PROPNAME_MAX_BUSINESS_SERVICES_PER_BUSINESS_ENTITY,
- RegistryEngine.DEFAULT_MAX_BUSINESS_SERVICES_PER_BUSINESS_ENTITY);
+ return getIntProperty(RegistryEngine.PROPNAME_MAX_SERVICES_PER_BUSINESS,
+ RegistryEngine.DEFAULT_MAX_SERVICES_PER_BUSINESS);
}
/**
*
*/
- public static int getMaxBindingTemplatesPerBusinessService()
+ public static int getMaxBindingsPerService()
{
- return getIntProperty(RegistryEngine.PROPNAME_MAX_BINDING_TEMPLATES_PER_BUSINESS_SERVICE,
- RegistryEngine.DEFAULT_MAX_BINDING_TEMPLATES_PER_BUSINESS_SERVICE);
+ return getIntProperty(RegistryEngine.PROPNAME_MAX_BINDINGS_PER_SERVICE,
+ RegistryEngine.DEFAULT_MAX_BINDINGS_PER_SERVICE);
}
/**
Modified: webservices/juddi/trunk/webapp/WEB-INF/juddi.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/webapp/WEB-INF/juddi.properties?rev=417863&r1=417862&r2=417863&view=diff
==============================================================================
--- webservices/juddi/trunk/webapp/WEB-INF/juddi.properties (original)
+++ webservices/juddi/trunk/webapp/WEB-INF/juddi.properties Wed Jun 28 13:09:55 2006
@@ -19,11 +19,15 @@
# FindXxxx and SaveXxxx UDDI functions.
juddi.maxNameLength=255
juddi.maxNameElementsAllowed=5
-juddi.maxBusinessEntitiesPerPublisher=25
-juddi.maxBusinessServicesPerBusinessEntity=20
-juddi.maxBindingTemplatesPerBusinessService=10
+
+# The maximum number of UDDI artifacts allowed
+# 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.maxRowsLimit=10
# jUDDI Authentication module to use
juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org