Skip to content
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

Jump to bottom

youcat: add tap_schema and uws init #167

Merged
merged 2 commits into from
Jul 16, 2024
Merged

youcat: add tap_schema and uws init #167

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
f112c95
youcat: add tap_schema and uws init
pdowler Jul 15, 2024
4ce6ce5
cadc-tap: remove bintray plugin from build
pdowler Jul 15, 2024
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
1 change: 0 additions & 1 deletion cadc-tap/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id "java"
id "maven"
id 'maven-publish'
id 'com.jfrog.bintray' version '1.8.4'
id 'checkstyle'
}

Expand Down
2 changes: 1 addition & 1 deletion youcat/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'ca.nrc.cadc'

Expand Down
112 changes: 112 additions & 0 deletions youcat/src/main/java/org/opencadc/youcat/YoucatInitAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
/*
************************************************************************
******************* CANADIAN ASTRONOMY DATA CENTRE *******************
************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES **************
*
* (c) 2024. (c) 2024.
* Government of Canada Gouvernement du Canada
* National Research Council Conseil national de recherches
* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6
* All rights reserved Tous droits réservés
*
* NRC disclaims any warranties, Le CNRC dénie toute garantie
* expressed, implied, or énoncée, implicite ou légale,
* statutory, of any kind with de quelque nature que ce
* respect to the software, soit, concernant le logiciel,
* including without limitation y compris sans restriction
* any warranty of merchantability toute garantie de valeur
* or fitness for a particular marchande ou de pertinence
* purpose. NRC shall not be pour un usage particulier.
* liable in any event for any Le CNRC ne pourra en aucun cas
* damages, whether direct or être tenu responsable de tout
* indirect, special or general, dommage, direct ou indirect,
* consequential or incidental, particulier ou général,
* arising from the use of the accessoire ou fortuit, résultant
* software. Neither the name de l'utilisation du logiciel. Ni
* of the National Research le nom du Conseil National de
* Council of Canada nor the Recherches du Canada ni les noms
* names of its contributors may de ses participants ne peuvent
* be used to endorse or promote être utilisés pour approuver ou
* products derived from this promouvoir les produits dérivés
* software without specific prior de ce logiciel sans autorisation
* written permission. préalable et particulière
* par écrit.
*
* This file is part of the Ce fichier fait partie du projet
* OpenCADC project. OpenCADC.
*
* OpenCADC is free software: OpenCADC est un logiciel libre ;
* you can redistribute it and/or vous pouvez le redistribuer ou le
* modify it under the terms of modifier suivant les termes de
* the GNU Affero General Public la “GNU Affero General Public
* License as published by the License” telle que publiée
* Free Software Foundation, par la Free Software Foundation
* either version 3 of the : soit la version 3 de cette
* License, or (at your option) licence, soit (à votre gré)
* any later version. toute version ultérieure.
*
* OpenCADC is distributed in the OpenCADC est distribué
* hope that it will be useful, dans l’espoir qu’il vous
* but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE
* without even the implied GARANTIE : sans même la garantie
* warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ
* or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF
* PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence
* General Public License for Générale Publique GNU Affero
* more details. pour plus de détails.
*
* You should have received Vous devriez avoir reçu une
* a copy of the GNU Affero copie de la Licence Générale
* General Public License along Publique GNU Affero avec
* with OpenCADC. If not, see OpenCADC ; si ce n’est
* <http://www.gnu.org/licenses/>. pas le cas, consultez :
* <http://www.gnu.org/licenses/>.
*
************************************************************************
*/

package org.opencadc.youcat;

import ca.nrc.cadc.db.DBUtil;
import ca.nrc.cadc.rest.InitAction;
import ca.nrc.cadc.tap.schema.InitDatabaseTS;
import ca.nrc.cadc.uws.server.impl.InitDatabaseUWS;
import javax.sql.DataSource;
import org.apache.log4j.Logger;

/**
*
* @author pdowler
*/
public class YoucatInitAction extends InitAction {
private static final Logger log = Logger.getLogger(YoucatInitAction.class);

public YoucatInitAction() {
}

@Override
public void doInit() {
try {
// tap_schema
log.info("InitDatabaseTS: START");
DataSource tapadm = DBUtil.findJNDIDataSource("jdbc/tapadm");
InitDatabaseTS tsi = new InitDatabaseTS(tapadm, null, "tap_schema");
tsi.doInit();
log.info("InitDatabaseTS: OK");

// uws schema
log.info("InitDatabaseUWS: START");
DataSource uws = DBUtil.findJNDIDataSource("jdbc/uws");
InitDatabaseUWS uwsi = new InitDatabaseUWS(uws, null, "uws");
uwsi.doInit();
log.info("InitDatabaseUWS: OK");
} catch (Exception ex) {
throw new RuntimeException("INIT FAIL: " + ex.getMessage(), ex);
}
}

@Override
public void doShutdown() {
super.doShutdown();
}
}
56 changes: 30 additions & 26 deletions youcat/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,34 @@
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>

<servlet>
<servlet-name>TableServlet</servlet-name>
<servlet-class>ca.nrc.cadc.rest.RestServlet</servlet-class>
<init-param>
<param-name>init</param-name>
<param-value>org.opencadc.youcat.YoucatInitAction</param-value>
</init-param>
<init-param>
<param-name>get</param-name>
<param-value>ca.nrc.cadc.vosi.actions.GetAction</param-value>
</init-param>
<init-param>
<param-name>put</param-name>
<param-value>ca.nrc.cadc.vosi.actions.PutAction</param-value>
</init-param>
<init-param>
<param-name>delete</param-name>
<param-value>ca.nrc.cadc.vosi.actions.DeleteAction</param-value>
</init-param>
<!--
<init-param>
<param-name>post</param-name>
<param-value>ca.nrc.cadc.vosi.actions.PostAction</param-value>
</init-param>
-->
<load-on-startup>2</load-on-startup>
</servlet>

<servlet>
<servlet-name>AsyncQueryServlet</servlet-name>
Expand All @@ -62,7 +90,7 @@
<param-name>delete</param-name>
<param-value>ca.nrc.cadc.uws.web.DeleteAction</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
<load-on-startup>3</load-on-startup>
</servlet>

<servlet>
Expand All @@ -84,7 +112,7 @@
<param-name>post</param-name>
<param-value>ca.nrc.cadc.uws.web.SyncPostAction</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
<load-on-startup>3</load-on-startup>
</servlet>

<servlet>
Expand Down Expand Up @@ -125,30 +153,6 @@
<load-on-startup>3</load-on-startup>
</servlet>

<servlet>
<servlet-name>TableServlet</servlet-name>
<servlet-class>ca.nrc.cadc.rest.RestServlet</servlet-class>
<init-param>
<param-name>get</param-name>
<param-value>ca.nrc.cadc.vosi.actions.GetAction</param-value>
</init-param>
<init-param>
<param-name>put</param-name>
<param-value>ca.nrc.cadc.vosi.actions.PutAction</param-value>
</init-param>
<init-param>
<param-name>delete</param-name>
<param-value>ca.nrc.cadc.vosi.actions.DeleteAction</param-value>
</init-param>
<!--
<init-param>
<param-name>post</param-name>
<param-value>ca.nrc.cadc.vosi.actions.PostAction</param-value>
</init-param>
-->
<load-on-startup>3</load-on-startup>
</servlet>

<servlet>
<servlet-name>AsyncTableUpdateServlet</servlet-name>
<servlet-class>ca.nrc.cadc.uws.server.JobServlet</servlet-class>
Expand Down
Loading