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 2010/01/21 05:25:57 UTC
svn commit: r901524 - in /webservices/juddi/trunk:
juddi-core/src/main/java/org/apache/juddi/config/
juddi-core/src/test/resources/ juddiv3-war/src/main/webapp/WEB-INF/classes/
Author: kstam
Date: Thu Jan 21 04:25:42 2010
New Revision: 901524
URL: http://svn.apache.org/viewvc?rev=901524&view=rev
Log:
JUDDI-316, allowing runtime token replacement of juddi.server.baseurl in accessPoints
Modified:
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
webservices/juddi/trunk/juddi-core/src/test/resources/juddiv3.properties
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java?rev=901524&r1=901523&r2=901524&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java Thu Jan 21 04:25:42 2010
@@ -102,9 +102,13 @@
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
try {
-
- if (!Install.alreadyInstalled(config)) {
- log.info("The 'root' publisher was not found, loading...");
+ boolean seedAlways = config.getBoolean("juddi.seed.always",false);
+ if (seedAlways || !Install.alreadyInstalled(config)) {
+ if (seedAlways) {
+ log.info("Installing UDDI seed data, loading...");
+ } else {
+ log.info("The 'root' publisher was not found, loading...");
+ }
try {
Install.install(config);
} catch (Exception e) {
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java?rev=901524&r1=901523&r2=901524&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java Thu Jan 21 04:25:42 2010
@@ -84,8 +84,8 @@
try {
tx.begin();
-
- if (alreadyInstalled(config))
+ boolean seedAlways = config.getBoolean("juddi.seed.always", false);
+ if (!seedAlways && alreadyInstalled(config))
new FatalErrorException(new ErrorMessage("errors.install.AlreadyInstalled"));
String rootPublisherStr = config.getString(Property.JUDDI_ROOT_PUBLISHER);
Modified: webservices/juddi/trunk/juddi-core/src/test/resources/juddiv3.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/test/resources/juddiv3.properties?rev=901524&r1=901523&r2=901524&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/test/resources/juddiv3.properties (original)
+++ webservices/juddi/trunk/juddi-core/src/test/resources/juddiv3.properties Thu Jan 21 04:25:42 2010
@@ -7,9 +7,11 @@
################################################################
# The ${juddi.server.baseurl} token can be referenced in accessPoints and will be resolved at runtime.
juddi.server.baseurl=http://localhost:8080
-
+#
juddi.root.publisher=root
#
+juddi.seed.always=false
+#
# Name of the persistence unit to use (the default, "juddiDatabase" refers to the unit compiled into the juddi library)
juddi.persistenceunit.name=juddiDatabase
#
Modified: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties?rev=901524&r1=901523&r2=901524&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties Thu Jan 21 04:25:42 2010
@@ -11,6 +11,8 @@
#
juddi.root.publisher=root
#
+juddi.seed.always=false
+#
# Name of the persistence unit to use (the default, "juddiDatabase" refers to the unit compiled into the juddi library)
juddi.persistenceunit.name=juddiDatabase
#
@@ -78,13 +80,6 @@
juddi.subscription.service=uddi:sales.apache.org:services-subscription
#juddi.subscription.service=uddi:marketing.apache.org:services-subscription
-#
-# These two tokens are referenced in the install data. Note that you
-# can use any tokens, and that their values can be set here or as
-# System parameters.
-juddi.server.name=macdaddy
-juddi.server.port=8080
-
#only used by RMITransport
#juddi.proxy.factory.initial =org.jnp.interfaces.NamingContextFactory
#juddi.proxy.provider.url =jnp://localhost:1099
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org