From 2e27ed6dc2974facd517bac7258f3dffddc49b7e Mon Sep 17 00:00:00 2001 From: Constantin Jucovschi <jucovschi@gmail.com> Date: Wed, 27 Aug 2014 16:18:02 +0200 Subject: [PATCH] version 0.0.6 --- .classpath | 32 ---- .gitignore | 4 + .settings/org.eclipse.core.resources.prefs | 3 - .settings/org.eclipse.jdt.core.prefs | 5 - .settings/org.eclipse.m2e.core.prefs | 4 - js/info_kwarc_sally_comm_core.js | 125 ++++++++------- js/info_kwarc_sally_comm_frames.js | 169 +++++++++++---------- js/info_kwarc_sally_comm_theo.js | 149 +++++++++--------- pom.xml | 2 +- 9 files changed, 246 insertions(+), 247 deletions(-) delete mode 100644 .classpath delete mode 100644 .settings/org.eclipse.core.resources.prefs delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 .settings/org.eclipse.m2e.core.prefs diff --git a/.classpath b/.classpath deleted file mode 100644 index 4556759..0000000 --- a/.classpath +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="src" output="target/classes" path="target/generated-sources/jaxb"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="output" path="target/classes"/> -</classpath> diff --git a/.gitignore b/.gitignore index fc3d428..73df13f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,7 @@ bin/ *.log felix-cache .metadata +pom.xml.versionsBackup +.classpath +.project +.settings \ No newline at end of file diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7ae16cf..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//target/generated-sources/jaxb=UTF-8 -encoding/<project>=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ec4300d..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/js/info_kwarc_sally_comm_core.js b/js/info_kwarc_sally_comm_core.js index 4a011e0..8d448bb 100644 --- a/js/info_kwarc_sally_comm_core.js +++ b/js/info_kwarc_sally_comm_core.js @@ -1,58 +1,71 @@ -var info_kwarc_sally_comm_core = { - name: 'info_kwarc_sally_comm_core', - defaultElementNamespaceURI: 'http:\/\/kwarc.info\/sally\/comm\/core', - typeInfos: [{ - type: 'classInfo', - localName: 'HeartbeatResponse', - propertyInfos: [] - }, { - type: 'classInfo', - localName: 'HeartbeatRequest', - propertyInfos: [] - }, { - type: 'classInfo', - localName: 'RegisterClientResponse', - propertyInfos: [{ - type: 'element', - name: 'sendQueue', - elementName: 'SendQueue', - typeInfo: 'String' - }] - }, { - type: 'classInfo', - localName: 'RegisterClientRequest', - propertyInfos: [{ - type: 'element', - name: 'listenQueue', - elementName: 'ListenQueue', - typeInfo: 'String' - }, { - type: 'element', - name: 'schemas', - collection: true, - elementName: 'Schemas', - typeInfo: 'String' - }, { - type: 'element', - name: 'environmentID', - elementName: 'EnvironmentID', - typeInfo: 'String' - }] - }], - elementInfos: [{ - elementName: 'HeartbeatResponse', - typeInfo: 'info_kwarc_sally_comm_core.HeartbeatResponse' - }, { - elementName: 'HeartbeatRequest', - typeInfo: 'info_kwarc_sally_comm_core.HeartbeatRequest' - }, { - elementName: 'RegisterClientResponse', - typeInfo: 'info_kwarc_sally_comm_core.RegisterClientResponse' - }, { - elementName: 'RegisterClientRequest', - typeInfo: 'info_kwarc_sally_comm_core.RegisterClientRequest' - }] +var _info_kwarc_sally_comm_core_factory = function () { + var info_kwarc_sally_comm_core = { + name: 'info_kwarc_sally_comm_core', + defaultElementNamespaceURI: 'http:\/\/kwarc.info\/sally\/comm\/core', + typeInfos: [{ + type: 'classInfo', + localName: 'HeartbeatResponse', + propertyInfos: [] + }, { + type: 'classInfo', + localName: 'HeartbeatRequest', + propertyInfos: [] + }, { + type: 'classInfo', + localName: 'RegisterClientResponse', + propertyInfos: [{ + type: 'element', + name: 'sendQueue', + elementName: 'SendQueue', + typeInfo: 'String' + }] + }, { + type: 'classInfo', + localName: 'RegisterClientRequest', + propertyInfos: [{ + type: 'element', + name: 'listenQueue', + elementName: 'ListenQueue', + typeInfo: 'String' + }, { + type: 'element', + name: 'schemas', + collection: true, + elementName: 'Schemas', + typeInfo: 'String' + }, { + type: 'element', + name: 'environmentID', + elementName: 'EnvironmentID', + typeInfo: 'String' + }] + }], + elementInfos: [{ + elementName: 'HeartbeatResponse', + typeInfo: 'info_kwarc_sally_comm_core.HeartbeatResponse' + }, { + elementName: 'HeartbeatRequest', + typeInfo: 'info_kwarc_sally_comm_core.HeartbeatRequest' + }, { + elementName: 'RegisterClientResponse', + typeInfo: 'info_kwarc_sally_comm_core.RegisterClientResponse' + }, { + elementName: 'RegisterClientRequest', + typeInfo: 'info_kwarc_sally_comm_core.RegisterClientRequest' + }] + }; + return { + info_kwarc_sally_comm_core: info_kwarc_sally_comm_core + }; }; -if (typeof require === 'function') { - module.exports.info_kwarc_sally_comm_core = info_kwarc_sally_comm_core; +if (typeof define === 'function' && define.amd) { + define([], _info_kwarc_sally_comm_core_factory); +} +else { + if (typeof module !== 'undefined' && module.exports) { + module.exports.info_kwarc_sally_comm_core = _info_kwarc_sally_comm_core_factory().info_kwarc_sally_comm_core; + } + else { + var info_kwarc_sally_comm_core = _info_kwarc_sally_comm_core_factory().info_kwarc_sally_comm_core; + } } \ No newline at end of file diff --git a/js/info_kwarc_sally_comm_frames.js b/js/info_kwarc_sally_comm_frames.js index c326fa2..8d69446 100644 --- a/js/info_kwarc_sally_comm_frames.js +++ b/js/info_kwarc_sally_comm_frames.js @@ -1,80 +1,93 @@ -var info_kwarc_sally_comm_frames = { - name: 'info_kwarc_sally_comm_frames', - defaultElementNamespaceURI: 'http:\/\/kwarc.info\/sally\/comm\/frames', - typeInfos: [{ - type: 'classInfo', - localName: 'RemoveDocLevelService', - propertyInfos: [{ - type: 'element', - name: 'id', - elementName: 'id', - typeInfo: 'String' - }] - }, { - type: 'classInfo', - localName: 'ExecDocLevelService', - propertyInfos: [{ - type: 'element', - name: 'id', - elementName: 'id', - typeInfo: 'String' - }] - }, { - type: 'classInfo', - localName: 'NewDocLevelService', - propertyInfos: [{ - type: 'element', - name: 'id', - elementName: 'id', - typeInfo: 'String' - }, { - type: 'element', - name: 'type', - elementName: 'type', - typeInfo: 'String' - }, { - type: 'element', - name: 'name', - elementName: 'name', - typeInfo: 'String' - }, { - type: 'element', - name: 'icon', - elementName: 'icon', - typeInfo: 'String' - }] - }, { - type: 'classInfo', - localName: 'ShowSallyFrameMenu', - propertyInfos: [{ - type: 'element', - name: 'posx', - elementName: 'posx', - typeInfo: 'Int' - }, { - type: 'element', - name: 'posy', - elementName: 'posy', - typeInfo: 'Int' - }] - }], - elementInfos: [{ - elementName: 'RemoveDocLevelService', - typeInfo: 'info_kwarc_sally_comm_frames.RemoveDocLevelService' - }, { - elementName: 'ExecDocLevelService', - typeInfo: 'info_kwarc_sally_comm_frames.ExecDocLevelService' - }, { - elementName: 'NewDocLevelService', - typeInfo: 'info_kwarc_sally_comm_frames.NewDocLevelService' - }, { - elementName: 'ShowSallyFrameMenu', - typeInfo: 'info_kwarc_sally_comm_frames.ShowSallyFrameMenu' - }, { - elementName: 'ListenDocLevelServices', - typeInfo: 'AnyType' - }] +var _info_kwarc_sally_comm_frames_factory = function () { + var info_kwarc_sally_comm_frames = { + name: 'info_kwarc_sally_comm_frames', + defaultElementNamespaceURI: 'http:\/\/kwarc.info\/sally\/comm\/frames', + typeInfos: [{ + type: 'classInfo', + localName: 'RemoveDocLevelService', + propertyInfos: [{ + type: 'element', + name: 'id', + elementName: 'id', + typeInfo: 'String' + }] + }, { + type: 'classInfo', + localName: 'ExecDocLevelService', + propertyInfos: [{ + type: 'element', + name: 'id', + elementName: 'id', + typeInfo: 'String' + }] + }, { + type: 'classInfo', + localName: 'NewDocLevelService', + propertyInfos: [{ + type: 'element', + name: 'id', + elementName: 'id', + typeInfo: 'String' + }, { + type: 'element', + name: 'type', + elementName: 'type', + typeInfo: 'String' + }, { + type: 'element', + name: 'name', + elementName: 'name', + typeInfo: 'String' + }, { + type: 'element', + name: 'icon', + elementName: 'icon', + typeInfo: 'String' + }] + }, { + type: 'classInfo', + localName: 'ShowSallyFrameMenu', + propertyInfos: [{ + type: 'element', + name: 'posx', + elementName: 'posx', + typeInfo: 'Int' + }, { + type: 'element', + name: 'posy', + elementName: 'posy', + typeInfo: 'Int' + }] + }], + elementInfos: [{ + elementName: 'RemoveDocLevelService', + typeInfo: 'info_kwarc_sally_comm_frames.RemoveDocLevelService' + }, { + elementName: 'ExecDocLevelService', + typeInfo: 'info_kwarc_sally_comm_frames.ExecDocLevelService' + }, { + elementName: 'NewDocLevelService', + typeInfo: 'info_kwarc_sally_comm_frames.NewDocLevelService' + }, { + elementName: 'ShowSallyFrameMenu', + typeInfo: 'info_kwarc_sally_comm_frames.ShowSallyFrameMenu' + }, { + elementName: 'ListenDocLevelServices', + typeInfo: 'AnyType' + }] + }; + return { + info_kwarc_sally_comm_frames: info_kwarc_sally_comm_frames + }; }; -if (typeof require === 'function') { - module.exports.info_kwarc_sally_comm_frames = info_kwarc_sally_comm_frames; +if (typeof define === 'function' && define.amd) { + define([], _info_kwarc_sally_comm_frames_factory); +} +else { + if (typeof module !== 'undefined' && module.exports) { + module.exports.info_kwarc_sally_comm_frames = _info_kwarc_sally_comm_frames_factory().info_kwarc_sally_comm_frames; + } + else { + var info_kwarc_sally_comm_frames = _info_kwarc_sally_comm_frames_factory().info_kwarc_sally_comm_frames; + } } \ No newline at end of file diff --git a/js/info_kwarc_sally_comm_theo.js b/js/info_kwarc_sally_comm_theo.js index f475565..722f69b 100644 --- a/js/info_kwarc_sally_comm_theo.js +++ b/js/info_kwarc_sally_comm_theo.js @@ -1,70 +1,83 @@ -var info_kwarc_sally_comm_theo = { - name: 'info_kwarc_sally_comm_theo', - defaultElementNamespaceURI: 'http:\/\/kwarc.info\/sally\/comm\/theo', - typeInfos: [{ - type: 'classInfo', - localName: 'OpenTheoWindowRequest', - propertyInfos: [{ - type: 'element', - name: 'url', - elementName: 'url', - typeInfo: 'String' - }, { - type: 'element', - name: 'title', - elementName: 'title', - typeInfo: 'String' - }, { - type: 'element', - name: 'posx', - elementName: 'posx', - typeInfo: 'Int' - }, { - type: 'element', - name: 'posy', - elementName: 'posy', - typeInfo: 'Int' - }, { - type: 'element', - name: 'width', - elementName: 'width', - typeInfo: 'Int' - }, { - type: 'element', - name: 'height', - elementName: 'height', - typeInfo: 'Int' - }] - }, { - type: 'classInfo', - localName: 'CloseTheoWindow', - propertyInfos: [{ - type: 'element', - name: 'id', - elementName: 'id', - typeInfo: 'String' - }] - }, { - type: 'classInfo', - localName: 'OpenTheoWindowResponse', - propertyInfos: [{ - type: 'element', - name: 'id', - elementName: 'id', - typeInfo: 'String' - }] - }], - elementInfos: [{ - elementName: 'OpenTheoWindowRequest', - typeInfo: 'info_kwarc_sally_comm_theo.OpenTheoWindowRequest' - }, { - elementName: 'CloseTheoWindow', - typeInfo: 'info_kwarc_sally_comm_theo.CloseTheoWindow' - }, { - elementName: 'OpenTheoWindowResponse', - typeInfo: 'info_kwarc_sally_comm_theo.OpenTheoWindowResponse' - }] +var _info_kwarc_sally_comm_theo_factory = function () { + var info_kwarc_sally_comm_theo = { + name: 'info_kwarc_sally_comm_theo', + defaultElementNamespaceURI: 'http:\/\/kwarc.info\/sally\/comm\/theo', + typeInfos: [{ + type: 'classInfo', + localName: 'OpenTheoWindowRequest', + propertyInfos: [{ + type: 'element', + name: 'url', + elementName: 'url', + typeInfo: 'String' + }, { + type: 'element', + name: 'title', + elementName: 'title', + typeInfo: 'String' + }, { + type: 'element', + name: 'posx', + elementName: 'posx', + typeInfo: 'Int' + }, { + type: 'element', + name: 'posy', + elementName: 'posy', + typeInfo: 'Int' + }, { + type: 'element', + name: 'width', + elementName: 'width', + typeInfo: 'Int' + }, { + type: 'element', + name: 'height', + elementName: 'height', + typeInfo: 'Int' + }] + }, { + type: 'classInfo', + localName: 'CloseTheoWindow', + propertyInfos: [{ + type: 'element', + name: 'id', + elementName: 'id', + typeInfo: 'String' + }] + }, { + type: 'classInfo', + localName: 'OpenTheoWindowResponse', + propertyInfos: [{ + type: 'element', + name: 'id', + elementName: 'id', + typeInfo: 'String' + }] + }], + elementInfos: [{ + elementName: 'OpenTheoWindowRequest', + typeInfo: 'info_kwarc_sally_comm_theo.OpenTheoWindowRequest' + }, { + elementName: 'CloseTheoWindow', + typeInfo: 'info_kwarc_sally_comm_theo.CloseTheoWindow' + }, { + elementName: 'OpenTheoWindowResponse', + typeInfo: 'info_kwarc_sally_comm_theo.OpenTheoWindowResponse' + }] + }; + return { + info_kwarc_sally_comm_theo: info_kwarc_sally_comm_theo + }; }; -if (typeof require === 'function') { - module.exports.info_kwarc_sally_comm_theo = info_kwarc_sally_comm_theo; +if (typeof define === 'function' && define.amd) { + define([], _info_kwarc_sally_comm_theo_factory); +} +else { + if (typeof module !== 'undefined' && module.exports) { + module.exports.info_kwarc_sally_comm_theo = _info_kwarc_sally_comm_theo_factory().info_kwarc_sally_comm_theo; + } + else { + var info_kwarc_sally_comm_theo = _info_kwarc_sally_comm_theo_factory().info_kwarc_sally_comm_theo; + } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index bc18f33..55de3d1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>info.kwarc.sally4.comm</groupId> <artifactId>comm-parent</artifactId> - <version>0.0.6-SNAPSHOT</version> + <version>0.0.6</version> <relativePath>../comm-parent</relativePath> </parent> -- GitLab