summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-04-30 08:21:11 (EDT)
committerStephan Born2013-04-30 08:21:11 (EDT)
commitc4fa03f5b25a2c651ac64c457d82c73451faeae1 (patch)
tree5c0b4083825c961065d3ecf57f8b641dabcfe01e
parentbbc7f13e59e500092381e76105bd68d11444aa01 (diff)
downloadorg.eclipse.stardust.ui.web-c4fa03f5b25a2c651ac64c457d82c73451faeae1.zip
org.eclipse.stardust.ui.web-c4fa03f5b25a2c651ac64c457d82c73451faeae1.tar.gz
org.eclipse.stardust.ui.web-c4fa03f5b25a2c651ac64c457d82c73451faeae1.tar.bz2
Bug 405694: Removed atmosphere* usage for Stardust Kepler build in JS files. Applied patch / instructions provided by Sidharth Singh.v1.0.0.20130529-0312-RC2v1.0.0.20130522-0655-RC1v1.0.0.20130508-0250-M7
-rw-r--r--stardust-portal-shell/resources/META-INF/webapp/js/PortalShellMain.js3
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/camelApplicationViewMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/conditionalPerformerViewMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/dataViewMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/genericApplicationViewMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/importTypeDeclarationsWizardMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_websocketInvite.js86
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_websocketModel.js71
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/messageTransformationApplicationViewMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/modelViewMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/modeler-main.js195
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/organizationViewMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/outline_main.js137
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/processInterfaceTestWrapperWizardMain.js3
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/reportMain.js123
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/roleViewMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/serviceWrapperWizardMain.js3
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/uiMashupApplicationViewMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/webServiceApplicationViewMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/xsdStructuredDataTypeViewMain.js1
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/public/chat.html72
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/public/jquery/application.js87
22 files changed, 226 insertions, 566 deletions
diff --git a/stardust-portal-shell/resources/META-INF/webapp/js/PortalShellMain.js b/stardust-portal-shell/resources/META-INF/webapp/js/PortalShellMain.js
index 873084e..16440fa 100644
--- a/stardust-portal-shell/resources/META-INF/webapp/js/PortalShellMain.js
+++ b/stardust-portal-shell/resources/META-INF/webapp/js/PortalShellMain.js
@@ -21,9 +21,6 @@ require
'jquery-ui' : [
'bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min',
'//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min' ],
- 'jquery.atmosphere' : [
- 'bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere',
- 'https://raw.github.com/Atmosphere/atmosphere/e6b2a1730d5c94e5d699f7656a76d1439c85889c/modules/jquery/src/main/webapp/jquery/jquery.atmosphere' ],
'jquery.download' : [
'bpm-modeler/js/libs/jquery/plugins/download.jQuery',
'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download' ],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/camelApplicationViewMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/camelApplicationViewMain.js
index 2126f0e..6057c95 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/camelApplicationViewMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/camelApplicationViewMain.js
@@ -21,7 +21,6 @@ require.config({
'raphael' : ['bpm-modeler/js/libs/raphael/2.0.1/raphael', '//cdnjs.cloudflare.com/ajax/libs/raphael/2.0.1/raphael-min'],
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/conditionalPerformerViewMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/conditionalPerformerViewMain.js
index d1030ca..1fa9c3f 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/conditionalPerformerViewMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/conditionalPerformerViewMain.js
@@ -21,7 +21,6 @@ require.config({
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/dataViewMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/dataViewMain.js
index 7aebc05..7738a4c 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/dataViewMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/dataViewMain.js
@@ -21,7 +21,6 @@ require.config({
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/genericApplicationViewMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/genericApplicationViewMain.js
index 090e6b7..4ea74ce 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/genericApplicationViewMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/genericApplicationViewMain.js
@@ -22,7 +22,6 @@ require.config({
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/importTypeDeclarationsWizardMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/importTypeDeclarationsWizardMain.js
index 921fab0..19e5c1e 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/importTypeDeclarationsWizardMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/importTypeDeclarationsWizardMain.js
@@ -22,7 +22,6 @@ require.config({
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_websocketInvite.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_websocketInvite.js
deleted file mode 100644
index f3453c0..0000000
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_websocketInvite.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 SunGard CSA LLC and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: SunGard CSA LLC - initial API and implementation and/or initial
- * documentation
- ******************************************************************************/
-
-/**
- *
- * @author Francesca.Herpertz
- *
- */
-define([ "bpm-modeler/js/m_commandsController", "bpm-modeler/js/m_urlUtils", "bpm-modeler/js/m_utils", "bpm-modeler/js/m_constants", "bpm-modeler/js/m_communicationController", "jquery.atmosphere" ],
- function(m_commandsController, m_urlUtils, m_utils, m_constants, m_communicationController) {
-
- var socket = jQuery.atmosphere;
- var request = new jQuery.atmosphere.AtmosphereRequest();
- var subsocket = null;
- var isInitial = true;
-
- return {
- init : function(url) {
- request.contentType = "application/json";
- request.transport = "websocket";
- request.fallbackTransport = 'long-polling';
- request.loglevel = "debug";
- request.url = m_urlUtils.getContextName() + '/services/streaming/bpm-modeling/collaboration' + url;
-
- request.onOpen = function(response) {
- console.log(response);
- if(isInitial == true){
- update();
- }
- };
-
- request.onMessage = function(response) {
- var message = response.responseBody;
- var obj = jQuery.parseJSON(message);
- m_commandsController.broadcastCommand(obj);
-
- };
-
- request.onReconnect = function(request, response) {
- socket.info("Reconnecting");
- };
-
- request.onErrer = function(response) {
- alert(response.responseBody);
- };
-
- subsocket = socket.subscribe(request);
-
- return true;
-
- },
- send : function(message) {
- subsocket.push(message);
- }
-
- };
-
- function update(){
- console.log("fiep");
- var url = m_urlUtils.getContextName()+ "/services/rest/bpm-modeler/modeler/" + new Date().getTime()+"/users/getOfflineInvites";
- isInitial = false;
- m_communicationController.getHead({
- "url" : url
- }, new function() {
- return {
- "success" : function(command) {
- m_utils.debug("recived command ok");
- },
- "error" : function(command) {
- m_utils.debug("recived command error"
- + command);
- }
- };
- });
-
-
- };
-
-});
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_websocketModel.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_websocketModel.js
deleted file mode 100644
index 7a52a82..0000000
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_websocketModel.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 SunGard CSA LLC and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: SunGard CSA LLC - initial API and implementation and/or initial
- * documentation
- ******************************************************************************/
-
-/**
- *
- * @author Francesca.Herpertz
- *
- */
-define(
- [ "bpm-modeler/js/m_commandsController", "bpm-modeler/js/m_urlUtils", "bpm-modeler/js/m_user", "jquery.atmosphere" ],
- function(m_commandsController, m_urlUtils, m_user) {
-
- var socket = jQuery.atmosphere;
- var request = new jQuery.atmosphere.AtmosphereRequest();
- var subsocket = null;
-
- return {
- init : function(url) {
- request.contentType = "application/json";
- request.transport = "websocket";
- request.fallbackTransport = 'long-polling';
- request.loglevel = "debug";
- request.url = m_urlUtils.getContextName()
- + '/services/streaming/bpm-modeling/collaboration'
- + url;
-
- request.onOpen = function(response) {
- response.responseBody;
- socket.info(response.responseBody);
- };
-
- request.onMessage = function(response) {
- var currentUser = m_user.getCurrentUser();
- var message = response.responseBody;
- var obj = jQuery.parseJSON(message);
-
- if (null != obj.isRedo || null != obj.isUndo) {
- if (null != obj.commandId) {
- m_commandsController.broadcastCommand(obj);
-
- }
- }else if ((obj.type != null && obj.type == "SUBMIT_CHAT_MESSAGE_COMMAND")
- || (obj.commandId != null && currentUser.account != obj.account)) {
- m_commandsController.broadcastCommand(obj);
-
- }
- };
-
- request.onReconnect = function(request, response) {
- socket.info(response.responseBody);
- };
-
- request.onErrer = function(response) {
- socket.info(response.responseBody);
- };
-
- subsocket = socket.subscribe(request);
- },
- send : function(message) {
- subsocket.push(message);
- }
- };
-
- });
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/messageTransformationApplicationViewMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/messageTransformationApplicationViewMain.js
index 86f9d10..f35bd3f 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/messageTransformationApplicationViewMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/messageTransformationApplicationViewMain.js
@@ -22,7 +22,6 @@ require.config({
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/modelViewMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/modelViewMain.js
index d837710..12105f1 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/modelViewMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/modelViewMain.js
@@ -22,7 +22,6 @@ require.config({
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/modeler-main.js b/web-modeler/src/main/resources/META-INF/xhtml/js/modeler-main.js
index 12e4316..b7733b5 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/modeler-main.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/modeler-main.js
@@ -1,98 +1,97 @@
-/*******************************************************************************
- * Copyright (c) 2011 SunGard CSA LLC and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: SunGard CSA LLC - initial API and implementation and/or initial
- * documentation
- ******************************************************************************/
-
-/**
- * @author Robert Sauer
- */
-
-require.config({
- baseUrl: "../../../",
- paths : {
- 'jquery' : ['bpm-modeler/js/libs/jquery/jquery-1.7.2', '//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min'],
- 'json' : ['bpm-modeler/js/libs/json/json2', '//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2'],
- 'raphael' : ['bpm-modeler/js/libs/raphael/2.0.1/raphael', '//cdnjs.cloudflare.com/ajax/libs/raphael/2.0.1/raphael-min'],
- 'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
-
- 'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/e6b2a1730d5c94e5d699f7656a76d1439c85889c/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
- 'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
- 'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
- 'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
- 'jquery.jstree': ['bpm-modeler/js/libs/jquery/plugins/jquery.jstree', 'https://jstree.googlecode.com/svn-history/r191/trunk/jquery.jstree'],
- 'jquery.simplemodal': ['bpm-modeler/js/libs/jquery/plugins/jquery.simplemodal.1.4.1.min', '//simplemodal.googlecode.com/files/jquery.simplemodal.1.4.1.min'],
- 'jquery.tablescroll': ['bpm-modeler/js/libs/jquery/plugins/jquery.tablescroll', 'https://raw.github.com/farinspace/jquery.tableScroll/master/jquery.tablescroll'],
- 'jquery.treeTable': ['bpm-modeler/js/libs/jquery/plugins/jquery.treeTable', 'https://raw.github.com/ludo/jquery-treetable/master/src/javascripts/jquery.treeTable'],
- 'jquery.url': ['bpm-modeler/js/libs/jquery/plugins/jquery.url', 'https://raw.github.com/allmarkedup/jQuery-URL-Parser/4f5254f2519111ad7037d398b2efa61d3cda58d4/jquery.url'],
- 'jquery.jqprint': ['bpm-modeler/js/libs/jquery/plugins/jquery.jqprint-0.3', 'https://raw.github.com/tanathos/jquery.jqprint/master/jquery.jqprint-0.3'],
-
- 'jslint': ['bpm-modeler/js/libs/jslint/jslint', 'https://raw.github.com/douglascrockford/JSLint/996246308b755df665bd6c4f3ae59d655ae0a97e/jslint'],
-
- 'modeler-plugins': '../services/rest/bpm-modeler/config/ui/plugins/modeler-plugins',
- 'i18n' : 'common/InfinityBPMI18N',
- 'ace': ['bpm-modeler/js/libs/ace/ace', 'https://github.com/ajaxorg/ace-builds/blob/master/src/ace']
- },
- shim: {
- 'angularjs': {
- require: "jquery",
- exports: "angular"
- },
- 'json': {
- exports: "JSON"
- },
- 'raphael': {
- exports: 'Raphael'
- },
- 'i18n': {
- exports: "InfinityBPMI18N"
- },
- 'jquery-ui': ['jquery'],
- 'jquery.download': ['jquery'],
- 'jquery.form': ['jquery'],
- 'jquery.jeditable': ['jquery'],
- 'jquery.simplemodal': ['jquery'],
- 'jquery.tablescroll': ['jquery'],
- 'jquery.treeTable': ['jquery'],
- 'jquery.url': ['jquery'],
- 'jquery.jqprint': ['jquery'],
- }
-});
-
-require(["require",
- "jquery",
- "json",
- "raphael",
-
- "jquery-ui",
- "jquery.download",
- "jquery.form",
- "jquery.jeditable",
- "jquery.simplemodal",
- "jquery.tablescroll",
- "jquery.treeTable",
- "jquery.url",
- "ace",
- "jquery.jqprint",
-
- "jslint",
-
- "modeler-plugins",
- "bpm-modeler/js/extensions_jquery",
- "bpm-modeler/js/extensions_raphael",
- "bpm-modeler/js/m_modelerViewLayoutManager",
- "i18n",
- "bpm-modeler/angular/app"
- ], function (require) {
-
- require("bpm-modeler/angular/app").init();
-
- require("bpm-modeler/js/m_modelerViewLayoutManager").initialize(
- $.url(window.location.search).param("fullId"));
-});
-
+/*******************************************************************************
+ * Copyright (c) 2011 SunGard CSA LLC and others. All rights reserved. This
+ * program and the accompanying materials are made available under the terms of
+ * the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: SunGard CSA LLC - initial API and implementation and/or initial
+ * documentation
+ ******************************************************************************/
+
+/**
+ * @author Robert Sauer
+ */
+
+require.config({
+ baseUrl: "../../../",
+ paths : {
+ 'jquery' : ['bpm-modeler/js/libs/jquery/jquery-1.7.2', '//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min'],
+ 'json' : ['bpm-modeler/js/libs/json/json2', '//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2'],
+ 'raphael' : ['bpm-modeler/js/libs/raphael/2.0.1/raphael', '//cdnjs.cloudflare.com/ajax/libs/raphael/2.0.1/raphael-min'],
+ 'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
+
+ 'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
+ 'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
+ 'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
+ 'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
+ 'jquery.jstree': ['bpm-modeler/js/libs/jquery/plugins/jquery.jstree', 'https://jstree.googlecode.com/svn-history/r191/trunk/jquery.jstree'],
+ 'jquery.simplemodal': ['bpm-modeler/js/libs/jquery/plugins/jquery.simplemodal.1.4.1.min', '//simplemodal.googlecode.com/files/jquery.simplemodal.1.4.1.min'],
+ 'jquery.tablescroll': ['bpm-modeler/js/libs/jquery/plugins/jquery.tablescroll', 'https://raw.github.com/farinspace/jquery.tableScroll/master/jquery.tablescroll'],
+ 'jquery.treeTable': ['bpm-modeler/js/libs/jquery/plugins/jquery.treeTable', 'https://raw.github.com/ludo/jquery-treetable/master/src/javascripts/jquery.treeTable'],
+ 'jquery.url': ['bpm-modeler/js/libs/jquery/plugins/jquery.url', 'https://raw.github.com/allmarkedup/jQuery-URL-Parser/4f5254f2519111ad7037d398b2efa61d3cda58d4/jquery.url'],
+ 'jquery.jqprint': ['bpm-modeler/js/libs/jquery/plugins/jquery.jqprint-0.3', 'https://raw.github.com/tanathos/jquery.jqprint/master/jquery.jqprint-0.3'],
+
+ 'jslint': ['bpm-modeler/js/libs/jslint/jslint', 'https://raw.github.com/douglascrockford/JSLint/996246308b755df665bd6c4f3ae59d655ae0a97e/jslint'],
+
+ 'modeler-plugins': '../services/rest/bpm-modeler/config/ui/plugins/modeler-plugins',
+ 'i18n' : 'common/InfinityBPMI18N',
+ 'ace': ['bpm-modeler/js/libs/ace/ace', 'https://github.com/ajaxorg/ace-builds/blob/master/src/ace']
+ },
+ shim: {
+ 'angularjs': {
+ require: "jquery",
+ exports: "angular"
+ },
+ 'json': {
+ exports: "JSON"
+ },
+ 'raphael': {
+ exports: 'Raphael'
+ },
+ 'i18n': {
+ exports: "InfinityBPMI18N"
+ },
+ 'jquery-ui': ['jquery'],
+ 'jquery.download': ['jquery'],
+ 'jquery.form': ['jquery'],
+ 'jquery.jeditable': ['jquery'],
+ 'jquery.simplemodal': ['jquery'],
+ 'jquery.tablescroll': ['jquery'],
+ 'jquery.treeTable': ['jquery'],
+ 'jquery.url': ['jquery'],
+ 'jquery.jqprint': ['jquery'],
+ }
+});
+
+require(["require",
+ "jquery",
+ "json",
+ "raphael",
+
+ "jquery-ui",
+ "jquery.download",
+ "jquery.form",
+ "jquery.jeditable",
+ "jquery.simplemodal",
+ "jquery.tablescroll",
+ "jquery.treeTable",
+ "jquery.url",
+ "ace",
+ "jquery.jqprint",
+
+ "jslint",
+
+ "modeler-plugins",
+ "bpm-modeler/js/extensions_jquery",
+ "bpm-modeler/js/extensions_raphael",
+ "bpm-modeler/js/m_modelerViewLayoutManager",
+ "i18n",
+ "bpm-modeler/angular/app"
+ ], function (require) {
+
+ require("bpm-modeler/angular/app").init();
+
+ require("bpm-modeler/js/m_modelerViewLayoutManager").initialize(
+ $.url(window.location.search).param("fullId"));
+});
+
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/organizationViewMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/organizationViewMain.js
index 152656f..489aba4 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/organizationViewMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/organizationViewMain.js
@@ -22,7 +22,6 @@ require.config({
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/outline_main.js b/web-modeler/src/main/resources/META-INF/xhtml/js/outline_main.js
index 8275beb..04fab08 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/outline_main.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/outline_main.js
@@ -1,69 +1,68 @@
-/*******************************************************************************
- * Copyright (c) 2011 SunGard CSA LLC and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: SunGard CSA LLC - initial API and implementation and/or initial
- * documentation
- ******************************************************************************/
-
-/**
- * @author Omkar.Patil
- * @author Robert Sauer
- */
-
-require.config({
- baseUrl: "../../",
- paths : {
- 'jquery' : ['bpm-modeler/js/libs/jquery/jquery-1.7.2', '//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min'],
- 'json' : ['bpm-modeler/js/libs/json/json2', '//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2'],
- 'raphael' : ['bpm-modeler/js/libs/raphael/2.0.1/raphael', '//cdnjs.cloudflare.com/ajax/libs/raphael/2.0.1/raphael-min'],
- 'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
-
- 'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/e6b2a1730d5c94e5d699f7656a76d1439c85889c/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
- 'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
- 'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
- 'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
- 'jquery.jstree': ['bpm-modeler/js/libs/jquery/plugins/jquery.jstree', 'https://jstree.googlecode.com/svn-history/r191/trunk/jquery.jstree'],
- 'jquery.simplemodal': ['bpm-modeler/js/libs/jquery/plugins/jquery.simplemodal.1.4.1.min', '//simplemodal.googlecode.com/files/jquery.simplemodal.1.4.1.min'],
- 'jquery.tablescroll': ['bpm-modeler/js/libs/jquery/plugins/jquery.tablescroll', 'https://raw.github.com/farinspace/jquery.tableScroll/master/jquery.tablescroll'],
- 'jquery.treeTable': ['bpm-modeler/js/libs/jquery/plugins/jquery.treeTable', 'https://raw.github.com/ludo/jquery-treetable/master/src/javascripts/jquery.treeTable'],
- 'jquery.url': ['bpm-modeler/js/libs/jquery/plugins/jquery.url', 'https://raw.github.com/allmarkedup/jQuery-URL-Parser/4f5254f2519111ad7037d398b2efa61d3cda58d4/jquery.url'],
-
- 'outline-plugins': '../services/rest/bpm-modeler/config/ui/plugins/outline-plugins',
- 'i18n' : 'common/InfinityBPMI18N'
- },
- shim: {
- 'raphael': {
- exports: "Raphael"
- },
- 'i18n': {
- exports: "InfinityBPMI18N"
- },
- 'jquery-ui': ['jquery'],
- 'jquery.download': ['jquery'],
- 'jquery.form': ['jquery'],
- 'jquery.jstree': ['jquery'],
- 'jquery.simplemodal': ['jquery'],
- 'jquery.url': ['jquery']
- }
-});
-
-define([
- "jquery",
- "jquery-ui",
- "jquery.download",
- "jquery.form",
- "jquery.simplemodal",
- "jquery.url",
- "jquery.jstree",
- "outline-plugins",
- "i18n",
- "bpm-modeler/js/m_outline"
-], function() {
- var outline = require('bpm-modeler/js/m_outline');
- outline.init();
-});
-
+/*******************************************************************************
+ * Copyright (c) 2011 SunGard CSA LLC and others. All rights reserved. This
+ * program and the accompanying materials are made available under the terms of
+ * the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: SunGard CSA LLC - initial API and implementation and/or initial
+ * documentation
+ ******************************************************************************/
+
+/**
+ * @author Omkar.Patil
+ * @author Robert Sauer
+ */
+
+require.config({
+ baseUrl: "../../",
+ paths : {
+ 'jquery' : ['bpm-modeler/js/libs/jquery/jquery-1.7.2', '//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min'],
+ 'json' : ['bpm-modeler/js/libs/json/json2', '//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2'],
+ 'raphael' : ['bpm-modeler/js/libs/raphael/2.0.1/raphael', '//cdnjs.cloudflare.com/ajax/libs/raphael/2.0.1/raphael-min'],
+ 'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
+
+ 'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
+ 'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
+ 'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
+ 'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
+ 'jquery.jstree': ['bpm-modeler/js/libs/jquery/plugins/jquery.jstree', 'https://jstree.googlecode.com/svn-history/r191/trunk/jquery.jstree'],
+ 'jquery.simplemodal': ['bpm-modeler/js/libs/jquery/plugins/jquery.simplemodal.1.4.1.min', '//simplemodal.googlecode.com/files/jquery.simplemodal.1.4.1.min'],
+ 'jquery.tablescroll': ['bpm-modeler/js/libs/jquery/plugins/jquery.tablescroll', 'https://raw.github.com/farinspace/jquery.tableScroll/master/jquery.tablescroll'],
+ 'jquery.treeTable': ['bpm-modeler/js/libs/jquery/plugins/jquery.treeTable', 'https://raw.github.com/ludo/jquery-treetable/master/src/javascripts/jquery.treeTable'],
+ 'jquery.url': ['bpm-modeler/js/libs/jquery/plugins/jquery.url', 'https://raw.github.com/allmarkedup/jQuery-URL-Parser/4f5254f2519111ad7037d398b2efa61d3cda58d4/jquery.url'],
+
+ 'outline-plugins': '../services/rest/bpm-modeler/config/ui/plugins/outline-plugins',
+ 'i18n' : 'common/InfinityBPMI18N'
+ },
+ shim: {
+ 'raphael': {
+ exports: "Raphael"
+ },
+ 'i18n': {
+ exports: "InfinityBPMI18N"
+ },
+ 'jquery-ui': ['jquery'],
+ 'jquery.download': ['jquery'],
+ 'jquery.form': ['jquery'],
+ 'jquery.jstree': ['jquery'],
+ 'jquery.simplemodal': ['jquery'],
+ 'jquery.url': ['jquery']
+ }
+});
+
+define([
+ "jquery",
+ "jquery-ui",
+ "jquery.download",
+ "jquery.form",
+ "jquery.simplemodal",
+ "jquery.url",
+ "jquery.jstree",
+ "outline-plugins",
+ "i18n",
+ "bpm-modeler/js/m_outline"
+], function() {
+ var outline = require('bpm-modeler/js/m_outline');
+ outline.init();
+});
+
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/processInterfaceTestWrapperWizardMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/processInterfaceTestWrapperWizardMain.js
index b44ea97..3690b71 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/processInterfaceTestWrapperWizardMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/processInterfaceTestWrapperWizardMain.js
@@ -29,9 +29,6 @@ require
'jquery-ui' : [
'bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min',
'//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min' ],
- 'jquery.atmosphere' : [
- 'bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere',
- 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere' ],
'jquery.download' : [
'bpm-modeler/js/libs/jquery/plugins/download.jQuery',
'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download' ],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/reportMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/reportMain.js
index a5be41b..885408c 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/reportMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/reportMain.js
@@ -1,62 +1,61 @@
-/*******************************************************************************
- * Copyright (c) 2011 SunGard CSA LLC and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: SunGard CSA LLC - initial API and implementation and/or initial
- * documentation
- ******************************************************************************/
-
-'use strict';
-
-/**
- * @author Robert Sauer
- */
-
-require.config({
- baseUrl: "../../../",
- paths : {
- 'jquery' : ['bpm-modeler/js/libs/jquery/jquery-1.7.2', '//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min'],
- 'json' : ['bpm-modeler/js/libs/json/json2', '//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2'],
- 'raphael' : ['bpm-modeler/js/libs/raphael/2.0.1/raphael', '//cdnjs.cloudflare.com/ajax/libs/raphael/2.0.1/raphael-min'],
- 'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
-
- 'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
- 'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
- 'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
- 'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
- 'jquery.jstree': ['bpm-modeler/js/libs/jquery/plugins/jquery.jstree', 'https://jstree.googlecode.com/svn-history/r191/trunk/jquery.jstree'],
- 'jquery.simplemodal': ['bpm-modeler/js/libs/jquery/plugins/jquery.simplemodal.1.4.1.min', '//simplemodal.googlecode.com/files/jquery.simplemodal.1.4.1.min'],
- 'jquery.tablescroll': ['bpm-modeler/js/libs/jquery/plugins/jquery.tablescroll', 'https://raw.github.com/farinspace/jquery.tableScroll/master/jquery.tablescroll'],
- 'jquery.treeTable': ['bpm-modeler/js/libs/jquery/plugins/jquery.treeTable', 'https://raw.github.com/ludo/jquery-treetable/master/src/javascripts/jquery.treeTable'],
- 'jquery.url': ['bpm-modeler/js/libs/jquery/plugins/jquery.url', 'https://raw.github.com/allmarkedup/jQuery-URL-Parser/4f5254f2519111ad7037d398b2efa61d3cda58d4/jquery.url'],
-
- 'common-plugins': '../services/rest/bpm-modeler/config/ui/plugins/common-plugins'
- },
- shim: {
- 'angularjs': {
- require: "jquery",
- exports: "angular"
- },
- 'jquery-ui': ['jquery'],
- 'jquery.download': ['jquery'],
- 'jquery.form': ['jquery'],
- 'jquery.jstree': ['jquery'],
- 'jquery.simplemodal': ['jquery'],
- 'jquery.url': ['jquery']
- }
-});
-
-define('reportMain',[
- "reportApp",
- "jquery",
- "common-plugins",
- "reportControllers"
-], function(reportApp, jQuery) {
- jQuery(document).ready(function() {
- reportApp.init();
- });
-});
-
+/*******************************************************************************
+ * Copyright (c) 2011 SunGard CSA LLC and others. All rights reserved. This
+ * program and the accompanying materials are made available under the terms of
+ * the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: SunGard CSA LLC - initial API and implementation and/or initial
+ * documentation
+ ******************************************************************************/
+
+'use strict';
+
+/**
+ * @author Robert Sauer
+ */
+
+require.config({
+ baseUrl: "../../../",
+ paths : {
+ 'jquery' : ['bpm-modeler/js/libs/jquery/jquery-1.7.2', '//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min'],
+ 'json' : ['bpm-modeler/js/libs/json/json2', '//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2'],
+ 'raphael' : ['bpm-modeler/js/libs/raphael/2.0.1/raphael', '//cdnjs.cloudflare.com/ajax/libs/raphael/2.0.1/raphael-min'],
+ 'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
+
+ 'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
+ 'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
+ 'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
+ 'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
+ 'jquery.jstree': ['bpm-modeler/js/libs/jquery/plugins/jquery.jstree', 'https://jstree.googlecode.com/svn-history/r191/trunk/jquery.jstree'],
+ 'jquery.simplemodal': ['bpm-modeler/js/libs/jquery/plugins/jquery.simplemodal.1.4.1.min', '//simplemodal.googlecode.com/files/jquery.simplemodal.1.4.1.min'],
+ 'jquery.tablescroll': ['bpm-modeler/js/libs/jquery/plugins/jquery.tablescroll', 'https://raw.github.com/farinspace/jquery.tableScroll/master/jquery.tablescroll'],
+ 'jquery.treeTable': ['bpm-modeler/js/libs/jquery/plugins/jquery.treeTable', 'https://raw.github.com/ludo/jquery-treetable/master/src/javascripts/jquery.treeTable'],
+ 'jquery.url': ['bpm-modeler/js/libs/jquery/plugins/jquery.url', 'https://raw.github.com/allmarkedup/jQuery-URL-Parser/4f5254f2519111ad7037d398b2efa61d3cda58d4/jquery.url'],
+
+ 'common-plugins': '../services/rest/bpm-modeler/config/ui/plugins/common-plugins'
+ },
+ shim: {
+ 'angularjs': {
+ require: "jquery",
+ exports: "angular"
+ },
+ 'jquery-ui': ['jquery'],
+ 'jquery.download': ['jquery'],
+ 'jquery.form': ['jquery'],
+ 'jquery.jstree': ['jquery'],
+ 'jquery.simplemodal': ['jquery'],
+ 'jquery.url': ['jquery']
+ }
+});
+
+define('reportMain',[
+ "reportApp",
+ "jquery",
+ "common-plugins",
+ "reportControllers"
+], function(reportApp, jQuery) {
+ jQuery(document).ready(function() {
+ reportApp.init();
+ });
+});
+
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/roleViewMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/roleViewMain.js
index 61cea5a..b7f649d 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/roleViewMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/roleViewMain.js
@@ -22,7 +22,6 @@ require.config({
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/serviceWrapperWizardMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/serviceWrapperWizardMain.js
index 6be6a4d..ec4c282 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/serviceWrapperWizardMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/serviceWrapperWizardMain.js
@@ -29,9 +29,6 @@ require
'jquery-ui' : [
'bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min',
'//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min' ],
- 'jquery.atmosphere' : [
- 'bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere',
- 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere' ],
'jquery.download' : [
'bpm-modeler/js/libs/jquery/plugins/download.jQuery',
'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download' ],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/uiMashupApplicationViewMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/uiMashupApplicationViewMain.js
index 1652cf6..a02000e 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/uiMashupApplicationViewMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/uiMashupApplicationViewMain.js
@@ -21,7 +21,6 @@ require.config({
'raphael' : ['bpm-modeler/js/libs/raphael/2.0.1/raphael', '//cdnjs.cloudflare.com/ajax/libs/raphael/2.0.1/raphael-min'],
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/webServiceApplicationViewMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/webServiceApplicationViewMain.js
index 4a866d6..1ab851f 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/webServiceApplicationViewMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/webServiceApplicationViewMain.js
@@ -22,7 +22,6 @@ require.config({
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/xsdStructuredDataTypeViewMain.js b/web-modeler/src/main/resources/META-INF/xhtml/js/xsdStructuredDataTypeViewMain.js
index 19b1ef0..cccba28 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/xsdStructuredDataTypeViewMain.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/xsdStructuredDataTypeViewMain.js
@@ -21,7 +21,6 @@ require.config({
'angularjs' : ['bpm-modeler/js/libs/angular/angular-1.0.2', '//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min'],
'jquery-ui': ['bpm-modeler/js/libs/jquery/plugins/jquery-ui-1.8.19.min', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min'],
- 'jquery.atmosphere': ['bpm-modeler/js/libs/jquery/plugins/jquery.atmosphere', 'https://raw.github.com/Atmosphere/atmosphere/cc760abedaa3d1f8bd7952c9555f7f40b8f41e2e/modules/jquery/src/main/webapp/jquery/jquery.atmosphere'],
'jquery.download': ['bpm-modeler/js/libs/jquery/plugins/download.jQuery', 'https://raw.github.com/filamentgroup/jQuery-File-Download/master/jQuery.download'],
'jquery.jeditable': ['bpm-modeler/js/libs/jquery/plugins/jquery.jeditable', 'https://raw.github.com/tuupola/jquery_jeditable/bae12d99ab991cd915805667ef72b8c9445548e0/jquery.jeditable'],
'jquery.form': ['bpm-modeler/js/libs/jquery/plugins/jquery.form', 'https://raw.github.com/malsup/form/5d413a0169b673c9ee81d5f458b1c955ff1b8027/jquery.form'],
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/public/chat.html b/web-modeler/src/main/resources/META-INF/xhtml/public/chat.html
deleted file mode 100644
index b647101..0000000
--- a/web-modeler/src/main/resources/META-INF/xhtml/public/chat.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-
-<script type="text/javascript" src="jquery/jquery-1.7.2.js"></script>
-<script type="text/javascript" src="jquery/jquery.atmosphere.js"></script>
-<script type="text/javascript" src="jquery/application.js"></script>
-
-<html>
-
-<head>
- <meta charset="utf-8">
- <title>Atmosphere Chat</title>
-
- <style>
- * {
- font-family: tahoma;
- font-size: 12px;
- padding: 0px;
- margin: 0px;
- }
-
- p {
- line-height: 18px;
- }
-
- div {
- width: 500px;
- margin-left: auto;
- margin-right: auto;
- }
-
- #content {
- padding: 5px;
- background: #ddd;
- border-radius: 5px;
- border: 1px solid #CCC;
- margin-top: 10px;
- }
-
- #header {
- padding: 5px;
- background: #f5deb3;
- border-radius: 5px;
- border: 1px solid #CCC;
- margin-top: 10px;
- }
-
- #input {
- border-radius: 2px;
- border: 1px solid #ccc;
- margin-top: 10px;
- padding: 5px;
- width: 400px;
- }
-
- #status {
- width: 88px;
- display: block;
- float: left;
- margin-top: 15px;
- }
- </style>
-</head>
-<body>
-<div id="header"><h3>Atmosphere Chat. Default transport is WebSocket, fallback is long-polling</h3></div>
-<div id="content"></div>
-<div>
- <span id="status">Connecting...</span>
- <input type="text" id="input" disabled="disabled"/>
-</div>
-
-</body>
-</html> \ No newline at end of file
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/public/jquery/application.js b/web-modeler/src/main/resources/META-INF/xhtml/public/jquery/application.js
deleted file mode 100644
index 51fe651..0000000
--- a/web-modeler/src/main/resources/META-INF/xhtml/public/jquery/application.js
+++ /dev/null
@@ -1,87 +0,0 @@
-$(function () {
- "use strict";
-
- var content = $('#content');
- var input = $('#input');
- var status = $('#status');
- var myName = false;
- var author = null;
- var logged = false;
- var socket = $.atmosphere;
- var request = { url: 'http://localhost:8080/pepper-test/services/streaming/chat/nase',
- contentType : "application/json",
- logLevel : 'debug',
- transport : 'websocket' ,
- fallbackTransport: 'long-polling'};
-
-
- request.onOpen = function(response) {
- content.html($('<p>', { text: 'Atmosphere connected using ' + response.transport }));
- input.removeAttr('disabled').focus();
- status.text('Choose name:');
- };
-
- request.onMessage = function (response) {
- var message = response.responseBody;
- try {
- var json = jQuery.parseJSON(message);
- } catch (e) {
- console.log('This doesn\'t look like a valid JSON: ', message.data);
- return;
- }
-
- if (!logged) {
- logged = true;
- status.text(myName + ': ').css('color', 'blue');
- input.removeAttr('disabled').focus();
- } else {
- input.removeAttr('disabled');
-
- var me = json.author == author;
- var date = typeof(json.time) == 'string' ? parseInt(json.time) : json.time;
- addMessage(json.author, json.message, me ? 'blue' : 'black', new Date(date));
- }
- };
-
- request.onClose = function(response) {
- logged = false;
- };
-
- request.onError = function(response) {
- content.html($('<p>', { text: 'Sorry, but there\'s some problem with your '
- + 'socket or the server is down' }));
- };
-
- var subSocket = socket.subscribe(request);
-
- input.keydown(function(e) {
- if (e.keyCode === 13) {
- var msg = $(this).val();
-
- // First message is always the author's name
- if (author == null) {
- author = msg;
- }
-
- var reqBroadcast = new $.atmosphere.AtmosphereRequest();
- reqBroadcast.contentType = 'application/json';
- reqBroadcast.data = jQuery.stringifyJSON({ author: author, message: msg });
- reqBroadcast.transport = 'websocket';
- reqBroadcast.fallbackTransport = 'long-polling';
- subSocket.push(reqBroadcast);
- $(this).val('');
-
- input.attr('disabled', 'disabled');
- if (myName === false) {
- myName = msg;
- }
- }
- });
-
- function addMessage(author, message, color, datetime) {
- content.append('<p><span style="color:' + color + '">' + author + '</span> @ ' +
- + (datetime.getHours() < 10 ? '0' + datetime.getHours() : datetime.getHours()) + ':'
- + (datetime.getMinutes() < 10 ? '0' + datetime.getMinutes() : datetime.getMinutes())
- + ': ' + message + '</p>');
- }
-}); \ No newline at end of file