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 2005/03/17 04:39:58 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/util Config.java
sviens 2005/03/16 19:39:58
Modified: src/java/org/apache/juddi/registry RegistryServlet.java
RegistryEngine.java
webapp/WEB-INF juddi.properties
src/java/org/apache/juddi/function SaveBusinessFunction.java
src/java/org/apache/juddi/util Config.java
Log:
Fix for bug# JUDDI-31. Auto-generated DiscoveryURL is now configurable via juddi.properties (see: http://issues.apache.org/jira/browse/JUDDI-31)
Revision Changes Path
1.20 +2 -2 ws-juddi/src/java/org/apache/juddi/registry/RegistryServlet.java
Index: RegistryServlet.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/registry/RegistryServlet.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- RegistryServlet.java 15 Mar 2005 02:09:33 -0000 1.19
+++ RegistryServlet.java 17 Mar 2005 03:39:57 -0000 1.20
@@ -125,8 +125,8 @@
props.put(RegistryEngine.PROPNAME_OPERATOR_NAME,
RegistryEngine.DEFAULT_OPERATOR_NAME);
- props.put(RegistryEngine.PROPNAME_OPERATOR_URL,
- RegistryEngine.DEFAULT_OPERATOR_URL);
+ props.put(RegistryEngine.PROPNAME_DISCOVERY_URL,
+ RegistryEngine.DEFAULT_DISCOVERY_URL);
props.put(RegistryEngine.PROPNAME_ADMIN_EMAIL_ADDRESS,
RegistryEngine.DEFAULT_ADMIN_EMAIL_ADDRESS);
1.13 +3 -3 ws-juddi/src/java/org/apache/juddi/registry/RegistryEngine.java
Index: RegistryEngine.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/registry/RegistryEngine.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RegistryEngine.java 7 Jun 2004 23:46:49 -0000 1.12
+++ RegistryEngine.java 17 Mar 2005 03:39:57 -0000 1.13
@@ -43,7 +43,7 @@
// Registry Property Names
//
public static final String PROPNAME_OPERATOR_NAME = "juddi.operatorName";
- public static final String PROPNAME_OPERATOR_URL = "juddi.operatorURL";
+ public static final String PROPNAME_DISCOVERY_URL = "juddi.discoveryURL";
public static final String PROPNAME_ADMIN_EMAIL_ADDRESS = "juddi.adminEmailAddress"; // unused
public static final String PROPNAME_DATASOURCE_NAME = "juddi.dataSource";
@@ -66,7 +66,7 @@
// Registry Default Property Values
//
public static final String DEFAULT_OPERATOR_NAME = "Apache.org";
- public static final String DEFAULT_OPERATOR_URL = "http://localhost:8080/juddi/";
+ public static final String DEFAULT_DISCOVERY_URL = "http://localhost:8080/juddi/uddiget.jsp?";
public static final String DEFAULT_ADMIN_EMAIL_ADDRESS = "nobody@apache.org"; // unused
public static final String DEFAULT_DATASOURCE_NAME = "java:comp/env/jdbc/juddiDB";
@@ -207,7 +207,7 @@
props.setProperty(RegistryEngine.PROPNAME_OPERATOR_NAME,"jUDDI.org");
props.setProperty(RegistryEngine.PROPNAME_MAX_NAME_ELEMENTS,"5");
props.setProperty(RegistryEngine.PROPNAME_MAX_NAME_LENGTH,"255");
- props.setProperty(RegistryEngine.PROPNAME_OPERATOR_URL,"http://localhost/juddi");
+ props.setProperty(RegistryEngine.PROPNAME_DISCOVERY_URL,"http://localhost/juddi");
props.setProperty(RegistryEngine.PROPNAME_ADMIN_EMAIL_ADDRESS,"admin@juddi.org");
props.setProperty(RegistryEngine.PROPNAME_MAX_MESSAGE_SIZE,"2097152");
props.setProperty(RegistryEngine.PROPNAME_AUTH_CLASS_NAME,"org.apache.juddi.auth.DefaultAuthenticator");
1.5 +3 -0 ws-juddi/webapp/WEB-INF/juddi.properties
Index: juddi.properties
===================================================================
RCS file: /home/cvs/ws-juddi/webapp/WEB-INF/juddi.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- juddi.properties 11 Mar 2005 04:31:07 -0000 1.4
+++ juddi.properties 17 Mar 2005 03:39:58 -0000 1.5
@@ -4,6 +4,9 @@
# The UDDI Operator Name
juddi.operatorName = jUDDI.org
+# The UDDI DiscoveryURL Prefix
+juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
+
# The UDDI Operator Contact Email Address
juddi.operatorEmailAddress = admin@juddi.org
1.11 +2 -2 ws-juddi/src/java/org/apache/juddi/function/SaveBusinessFunction.java
Index: SaveBusinessFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/SaveBusinessFunction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SaveBusinessFunction.java 8 Mar 2005 03:17:05 -0000 1.10
+++ SaveBusinessFunction.java 17 Mar 2005 03:39:58 -0000 1.11
@@ -293,8 +293,8 @@
{
// get the DiscoveryURL from the juddi properties file
StringBuffer siteURL = new StringBuffer();
- siteURL.append(Config.getOperatorURL());
- siteURL.append("/uddiget.jsp?businesskey=");
+ siteURL.append(Config.getDiscoveryURL());
+ siteURL.append("businesskey=");
siteURL.append(business.getBusinessKey());
// add to the business entity
1.12 +3 -3 ws-juddi/src/java/org/apache/juddi/util/Config.java
Index: Config.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/util/Config.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Config.java 25 Jun 2004 02:44:51 -0000 1.11
+++ Config.java 17 Mar 2005 03:39:58 -0000 1.12
@@ -86,10 +86,10 @@
/**
*
*/
- public static String getOperatorURL()
+ public static String getDiscoveryURL()
{
- return getStringProperty(RegistryEngine.PROPNAME_OPERATOR_URL,
- RegistryEngine.DEFAULT_OPERATOR_URL);
+ return getStringProperty(RegistryEngine.PROPNAME_DISCOVERY_URL,
+ RegistryEngine.DEFAULT_DISCOVERY_URL);
}
/**