Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-05-30 22:09:39 +0000
committerRoberto E. Escobar2014-06-05 02:07:26 +0000
commit4bc20097148b163ee30a02c348ac73ab55b2bd32 (patch)
tree14daa067c71d315c680313e43a1c6b03d3e9e013
parent6b6cd487b312d6a044593e1d3589e9141945c679 (diff)
downloadorg.eclipse.osee-4bc20097148b163ee30a02c348ac73ab55b2bd32.tar.gz
org.eclipse.osee-4bc20097148b163ee30a02c348ac73ab55b2bd32.tar.xz
org.eclipse.osee-4bc20097148b163ee30a02c348ac73ab55b2bd32.zip
feature[ats_ATS59040]: Remove Vaadin support
-rw-r--r--features/org.eclipse.osee.x.core.external.feature/feature.xml7
-rw-r--r--features/org.eclipse.osee.x.core.external.feature/pom.xml1
-rw-r--r--features/org.eclipse.osee.x.core.feature/feature.xml23
-rw-r--r--features/org.eclipse.osee.x.server.feature/feature.xml3
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/.classpath7
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/.project28
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/build.properties4
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/closebutton.pngbin366 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/error_icon.pngbin439 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/favicon.icobin1406 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/linespacer.pngbin90 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_16.pngbin839 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_32.pngbin2818 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_large.pngbin19179 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_large.xcfbin55574 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css280
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/warning_icon.pngbin201 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/woodsonArrow.pngbin358 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/woodsonArrow_left.pngbin362 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.vaadin.widgets/.classpath7
-rw-r--r--plugins/org.eclipse.osee.vaadin.widgets/.project28
-rw-r--r--plugins/org.eclipse.osee.vaadin.widgets/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.osee.vaadin.widgets/build.properties4
-rw-r--r--plugins/org.eclipse.osee.vaadin.widgets/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/AccountMenuBar.java114
-rw-r--r--plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/ClientDetails.java99
-rw-r--r--plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/HasViewTitle.java18
-rw-r--r--plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/HasViews.java21
-rw-r--r--plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/Navigator.java425
-rw-r--r--plugins/org.eclipse.osee.vaadin/.classpath7
-rw-r--r--plugins/org.eclipse.osee.vaadin/.project33
-rw-r--r--plugins/org.eclipse.osee.vaadin/META-INF/MANIFEST.MF17
-rw-r--r--plugins/org.eclipse.osee.vaadin/OSGI-INF/vaadin.application.manager.xml26
-rw-r--r--plugins/org.eclipse.osee.vaadin/OSGI-INF/vaadin.resource.http.context.xml6
-rw-r--r--plugins/org.eclipse.osee.vaadin/build.properties5
-rw-r--r--plugins/org.eclipse.osee.vaadin/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/AbstractApplication.java134
-rw-r--r--plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/ApplicationConstants.java29
-rw-r--r--plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/ApplicationFactory.java22
-rw-r--r--plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/HasMultiplePages.java23
-rw-r--r--plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationServlet.java400
-rw-r--r--plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationServletManager.java162
-rw-r--r--plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationSession.java52
-rw-r--r--plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationState.java70
-rw-r--r--plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationUtils.java74
-rw-r--r--plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/BundleHttpContext.java46
-rw-r--r--plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ResourceHttpContext.java79
-rw-r--r--plugins/org.eclipse.osee.x.core.parent/pom.xml4
50 files changed, 0 insertions, 2382 deletions
diff --git a/features/org.eclipse.osee.x.core.external.feature/feature.xml b/features/org.eclipse.osee.x.core.external.feature/feature.xml
index b7f35409b1a..80caa51881a 100644
--- a/features/org.eclipse.osee.x.core.external.feature/feature.xml
+++ b/features/org.eclipse.osee.x.core.external.feature/feature.xml
@@ -90,13 +90,6 @@
unpack="false"/>
<plugin
- id="com.vaadin"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="javax.servlet"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.osee.x.core.external.feature/pom.xml b/features/org.eclipse.osee.x.core.external.feature/pom.xml
index 19e4cfaf52b..08fe545b009 100644
--- a/features/org.eclipse.osee.x.core.external.feature/pom.xml
+++ b/features/org.eclipse.osee.x.core.external.feature/pom.xml
@@ -26,7 +26,6 @@
<configuration>
<excludes>
<plugin id="org.apache.xerces" />
- <plugin id="com.vaadin" />
<plugin id="javax.xml" />
<plugin id="org.apache.xml.resolver" />
<plugin id="org.apache.xml.serializer" />
diff --git a/features/org.eclipse.osee.x.core.feature/feature.xml b/features/org.eclipse.osee.x.core.feature/feature.xml
index adb9b282998..944ff0fb2be 100644
--- a/features/org.eclipse.osee.x.core.feature/feature.xml
+++ b/features/org.eclipse.osee.x.core.feature/feature.xml
@@ -29,7 +29,6 @@
<import plugin="org.apache.commons.codec"/>
<import plugin="org.apache.xerces"/>
<import plugin="javax.mail.glassfish"/>
- <import plugin="com.vaadin" version="6.6.6" match="greaterOrEqual"/>
<import plugin="javax.servlet" version="2.5.0" match="greaterOrEqual"/>
<import plugin="com.sun.jersey" version="1.18.0" match="greaterOrEqual"/>
<import plugin="javax.ws.rs"/>
@@ -74,20 +73,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.osee.vaadin"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osee.vaadin.widgets"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.osee.event"
download-size="0"
install-size="0"
@@ -109,14 +94,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.osee.vaadin.themes"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
id="org.eclipse.osee.executor.admin"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.osee.x.server.feature/feature.xml b/features/org.eclipse.osee.x.server.feature/feature.xml
index 91cf539e91c..c0787c1dfbf 100644
--- a/features/org.eclipse.osee.x.server.feature/feature.xml
+++ b/features/org.eclipse.osee.x.server.feature/feature.xml
@@ -38,11 +38,8 @@
version="0.0.0"/>
<requires>
- <import plugin="com.vaadin" version="6.6.6" match="greaterOrEqual"/>
<import plugin="javax.servlet"/>
<import plugin="org.eclipse.osgi"/>
- <import plugin="org.eclipse.osee.vaadin"/>
- <import plugin="org.eclipse.osee.vaadin.widgets"/>
<import plugin="org.apache.commons.lang" version="2.6.0" match="greaterOrEqual"/>
</requires>
diff --git a/plugins/org.eclipse.osee.vaadin.themes/.classpath b/plugins/org.eclipse.osee.vaadin.themes/.classpath
deleted file mode 100644
index ad32c83a788..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.vaadin.themes/.project b/plugins/org.eclipse.osee.vaadin.themes/.project
deleted file mode 100644
index 1091dafe923..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.vaadin.themes</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.vaadin.themes/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.vaadin.themes/META-INF/MANIFEST.MF
deleted file mode 100644
index 55307da9321..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Osee Vaadin Themes
-Bundle-SymbolicName: org.eclipse.osee.vaadin.themes
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Fragment-Host: com.vaadin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.osee.vaadin.themes/build.properties b/plugins/org.eclipse.osee.vaadin.themes/build.properties
deleted file mode 100644
index 34d2e4d2dad..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/plugins/org.eclipse.osee.vaadin.themes/pom.xml b/plugins/org.eclipse.osee.vaadin.themes/pom.xml
deleted file mode 100644
index 5f608c6347c..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.core.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.core.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.vaadin.themes</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Vaadin Themes - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/closebutton.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/closebutton.png
deleted file mode 100644
index 68cd3766ccb..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/closebutton.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/error_icon.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/error_icon.png
deleted file mode 100644
index 0109a73b64f..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/error_icon.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/favicon.ico b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/favicon.ico
deleted file mode 100644
index 68e23bcce61..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/linespacer.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/linespacer.png
deleted file mode 100644
index 73dc6eebc6b..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/linespacer.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_16.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_16.png
deleted file mode 100644
index fbdac192723..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_16.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_32.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_32.png
deleted file mode 100644
index 5e36a1842e6..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_32.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_large.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_large.png
deleted file mode 100644
index 9db89ee99e4..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_large.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_large.xcf b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_large.xcf
deleted file mode 100644
index 00399c567b8..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/osee_large.xcf
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css
deleted file mode 100644
index fb8183051fe..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css
+++ /dev/null
@@ -1,280 +0,0 @@
-@import url(../reindeer/styles.css);
-
-/*********** Page Template Layout *****************/
-.osee-main-container-layout {
- width: 100%;
- height: 100%;
-}
-
-.osee-header-section {
- margin: 0 auto; /* Centered inside outer div */
-}
-
-.osee-page-content-section {
-
-}
-
-.osee-footer-section {
- margin: 0 auto; /* Centered inside outer div */
- background: #000; url (bg-footer.jpg) repeat-x scroll left top;
- color: #AAA; /* Grey on black */
- padding: 10px 0;
-}
-
-/*********** End of Page Template Layout *****************/
-.osee-logo {
- background: url(osee_32.png) center;
- width: 32px;
- height: 32px;
- padding: 5px;
- vertical-align: middle;
-}
-
-.osee-header-bar {
- height: 300px;
- background: black repeat-x;
- background-image: url(img/bg.png);
- color: #d1d3d6;
- text-shadow: rgba(0, 0, 0, .9) 0 1px 0;
- padding: 5px 10px;
-}
-
-.osee-header {
- border: 1px solid #D0D0D0;
-}
-
-.osee-footer {
-
-}
-
-.osee-footer-bar {
- height: 300px;
- background: #333333 repeat-x;
- background-image: url(img/bg.png);
- color: #d1d3d6;
-}
-
-.osee-product-summary {
- padding-top: 15px;
- font-size: 9px;
- text-align: right;
-}
-
-.osee-search-header-component-small {
- background: #AAAAAA;
- border-color: #555555;
- border-top-style:solid;
- border-right-style:none;
- border-bottom-style:solid;
- border-left-style:none;
- border-width:1px;
-}
-
-.osee-title-medium-text a img {
- font-size: 70px;
- width: 70px;
- height: 70px;
-}
-
-.osee-search-textfield {
- width: 335px;
-}
-
-.osee-searchresult-artname {
- font-size: 14px;
- color: blue;
-}
-
-.osee-searchresult-artname-nolink {
- font-size: 14px;
- color: blue;
- font-weight: bold;
-}
-
-.osee-searchresult-arttype {
- font-size: 15px;
- color: black;
-}
-
-.osee-attrname {
- font-size: 12px;
- color: green;
-}
-
-.osee-searchresult-match-many {
- font-weight: bold;
- color: black;
-}
-
-.osee-searchresults-manyresultsfield {
- width: 20px;
-}
-
-.osee-searchresults-noresults {
- font-size: 15px;
- font-weight: bold;
-}
-
-.osee-horizontal-line {
- background-image:url('linespacer.png');
- background-repeat:repeat-x;
-}
-
-.osee-leftarrow {
- background-image:url('woodsonArrow_left.png');
- width: 35px;
- height: 35px;
- background-repeat:no-repeat;
-}
-
-.osee-rightarrow {
- background-image:url('woodsonArrow.png');
- width: 35px;
- height: 35px;
- background-repeat:no-repeat;
-}
-
-.osee-attributelabel {
- text-align:right;
- font-size: 12px;
- color: green;
-}
-
-.osee-attributelabel-long {
- text-align:left;
- font-size: 12px;
- color: green;
-}
-
-.osee-attributevalue {
- font-weight:bold;
- text-align:left;
-}
-
-.osee-attributestitlelabel {
- font-size: 14px;
- color: black;
- font-weight:bold;
-}
-
-.osee-attributesborder {
- border-style:solid;
- border-width:1px;
-}
-
-.osee-currentpagelabel {
- font-weight:bold;
- font-size: 14px;
-}
-
-.red {
- border-color: red;
- border-style:solid;
- border-width:2px;
-}
-
-.v-orderedlayout-spacing-on,
-.v-horizontallayout-spacing-on,
-.v-verticallayout-spacing-on {
- padding-top: 0px;
- padding-left: 0px;
-}
-
-.v-caption-osee-exception-error-title-text {
- font-size: 20px;
- color: red;
- background-color: #F3E2E0;
- font-weight:bold;
- }
-
-.v-caption-osee-exception-warning-title-text {
- font-size: 20px;
- background-color: yellow;
- color: orange;
- font-weight:bold;
- }
-
-.osee-exception {
- margin: 10px 10px 10px 10px;
- }
-
-.osee-exception-longmsg {
- resize: none;
- }
-
-.osee-emaildialog-titles {
- text-align: right;
- }
-
-.v-window-wrap {
- border: none;
- -webkit-border-radius: 12px;
- -moz-border-radius: 12px;
- border-radius: 12px;
- overflow: hidden;
- }
-
-.v-window-wrap2 {
- background: #fff;
- -webkit-border-radius: 9px;
- -moz-border-radius: 9px;
- border-radius: 9px;
- }
-
-.v-window-outerheader {
- color: transparent;
- padding: 0px;
- max-width: 800px;
- white-space: normal;
- height: 0px;
- }
-
-div.v-window-header {
- white-space: normal;
- }
-
-.v-window-closebox {
- right: 0px;
- top: 0px;
- width: 0px;
- height: 0px;
- }
-
-.v-window-closebox:hover {
- background-position: left bottom;
- }
-
-.v-window-footer {
- height: 0px;
- }
-
-.v-window-resizebox {
- width: 0px;
- height: 0px;
- }
-
-.invisible {
- visibility:hidden;
- }
-
-.osee-working-label-1 {
- background-color: #9cdd93;
- font-size: 20px;
- font-weight:bold;
- }
-
-.osee-working-label-2 {
- background-color: #78d16b;
- font-size: 20px;
- font-weight:bold;
- }
-
-.osee-working-label-3 {
- background-color: #46b037;
- font-size: 20px;
- font-weight:bold;
- }
-
-.v-textarea {
- resize: none;
- } \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/warning_icon.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/warning_icon.png
deleted file mode 100644
index 98d0dad194a..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/warning_icon.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/woodsonArrow.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/woodsonArrow.png
deleted file mode 100644
index ff8a06a84af..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/woodsonArrow.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/woodsonArrow_left.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/woodsonArrow_left.png
deleted file mode 100644
index 1a11452d46b..00000000000
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/woodsonArrow_left.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.vaadin.widgets/.classpath b/plugins/org.eclipse.osee.vaadin.widgets/.classpath
deleted file mode 100644
index ad32c83a788..00000000000
--- a/plugins/org.eclipse.osee.vaadin.widgets/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.vaadin.widgets/.project b/plugins/org.eclipse.osee.vaadin.widgets/.project
deleted file mode 100644
index 451b27034b8..00000000000
--- a/plugins/org.eclipse.osee.vaadin.widgets/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.vaadin.widgets</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.vaadin.widgets/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.vaadin.widgets/META-INF/MANIFEST.MF
deleted file mode 100644
index 9e55f8b78ca..00000000000
--- a/plugins/org.eclipse.osee.vaadin.widgets/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OSEE Vaadin Widgets
-Bundle-SymbolicName: org.eclipse.osee.vaadin.widgets
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.vaadin,
- com.vaadin.terminal,
- com.vaadin.terminal.gwt.server,
- com.vaadin.ui,
- javax.servlet;version="2.5.0",
- javax.servlet.http;version="2.5.0"
-Export-Package: org.eclipse.osee.vaadin.widgets
diff --git a/plugins/org.eclipse.osee.vaadin.widgets/build.properties b/plugins/org.eclipse.osee.vaadin.widgets/build.properties
deleted file mode 100644
index 34d2e4d2dad..00000000000
--- a/plugins/org.eclipse.osee.vaadin.widgets/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/plugins/org.eclipse.osee.vaadin.widgets/pom.xml b/plugins/org.eclipse.osee.vaadin.widgets/pom.xml
deleted file mode 100644
index f750878f2ff..00000000000
--- a/plugins/org.eclipse.osee.vaadin.widgets/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.core.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.core.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.vaadin.widgets</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Vaadin Widgets - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/AccountMenuBar.java b/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/AccountMenuBar.java
deleted file mode 100644
index 4dd2c9508b7..00000000000
--- a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/AccountMenuBar.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.widgets;
-
-import com.vaadin.Application;
-import com.vaadin.ui.MenuBar;
-import com.vaadin.ui.Window;
-
-/**
- * @author Roberto E. Escobar
- */
-@SuppressWarnings("serial")
-public class AccountMenuBar extends MenuBar {
-
- private final ClientDetails clientDetails;
-
- private boolean populated;
-
- public AccountMenuBar() {
- this.clientDetails = new ClientDetails();
- }
-
- @Override
- public void attach() {
- if (populated) {
- // Only populate the layout once
- return;
- }
- final MenuBar menuBar = this;
-
- String userName = getUserName(menuBar.getApplication());
- // if (userName.equalsIgnoreCase("guest")) {
- // menuBar.addItem("Log In", new Command() {
- // @Override
- // public void menuSelected(MenuItem selectedItem) {
- // System.out.printf("Log In Page: %s\n", getLogInUrl());
- // }
- // });
- //
- // menuBar.addItem("Register", new Command() {
- // @Override
- // public void menuSelected(MenuItem selectedItem) {
- // String registrationUrl = getRegistrationUrl();
- // System.out.printf("Registration Page: %s \n", registrationUrl);
- // showClientDetails(menuBar.getApplication());
- // }
- // });
- // } else {
- // MenuItem accountItem = menuBar.addItem("Account", null);
- //
- // accountItem.addItem("Change Password", new Command() {
- // @Override
- // public void menuSelected(MenuItem selectedItem) {
- // System.out.printf("Change Password");
- // }
- // });
- //
- // accountItem.addItem("Log Off", new Command() {
- // @Override
- // public void menuSelected(MenuItem selectedItem) {
- // String logoutUrl = getLogOutUrl(menuBar.getApplication());
- // System.out.printf("LogOut: %s \n", logoutUrl);
- // }
- // });
- //
- // Resource settingsIcon = new ThemeResource("../runo/icons/16/settings.png");
- // MenuItem item = accountItem.addItem("", settingsIcon, new MenuBar.Command() {
- // @Override
- // public void menuSelected(MenuItem selectedItem) {
- // System.out.println("Options");
- // }
- // });
- // item.setDescription("Options");
- // }
- populated = true;
- }
-
- private void showClientDetails(Application application) {
- Window subWindow = new Window("Client Details");
- subWindow.addComponent(clientDetails);
- subWindow.setModal(true);
- subWindow.setHeight("200");
- subWindow.setWidth("500");
- application.getMainWindow().addWindow(subWindow);
- }
-
- private String getUserName(Application application) {
- Object user = application.getUser();
- return user != null ? user.toString() : "Guest";
- }
-
- private String getRegistrationUrl() {
- String registrationUrl = "../register";
- return registrationUrl;
- }
-
- private String getLogInUrl() {
- String logInUrl = "../login";
- return logInUrl;
- }
-
- private String getLogOutUrl(Application application) {
- return application.getLogoutURL();
- }
-
-}
diff --git a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/ClientDetails.java b/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/ClientDetails.java
deleted file mode 100644
index a25491545c6..00000000000
--- a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/ClientDetails.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.widgets;
-
-import com.vaadin.Application;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
-import com.vaadin.terminal.gwt.server.WebBrowser;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.VerticalLayout;
-
-/**
- * @author Roberto E. Escobar
- */
-@SuppressWarnings("serial")
-public class ClientDetails extends VerticalLayout {
-
- private boolean populated;
-
- public ClientDetails() {
- this.populated = false;
- }
-
- @Override
- public void attach() {
- if (populated) {
- // Only populate the layout once
- return;
- }
- Application application = getApplication();
- WebApplicationContext context = (WebApplicationContext) application.getContext();
- WebBrowser webBrowser = context.getBrowser();
-
- String browserTypeAndVersion = getTypeAndVersion(webBrowser);
- browserTypeAndVersion = browserTypeAndVersion + " in " + getOperatingSystem(webBrowser);
-
- // Create labels for the information and add them to the application
-
- Label idlabel = new Label("SessionId: " + context.getHttpSession().getId(), Label.CONTENT_XHTML);
-
- Label ipAddresslabel =
- new Label("Hello " + application.getUser() + " from <b>" + webBrowser.getAddress() + "</b>.",
- Label.CONTENT_XHTML);
- Label browser = new Label("You are running <b>" + browserTypeAndVersion + "</b>.", Label.CONTENT_XHTML);
- Label screenSize =
- new Label(
- "Your screen resolution is <b>" + webBrowser.getScreenWidth() + "x" + webBrowser.getScreenHeight() + "</b>.",
- Label.CONTENT_XHTML);
- Label locale =
- new Label("Your browser is set to primarily use the <b>" + webBrowser.getLocale() + "</b> locale.",
- Label.CONTENT_XHTML);
- Label secureConnection =
- new Label(webBrowser.isSecureConnection() ? "SecureConnection" : "Unsecure Channel", Label.CONTENT_XHTML);
-
- addComponent(idlabel);
- addComponent(ipAddresslabel);
- addComponent(browser);
- addComponent(screenSize);
- addComponent(locale);
- addComponent(secureConnection);
-
- populated = true;
- }
-
- private String getOperatingSystem(WebBrowser webBrowser) {
- if (webBrowser.isWindows()) {
- return "Windows";
- } else if (webBrowser.isMacOSX()) {
- return "Mac OSX";
- } else if (webBrowser.isLinux()) {
- return "Linux";
- } else {
- return "an unknown operating system";
- }
- }
-
- private String getTypeAndVersion(WebBrowser webBrowser) {
- if (webBrowser.isChrome()) {
- return "Chrome " + webBrowser.getBrowserMajorVersion() + "." + webBrowser.getBrowserMinorVersion();
- } else if (webBrowser.isOpera()) {
- return "Opera " + webBrowser.getBrowserMajorVersion() + "." + webBrowser.getBrowserMinorVersion();
- } else if (webBrowser.isFirefox()) {
- return "Firefox " + webBrowser.getBrowserMajorVersion() + "." + webBrowser.getBrowserMinorVersion();
- } else if (webBrowser.isSafari()) {
- return "Safari " + webBrowser.getBrowserMajorVersion() + "." + webBrowser.getBrowserMinorVersion();
- } else if (webBrowser.isIE()) {
- return "Internet Explorer " + webBrowser.getBrowserMajorVersion();
- } else {
- return "an unknown browser";
- }
- }
-}
diff --git a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/HasViewTitle.java b/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/HasViewTitle.java
deleted file mode 100644
index 56a2b07d04b..00000000000
--- a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/HasViewTitle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.widgets;
-
-/**
- * @author Shawn F. Cook
- */
-public interface HasViewTitle {
- public String getViewTitle();
-}
diff --git a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/HasViews.java b/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/HasViews.java
deleted file mode 100644
index bda62c7b6af..00000000000
--- a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/HasViews.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.widgets;
-
-import java.util.List;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface HasViews {
-
- List<Class<? extends Navigator.View>> getViews();
-}
diff --git a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/Navigator.java b/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/Navigator.java
deleted file mode 100644
index fb9c2546dd7..00000000000
--- a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/Navigator.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.widgets;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import com.vaadin.Application;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Component;
-import com.vaadin.ui.CustomComponent;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.UriFragmentUtility;
-import com.vaadin.ui.UriFragmentUtility.FragmentChangedEvent;
-import com.vaadin.ui.UriFragmentUtility.FragmentChangedListener;
-import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Window;
-
-/**
- * Code from Vaadin Navigator Add-On - this should become part of the vaadin api in the future
- */
-@SuppressWarnings("serial")
-public class Navigator extends CustomComponent {
-
- private final HashMap<String, Class<?>> uriToClass = new HashMap<String, Class<?>>();
- private final HashMap<Class<?>, String> classToUri = new HashMap<Class<?>, String>();
- private final HashMap<Class<?>, View> classToView = new HashMap<Class<?>, View>();
-
- private String mainViewUri = null;
- private final VerticalLayout layout = new VerticalLayout();
- private final UriFragmentUtility uriFragmentUtil = new UriFragmentUtility();
- private String currentFragment = "";
- private View currentView = null;
- private final LinkedList<ViewChangeListener> listeners = new LinkedList<ViewChangeListener>();
-
- public Navigator() {
- layout.setSizeFull();
- setSizeFull();
- layout.addComponent(uriFragmentUtil);
- setCompositionRoot(layout);
- uriFragmentUtil.addListener(new FragmentChangedListener() {
- @Override
- public void fragmentChanged(FragmentChangedEvent source) {
- Navigator.this.fragmentChanged();
- }
- });
- }
-
- public void fragmentChanged() {
- String newFragment = uriFragmentUtil.getFragment();
- if ("".equals(newFragment)) {
- newFragment = mainViewUri;
- }
- int i = newFragment.indexOf('/');
- String uri = i < 0 ? newFragment : newFragment.substring(0, i);
- final String requestedDataId = i < 0 || i + 1 == newFragment.length() ? null : newFragment.substring(i + 1);
- if (uriToClass.containsKey(uri)) {
- final View newView = getOrCreateView(uri);
-
- String warn = currentView == null ? null : currentView.getWarningForNavigatingFrom();
- if (warn != null && warn.length() > 0) {
- confirmedMoveToNewView(requestedDataId, newView, warn);
- } else {
- moveTo(newView, requestedDataId, false);
- }
-
- } else {
- uriFragmentUtil.setFragment(currentFragment, false);
- }
- }
-
- private void confirmedMoveToNewView(final String requestedDataId, final View newView, String warn) {
- VerticalLayout lo = new VerticalLayout();
- lo.setMargin(true);
- lo.setSpacing(true);
- lo.setWidth("400px");
- final Window wDialog = new Window("Warning", lo);
- wDialog.setModal(true);
- final Window main = getWindow();
- main.addWindow(wDialog);
- lo.addComponent(new Label(warn));
- lo.addComponent(new Label("If you do not want to navigate away from the current screen, press Cancel."));
- Button cancel = new Button("Cancel", new Button.ClickListener() {
-
- @Override
- public void buttonClick(ClickEvent event) {
- uriFragmentUtil.setFragment(currentFragment, false);
-
- //Vaadin library bug in which without catching and using the return value of this method
- // the Java compiler will silently generate bytecode that drops the extra value from the stack
- // https://vaadin.com/forum/-/message_boards/view_message/311111
- boolean catchButDontUseBoolean = main.removeWindow(wDialog);
- if (catchButDontUseBoolean) {
- //Do Nothing
- }
- }
- });
- Button cont = new Button("Continue", new Button.ClickListener() {
-
- @Override
- public void buttonClick(ClickEvent event) {
- main.removeWindow(wDialog);
- moveTo(newView, requestedDataId, false);
- }
-
- });
- HorizontalLayout h = new HorizontalLayout();
- h.addComponent(cancel);
- h.addComponent(cont);
- h.setSpacing(true);
- lo.addComponent(h);
- lo.setComponentAlignment(h, Alignment.MIDDLE_RIGHT);
- }
-
- private View getOrCreateView(String uri) {
- Class<?> newViewClass = uriToClass.get(uri);
- if (!classToView.containsKey(newViewClass)) {
- try {
- View view = (View) newViewClass.newInstance();
- view.init(this, getApplication());
- classToView.put(newViewClass, view);
- } catch (InstantiationException e) {
- e.printStackTrace();
- throw new RuntimeException(e);
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- throw new RuntimeException(e);
- }
- }
- final View v = classToView.get(newViewClass);
- return v;
- }
-
- private void moveTo(View v, String requestedDataId, boolean noFragmentSetting) {
- currentFragment = classToUri.get(v.getClass());
- if (requestedDataId != null) {
- currentFragment += "/" + requestedDataId;
- }
- if (!noFragmentSetting && !currentFragment.equals(uriFragmentUtil.getFragment())) {
- uriFragmentUtil.setFragment(currentFragment, false);
- }
- Component removeMe = null;
- for (Iterator<Component> i = layout.getComponentIterator(); i.hasNext();) {
- Component c = i.next();
- if (c != uriFragmentUtil) {
- removeMe = c;
- }
- }
- if (removeMe != null) {
- layout.removeComponent(removeMe);
- }
- layout.addComponent(v);
- layout.setExpandRatio(v, 1.0F);
- v.navigateTo(requestedDataId);
- View previousView = currentView;
- currentView = v;
-
- for (ViewChangeListener l : listeners) {
- l.navigatorViewChange(previousView, currentView);
- }
- }
-
- /**
- * Get the main view. Main view is the default view shown to user when he opens application without specifying view
- * uri.
- *
- * @return Uri of the main view.
- */
- public String getMainView() {
- return mainViewUri;
- }
-
- /**
- * Set the main view. Main view is the default view shown to user when he opens application without specifying view
- * uri. If main view has not been set, the first view registered with addView() is used as main view. Note that the
- * view must be registered with addView() before calling this method.
- *
- * @param mainViewUri Uri of the main view.
- */
- public void setMainView(String mainViewUri) {
- if (uriToClass.containsKey(mainViewUri)) {
- this.mainViewUri = mainViewUri;
- if (currentView == null) {
- moveTo(getOrCreateView(mainViewUri), null, true);
- }
- } else {
- throw new IllegalArgumentException("No view with given uri can be found in the navigator");
- }
- }
-
- /**
- * Add a new view to navigator. Register a view to navigator.
- *
- * @param uri String that identifies a view. This is the string that is shown in URL after #
- * @param viewClass Component class that implements Navigator.View interface
- */
- public void addView(String uri, Class<?> viewClass) {
-
- // Check parameters
- if (!View.class.isAssignableFrom(viewClass)) {
- throw new IllegalArgumentException("viewClass must implemenent Navigator.View");
- }
-
- if (uri == null || viewClass == null || uri.length() == 0) {
- throw new IllegalArgumentException("viewClass and uri must be non-null and not empty");
- }
-
- if (uriToClass.containsKey(uri)) {
- if (uriToClass.get(uri) == viewClass) {
- return;
- }
-
- throw new IllegalArgumentException(uriToClass.get(uri).getName() + " is already mapped to '" + uri + "'");
- }
-
- if (classToUri.containsKey(viewClass)) {
- throw new IllegalArgumentException("Each view class can only be added to Navigator with one uri");
- }
-
- if (uri.indexOf('/') >= 0 || uri.indexOf('#') >= 0) {
- throw new IllegalArgumentException("Uri can not contain # or / characters");
- }
-
- uriToClass.put(uri, viewClass);
- classToUri.put(viewClass, uri);
-
- if (getMainView() == null) {
- setMainView(uri);
- }
- }
-
- /**
- * Remove view from navigator.
- *
- * @param uri Uri of the view to remove.
- */
- public void removeView(String uri) {
- Class<?> c = uriToClass.get(uri);
- if (c != null) {
- uriToClass.remove(uri);
- classToUri.remove(c);
- if (getMainView() == null || getMainView().equals(getMainView())) {
- if (uriToClass.size() == 0) {
- mainViewUri = null;
- } else {
- setMainView(uriToClass.keySet().iterator().next());
- }
- }
- }
- }
-
- /**
- * Get the uri for given view implementation class.
- *
- * @param viewClass Class that implements the view.
- * @return Uri registered for the view class.
- */
- public String getUri(Class<?> viewClass) {
- return classToUri.get(viewClass);
- }
-
- /**
- * Get the view class for given uri.
- *
- * @param uri Uri to get view for
- * @return View that corresponds to the uri
- */
- public Class<?> getViewClass(String uri) {
- return uriToClass.get(uri);
- }
-
- /**
- * Switch to view identified with uri. Uri can be either the exact uri registered previously with addView() or it can
- * also contain data id passed to the view. In case data id is included, the format is 'uri/freeFormedDataIdString'.
- *
- * @param uri Uri where to navigate.
- */
- public void navigateTo(String uri) {
- uriFragmentUtil.setFragment(uri);
- }
-
- /**
- * Switch to view implemented by given class. Note that the view must be registered to navigator with addView()
- * before calling this method.
- *
- * @param viewClass Class that implements the view.
- */
- public void navigateTo(Class<?> viewClass) {
- String uri = getUri(viewClass);
- if (uri != null) {
- navigateTo(uri);
- }
- }
-
- /**
- * Listen to the view changes. The listener will get notified after the view has changed.
- *
- * @param listener Listener to invoke after view changes.
- */
- public void addListener(ViewChangeListener listener) {
- listeners.add(listener);
- }
-
- /**
- * Remove the view change listener.
- *
- * @param listener Listener to remove.
- */
- public void removeListener(ViewChangeListener listener) {
- listeners.remove(listener);
- }
-
- /**
- * Interface for listening to View changes.
- */
- public interface ViewChangeListener {
-
- /**
- * Invoked after the view has changed. Be careful for deadlocks if you decide to change the view again in the
- * listener.
- *
- * @param previous Preview view before the change.
- * @param current New view after the change.
- */
- public void navigatorViewChange(View previous, View current);
-
- }
-
- /**
- * Interface for all views controlled by the navigator. Each view added to the navigator must implement this
- * interface.
- */
- public interface View extends Component {
-
- /**
- * Init view. Convenience method which navigator call before slightly before the view is first time rendered. This
- * is called only once in the lifetime of each view instance. In many cases it is better to construct UI within
- * this method than in constructor as you are guaranteed to get references to application and navigator here.
- *
- * @param navigator Reference to navigator that controls the window where this view is attached to.
- * @param application Application instance this view lives in.
- */
- public void init(Navigator navigator, Application application);
-
- /**
- * This view is navigated to. This method is always called before the view is shown on screen. If there is any
- * additional id to data what should be shown in the view, it is also optionally passed as parameter.
- *
- * @param requestedDataId Id of the data extracted from URI fragment or null if not given. This is the string that
- * appears in URI after #viewname/
- */
- public void navigateTo(String requestedDataId);
-
- /**
- * Get a warning that should be shown to user before navigating away from the view. If the current view is in
- * state where navigating away from it could lead to data loss, this method should return a message that will be
- * shown to user before he confirms that he will leave the screen. If there is no need to ask questions from user,
- * this should return null.
- *
- * @return Message to be shown or null if no message should be shown.
- */
- public String getWarningForNavigatingFrom();
- }
-
- /**
- * Interface implemented by all applications that uses Navigator.
- */
- public interface NavigableApplication {
-
- /**
- * Create a new browser window. This method must construct a new window that could be used as a main window for
- * the application. Each call to this method must create a new instance and your application should work when
- * there are multiple instances of concurrently. Each window can contain anything you like, but at least they
- * should contain a new Navigator instance for controlling navigation within the window. Typically one also adds
- * some kind of menu for commanding navigator.
- *
- * @return New window.
- */
- public Window createNewWindow();
- }
-
- /**
- * Helper for overriding Application.getWindow(String).
- * <p>
- * This helper makes implementing support for multiple browser tabs or browser windows easy. Just override
- * Application.getWindow(String) in your application like this:
- * </p>
- *
- * <pre>
- * &#064;Override
- * public Window getWindow(String name) {
- * return Navigator.getWindow(this, name, super.getWindow(name));
- * }
- * </pre>
- *
- * @param application Application instance, which implements Navigator.NavigableApplication interface.
- * @param name Name parameter from Application.getWindow(String name)
- * @param superGetWindow The window returned by super.getWindow(name)
- * @return
- */
- public static Window getWindow(NavigableApplication application, String name, Window superGetWindow) {
- if (superGetWindow != null) {
- return superGetWindow;
- }
-
- Window w = application.createNewWindow();
- w.setName(name);
- ((Application) application).addWindow(w);
- w.open(new ExternalResource(w.getURL()));
- return w;
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.vaadin/.classpath b/plugins/org.eclipse.osee.vaadin/.classpath
deleted file mode 100644
index ad32c83a788..00000000000
--- a/plugins/org.eclipse.osee.vaadin/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.vaadin/.project b/plugins/org.eclipse.osee.vaadin/.project
deleted file mode 100644
index 238676708f4..00000000000
--- a/plugins/org.eclipse.osee.vaadin/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.vaadin</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.vaadin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.vaadin/META-INF/MANIFEST.MF
deleted file mode 100644
index e08cb0e231e..00000000000
--- a/plugins/org.eclipse.osee.vaadin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OSEE Vaadin
-Bundle-SymbolicName: org.eclipse.osee.vaadin
-Bundle-Version: 0.17.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/*.xml
-Import-Package: javax.servlet;version="2.5.0",
- javax.servlet.http;version="2.5.0",
- org.eclipse.osee.event,
- org.eclipse.osee.logger,
- org.osgi.framework;version="1.6.0",
- org.osgi.service.http;version="1.2.1"
-Require-Bundle: com.vaadin;visibility:=reexport,
- javax.servlet;bundle-version="2.5.0";visibility:=reexport
-Export-Package: org.eclipse.osee.vaadin
diff --git a/plugins/org.eclipse.osee.vaadin/OSGI-INF/vaadin.application.manager.xml b/plugins/org.eclipse.osee.vaadin/OSGI-INF/vaadin.application.manager.xml
deleted file mode 100644
index 358f1c380ec..00000000000
--- a/plugins/org.eclipse.osee.vaadin/OSGI-INF/vaadin.application.manager.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" enabled="true" immediate="true" name="org.eclipse.osee.vaadin.internal.ApplicationServletManager">
- <implementation class="org.eclipse.osee.vaadin.internal.ApplicationServletManager"/>
-
- <reference interface="org.osgi.service.http.HttpService" name="HttpService"
- cardinality="1..1"
- policy="static"
- bind="setHttpService" />
-
- <reference interface="org.eclipse.osee.logger.Log" name="Log"
- cardinality="1..1"
- policy="static"
- bind="setLogger" />
-
- <reference interface="org.eclipse.osee.event.EventService" name="EventService"
- cardinality="1..1"
- policy="static"
- bind="setEventService" />
-
- <reference interface="org.eclipse.osee.vaadin.ApplicationFactory" name="ApplicationFactory"
- cardinality="1..n"
- policy="dynamic"
- bind="addFactory"
- unbind="removeFactory" />
-
-</scr:component>
diff --git a/plugins/org.eclipse.osee.vaadin/OSGI-INF/vaadin.resource.http.context.xml b/plugins/org.eclipse.osee.vaadin/OSGI-INF/vaadin.resource.http.context.xml
deleted file mode 100644
index d040938020f..00000000000
--- a/plugins/org.eclipse.osee.vaadin/OSGI-INF/vaadin.resource.http.context.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" enabled="true" immediate="true" name="org.eclipse.osee.vaadin.internal.ResourceHttpContext">
- <implementation class="org.eclipse.osee.vaadin.internal.ResourceHttpContext"/>
- <property name="http.context" type="String" value="VAADIN"/>
- <reference bind="setHttpService" cardinality="1..1" interface="org.osgi.service.http.HttpService" name="HttpService" policy="static"/>
-</scr:component>
diff --git a/plugins/org.eclipse.osee.vaadin/build.properties b/plugins/org.eclipse.osee.vaadin/build.properties
deleted file mode 100644
index c58ea2178c3..00000000000
--- a/plugins/org.eclipse.osee.vaadin/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/
diff --git a/plugins/org.eclipse.osee.vaadin/pom.xml b/plugins/org.eclipse.osee.vaadin/pom.xml
deleted file mode 100644
index 10ad5fd66c3..00000000000
--- a/plugins/org.eclipse.osee.vaadin/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.core.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.core.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.vaadin</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Vaadin - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/AbstractApplication.java b/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/AbstractApplication.java
deleted file mode 100644
index d51f4dc3809..00000000000
--- a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/AbstractApplication.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin;
-
-import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.osee.vaadin.internal.ApplicationState;
-import com.vaadin.Application;
-import com.vaadin.service.ApplicationContext.TransactionListener;
-import com.vaadin.ui.Window;
-
-/**
- * @author Roberto E. Escobar
- */
-public abstract class AbstractApplication extends Application implements TransactionListener {
-
- private static final long serialVersionUID = -3069770596395717931L;
-
- private static final ApplicationState applicationState = new ApplicationState();
-
- protected AbstractApplication() {
- super();
- }
-
- protected Window getCurrentWindow() {
- return applicationState.getWindow();
- }
-
- @Override
- public final void init() {
- getContext().addTransactionListener(this);
-
- boolean isApplicationValid = applicationState.isApplicationValid();
- if (!isApplicationValid) {
- applicationState.setApplication(this);
- }
-
- Window currentWindow = createWindow();
- currentWindow.setName(getWindowName());
- setMainWindow(currentWindow);
-
- if (!isApplicationValid) {
- applicationState.removeApplication();
- }
- }
-
- @Override
- public final void transactionStart(Application application, Object transactionData) {
- if (this == application) {
-
- if (!applicationState.isApplicationValid()) {
- applicationState.setApplication(this);
- }
-
- HttpServletRequest request = (HttpServletRequest) transactionData;
- String paramValue = request.getParameter("fr");
- applicationState.setUriFragment(paramValue);
- }
- }
-
- @Override
- public final void transactionEnd(Application application, Object transactionData) {
- if (this == application) {
- applicationState.clearAll();
- }
- }
-
- //https://vaadin.com/web/joonas/wiki/-/wiki/Main/Supporting%20Multible%20Tabs
- @Override
- public final Window getWindow(String name) {
- Window toReturn = null;
- if (isRunning()) {
- toReturn = super.getWindow(name);
-
- Window mainWindow = getMainWindow();
- if (mainWindow != null && matchesWindowName(mainWindow.getName(), name)) {
- if (toReturn == null) {
- toReturn = createWindow();
- toReturn.setName(name);
- addWindow(toReturn);
- }
- applicationState.setWindow(toReturn);
-
- // SEE: http://vaadin.com/forum/-/message_boards/message/57240
- // Empty string is a call for home page.
- if ("".equals(applicationState.getUriFragment())) {
- if (mainWindow instanceof HasMultiplePages) {
- HasMultiplePages multiPaged = (HasMultiplePages) mainWindow;
- if (multiPaged.getCurrentPage() == null) {
- multiPaged.setToDefault();
- }
- }
- }
- }
- }
- return toReturn;
- }
-
- private Window createWindow() {
- try {
- Application application = applicationState.getApplication();
- return createApplicationWindow(application.getLocale());
- } catch (Exception ex) {
- throw new IllegalStateException(ex);
- }
- }
-
- private String getWindowName() {
- return getApplicationWindowName();
- }
-
- protected boolean matchesWindowName(String windowName, String name) {
- boolean result = name.equals(windowName);
- if (!result) {
- String[] nameParts = name.split("_");
- if (nameParts.length == 2) {
- result = windowName.equals(nameParts[0]);
- }
- }
- return result;
- }
-
- protected abstract Window createApplicationWindow(Locale locale) throws Exception;
-
- protected abstract String getApplicationWindowName();
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/ApplicationConstants.java b/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/ApplicationConstants.java
deleted file mode 100644
index 81ffeac0d02..00000000000
--- a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/ApplicationConstants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class ApplicationConstants {
-
- private ApplicationConstants() {
- // Constants Class
- }
-
- public static final String APP_REGISTRATION_EVENT = "org/eclipse/osee/vaadin/event/APP_REGISTRATION";
-
- public static final String APP_DEREGISTRATION_EVENT = "org/eclipse/osee/vaadin/event/APP_DEREGISTRATION";
-
- public static final String APP_CONTEXT_NAME = "context.name";
-
- public static final String APP_COMPONENT_NAME = "component.name";
-}
diff --git a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/ApplicationFactory.java b/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/ApplicationFactory.java
deleted file mode 100644
index 650a3769359..00000000000
--- a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/ApplicationFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface ApplicationFactory {
-
- AbstractApplication createInstance() throws Exception;
-
- Class<? extends AbstractApplication> getApplicationClass();
-
-}
diff --git a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/HasMultiplePages.java b/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/HasMultiplePages.java
deleted file mode 100644
index fab4feb6e09..00000000000
--- a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/HasMultiplePages.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin;
-
-import com.vaadin.ui.Component;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface HasMultiplePages {
-
- void setToDefault();
-
- Component getCurrentPage();
-}
diff --git a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationServlet.java b/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationServlet.java
deleted file mode 100644
index 7128637c17f..00000000000
--- a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationServlet.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.internal;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.Principal;
-import java.util.Date;
-import java.util.Set;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.vaadin.AbstractApplication;
-import org.eclipse.osee.vaadin.ApplicationFactory;
-import com.vaadin.Application;
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
-import com.vaadin.terminal.gwt.server.JsonPaintTarget;
-import com.vaadin.terminal.gwt.server.SystemMessageException;
-import com.vaadin.ui.Window;
-
-/**
- * @author Roberto E. Escobar
- */
-@SuppressWarnings("serial")
-public class ApplicationServlet extends AbstractApplicationServlet {
-
- private final ApplicationFactory factory;
- private final Set<ApplicationSession> sessions;
- private final Log logger;
-
- public ApplicationServlet(Log logger, Set<ApplicationSession> sessions, ApplicationFactory factory) {
- this.logger = logger;
- this.sessions = sessions;
- this.factory = factory;
- }
-
- private Log getLogger() {
- return logger;
- }
-
- @Override
- protected Application getNewApplication(HttpServletRequest request) throws ServletException {
- Application application;
- try {
- application = factory.createInstance();
- } catch (Exception ex) {
- throw new ServletException(String.format("Error creating vaading application using [%s]",
- factory.getClass().getName()), ex);
- }
- if (application == null) {
- throw new ServletException(String.format("Error creating vaading application using [%s]",
- factory.getClass().getName()));
- }
-
- setApplicationMetaData(request, application);
- HttpSession httpSession = request.getSession();
-
- final ApplicationSession session = new ApplicationSession(application, httpSession);
- sessions.add(session);
- httpSession.setAttribute(ApplicationSession.class.getName(), new HttpSessionListener() {
-
- @Override
- public void sessionDestroyed(HttpSessionEvent arg0) {
- session.dispose();
- sessions.remove(session);
- }
-
- @Override
- public void sessionCreated(HttpSessionEvent arg0) {
- // Do Nothing
- }
- });
- return application;
- }
-
- @SuppressWarnings("unused")
- private void setApplicationMetaData(HttpServletRequest request, Application application) throws ServletException {
-
- // TODO: Hook into user admin - or have this done through a filter
- // application.setUser(user);
- // application.setLogoutURL(logoutURL);
- // application.setMainWindow(mainWindow);
-
- Principal principal = request.getUserPrincipal();
- if (principal == null) {
- principal = new Principal() {
-
- @Override
- public String getName() {
- return "Guest";
- }
-
- @Override
- public String toString() {
- return getName();
- }
- };
- }
- // if (request.isUserInRole("Some Role")) {
- // application.setUserRole("myRole");
- // } else {
- // throw new ServletException("Access Denied");
- // }
- application.setUser(principal);
- // application.setLogoutURL(request.getContextPath() + "logout.jsp");
- }
-
- @Override
- protected URL getApplicationUrl(HttpServletRequest request) throws MalformedURLException {
- String serverName = request.getServerName();
- int serverPort = request.getServerPort();
- String requestUri = request.getRequestURI();
-
- StringBuilder urlBuilder = new StringBuilder();
- urlBuilder.append(request.getScheme()).append("://");
- urlBuilder.append(request.getServerName());
- if (!(request.getServerPort() == 443 && "https".equals(request.getScheme())) || !(request.getServerPort() == 80 && "http".equals(request.getScheme()))) {
- urlBuilder.append(":").append(request.getServerPort());
- }
- urlBuilder.append(request.getRequestURI());
-
- final URL reqURL = new URL(urlBuilder.toString());
- String servletPath = getServletPath(request);
-
- URL url = new URL(reqURL, servletPath);
-
- if (getLogger().isTraceEnabled()) {
- getLogger().trace("application url ------------------------------------------------------");
- getLogger().trace("application url - serverName[%s] port[%s]", serverName, serverPort);
- getLogger().trace("application url - requestUri[%s]", requestUri);
- getLogger().trace("application url - servletPath[%s]", servletPath);
- getLogger().trace("application url - URL - [%s]", url.toString());
- getLogger().trace("application url ------------------------------------------------------");
- }
- return url;
- }
-
- private String getServletPath(HttpServletRequest request) {
- String servletPath = "";
- if (request.getAttribute("javax.servlet.include.servlet_path") != null) {
- // this is an include request
- servletPath =
- request.getAttribute("javax.servlet.include.context_path").toString() + request.getAttribute("javax.servlet.include.servlet_path");
-
- } else {
- servletPath = request.getContextPath() + request.getServletPath();
- }
-
- if (servletPath.length() == 0 || servletPath.charAt(servletPath.length() - 1) != '/') {
- servletPath = servletPath + "/";
- }
- return servletPath;
- }
-
- @Override
- protected Class<? extends Application> getApplicationClass() {
- return AbstractApplication.class;
- }
-
- @Override
- public void destroy() {
- super.destroy();
- for (ApplicationSession info : sessions) {
- info.dispose();
- }
- sessions.clear();
- }
-
- private String getApplicationOrSystemProperty(String parameterName, String defaultValue) {
- String val = null;
-
- // Try application properties
- val = getApplicationProperty(parameterName);
- if (val != null) {
- return val;
- }
-
- // Try system properties
- val = getSystemProperty(parameterName);
- if (val != null) {
- return val;
- }
-
- return defaultValue;
- }
-
- @Override
- protected void writeAjaxPageHtmlVaadinScripts(Window window, String themeName, Application application, final BufferedWriter page, String appUrl, String themeUri, String appId, HttpServletRequest request) throws ServletException, IOException {
-
- // request widgetset takes precedence (e.g portlet include)
- String requestWidgetset = (String) request.getAttribute(REQUEST_WIDGETSET);
- String sharedWidgetset = (String) request.getAttribute(REQUEST_SHARED_WIDGETSET);
- if (requestWidgetset == null && sharedWidgetset == null) {
- // Use the value from configuration or DEFAULT_WIDGETSET.
- // If no shared widgetset is specified, the default widgetset is
- // assumed to be in the servlet/portlet itself.
- requestWidgetset = getApplicationOrSystemProperty(PARAMETER_WIDGETSET, DEFAULT_WIDGETSET);
- }
-
- String widgetset;
- String widgetsetBasePath;
- if (requestWidgetset != null) {
- widgetset = requestWidgetset;
- widgetsetBasePath = getWebApplicationsStaticFileLocation(request);
- } else {
- widgetset = sharedWidgetset;
- widgetsetBasePath = getStaticFilesLocation(request);
- }
-
- widgetset = stripSpecialChars(widgetset);
-
- String widgetsetFilePath =
- widgetsetBasePath + "/" + WIDGETSET_DIRECTORY_PATH + widgetset + "/" + widgetset + ".nocache.js?" + new Date().getTime();
-
- if (getLogger().isTraceEnabled()) {
- getLogger().trace("writeAjaxPageHtmlVaadinScripts ------------------------------------------------------");
- getLogger().trace("writeAjaxPageHtmlVaadinScripts - widgetset[%s]", widgetset);
- getLogger().trace("writeAjaxPageHtmlVaadinScripts - widgetsetBasePath[%s]", widgetsetBasePath);
- getLogger().trace("writeAjaxPageHtmlVaadinScripts - widgetsetFilePath[%s]", widgetsetFilePath);
- getLogger().trace("writeAjaxPageHtmlVaadinScripts ------------------------------------------------------");
- }
-
- // Get system messages
- Application.SystemMessages systemMessages = null;
- try {
- systemMessages = getSystemMessages();
- } catch (SystemMessageException e) {
- // failing to get the system messages is always a problem
- throw new ServletException("CommunicationError!", e);
- }
-
- // Start - Create hidden image tags so reverse proxy can update paths
- page.write("<img id='applicationElementURI' style=\"position:absolute;width:0;height:0;border:0;overflow:hidden;\" src='" + appUrl + "'/>\n");
- page.write("<img id='themeElementURI' style=\"position:absolute;width:0;height:0;border:0;overflow:hidden;\" ");
- page.write(themeUri != null ? "src='" + themeUri + "' " : "src='null' ");
- page.write("/>\n");
-
- page.write("<script type=\"text/javascript\">\n");
- page.write("//<![CDATA[\n");
- page.write("var applicationElementURI = document.getElementById('applicationElementURI');\n");
- page.write("var themeElementURI = document.getElementById('themeElementURI');\n");
- page.write("//]]>\n</script>\n");
- // End -
-
- page.write("<script type=\"text/javascript\">\n");
- page.write("//<![CDATA[\n");
- page.write("if(!vaadin || !vaadin.vaadinConfigurations) {\n " + //
- "if(!vaadin) { var vaadin = {}} \n" + //
- "vaadin.vaadinConfigurations = {};\n" + //
- "if (!vaadin.themesLoaded) { vaadin.themesLoaded = {}; }\n");
-
- if (!isProductionMode()) {
- page.write("vaadin.debug = true;\n");
- }
- page.write("document.write('<iframe tabIndex=\"-1\" id=\"__gwt_historyFrame\" " + //
- "style=\"position:absolute;width:0;height:0;border:0;overflow:hidden;\" src=\"javascript:false\"></iframe>');\n");
-
- page.write("document.write(\"<script language='javascript' src='" + widgetsetFilePath + "'><\\/script>\");\n}\n");
-
- page.write("vaadin.vaadinConfigurations[\"" + appId + "\"] = {");
-
- // Get Application URL from application element source attribute
- page.write("appUri: applicationElementURI.src, ");
-
- if (window != application.getMainWindow()) {
- page.write("windowName: \"" + JsonPaintTarget.escapeJSON(window.getName()) + "\", ");
- }
- if (isStandalone()) {
- page.write("standalone: true, ");
- }
-
- // Get theme URI from theme element source attribute
- page.write("themeUri: themeElementURI.src");
-
- page.write(", versionInfo : {vaadinVersion:\"");
- page.write(VERSION);
- page.write("\",applicationVersion:\"");
- page.write(JsonPaintTarget.escapeJSON(application.getVersion()));
- page.write("\"}");
- if (systemMessages != null) {
- // Write the CommunicationError -message to client
- String caption = systemMessages.getCommunicationErrorCaption();
- if (caption != null) {
- caption = "\"" + JsonPaintTarget.escapeJSON(caption) + "\"";
- }
- String message = systemMessages.getCommunicationErrorMessage();
- if (message != null) {
- message = "\"" + JsonPaintTarget.escapeJSON(message) + "\"";
- }
- String url = systemMessages.getCommunicationErrorURL();
- if (url != null) {
- url = "\"" + JsonPaintTarget.escapeJSON(url) + "\"";
- }
-
- page.write(",\"comErrMsg\": {" + "\"caption\":" + caption + "," + "\"message\" : " + message + "," + "\"url\" : " + url + "}");
-
- // Write the AuthenticationError -message to client
- caption = systemMessages.getAuthenticationErrorCaption();
- if (caption != null) {
- caption = "\"" + JsonPaintTarget.escapeJSON(caption) + "\"";
- }
- message = systemMessages.getAuthenticationErrorMessage();
- if (message != null) {
- message = "\"" + JsonPaintTarget.escapeJSON(message) + "\"";
- }
- url = systemMessages.getAuthenticationErrorURL();
- if (url != null) {
- url = "\"" + JsonPaintTarget.escapeJSON(url) + "\"";
- }
-
- page.write(",\"authErrMsg\": {" + "\"caption\":" + caption + "," + "\"message\" : " + message + "," + "\"url\" : " + url + "}");
- }
- page.write("};\n//]]>\n</script>\n");
-
- if (themeName != null) {
- // Custom theme's stylesheet, load only once, in different
- // script
- // tag to be dominate styles injected by widget
- // set
- page.write("<script type=\"text/javascript\">\n");
- page.write("//<![CDATA[\n");
- page.write("if(!vaadin.themesLoaded['" + themeName + "']) {\n");
- page.write("var stylesheet = document.createElement('link');\n");
- page.write("stylesheet.setAttribute('rel', 'stylesheet');\n");
- page.write("stylesheet.setAttribute('type', 'text/css');\n");
-
- // Get theme uri from theme element source
- page.write("var myHref = themeElementURI.src + \"/styles.css\";\n");
- page.write("stylesheet.setAttribute('href', myHref);\n");
- page.write("document.getElementsByTagName('head')[0].appendChild(stylesheet);\n");
- page.write("vaadin.themesLoaded['" + themeName + "'] = true;\n}\n");
- page.write("//]]>\n</script>\n");
- }
-
- // Warn if the widgetset has not been loaded after 15 seconds on
- // inactivity
- page.write("<script type=\"text/javascript\">\n");
- page.write("//<![CDATA[\n");
- page.write("setTimeout('if (typeof " + widgetset.replace('.', '_') + " == \"undefined\") {alert(\"Failed to load the widgetset: " + widgetsetFilePath + "\")};',15000);\n" + "//]]>\n</script>\n");
- }
-
- private String getWebApplicationsStaticFileLocation(HttpServletRequest request) {
- String staticFileLocation;
- // if property is defined in configurations, use that
- staticFileLocation = getApplicationOrSystemProperty(PARAMETER_VAADIN_RESOURCES, null);
- if (staticFileLocation != null) {
- return staticFileLocation;
- }
-
- // the last (but most common) option is to generate default location
- // from request
-
- // if context is specified add it to widgetsetUrl
- String ctxPath = request.getContextPath();
-
- // FIXME: ctxPath.length() == 0 condition is probably unnecessary and
- // might even be wrong.
-
- if (ctxPath.length() == 0 && request.getAttribute("javax.servlet.include.context_path") != null) {
- // include request (e.g portlet), get context path from
- // attribute
- ctxPath = (String) request.getAttribute("javax.servlet.include.context_path");
- }
-
- // Remove heading and trailing slashes from the context path
- ctxPath = removeHeadingOrTrailing(ctxPath, "/");
-
- if (ctxPath.equals("")) {
- return "";
- } else {
- return "/" + ctxPath;
- }
- }
-
- private static String removeHeadingOrTrailing(String string, String what) {
- while (string.startsWith(what)) {
- string = string.substring(1);
- }
-
- while (string.endsWith(what)) {
- string = string.substring(0, string.length() - 1);
- }
-
- return string;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationServletManager.java b/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationServletManager.java
deleted file mode 100644
index f8363d68d2a..00000000000
--- a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationServletManager.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.internal;
-
-import java.util.Dictionary;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
-import java.util.concurrent.CopyOnWriteArrayList;
-import javax.servlet.http.HttpServlet;
-import org.eclipse.osee.event.EventService;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.vaadin.ApplicationConstants;
-import org.eclipse.osee.vaadin.ApplicationFactory;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.http.HttpContext;
-import org.osgi.service.http.HttpService;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ApplicationServletManager {
-
- private final Map<String, HttpServlet> registered = new ConcurrentHashMap<String, HttpServlet>();
-
- private final List<ServiceReference<ApplicationFactory>> pending =
- new CopyOnWriteArrayList<ServiceReference<ApplicationFactory>>();
-
- private HttpService httpService;
- private EventService eventService;
- private Log logger;
- private Thread thread;
-
- private Dictionary<String, String> initParams;
-
- public void setHttpService(HttpService httpService) {
- this.httpService = httpService;
- }
-
- public void setEventService(EventService eventService) {
- this.eventService = eventService;
- }
-
- public void setLogger(Log logger) {
- this.logger = logger;
- }
-
- private HttpService getHttpService() {
- return httpService;
- }
-
- private EventService getEventService() {
- return eventService;
- }
-
- private Log getLogger() {
- return logger;
- }
-
- public void start(Map<String, Object> properties) {
- initParams = ApplicationUtils.getConfigParams(properties);
- thread = new Thread("Register Pending Vaadin Applications") {
- @Override
- public void run() {
- for (ServiceReference<ApplicationFactory> reference : pending) {
- register(reference);
- }
- pending.clear();
- }
- };
- thread.start();
- }
-
- public void stop() {
- if (thread != null && thread.isAlive()) {
- thread.interrupt();
- }
- initParams = null;
- }
-
- private boolean isReady() {
- return getHttpService() != null && getLogger() != null && getEventService() != null && initParams != null;
- }
-
- public void addFactory(ServiceReference<ApplicationFactory> reference) {
- if (isReady()) {
- register(reference);
- } else {
- pending.add(reference);
- }
- }
-
- public void removeFactory(ServiceReference<ApplicationFactory> reference) {
- if (isReady()) {
- unregister(reference);
- } else {
- pending.remove(reference);
- }
- }
-
- private void register(ServiceReference<ApplicationFactory> reference) {
- String componentName = ApplicationUtils.getComponentName(reference);
- String contextName = ApplicationUtils.getContextName(reference);
-
- try {
- Bundle bundle = reference.getBundle();
- ApplicationFactory applicationFactory = bundle.getBundleContext().getService(reference);
-
- ApplicationUtils.checkValid(applicationFactory);
-
- HttpServlet servlet = createContainer(applicationFactory);
- HttpContext httpContext = new BundleHttpContext(bundle);
-
- httpService.registerServlet(contextName, servlet, initParams, httpContext);
- registered.put(componentName, servlet);
- notifyRegistration(reference);
- getLogger().debug("Registered servlet for '%s' alias '%s'", componentName, contextName);
- } catch (Exception ex) {
- getLogger().error(ex, "Error registering servelt for '%s' alias '%s'", componentName, contextName);
- }
- }
-
- private HttpServlet createContainer(ApplicationFactory applicationFactory) throws Exception {
- ApplicationUtils.checkValid(applicationFactory);
- Set<ApplicationSession> sessions = new ConcurrentSkipListSet<ApplicationSession>();
- return new ApplicationServlet(getLogger(), sessions, applicationFactory);
- }
-
- private void unregister(ServiceReference<ApplicationFactory> reference) {
- String componentName = ApplicationUtils.getComponentName(reference);
- String contextName = ApplicationUtils.getContextName(reference);
-
- getLogger().debug("De-registering servlet for '%s' alias '%s'", componentName, contextName);
- HttpServlet servlet = registered.remove(componentName);
- if (servlet != null) {
- httpService.unregister(contextName);
- servlet.destroy();
- }
- notifyDeRegistration(reference);
- }
-
- private void notifyRegistration(ServiceReference<ApplicationFactory> reference) {
- Map<String, String> data = ApplicationUtils.toMap(reference);
- eventService.postEvent(ApplicationConstants.APP_REGISTRATION_EVENT, data);
- }
-
- private void notifyDeRegistration(ServiceReference<ApplicationFactory> reference) {
- Map<String, String> data = ApplicationUtils.toMap(reference);
- eventService.postEvent(ApplicationConstants.APP_DEREGISTRATION_EVENT, data);
- }
-}
diff --git a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationSession.java b/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationSession.java
deleted file mode 100644
index 3afbcbb14d2..00000000000
--- a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationSession.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.internal;
-
-import javax.servlet.http.HttpSession;
-import com.vaadin.Application;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class ApplicationSession implements Comparable<ApplicationSession> {
-
- private final Application application;
- private final HttpSession httpSession;
-
- public ApplicationSession(Application application, HttpSession session) {
- this.application = application;
- this.httpSession = session;
- }
-
- public Application getApplication() {
- return application;
- }
-
- public HttpSession getHttpSession() {
- return httpSession;
- }
-
- public void dispose() {
- Application application = getApplication();
- if (application != null) {
- application.close();
- }
- httpSession.removeAttribute(ApplicationServlet.class.getName());
- httpSession.removeAttribute(WebApplicationContext.class.getName());
- }
-
- @Override
- public int compareTo(ApplicationSession o) {
- return o.getHttpSession().getId().compareTo(this.getHttpSession().getId());
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationState.java b/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationState.java
deleted file mode 100644
index 7f35650eb8c..00000000000
--- a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationState.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.internal;
-
-import com.vaadin.Application;
-import com.vaadin.ui.Window;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ApplicationState {
-
- private final ThreadLocal<Application> application = new ThreadLocal<Application>();
- private final ThreadLocal<Window> window = new ThreadLocal<Window>();
- private final ThreadLocal<String> uriFragment = new ThreadLocal<String>();
-
- public Application getApplication() {
- return application.get();
- }
-
- public void setApplication(Application application) {
- this.application.set(application);
- }
-
- public boolean isApplicationValid() {
- return getApplication() != null;
- }
-
- public Window getWindow() {
- return window.get();
- }
-
- public void setWindow(Window window) {
- this.window.set(window);
- }
-
- public String getUriFragment() {
- return uriFragment.get();
- }
-
- public void setUriFragment(String fragment) {
- uriFragment.set(fragment);
- }
-
- public void removeApplication() {
- application.remove();
- }
-
- public void removeWindow() {
- window.remove();
- }
-
- public void removeUriFragment() {
- uriFragment.remove();
- }
-
- public void clearAll() {
- removeApplication();
- removeWindow();
- removeUriFragment();
- }
-}
diff --git a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationUtils.java b/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationUtils.java
deleted file mode 100644
index c92ee4f4433..00000000000
--- a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ApplicationUtils.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.internal;
-
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import org.eclipse.osee.vaadin.ApplicationConstants;
-import org.eclipse.osee.vaadin.ApplicationFactory;
-import org.osgi.framework.ServiceReference;
-import com.vaadin.terminal.gwt.server.Constants;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class ApplicationUtils {
-
- private ApplicationUtils() {
- // Utility class
- }
-
- public static String getContextName(ServiceReference<?> reference) {
- String contextName = (String) reference.getProperty(ApplicationConstants.APP_CONTEXT_NAME);
- if (!isValid(contextName)) {
- contextName = getComponentName(reference);
- }
- return normalize(contextName);
- }
-
- public static String getComponentName(ServiceReference<?> reference) {
- return (String) reference.getProperty(ApplicationConstants.APP_COMPONENT_NAME);
- }
-
- public static void checkValid(ApplicationFactory application) throws Exception {
- if (application == null) {
- throw new IllegalStateException("ApplicationFactory service was null");
- }
- }
-
- public static String normalize(String contextName) {
- return contextName != null && !contextName.startsWith("/") ? "/" + contextName : contextName;
- }
-
- private static boolean isValid(String value) {
- return value != null && value.length() > 0;
- }
-
- public static Dictionary<String, String> getConfigParams(Map<String, Object> properties) {
- String productionMode = (String) properties.get(Constants.SERVLET_PARAMETER_PRODUCTION_MODE);
- Dictionary<String, String> initParams = new Hashtable<String, String>();
- if (productionMode != null) {
- initParams.put(Constants.SERVLET_PARAMETER_PRODUCTION_MODE, productionMode);
- }
- return initParams;
- }
-
- public static Map<String, String> toMap(ServiceReference<ApplicationFactory> reference) {
- Map<String, String> data = new HashMap<String, String>();
- for (String key : reference.getPropertyKeys()) {
- Object object = reference.getProperty(key);
- data.put(key, String.valueOf(object));
- }
- return data;
- }
-}
diff --git a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/BundleHttpContext.java b/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/BundleHttpContext.java
deleted file mode 100644
index ef2b956f3e6..00000000000
--- a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/BundleHttpContext.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.internal;
-
-import java.net.URL;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.osgi.framework.Bundle;
-import org.osgi.service.http.HttpContext;
-
-/**
- * @author Roberto E. Escobar
- */
-public class BundleHttpContext implements HttpContext {
-
- private final Bundle bundle;
-
- public BundleHttpContext(Bundle bundle) {
- this.bundle = bundle;
- }
-
- @Override
- public URL getResource(String name) {
- return bundle.getEntry(name);
- }
-
- @Override
- public String getMimeType(String name) {
- return null;
- }
-
- @Override
- public boolean handleSecurity(HttpServletRequest request, HttpServletResponse response) {
- // Assume the container has already performed authentication
- return true;
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ResourceHttpContext.java b/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ResourceHttpContext.java
deleted file mode 100644
index 9c62dd41ae0..00000000000
--- a/plugins/org.eclipse.osee.vaadin/src/org/eclipse/osee/vaadin/internal/ResourceHttpContext.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.vaadin.internal;
-
-import java.net.URL;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.http.HttpContext;
-import org.osgi.service.http.HttpService;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ResourceHttpContext implements HttpContext {
-
- private static final String VAADIN_BUNDLE = "com.vaadin";
- private static final String HTTP_CONTEXT = "http.context";
-
- private HttpService httpService;
- private String contextName;
- private Bundle resourceBundle;
-
- public void setHttpService(HttpService httpService) {
- this.httpService = httpService;
- }
-
- public void start(BundleContext bundleContext, Map<String, String> properties) throws Exception {
- resourceBundle = getVaadinBundle(bundleContext);
- contextName = properties.get(HTTP_CONTEXT);
- contextName = ApplicationUtils.normalize(contextName);
-
- httpService.registerResources(contextName, contextName, this);
- }
-
- private Bundle getVaadinBundle(BundleContext bundleContext) {
- Bundle vaadinBundle = null;
- for (Bundle bundle : bundleContext.getBundles()) {
- if (VAADIN_BUNDLE.equals(bundle.getSymbolicName())) {
- vaadinBundle = bundle;
- break;
- }
- }
- return vaadinBundle;
- }
-
- public void stop() {
- httpService.unregister(contextName);
- contextName = null;
- httpService = null;
- resourceBundle = null;
- }
-
- @Override
- public boolean handleSecurity(HttpServletRequest request, HttpServletResponse response) {
- // Assume the container has already performed authentication
- return true;
- }
-
- @Override
- public URL getResource(String name) {
- return resourceBundle.getResource(name);
- }
-
- @Override
- public String getMimeType(String name) {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.osee.x.core.parent/pom.xml b/plugins/org.eclipse.osee.x.core.parent/pom.xml
index eef9f9ea344..3baedd5673f 100644
--- a/plugins/org.eclipse.osee.x.core.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.core.parent/pom.xml
@@ -60,10 +60,6 @@
<module>../../plugins/org.eclipse.osee.template.engine</module>
<module>../../plugins/org.eclipse.osee.template.engine.test</module>
- <module>../../plugins/org.eclipse.osee.vaadin</module>
- <module>../../plugins/org.eclipse.osee.vaadin.widgets</module>
- <module>../../plugins/org.eclipse.osee.vaadin.themes</module>
-
<module>../../plugins/org.eclipse.osee.jaxrs</module>
<module>../../plugins/org.eclipse.osee.jaxrs.server</module>
<module>../../plugins/org.eclipse.osee.jaxrs.server.test</module>

Back to the top