Skip to content

Commit 9bc6dd8

Browse files
dsato80dsato80
committed
add 2d sampling server
1 parent 8621fb8 commit 9bc6dd8

18 files changed

+2543
-120
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
LocationService/WebContent/js/lib/DataTables-1.10.6/
2+
LocationService/WebContent/js/lib/jquery-ui-1.11.4/
3+
*.jar

‎LocationService/.classpath

+24-34
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,24 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="resource"/>
5-
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
6-
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
7-
<classpathentry combineaccessrules="false" kind="src" path="/location-service-library"/>
8-
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.ibm.ws.st.core.runtimeClasspathProvider/WebSphere Application Server V8.5 Liberty Profile">
9-
<attributes>
10-
<attribute name="owner.project.facets" value="jst.web"/>
11-
</attributes>
12-
</classpathentry>
13-
<classpathentry kind="src" path=".apt_generated">
14-
<attributes>
15-
<attribute name="optional" value="true"/>
16-
</attributes>
17-
</classpathentry>
18-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java70">
19-
<attributes>
20-
<attribute name="owner.project.facets" value="java"/>
21-
</attributes>
22-
</classpathentry>
23-
<classpathentry kind="lib" path="/location-service-library/lib/commons-math3-3.3.jar">
24-
<attributes>
25-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
26-
</attributes>
27-
</classpathentry>
28-
<classpathentry kind="lib" path="/location-service-library/lib/wink-1.4.jar">
29-
<attributes>
30-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
31-
</attributes>
32-
</classpathentry>
33-
<classpathentry kind="output" path="build/classes"/>
34-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src"/>
4+
<classpathentry kind="src" path="resource"/>
5+
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
6+
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
7+
<classpathentry combineaccessrules="false" kind="src" path="/location-service-library"/>
8+
<classpathentry kind="src" path=".apt_generated">
9+
<attributes>
10+
<attribute name="optional" value="true"/>
11+
</attributes>
12+
</classpathentry>
13+
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.ibm.ws.st.core.runtimeClasspathProvider/WebSphere Application Server Liberty Profile">
14+
<attributes>
15+
<attribute name="owner.project.facets" value="jst.web"/>
16+
</attributes>
17+
</classpathentry>
18+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0_73]">
19+
<attributes>
20+
<attribute name="owner.project.facets" value="java"/>
21+
</attributes>
22+
</classpathentry>
23+
<classpathentry kind="output" path="build/classes"/>
24+
</classpath>

‎LocationService/.settings/org.eclipse.wst.common.project.facet.core.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<faceted-project>
3-
<runtime name="WebSphere Application Server V8.5 Liberty Profile"/>
4-
<fixed facet="jst.web"/>
5-
<fixed facet="wst.jsdt.web"/>
6-
<fixed facet="java"/>
7-
<installed facet="jst.web" version="3.0"/>
8-
<installed facet="wst.jsdt.web" version="1.0"/>
9-
<installed facet="java" version="1.7"/>
10-
</faceted-project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<faceted-project>
3+
<runtime name="WebSphere Application Server Liberty Profile"/>
4+
<fixed facet="jst.web"/>
5+
<fixed facet="wst.jsdt.web"/>
6+
<fixed facet="java"/>
7+
<installed facet="jst.web" version="3.0"/>
8+
<installed facet="wst.jsdt.web" version="1.0"/>
9+
<installed facet="java" version="1.7"/>
10+
</faceted-project>

‎LocationService/WebContent/WEB-INF/urlrewriterules.xml

+27-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<urlrewrite>
3-
4-
<rule>
5-
<from>^/location/beacons/([^/]+)/(.+)$</from>
6-
<to>/location/beacons?action=$1&amp;user_id=$2</to>
7-
</rule>
8-
9-
<rule>
10-
<from>^/location/beacons/(.+)$</from>
11-
<to>/location/beacons?user_id=$1</to>
12-
</rule>
13-
14-
</urlrewrite>
15-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<urlrewrite>
3+
<rule>
4+
<from>^/location/beacons/([^/]+)/(.+)$</from>
5+
<to>/location/beacons?action=$1&amp;user_id=$2</to>
6+
</rule>
7+
8+
<rule>
9+
<from>^/location/beacons/(.+)$</from>
10+
<to>/location/beacons?user_id=$1</to>
11+
</rule>
12+
13+
<rule>
14+
<from>^/data/([^/]+)/?$</from>
15+
<to>/data?type=$1</to>
16+
</rule>
17+
18+
<rule>
19+
<from>^/data/([^/]+)/([^/]+)/?$</from>
20+
<to>/data?type=$1&amp;id=$2</to>
21+
</rule>
22+
23+
<rule>
24+
<from>^/data/([^/]+)/(.+)$</from>
25+
<to>/data?type=$1&amp;id=$2</to>
26+
</rule>
27+
</urlrewrite>

‎LocationService/WebContent/env_editor.html

+18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
<!DOCTYPE html>
2+
<!----------------------------------------------------------------------------
3+
Copyright (c) 2014, 2015 IBM Corporation
4+
Permission is hereby granted, free of charge, to any person obtaining a copy
5+
of this software and associated documentation files (the "Software"), to deal
6+
in the Software without restriction, including without limitation the rights
7+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is
9+
furnished to do so, subject to the following conditions:
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
13+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
15+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
16+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
17+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
18+
THE SOFTWARE.
19+
------------------------------------------------------------------------------>
220
<html>
321
<head>
422
<meta charset="UTF-8">

0 commit comments

Comments
 (0)