Author: tyrell
Date: Thu Jan 24 02:48:30 2008
New Revision: 12814
Log:
Adding UUID generation and passing the UUID when fetching live announcements.
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
trunk/mashup/java/modules/www/taskbar.jsp
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
==============================================================================
--- trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
(original)
+++ trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
Thu Jan 24 02:48:30 2008
@@ -18,6 +18,7 @@
public interface MashupConstants {
public static String MASHUP_SERVER_VERSION = "Version";
+ public static String MASHUP_SERVER_UUID = "ServerUUID";
public static String MASHUP_JS_SERVICE = "MashupJSService";
public static String CONTENT_TYPE_QUERY_PARAM = "content-type";
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
==============================================================================
--- trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
(original)
+++ trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
Thu Jan 24 02:48:30 2008
@@ -16,6 +16,7 @@
package org.wso2.mashup.utils;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
@@ -631,7 +632,7 @@
public static void setInitialSetupComplete(boolean status) {
PersistenceManager pm = new PersistenceManager();
pm.updateConfigurationProperty(MashupConstants.INITIAL_SETUP_COMPLETE,
- String.valueOf(status));
+ String.valueOf(status));
}
/**
@@ -647,6 +648,7 @@
/**
* Determines if the request originated from the local system.
+ *
* @param request Servlet request object.
* @return true if the request was for localhost.
*/
@@ -664,10 +666,31 @@
int startHostName = urlString.indexOf(protocolSeparator) +
protocolSeparator.length();
int portSeparator = urlString.indexOf(":", startHostName);
int endHostName = portSeparator != -1 && portSeparator <
urlString.indexOf("/",
- startHostName) ? portSeparator : urlString.indexOf("/",
startHostName);
+
startHostName) ?
+ portSeparator : urlString.indexOf("/", startHostName);
hostPart = urlString.substring(startHostName, endHostName);
}
return MashupConstants.LOCALHOST.equalsIgnoreCase(hostPart) ||
MashupConstants.LOCALHOST_IP.
equals(hostPart);
}
+
+
+ /**
+ * Sets and/or returns a UUID for this server instance. This UUID is
persisted using the WSAS persistence manager.
+ *
+ * @return The UUID string for this server instance
+ */
+ public static String getServerUUID() {
+ PersistenceManager pm = new PersistenceManager();
+ String serverUUID =
pm.getConfigurationProperty(MashupConstants.MASHUP_SERVER_UUID);
+
+ if (serverUUID == null) {
+ //Setting the UUID of this server instance
+ serverUUID = UUIDGenerator.getUUID();
+ pm.updateConfigurationProperty(MashupConstants.MASHUP_SERVER_UUID,
serverUUID);
+ }
+
+ return serverUUID;
+ }
+
}
Modified: trunk/mashup/java/modules/www/taskbar.jsp
==============================================================================
--- trunk/mashup/java/modules/www/taskbar.jsp (original)
+++ trunk/mashup/java/modules/www/taskbar.jsp Thu Jan 24 02:48:30 2008
@@ -323,7 +323,7 @@
</div>
<%
//Preprocessing fetched announcements to check for null
- String announcement =
announcementsFetcher.get(RegistryUtils.getAnnouncementsUrl());
+ String announcement =
announcementsFetcher.get(MashupUtils.getServerUUID(),
RegistryUtils.getAnnouncementsUrl());
if (announcement == null) {
announcement = "";
}
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
