[mashup-dev] svn commit r17722 - in trunk/mashup/java/modules/www:
. js
keith at wso2.com
keith at wso2.com
Sun Jun 1 04:45:40 PDT 2008
Author: keith
Date: Sun Jun 1 04:45:40 2008
New Revision: 17722
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17722
Log:
Using the mail.js and global_params.js from the mashup context
(Reducing the dependancy on the wsasadmin context) Mashup-824
Modified:
trunk/mashup/java/modules/www/editor.jsp
trunk/mashup/java/modules/www/faulty_mashup.jsp
trunk/mashup/java/modules/www/header.jsp
trunk/mashup/java/modules/www/index.jsp
trunk/mashup/java/modules/www/js/services.js
trunk/mashup/java/modules/www/mashup.jsp
trunk/mashup/java/modules/www/scraper.jsp
trunk/mashup/java/modules/www/search.jsp
trunk/mashup/java/modules/www/signin.jsp
trunk/mashup/java/modules/www/user.jsp
Modified: trunk/mashup/java/modules/www/editor.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/editor.jsp?rev=17722&r1=17721&r2=17722&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/editor.jsp (original)
+++ trunk/mashup/java/modules/www/editor.jsp Sun Jun 1 04:45:40 2008
@@ -121,8 +121,8 @@
<!-- Required Javascript -->
<script language="javascript" src="js/common.js" type="text/javascript"></script>
-<script type="text/javascript" src="../wsasadmin/global_params.js"></script>
-<script type="text/javascript" src="../wsasadmin/js/main.js"></script>
+<script type="text/javascript" src="js/global_params.js"></script>
+<script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript" src="js/mashup-main.js"></script>
<script language="javascript" src="js/wso2/WSRequest.js" type="text/javascript"></script>
<script language="javascript" src="js/base64.js" type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/faulty_mashup.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/faulty_mashup.jsp?rev=17722&r1=17721&r2=17722&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/faulty_mashup.jsp (original)
+++ trunk/mashup/java/modules/www/faulty_mashup.jsp Sun Jun 1 04:45:40 2008
@@ -62,8 +62,8 @@
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js" type="text/javascript"></script>
<!--WSO2 Dependencies-->
- <script type="text/javascript" src="../wsasadmin/global_params.js"></script>
- <script type="text/javascript" src="../wsasadmin/js/main.js"></script>
+ <script type="text/javascript" src="js/global_params.js"></script>
+ <script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript" src="js/wso2/WSRequest.js"></script>
<script type="text/javascript" src="js/mashup-main.js"></script>
<script type="text/javascript" src="js/services.js"></script>
Modified: trunk/mashup/java/modules/www/header.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/header.jsp?rev=17722&r1=17721&r2=17722&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/header.jsp (original)
+++ trunk/mashup/java/modules/www/header.jsp Sun Jun 1 04:45:40 2008
@@ -18,8 +18,8 @@
<%@ page import="java.net.URLEncoder" %>
<%@ page import="java.util.ResourceBundle" %>
-<script type="text/javascript" src="../wsasadmin/global_params.js"></script>
-<script type="text/javascript" src="../wsasadmin/js/main.js"></script>
+<script type="text/javascript" src="js/global_params.js"></script>
+<script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript" src="js/utils.js"></script>
<script type="text/javascript" src="js/tooltip.js"></script>
Modified: trunk/mashup/java/modules/www/index.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/index.jsp?rev=17722&r1=17721&r2=17722&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/index.jsp (original)
+++ trunk/mashup/java/modules/www/index.jsp Sun Jun 1 04:45:40 2008
@@ -87,8 +87,8 @@
type="text/javascript"></script>
<!--WSO2 Dependencies-->
-<script type="text/javascript" src="../wsasadmin/global_params.js"></script>
-<script type="text/javascript" src="../wsasadmin/js/main.js"></script>
+<script type="text/javascript" src="js/global_params.js"></script>
+<script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript" src="js/wso2/WSRequest.js"></script>
<script type="text/javascript" src="js/mashup-main.js"></script>
<script type="text/javascript" src="js/services.js"></script>
Modified: trunk/mashup/java/modules/www/js/services.js
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/js/services.js?rev=17722&r1=17721&r2=17722&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/js/services.js (original)
+++ trunk/mashup/java/modules/www/js/services.js Sun Jun 1 04:45:40 2008
@@ -16,8 +16,8 @@
var GLOBAL_SERVICE_STRING = "GlobalAdmin"
var SERVICE_GROUP_ADMIN_STRING = "ServiceGroupAdmin"
-var serverURL = self.location.protocol + "//" + self.location.hostname + ":" +
- self.location.port + "/" + SERVICE_PATH;
+var mashupServerURL = self.location.protocol + "//" + self.location.hostname + ":" +
+ self.location.port + "/" + ROOT_CONTEXT + SERVICE_PATH;
if (typeof wso2 == "undefined") {
/**
@@ -47,7 +47,7 @@
' <arg0>' + userName + '</arg0>\n' +
' <arg1>' + password + '</arg1>\n' +
' </ns1:login>\n';
- var callURL = serverURL + "/" + GLOBAL_SERVICE_STRING;
+ var callURL = mashupServerURL + "/" + GLOBAL_SERVICE_STRING;
new wso2.wsf.WSRequest(callURL, "login", bodyXML, callback, userName);
};
@@ -64,7 +64,7 @@
var bodyXML = '<ns1:logout xmlns:ns1="http://org.apache.axis2/xsd"/>\n';
- var callURL = serverURL + "/" + GLOBAL_SERVICE_STRING + "/" + "logout";
+ var callURL = mashupServerURL + "/" + GLOBAL_SERVICE_STRING + "/" + "logout";
new wso2.wsf.WSRequest(callURL, "logout", bodyXML, callback);
};
@@ -81,7 +81,7 @@
var body_xml = '<ns1:listServiceGroups xmlns:ns1="http://org.apache.axis2/xsd">\n' +
' </ns1:listServiceGroups>\n';
- var callURL = serverURL + "/" + SERVICE_GROUP_ADMIN_STRING + "/" + "listServiceGroups";
+ var callURL = mashupServerURL + "/" + SERVICE_GROUP_ADMIN_STRING + "/" + "listServiceGroups";
new wso2.wsf.WSRequest(callURL, "listServiceGroups", body_xml, callback, params, wso2.mashup.services.defaultErrHandler);
@@ -103,7 +103,7 @@
' <arg1>' + serviceName + '</arg1>\n' +
' </ns1:listAllOperations>\n';
- var callURL = serverURL + "/" + "OperationAdmin" + "/" + "listAllOperations";
+ var callURL = mashupServerURL + "/" + "OperationAdmin" + "/" + "listAllOperations";
new wso2.wsf.WSRequest(callURL, "listAllOperations", body_xml, callback, "", wso2.mashup.services.defaultErrHandler);
};
@@ -123,7 +123,7 @@
' <req:serviceName>' + serviceName + '</req:serviceName>\n' +
' </req:getServiceDataRequest>\n';
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
new wso2.wsf.WSRequest(callURL, "getServiceData", body_xml, callback, params, wso2.mashup.services.defaultErrHandler);
};
@@ -143,7 +143,7 @@
' <req:serviceName>' + serviceName + '</req:serviceName>\n' +
' </req:getDataRequest>\n';
- var callURL = serverURL + "/" + "ServiceMetaDataLister" + "/" ;
+ var callURL = mashupServerURL + "/" + "ServiceMetaDataLister" + "/" ;
new wso2.wsf.WSRequest(callURL, "getData", body_xml, callback, "", wso2.mashup.services.defaultErrHandler);
};
@@ -160,7 +160,7 @@
*/
wso2.mashup.services.activationOfService = function (serviceName, serviceStatus, callback, params) {
var body_xml = '';
- var callURL = serverURL + "/" + "MashupAdminService" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" ;
var soapAction = "";
var params = new Array(serviceName, serviceStatus);
@@ -196,7 +196,7 @@
wso2.mashup.services.editServiceDocumentation =
function (serviceName, documentation, callback, params) {
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
var body_xml = '<req:setServiceDocumentation xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:serviceName>' + serviceName + '</req:serviceName>\n' +
@@ -221,7 +221,7 @@
wso2.mashup.services.editOperationDocumentation =
function (serviceName, operationName, documentation, callback, params) {
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
var body_xml = '<req:setOperationDocumentation xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:serviceName>' + serviceName + '</req:serviceName>\n' +
@@ -246,7 +246,7 @@
wso2.mashup.services.setServiceOperationStatus =
function (serviceName, operationName, status, callback, params) {
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
var body_xml = '<req:changeOperationStatus xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:serviceName>' + serviceName + '</req:serviceName>\n' +
@@ -267,7 +267,7 @@
*/
wso2.mashup.services.isPossibleToCreate = function (mashupPath, callback, params) {
- var callURL = serverURL + "/" + "ServiceMetaDataLister" + "/" ;
+ var callURL = mashupServerURL + "/" + "ServiceMetaDataLister" + "/" ;
var body_xml = '<req:isPossibleToCreateRequest xmlns:req="http://servicemetadatalister.coreservices.mashup.wso2.org/xsd">\n' +
' <req:servicePath>' + mashupPath + '</req:servicePath>\n' +
@@ -291,7 +291,7 @@
function (serviceName, destinationAddress, username, password, overwriteExisting, migrateTags, localUserName, callback, params,
errorCallback) {
- var callURL = serverURL + "/" + "ServiceSharingHelper" + "/" ;
+ var callURL = mashupServerURL + "/" + "ServiceSharingHelper" + "/" ;
var body_xml = '<req:shareServiceRequest xmlns:req="http://servicesharinghelper.coreservices.mashup.wso2.org/xsd">\n' +
' <req:serviceName>' + serviceName + '</req:serviceName>\n' +
@@ -324,7 +324,7 @@
function (serviceName, destinationAddress, infocardtoken, overwriteExisting, migrateTags, callback, params,
errorCallback) {
- var callURL = serverURL + "/" + "ServiceSharingHelper" + "/" ;
+ var callURL = mashupServerURL + "/" + "ServiceSharingHelper" + "/" ;
//Making the infocard token transport friendly
infocardtoken = "<![CDATA[" + infocardtoken + "]]>";
@@ -356,7 +356,7 @@
var body_xml = '<req:getFaultyServiceArchivesRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
' </req:getFaultyServiceArchivesRequest>\n';
- var callURL = serverURL + "/" + "ServiceAdmin" ;
+ var callURL = mashupServerURL + "/" + "ServiceAdmin" ;
new wso2.wsf.WSRequest(callURL, "getFaultyServiceArchives", body_xml, callback, "", wso2.mashup.services.defaultErrHandler);
@@ -375,7 +375,7 @@
*/
wso2.mashup.services.saveServiceSource = function (path, modifiedSource, callback, params) {
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
var serviceSource = Base64.encode(modifiedSource);
@@ -395,7 +395,7 @@
* @param {callback} params Parameters to be set in the callback
*/
wso2.mashup.services.saveUiSource = function (path, modifiedSource, callback, params) {
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
var serviceSource = Base64.encode(modifiedSource);
@@ -413,7 +413,7 @@
* @param {callback} callback User-defined callback function or object
*/
wso2.mashup.services.deleteService = function (serviceName, callback) {
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
var body_xml = '<req:deleteService xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:serviceName>' + serviceName + '</req:serviceName>\n' +
@@ -429,7 +429,7 @@
* @param {callback} callback User-defined callback function or object
*/
wso2.mashup.services.deleteCertificate = function (userName, certAlias, callback) {
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
var body_xml = '<req:deleteCert xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:userName>' + userName + '</req:userName>\n' +
@@ -447,7 +447,7 @@
* @param {callback} callback User-defined callback function or object
*/
wso2.mashup.services.importCertFromUrl = function (userName, certAlias, url, callback) {
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
var body_xml = '<req:importCertFromUrl xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:userName>' + userName + '</req:userName>\n' +
@@ -464,7 +464,7 @@
* @param {callback} callback User-defined callback function or object
*/
wso2.mashup.services.reDeployService = function (serviceName, callback) {
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
var body_xml = '<req:redeployService xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:serviceName>' + serviceName + '</req:serviceName>\n' +
@@ -481,7 +481,7 @@
* @param {callback} callback
*/
wso2.mashup.services.enableServiceTransport = function (serviceName, transportName, params, callback) {
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
var body_xml = '<req:enableServiceTransport xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:serviceName>' + serviceName + '</req:serviceName>\n' +
@@ -499,7 +499,7 @@
* @param {callback} callback
*/
wso2.mashup.services.disableServiceTransport = function (serviceName, transportName, params, callback) {
- var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
+ var callURL = mashupServerURL + "/" + "MashupAdminService" + "/" ;
var body_xml = '<req:disableServiceTransport xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:serviceName>' + serviceName + '</req:serviceName>\n' +
@@ -514,7 +514,7 @@
* @param {callback} callback User-defined callback function or object
*/
wso2.mashup.services.getFaultyServices = function (callback) {
- var callURL = serverURL + "/" + "ServiceMetaDataLister" + "/" ;
+ var callURL = mashupServerURL + "/" + "ServiceMetaDataLister" + "/" ;
var body_xml = '<req:getFaultyServicesOpRequest xmlns:req="http://servicemetadatalister.coreservices.mashup.wso2.org/xsd">\n' +
' </req:getFaultyServicesOpRequest>\n';
@@ -528,7 +528,7 @@
* @param {callback} callback User-defined callback function or object.
*/
wso2.mashup.services.getUserNames = function (namePrefix, callback) {
- var callURL = serverURL + "/" + "ServiceMetaDataLister" + "/" ;
+ var callURL = mashupServerURL + "/" + "ServiceMetaDataLister" + "/" ;
var body_xml = '<req:getUserNamesRequest xmlns:req="http://servicemetadatalister.coreservices.mashup.wso2.org/xsd">\n' +
' <req:namePrefix>' + namePrefix + '</req:namePrefix>\n' +
@@ -551,7 +551,7 @@
wso2.mashup.services.downloadService =
function (serviceName, remoteServer, callback, params, errorCallback) {
- var callURL = serverURL + "/" + "ServiceSharingHelper" + "/" ;
+ var callURL = mashupServerURL + "/" + "ServiceSharingHelper" + "/" ;
var body_xml = '<req:downloadServiceRequest xmlns:req="http://servicesharinghelper.coreservices.mashup.wso2.org/xsd">\n' +
' <req:remoteServer>' + remoteServer + '</req:remoteServer>\n' +
@@ -572,7 +572,7 @@
*/
wso2.mashup.services.getSharableServices = function(callback) {
- var callURL = serverURL + "/" + "ServiceSharingHelper" + "/" ;
+ var callURL = mashupServerURL + "/" + "ServiceSharingHelper" + "/" ;
var body_xml = '<req:getSharableServicesRequest xmlns:req="http://servicesharinghelper.coreservices.mashup.wso2.org/xsd">\n' +
' </req:getSharableServicesRequest>\n';
@@ -587,7 +587,7 @@
* @param callback User-defined callback function or object
*/
wso2.mashup.services.getUrlContents = function(url, userAgent, callback) {
- var callURL = serverURL + "/" + "ScraperService" + "/" ;
+ var callURL = mashupServerURL + "/" + "ScraperService" + "/" ;
var body_xml = '<req:getUrlRequest xmlns:req="http://scraperservice.coreservices.mashup.wso2.org/xsd">\n' +
' <req:url>' + url + '</req:url>\n' +
Modified: trunk/mashup/java/modules/www/mashup.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/mashup.jsp?rev=17722&r1=17721&r2=17722&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/mashup.jsp (original)
+++ trunk/mashup/java/modules/www/mashup.jsp Sun Jun 1 04:45:40 2008
@@ -87,8 +87,8 @@
<script language="javascript" src="js/yui/connection/connection.js" type="text/javascript"></script>
<!--WSO2 Dependencies-->
-<script type="text/javascript" src="../wsasadmin/global_params.js"></script>
-<script type="text/javascript" src="../wsasadmin/js/main.js"></script>
+<script type="text/javascript" src="js/global_params.js"></script>
+<script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript" src="js/wso2/WSRequest.js"></script>
<script type="text/javascript" src="js/mashup-main.js"></script>
<script type="text/javascript" src="js/services.js"></script>
Modified: trunk/mashup/java/modules/www/scraper.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/scraper.jsp?rev=17722&r1=17721&r2=17722&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/scraper.jsp (original)
+++ trunk/mashup/java/modules/www/scraper.jsp Sun Jun 1 04:45:40 2008
@@ -101,8 +101,8 @@
<script type="text/javascript" src="js/xml-for-script/tinyxmlw3cdom.js"></script>
<!--WSO2 Dependencies-->
-<script type="text/javascript" src="../wsasadmin/global_params.js"></script>
-<script type="text/javascript" src="../wsasadmin/js/main.js"></script>
+<script type="text/javascript" src="js/global_params.js"></script>
+<script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript" src="js/wso2/WSRequest.js"></script>
<script type="text/javascript" src="js/mashup-main.js"></script>
<script type="text/javascript" src="js/services.js"></script>
Modified: trunk/mashup/java/modules/www/search.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/search.jsp?rev=17722&r1=17721&r2=17722&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/search.jsp (original)
+++ trunk/mashup/java/modules/www/search.jsp Sun Jun 1 04:45:40 2008
@@ -399,8 +399,8 @@
<title><%= bundle.getString("main.title")%> - Search</title>
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
- <script type="text/javascript" src="../wsasadmin/global_params.js"></script>
- <script type="text/javascript" src="../wsasadmin/js/main.js"></script>
+ <script type="text/javascript" src="js/global_params.js"></script>
+ <script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript" src="js/wso2/WSRequest.js"></script>
<script type="text/javascript" src="js/mashup-main.js"></script>
<script language="javascript" src="js/common.js" type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/signin.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/signin.jsp?rev=17722&r1=17721&r2=17722&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/signin.jsp (original)
+++ trunk/mashup/java/modules/www/signin.jsp Sun Jun 1 04:45:40 2008
@@ -134,8 +134,8 @@
<script language="javascript" src="js/prototype.js" type="text/javascript"></script>
<script language="javascript" src="js/common.js" type="text/javascript"></script>
<script language="javascript" src="js/utils.js" type="text/javascript"></script>
- <script type="text/javascript" src="../wsasadmin/global_params.js"></script>
- <script type="text/javascript" src="../wsasadmin/js/main.js"></script>
+ <script type="text/javascript" src="js/global_params.js"></script>
+ <script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript" language="JavaScript">
Modified: trunk/mashup/java/modules/www/user.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/user.jsp?rev=17722&r1=17721&r2=17722&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/user.jsp (original)
+++ trunk/mashup/java/modules/www/user.jsp Sun Jun 1 04:45:40 2008
@@ -95,8 +95,8 @@
type="text/javascript"></script>
<!--WSO2 Dependencies-->
- <script type="text/javascript" src="../wsasadmin/global_params.js"></script>
- <script type="text/javascript" src="../wsasadmin/js/main.js"></script>
+ <script type="text/javascript" src="js/global_params.js"></script>
+ <script type="text/javascript" src="js/main.js"></script>
<script type="text/javascript" src="js/wso2/WSRequest.js"></script>
<script type="text/javascript" src="js/mashup-main.js"></script>
<script type="text/javascript" src="js/services.js"></script>
More information about the Mashup-dev
mailing list