Skip to content

IRSA-194: Handle bad ipac table upload #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2017
Merged

IRSA-194: Handle bad ipac table upload #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6a0571
IRSA-194: Handle bad ipac table upload
loitly Mar 14, 2017
358f0c5
IRSA-194: also clean files coming in via IpacTableFromSource.
loitly Mar 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions buildScript/gwt_webapp.gincl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ task prepareWebapp (type:Copy, dependsOn: [gwt, loadConfig, createVersionTag]) {
include 'logging.properties'
into 'WEB-INF/classes'
}
from("$rootDir/config/web.xml") {
into "WEB-INF"
}
from("$rootDir/config") {
include "context.xml"
into 'META-INF'
Expand Down
59 changes: 4 additions & 55 deletions src/firefly/config/web.xml → config/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,13 @@
<url-pattern>*.html</url-pattern>
<url-pattern>*.css</url-pattern>
<url-pattern>*.js</url-pattern>
<url-pattern>/servlet/FireFly_PropertyDownload</url-pattern>
<url-pattern>/sticky/CmdSrv</url-pattern>
<url-pattern>/sticky/firefly/events</url-pattern>
</filter-mapping>



<!-- remote loger servlet and its mappings -->
<servlet>
<servlet-name>remoteLogging</servlet-name>
<servlet-class>edu.caltech.ipac.firefly.server.servlets.FireflyRemoteLogging</servlet-class>

<init-param>
<param-name>gwtSymbolMapDir</param-name>
<param-value>WEB-INF/deploy/symbolMaps</param-value>
</init-param>
</servlet>
<servlet-mapping>
<servlet-name>remoteLogging</servlet-name>
<url-pattern>/remote_logging</url-pattern>
</servlet-mapping>



<!-- Servlet and its mappings -->
<servlet>
<servlet-class>edu.caltech.ipac.firefly.server.servlets.AnyFileDownload</servlet-class>
<servlet-name>FireFly Any FileDownload</servlet-name>
Expand All @@ -70,15 +53,6 @@
<url-pattern>/servlet/Download</url-pattern>
</servlet-mapping>

<servlet>
<servlet-class>edu.caltech.ipac.firefly.server.servlets.PropertyStringDownload</servlet-class>
<servlet-name>FireFly PropertyDownload</servlet-name>
</servlet>
<servlet-mapping>
<servlet-name>FireFly PropertyDownload</servlet-name>
<url-pattern>/servlet/FireFly_PropertyDownload</url-pattern>
</servlet-mapping>

<servlet>
<servlet-class>edu.caltech.ipac.firefly.server.servlets.FitsUpload</servlet-class>
<servlet-name>FireFly FitsUpload</servlet-name>
Expand All @@ -97,15 +71,6 @@
<url-pattern>/sticky/FireFly_ImageDownload</url-pattern>
</servlet-mapping>

<servlet>
<servlet-class>edu.caltech.ipac.firefly.server.servlets.AnyFileUpload</servlet-class>
<servlet-name>Firefly FileUpload</servlet-name>
</servlet>
<servlet-mapping>
<servlet-name>Firefly FileUpload</servlet-name>
<url-pattern>/sticky/Firefly_FileUpload</url-pattern>
</servlet-mapping>

<servlet>
<servlet-class>edu.caltech.ipac.firefly.server.servlets.ServerStatus</servlet-class>
<servlet-name>status</servlet-name>
Expand All @@ -125,19 +90,8 @@
</servlet-mapping>




<!-- Heritage servlet and its mappings -->

<!-- Resources -->

<resource-ref>
<description>Archive Datasource</description>
<res-ref-name>jdbc/Archive</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>

<resource-ref>
<description>Operation Datasource</description>
<res-ref-name>jdbc/Operation</res-ref-name>
Expand All @@ -146,19 +100,13 @@
</resource-ref>

<resource-ref>
<description>Firefly Mail Session</description>
<description>Mail Session</description>
<res-ref-name>MailSession</res-ref-name>
<res-type>javax.mail.Session</res-type>
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>

<context-param>
<param-name>AppName</param-name>
<param-value>Firefly Viewer</param-value>
</context-param>


<security-constraint>
<web-resource-collection>
<web-resource-name> Admin Area </web-resource-name>
Expand Down Expand Up @@ -190,9 +138,10 @@
<mime-type>image/fits</mime-type>
</mime-mapping>

<!--welcome page-->
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>@launch.page@</welcome-file>
<welcome-file>index.html</welcome-file>
</welcome-file-list>


Expand Down
272 changes: 0 additions & 272 deletions src/fftools/config/web.xml
View file
Open in desktop

This file was deleted.

Loading