Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-08-14 00:07:04 +0000
committerRoberto E. Escobar2014-09-29 22:55:19 +0000
commit84045a1897455dd7988bc473938cda7fee39c22d (patch)
treeeae246b022e6e657eea08a668eff990c5cf450a9
parent436b129e96abc4028393ae3e817cdda4f70e68a1 (diff)
downloadorg.eclipse.osee-84045a1897455dd7988bc473938cda7fee39c22d.tar.gz
org.eclipse.osee-84045a1897455dd7988bc473938cda7fee39c22d.tar.xz
org.eclipse.osee-84045a1897455dd7988bc473938cda7fee39c22d.zip
feature[ats_ATS99009]: Contribute all static content through JAX-RS
-rw-r--r--features/org.eclipse.osee.x.server.external.feature/feature.xml7
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/build.properties3
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/plugin.xml12
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/resources/DispoApplication.java2
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/web/js/dispoApp.js10
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/web/main.html2
-rw-r--r--plugins/org.eclipse.osee.web/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.web/build.properties3
-rw-r--r--plugins/org.eclipse.osee.web/plugin.xml12
10 files changed, 11 insertions, 45 deletions
diff --git a/features/org.eclipse.osee.x.server.external.feature/feature.xml b/features/org.eclipse.osee.x.server.external.feature/feature.xml
index 0088490af7c..1f5ed9ca773 100644
--- a/features/org.eclipse.osee.x.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.x.server.external.feature/feature.xml
@@ -346,11 +346,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.equinox.http.registry"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF
index 95c85aed9ab..318962aff86 100644
--- a/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF
@@ -1,11 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: OSEE Disposition REST (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.disposition.rest;singleton:=true
+Bundle-SymbolicName: org.eclipse.osee.disposition.rest
Bundle-Version: 0.19.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Eclipse Open System Engineering Environment
Service-Component: OSGI-INF/*.xml
+Osee-JaxRs-Resource: /web/*;path=/dispo
Import-Package:
com.google.common.collect,
com.google.common.io,
@@ -31,4 +32,3 @@ Import-Package:
org.eclipse.osee.orcs.utility,
org.eclipse.osee.template.engine,
org.json
-Require-Bundle: org.eclipse.equinox.http.registry
diff --git a/plugins/org.eclipse.osee.disposition.rest/build.properties b/plugins/org.eclipse.osee.disposition.rest/build.properties
index 948f0bdf020..c58ea2178c3 100644
--- a/plugins/org.eclipse.osee.disposition.rest/build.properties
+++ b/plugins/org.eclipse.osee.disposition.rest/build.properties
@@ -2,5 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- OSGI-INF/,\
- plugin.xml
+ OSGI-INF/
diff --git a/plugins/org.eclipse.osee.disposition.rest/plugin.xml b/plugins/org.eclipse.osee.disposition.rest/plugin.xml
deleted file mode 100644
index ca1cbe680a8..00000000000
--- a/plugins/org.eclipse.osee.disposition.rest/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.equinox.http.registry.resources">
- <resource
- alias="/dispo"
- base-name="/web">
- </resource>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/resources/DispoApplication.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/resources/DispoApplication.java
index 1fa2190882f..3fbb3ba11cd 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/resources/DispoApplication.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/resources/DispoApplication.java
@@ -27,7 +27,7 @@ import org.eclipse.osee.disposition.rest.util.TemplateRegistry;
/**
* @author Angel Avila
*/
-@ApplicationPath("dispor")
+@ApplicationPath("dispo")
public final class DispoApplication extends Application {
private DispoApi dispoApi;
diff --git a/plugins/org.eclipse.osee.disposition.rest/web/js/dispoApp.js b/plugins/org.eclipse.osee.disposition.rest/web/js/dispoApp.js
index 2ded8528b37..0f23a005e72 100644
--- a/plugins/org.eclipse.osee.disposition.rest/web/js/dispoApp.js
+++ b/plugins/org.eclipse.osee.disposition.rest/web/js/dispoApp.js
@@ -52,7 +52,7 @@ app.directive('ngModelOnblur', function() {
app.provider('Program', function() {
this.$get = ['$resource',
function($resource) {
- var Program = $resource('/dispor/program/:programId', {}, {});
+ var Program = $resource('/dispo/program/:programId', {}, {});
return Program;
}
];
@@ -61,7 +61,7 @@ app.provider('Program', function() {
app.provider('Report', function() {
this.$get = ['$resource',
function($resource) {
- var Program = $resource('/dispor/program/:programId/report', {}, {});
+ var Program = $resource('/dispo/program/:programId/report', {}, {});
return Program;
}
];
@@ -70,7 +70,7 @@ app.provider('Report', function() {
app.provider('Set', function() {
this.$get = ['$resource',
function($resource) {
- var Set = $resource('/dispor/program/:programId/set/:setId', {}, {
+ var Set = $resource('/dispo/program/:programId/set/:setId', {}, {
update: {
method: 'PUT'
}
@@ -85,7 +85,7 @@ app.provider('Item', function() {
'$resource',
function($resource) {
var Item = $resource(
- '/dispor/program/:programId/set/:setId/item/:itemId', {}, {
+ '/dispo/program/:programId/set/:setId/item/:itemId', {}, {
update: {
method: 'PUT'
}
@@ -100,7 +100,7 @@ app.provider('Annotation', function() {
'$resource',
function($resource) {
var Annotation = $resource(
- '/dispor/program/:programId/set/:setId/item/:itemId/annotation/:annotationId', {}, {
+ '/dispo/program/:programId/set/:setId/item/:itemId/annotation/:annotationId', {}, {
update: {
method: 'PUT'
}
diff --git a/plugins/org.eclipse.osee.disposition.rest/web/main.html b/plugins/org.eclipse.osee.disposition.rest/web/main.html
index ebd506bf5be..54461d2b84c 100644
--- a/plugins/org.eclipse.osee.disposition.rest/web/main.html
+++ b/plugins/org.eclipse.osee.disposition.rest/web/main.html
@@ -5,8 +5,6 @@
<meta charset="ISO-8859-1">
<title>Disposition</title>
<link rel="stylesheet" href="/lib/css/bootstrap.min.css">
- <link href="/lib/css/bootstrap-responsive.css" rel="stylesheet">
- <link rel="stylesheet" type="text/css" href="http://angular-ui.github.com/ng-grid/css/ng-grid.css" />
<link href="css/user.css" rel="stylesheet">
<link href="css/admin.css" rel="stylesheet">
</head>
diff --git a/plugins/org.eclipse.osee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.web/META-INF/MANIFEST.MF
index 4cb133d12a0..f80aaff4a77 100644
--- a/plugins/org.eclipse.osee.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.web/META-INF/MANIFEST.MF
@@ -5,3 +5,4 @@ Bundle-SymbolicName: org.eclipse.osee.web;singleton:=true
Bundle-Version: 0.19.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Eclipse Open System Engineering Environment
+Osee-JaxRs-Resource: /web/*;path=/lib
diff --git a/plugins/org.eclipse.osee.web/build.properties b/plugins/org.eclipse.osee.web/build.properties
index 1e80806d8a4..22deba1d445 100644
--- a/plugins/org.eclipse.osee.web/build.properties
+++ b/plugins/org.eclipse.osee.web/build.properties
@@ -1,4 +1,3 @@
bin.includes = META-INF/,\
.,\
- web/,\
- plugin.xml
+ web/
diff --git a/plugins/org.eclipse.osee.web/plugin.xml b/plugins/org.eclipse.osee.web/plugin.xml
deleted file mode 100644
index 77c929666b1..00000000000
--- a/plugins/org.eclipse.osee.web/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.equinox.http.registry.resources">
- <resource
- alias="/lib"
- base-name="/web">
- </resource>
- </extension>
-
-</plugin>

Back to the top