Skip to content

Commit 18589f1

Browse files
committed
DM-4593: background monitor for Firefly
- Background Monitor: - support existing features except for listed TODOs. - send BackgroundStatus as json action. - convert DownloadRequest to json - added BackgroundCntlr and related pieces - resizable layout.. 1-3 columns Also: - add standardized interfaces for our Flux controllers - expand CommandServices to allow for HttpCommand - separate VisHeader into VisHeader and VisPreview - restyle banner.jsx - convert code to use SearchServices - add LightCurveFileGroupsProcessor stub - add VO_TABLE support to DataGroup.readAnyFormat (based on file extension only, should peek into data to detect) TODOs: - downloadScript dialog - resend email - retain background jobs and statuses after reload - email notification is not working for local env
1 parent be6d797 commit 18589f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2199
-828
lines changed

src/fftools/config/web.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -189,16 +189,6 @@
189189
<url-pattern>/sticky/CmdSrv</url-pattern>
190190
</servlet-mapping>
191191

192-
<servlet>
193-
<servlet-class>edu.caltech.ipac.firefly.server.servlets.JsonSearchServices</servlet-class>
194-
<servlet-name>FireFly SearchService</servlet-name>
195-
</servlet>
196-
<servlet-mapping>
197-
<servlet-name>FireFly SearchService</servlet-name>
198-
<url-pattern>/search/json</url-pattern>
199-
</servlet-mapping>
200-
201-
202192
<servlet>
203193
<servlet-class>edu.caltech.ipac.firefly.server.servlets.FFToolsStandaloneService</servlet-class>
204194
<servlet-name>FireFly FFTool Standalone</servlet-name>

src/firefly/config/web.xml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<url-pattern>*.css</url-pattern>
4040
<url-pattern>*.js</url-pattern>
4141
<url-pattern>/servlet/FireFly_PropertyDownload</url-pattern>
42-
<url-pattern>/search/json</url-pattern>
42+
<url-pattern>/search/*</url-pattern>
4343
</filter-mapping>
4444

4545

@@ -106,15 +106,6 @@
106106
<url-pattern>/sticky/Firefly_FileUpload</url-pattern>
107107
</servlet-mapping>
108108

109-
<servlet>
110-
<servlet-class>edu.caltech.ipac.firefly.server.servlets.SaveAsIpacTable</servlet-class>
111-
<servlet-name>Firefly SaveAsIpacTable</servlet-name>
112-
</servlet>
113-
<servlet-mapping>
114-
<servlet-name>Firefly SaveAsIpacTable</servlet-name>
115-
<url-pattern>/servlet/SaveAsIpacTable</url-pattern>
116-
</servlet-mapping>
117-
118109
<servlet>
119110
<servlet-class>edu.caltech.ipac.firefly.server.servlets.ServerStatus</servlet-class>
120111
<servlet-name>status</servlet-name>
@@ -133,14 +124,7 @@
133124
<url-pattern>/sticky/CmdSrv</url-pattern>
134125
</servlet-mapping>
135126

136-
<servlet>
137-
<servlet-class>edu.caltech.ipac.firefly.server.servlets.JsonSearchServices</servlet-class>
138-
<servlet-name>FireFly SearchService</servlet-name>
139-
</servlet>
140-
<servlet-mapping>
141-
<servlet-name>FireFly SearchService</servlet-name>
142-
<url-pattern>/search/json</url-pattern>
143-
</servlet-mapping>
127+
144128

145129

146130
<!-- Heritage servlet and its mappings -->
@@ -162,7 +146,7 @@
162146
</resource-ref>
163147

164148
<resource-ref>
165-
<description>Hydra Mail Session</description>
149+
<description>Firefly Mail Session</description>
166150
<res-ref-name>MailSession</res-ref-name>
167151
<res-type>javax.mail.Session</res-type>
168152
<res-auth>Container</res-auth>

src/firefly/html/css/global.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@
245245
display: inline-block;
246246
position: relative;
247247
text-shadow: 0 1px 0 #fff;
248-
width: 14px;
249-
height: 14px;
248+
width: 13px;
249+
height: 13px;
250250
}
251251
.btn-close:hover {
252252
background-color: #949494;
67 Bytes
Loading
834 Bytes
Loading

0 commit comments

Comments
 (0)