You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2008/10/06 23:04:51 UTC

svn commit: r702263 - in /webservices/juddi/branches/v3_trunk/juddi-core: ./ src/main/java/org/apache/juddi/config/ src/main/resources/ src/test/java/org/apache/juddi/config/ src/test/java/org/apache/juddi/test/

Author: kstam
Date: Mon Oct  6 14:04:51 2008
New Revision: 702263

URL: http://svn.apache.org/viewvc?rev=702263&view=rev
Log:
JUDDI-133 adding some more properties

Added:
    webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/config/
    webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/config/ApplicationConfigurationTest.java   (contents, props changed)
      - copied, changed from r700778, webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/ApplicationConfigurationTest.java
Removed:
    webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/ApplicationConfigurationTest.java
Modified:
    webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi.properties

Modified: webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/pom.xml?rev=702263&r1=702262&r2=702263&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/pom.xml Mon Oct  6 14:04:51 2008
@@ -92,6 +92,21 @@
 			<artifactId>commons-dbcp</artifactId>
 			<version>1.2.2</version>
 		</dependency>
+				<dependency>
+			<groupId>commons-configuration</groupId>
+			<artifactId>commons-configuration</artifactId>
+			<version>1.5</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.1</version>
+		</dependency>
+		<dependency>
+	      <groupId>log4j</groupId>
+	      <artifactId>log4j</artifactId>
+	      <version>1.2.13</version>
+	    </dependency>
   </dependencies>
 
 </project>
\ No newline at end of file

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java?rev=702263&r1=702262&r2=702263&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java Mon Oct  6 14:04:51 2008
@@ -57,7 +57,7 @@
 		compositeConfig.addConfiguration(new SystemConfiguration());
 		//Properties from file
 		PropertiesConfiguration propConfig = new PropertiesConfiguration(JUDDI_PROPERTIES);
-		long refreshDelay = propConfig.getLong(Property.JUDDI_RELOAD_DELAY, 1000l);
+		long refreshDelay = propConfig.getLong(Property.JUDDI_CONFIGURATION_RELOAD_DELAY, 1000l);
 		log.debug("Setting refreshDelay to " + refreshDelay);
 		FileChangedReloadingStrategy fileChangedReloadingStrategy = new FileChangedReloadingStrategy();
 		fileChangedReloadingStrategy.setRefreshDelay(refreshDelay);

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java?rev=702263&r1=702262&r2=702263&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java Mon Oct  6 14:04:51 2008
@@ -2,5 +2,17 @@
 
 public interface Property 
 {
-	public final static String JUDDI_RELOAD_DELAY = "juddi.reload.delay";
+	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_AUTHENTICATOR               ="juddi.authenticator";
+	public final static String JUDDI_UUID_GENERATOR              ="juddi.uuidgen";
+	public final static String JUDDI_CRYPTOR                     ="juddi.cryptor";
+	public final static String JUDDI_VALIDATOR                   ="juddi.validator";
 }

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi.properties?rev=702263&r1=702262&r2=702263&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi.properties (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi.properties Mon Oct  6 14:04:51 2008
@@ -1 +1,46 @@
-juddi.reload.delay=2000
+################################################################
+#                 jUDDI-v3.0 configuration.                    #
+################################################################
+# Note that the property settings in this                      #
+# file can be overriden by system parameters                   #
+#                                                              #
+################################################################
+#
+# Check-the-time-stamp-on-this-file Interval in milli seconds  
+juddi.configuration.reload.delay=2000
+#
+# Default locale
+juddi.locale=en_US
+#
+#The UDDI Operator Contact Email Address
+juddi.operatorEmailAddress=admin@juddi.org
+#
+# The maximum name size and maximum number
+# of name elements allows in several of the
+# FindXxxx and SaveXxxx UDDI functions.
+juddi.maxNameLength=255
+juddi.maxNameElementsAllowed=5
+#
+# 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 Authentication module to use
+juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
+#
+# jUDDI UUIDGen implementation to use
+juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
+#
+# jUDDI Cryptor implementation to use
+juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
+#
+# jUDDI Validator to use
+juddi.validator=org.apache.juddi.validator.DefaultValidator
+
+
+

Copied: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/config/ApplicationConfigurationTest.java (from r700778, webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/ApplicationConfigurationTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/config/ApplicationConfigurationTest.java?p2=webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/config/ApplicationConfigurationTest.java&p1=webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/ApplicationConfigurationTest.java&r1=700778&r2=702263&rev=702263&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/ApplicationConfigurationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/config/ApplicationConfigurationTest.java Mon Oct  6 14:04:51 2008
@@ -1,16 +1,14 @@
-package org.apache.juddi.test;
+package org.apache.juddi.config;
 
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.config.AppConfig;
-import org.apache.juddi.config.Property;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
 
 public class ApplicationConfigurationTest 
 {
 	@Test
 	public void readPropertyFromFile() throws ConfigurationException
 	{
-		long refreshDelay = AppConfig.getConfiguration().getLong(Property.JUDDI_RELOAD_DELAY);
+		long refreshDelay = AppConfig.getConfiguration().getLong(Property.JUDDI_CONFIGURATION_RELOAD_DELAY);
 		System.out.println(refreshDelay);
 	}
 	

Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/config/ApplicationConfigurationTest.java
------------------------------------------------------------------------------
    svn:mergeinfo = 



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org