Skip to content

Commit 2dfdd19

Browse files
chrisknollchrisknoll
authored
Merge pull request #182 from OHDSI/v2.0-integration-candidate
V2.0.0 Release
2 parents b2ccb67 + eb370a5 commit 2dfdd19

File tree

236 files changed

+10458
-862
lines changed

Some content is hidden

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

236 files changed

+10458
-862
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
*application.properties
2+
.idea/
3+
*.iml
24
sandbox/
35
/target/
46
.settings

‎.idea/compiler.xml

+32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml

+79-72
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
<version>1.0.0-SNAPSHOT</version>
1010
<name>WebAPI</name>
1111
<properties>
12+
<webapi.version>2.0.0</webapi.version>
1213
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1314
<jersey.version>2.14</jersey.version>
1415
<!-- Spring Boot manages spring.version as well -->
1516
<spring.boot.version>1.2.1.RELEASE</spring.boot.version>
1617
<spring.batch.version>3.0.3.RELEASE</spring.batch.version>
1718
<flyway.version>3.1</flyway.version>
19+
<waffle.version>1.7.3</waffle.version>
1820
<start-class>org.ohdsi.webapi.WebApi</start-class>
1921

2022
<!-- Primary DataSource -->
@@ -43,8 +45,24 @@
4345

4446
<spring.batch.repository.tableprefix>${datasource.ohdsi.schema}.BATCH_</spring.batch.repository.tableprefix>
4547
<spring.batch.repository.isolationLevelForCreate>ISOLATION_READ_COMMITTED</spring.batch.repository.isolationLevelForCreate>
46-
4748
<spring.profiles.active>default</spring.profiles.active>
49+
50+
<security.enabled>false</security.enabled>
51+
<security.token.expiration>43200</security.token.expiration>
52+
<security.origin>http://localhost</security.origin>
53+
<security.ssl.enabled>false</security.ssl.enabled>
54+
<security.oauth.callback.ui>http://localhost/Atlas/#/welcome</security.oauth.callback.ui>
55+
<security.oauth.callback.api>http://localhost:8080/WebAPI/user/oauth/callback</security.oauth.callback.api>
56+
<security.oauth.google.apiKey></security.oauth.google.apiKey>
57+
<security.oauth.google.apiSecret></security.oauth.google.apiSecret>
58+
<security.oauth.facebook.apiKey></security.oauth.facebook.apiKey>
59+
<security.oauth.facebook.apiSecret></security.oauth.facebook.apiSecret>
60+
61+
<!-- EMBEDDED SERVER CONFIGURATION (ServerProperties) -->
62+
<server.port>8080</server.port>
63+
<server.ssl.key-store></server.ssl.key-store>
64+
<server.ssl.key-store-password></server.ssl.key-store-password>
65+
<server.ssl.key-password></server.ssl.key-password>
4866
</properties>
4967
<build>
5068
<finalName>WebAPI</finalName>
@@ -121,8 +139,8 @@
121139
<version>2.5.1</version>
122140
<inherited>true</inherited>
123141
<configuration>
124-
<source>1.7</source>
125-
<target>1.7</target>
142+
<source>1.8</source>
143+
<target>1.8</target>
126144
</configuration>
127145
</plugin>
128146
<plugin>
@@ -322,17 +340,15 @@
322340
<version>${flyway.version}</version>
323341
</dependency>
324342
<dependency>
325-
<groupId>org.apache.httpcomponents</groupId>
326-
<artifactId>httpclient</artifactId>
327-
<version>4.3.6</version>
328-
</dependency>
329-
<dependency>
330-
<groupId>commons-httpclient</groupId>
331-
<artifactId>commons-httpclient</artifactId>
332-
<version>3.1</version>
333-
</dependency>
334-
335-
343+
<groupId>org.apache.httpcomponents</groupId>
344+
<artifactId>httpclient</artifactId>
345+
<version>4.3.6</version>
346+
</dependency>
347+
<dependency>
348+
<groupId>commons-httpclient</groupId>
349+
<artifactId>commons-httpclient</artifactId>
350+
<version>3.1</version>
351+
</dependency>
336352
<dependency>
337353
<groupId>org.springframework.batch</groupId>
338354
<artifactId>spring-batch-admin-manager</artifactId>
@@ -348,13 +364,17 @@
348364
</exclusion>
349365
</exclusions>
350366
</dependency>
351-
352367
<dependency>
353368
<groupId>org.postgresql</groupId>
354369
<artifactId>postgresql</artifactId>
355370
<version>9.4-1201-jdbc41</version>
356371
<type>jar</type>
357372
</dependency>
373+
<dependency>
374+
<groupId>com.microsoft.sqlserver</groupId>
375+
<artifactId>mssql-jdbc</artifactId>
376+
<version>6.1.0.jre8</version>
377+
</dependency>
358378
<dependency>
359379
<groupId>com.opencsv</groupId>
360380
<artifactId>opencsv</artifactId>
@@ -367,6 +387,46 @@
367387
<version>4.1</version>
368388
<type>jar</type>
369389
</dependency>
390+
<dependency>
391+
<groupId>org.apache.shiro</groupId>
392+
<artifactId>shiro-core</artifactId>
393+
<version>1.2.4</version>
394+
</dependency>
395+
<dependency>
396+
<groupId>org.apache.shiro</groupId>
397+
<artifactId>shiro-web</artifactId>
398+
<version>1.2.4</version>
399+
</dependency>
400+
<dependency>
401+
<groupId>org.apache.shiro</groupId>
402+
<artifactId>shiro-spring</artifactId>
403+
<version>1.2.4</version>
404+
</dependency>
405+
<dependency>
406+
<groupId>com.github.dblock.waffle</groupId>
407+
<artifactId>waffle-shiro</artifactId>
408+
<version>1.7.4</version>
409+
</dependency>
410+
<dependency>
411+
<groupId>com.github.dblock.waffle</groupId>
412+
<artifactId>waffle-jna</artifactId>
413+
<version>${waffle.version}</version>
414+
</dependency>
415+
<dependency>
416+
<groupId>io.jsonwebtoken</groupId>
417+
<artifactId>jjwt</artifactId>
418+
<version>0.6.0</version>
419+
</dependency>
420+
<dependency>
421+
<groupId>io.buji</groupId>
422+
<artifactId>buji-pac4j</artifactId>
423+
<version>2.0.2</version>
424+
</dependency>
425+
<dependency>
426+
<groupId>org.pac4j</groupId>
427+
<artifactId>pac4j-oauth</artifactId>
428+
<version>1.9.2</version>
429+
</dependency>
370430
</dependencies>
371431
<profiles>
372432
<profile>
@@ -384,6 +444,7 @@
384444
<flyway.datasource.username>user</flyway.datasource.username>
385445
<flyway.datasource.password>pass</flyway.datasource.password>
386446
<flyway.locations>classpath:db/migration/oracle</flyway.locations>
447+
<hibernate.dialect>org.hibernate.dialect.Oracle10gDialect</hibernate.dialect>
387448
</properties>
388449
<dependencies>
389450
<dependency>
@@ -408,6 +469,7 @@
408469
<flyway.datasource.username>userWithWritesToOhdsiSchema</flyway.datasource.username>
409470
<flyway.datasource.password>PASS</flyway.datasource.password>
410471
<flyway.locations>classpath:db/migration/postgresql</flyway.locations>
472+
<hibernate.dialect>org.hibernate.dialect.PostgreSQL9Dialect</hibernate.dialect>
411473
</properties>
412474
</profile>
413475
<profile>
@@ -424,63 +486,8 @@
424486
<flyway.datasource.username>FLYWAY_USER</flyway.datasource.username>
425487
<flyway.datasource.password>FLYWAY_PASS</flyway.datasource.password>
426488
<flyway.locations>classpath:db/migration/sqlserver</flyway.locations>
489+
<hibernate.dialect>org.hibernate.dialect.SQLServer2012Dialect</hibernate.dialect>
427490
</properties>
428-
<dependencies>
429-
<dependency>
430-
<groupId>com.microsoft.sqlserver</groupId>
431-
<artifactId>sqljdbc4</artifactId>
432-
<version>4.0</version>
433-
<type>jar</type>
434-
</dependency>
435-
</dependencies>
436-
</profile>
437-
<profile>
438-
<id>webapi-local</id>
439-
<properties>
440-
<datasource.driverClassName>com.microsoft.sqlserver.jdbc.SQLServerDriver</datasource.driverClassName>
441-
<datasource.url>jdbc:sqlserver://server</datasource.url>
442-
<datasource.username>USER</datasource.username>
443-
<datasource.password>PASS</datasource.password>
444-
<datasource.dialect>sql server</datasource.dialect>
445-
<datasource.ohdsi.schema>OHDSI_schema</datasource.ohdsi.schema>
446-
<flyway.datasource.driverClassName>${datasource.driverClassName}</flyway.datasource.driverClassName>
447-
<flyway.datasource.url>${datasource.url}</flyway.datasource.url>
448-
<flyway.datasource.username>FLYWAY_USER</flyway.datasource.username>
449-
<flyway.datasource.password>FLYWAY_PASS</flyway.datasource.password>
450-
<flyway.locations>classpath:db/migration/sqlserver</flyway.locations>
451-
</properties>
452-
<dependencies>
453-
<dependency>
454-
<groupId>com.microsoft.sqlserver</groupId>
455-
<artifactId>sqljdbc4</artifactId>
456-
<version>4.0</version>
457-
<type>jar</type>
458-
</dependency>
459-
</dependencies>
460-
</profile>
461-
<profile>
462-
<id>webapi-alpha</id>
463-
<properties>
464-
<datasource.driverClassName>com.microsoft.sqlserver.jdbc.SQLServerDriver</datasource.driverClassName>
465-
<datasource.url>jdbc:sqlserver://server</datasource.url>
466-
<datasource.username>USER</datasource.username>
467-
<datasource.password>PASS</datasource.password>
468-
<datasource.dialect>sql server</datasource.dialect>
469-
<datasource.ohdsi.schema>OHDSI_schema</datasource.ohdsi.schema>
470-
<flyway.datasource.driverClassName>${datasource.driverClassName}</flyway.datasource.driverClassName>
471-
<flyway.datasource.url>${datasource.url}</flyway.datasource.url>
472-
<flyway.datasource.username>FLYWAY_USER</flyway.datasource.username>
473-
<flyway.datasource.password>FLYWAY_PASS</flyway.datasource.password>
474-
<flyway.locations>classpath:db/migration/sqlserver</flyway.locations>
475-
</properties>
476-
<dependencies>
477-
<dependency>
478-
<groupId>com.microsoft.sqlserver</groupId>
479-
<artifactId>sqljdbc4</artifactId>
480-
<version>4.0</version>
481-
<type>jar</type>
482-
</dependency>
483-
</dependencies>
484-
</profile>
491+
</profile>
485492
</profiles>
486493
</project>

0 commit comments

Comments
 (0)