MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

no message

This commit is contained in:
annabakouli 2018-01-18 12:27:30 +02:00
parent 943d121e98
commit 9bbaaa7f9e
12 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ dmp-backend/src/main/ui-resources/static/inline.bundle.js
dmp-backend/src/main/ui-resources/static/index.html dmp-backend/src/main/ui-resources/static/index.html
dmp-backend/src/main/ui-resources/static/favicon.ico dmp-backend/src/main/ui-resources/static/favicon.ico
dmp-backend/src/main/ui-resources/static/assets/lang/en.json dmp-backend/src/main/ui-resources/static/assets/lang/en.json
dmp-frontend/new 3.xml

1
dmp-admin/src/app/dataset-profile-form/form/form.component.html
View File

@ -70,5 +70,4 @@
<button class="btn btn-primary" style="margin-top:20px;" type="submit" [disabled]="!form.valid">Save</button> <button class="btn btn-primary" style="margin-top:20px;" type="submit" [disabled]="!form.valid">Save</button>
</form> </form>
</div> </div>
<p>Form value: {{ form.value | json }}</p>
</div> </div>

2
dmp-admin/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
View File

@ -23,7 +23,7 @@ export class GooggleSignInComponent implements OnInit, AfterViewInit {
ngOnInit() { ngOnInit() {
} }
private clientId:string = '1010962018903-glegmqudqtl1lub0150vacopbu06lgsg.apps.googleusercontent.com'; private clientId:string = '524432312250-sc9qsmtmbvlv05r44onl6l93ia3k9deo.apps.googleusercontent.com';
private scope = [ private scope = [
'profile', 'profile',

2
dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html
View File

@ -3,7 +3,7 @@
<div class="col-sm-6 col-md-4 col-md-offset-4"> <div class="col-sm-6 col-md-4 col-md-offset-4">
<h1 class="text-center login-title"></h1> <h1 class="text-center login-title"></h1>
<div class="account-wall"> <div class="account-wall">
<img class="profile-img" src="/assets/icons/user-icon.png"> <img class="profile-img" src="/admin-ui/assets/icons/user-icon.png">
<form class="form-signin" [formGroup]="nativeLoginForm"> <form class="form-signin" [formGroup]="nativeLoginForm">
<input type="text" class="form-control" [(ngModel)]="creds.username" formControlName="username" placeholder="Username or Email" required autofocus> <input type="text" class="form-control" [(ngModel)]="creds.username" formControlName="username" placeholder="Username or Email" required autofocus>
<input type="password" class="form-control" [(ngModel)]="creds.password" formControlName="password" placeholder="Password" required> <input type="password" class="form-control" [(ngModel)]="creds.password" formControlName="password" placeholder="Password" required>

2
dmp-admin/src/app/services/rest-base.ts
View File

@ -18,7 +18,7 @@ export class RestBase {
/* /*
*/ */
protocol: string = "http"; protocol: string = "http";
hostname: string = "192.168.32.96"; hostname: string = "dl043.madgik.di.uoa.gr";
port: number = 8080; port: number = 8080;
webappname: string = ""; webappname: string = "";
restpath: string = ""; restpath: string = "";

16
dmp-admin/src/index.html
View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>DmpAdmin</title> <title>DmpAdmin</title>
<base href="/"> <base href="/admin-ui/">
<meta name="csrf-token" content="2c64def7de30197c40276fe1a7ea874ca8871f70be7d7dc3305465a4d5c565e4"> <meta name="csrf-token" content="2c64def7de30197c40276fe1a7ea874ca8871f70be7d7dc3305465a4d5c565e4">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
@ -27,17 +27,17 @@
<!-- XML to json and vice versa lib --> <!-- XML to json and vice versa lib -->
<script src="assets/xml2json.min.js"></script> <script src="/admin-ui/assets/xml2json.min.js"></script>
<!-- Json formatter lib --> <!-- Json formatter lib -->
<link rel="stylesheet" type="text/css" href="assets/jquery.json-viewer.css"> <link rel="stylesheet" type="text/css" href="/admin-ui/assets/jquery.json-viewer.css">
<script src="assets/jquery.json-viewer.js"></script> <script src="/admin-ui/assets/jquery.json-viewer.js"></script>
<!-- lib 4 pretty-printing xml and json --> <!-- lib 4 pretty-printing xml and json -->
<script src="assets/vkbeautify.0.99.00.js"></script> <script src="/admin-ui/assets/vkbeautify.0.99.00.js"></script>
<!-- Nice BS notifications --> <!-- Nice BS notifications -->
<script src="assets/bootstrap-notify.min.js"></script> <script src="/admin-ui/assets/bootstrap-notify.min.js"></script>
<!-- that's google sign in library --> <!-- that's google sign in library -->
<script src="https://apis.google.com/js/platform.js"></script> <script src="https://apis.google.com/js/platform.js"></script>
@ -47,8 +47,8 @@
<!-- my custom global code and css --> <!-- my custom global code and css -->
<link rel="stylesheet" type="text/css" href="assets/custom.css"> <link rel="stylesheet" type="text/css" href="/admin-ui/assets/custom.css">
<script src="assets/custom.js"></script> <script src="/admin-ui/assets/custom.js"></script>
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">

6
dmp-backend/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>dmp-backend</groupId> <groupId>dmp-backend</groupId>
<artifactId>dmp-backend</artifactId> <artifactId>dmp-backend</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<!--<packaging>war</packaging>--> <packaging>war</packaging>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
@ -187,11 +187,11 @@
<version>3.5</version> <version>3.5</version>
</dependency> </dependency>
<!-- <dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId> <artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency>--> </dependency>
</dependencies> </dependencies>
<build> <build>

4
dmp-backend/src/main/java/eu/eudat/EuDatApplication.java
View File

@ -18,10 +18,10 @@ import java.util.List;
public class EuDatApplication extends SpringBootServletInitializer { public class EuDatApplication extends SpringBootServletInitializer {
private static final Logger logger = LoggerFactory.getLogger(EuDatApplication.class); private static final Logger logger = LoggerFactory.getLogger(EuDatApplication.class);
/*@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
return builder.sources(EuDatApplication.class); return builder.sources(EuDatApplication.class);
}*/ }
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(EuDatApplication.class, args); SpringApplication.run(EuDatApplication.class, args);

5
dmp-backend/src/main/java/eu/eudat/proxy/config/ConfigLoader.java
View File

@ -34,9 +34,12 @@ public class ConfigLoader {
JAXBContext jaxbContext = JAXBContext.newInstance(ExternalUrls.class); JAXBContext jaxbContext = JAXBContext.newInstance(ExternalUrls.class);
Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
is = new URL("file:///C:/Users/ikalyvas/Documents/Projects/OpenAIRE-EUDAT-DMP-service-pilot/dmp-backend/src/main/resources/ExternalUrls.xml").openStream(); is = new URL("file:///"+System.getenv("CATALINA_HOME")+fileUrl).openStream();
//is = new URL("file:///C:/Users/ikalyvas/Documents/Projects/OpenAIRE-EUDAT-DMP-service-pilot/dmp-backend/src/main/resources/ExternalUrls.xml").openStream();
externalUrls = (ExternalUrls) jaxbUnmarshaller.unmarshal(is); externalUrls = (ExternalUrls) jaxbUnmarshaller.unmarshal(is);
// System.out.println(new ObjectMapper().writeValueAsString(externalUrls));
} catch (Exception ex) { } catch (Exception ex) {
//log the error and shutdown the system (that's a critical error)
ex.printStackTrace(); ex.printStackTrace();
System.out.println("Cannot find in folder"+current); System.out.println("Cannot find in folder"+current);
} finally { } finally {

4
dmp-backend/src/main/resources/application.properties
View File

@ -37,11 +37,11 @@ google.login.clientId=524432312250-sc9qsmtmbvlv05r44onl6l93ia3k9deo.apps.googleu
########################LINKEDIN LOGIN Properties#############################HiR4hQH9HNubKC5iKQy0l4mAZ ########################LINKEDIN LOGIN Properties#############################HiR4hQH9HNubKC5iKQy0l4mAZ
linkedin.login.clientId=86bl8vfk77clh9 linkedin.login.clientId=86bl8vfk77clh9
linkedin.login.clientSecret=2OCO9e3wKylW05Tt linkedin.login.clientSecret=2OCO9e3wKylW05Tt
linkedin.login.redirect_uri=http://dl043.madgik.di.uoa.gr/dmp/login/linkedin linkedin.login.redirect_uri=http://dl043.madgik.di.uoa.gr:8080/login/linkedin
########################LINKEDIN LOGIN Properties############################# ########################LINKEDIN LOGIN Properties#############################
twitter.login.clientId=HiR4hQH9HNubKC5iKQy0l4mAZ twitter.login.clientId=HiR4hQH9HNubKC5iKQy0l4mAZ
twitter.login.clientSecret=9KZHgkqUO2QFnELSL14jeUvfUacWX23rqD8OW8X0xoRDXOSfKH twitter.login.clientSecret=9KZHgkqUO2QFnELSL14jeUvfUacWX23rqD8OW8X0xoRDXOSfKH
twitter.login.redirect_uri=http://dl043.madgik.di.uoa.gr/dmp/login/twitter twitter.login.redirect_uri=http://dl043.madgik.di.uoa.gr:8080/login/twitter
########################Persistence/Hibernate/Batch############################## ########################Persistence/Hibernate/Batch##############################
#persistence.hibernate.jdbc.batch_size = 30 #persistence.hibernate.jdbc.batch_size = 30
#persistence.hibernate.order_inserts = true #persistence.hibernate.order_inserts = true

4
dmp-frontend/src/app/app.constants.ts
View File

@ -1,6 +1,6 @@
export const HostConfiguration = { export const HostConfiguration = {
Server: 'http://192.168.32.73:8080/', Server: 'http://dl043.madgik.di.uoa.gr:8080/',
App: 'http://localhost:4200/' App: 'http://dl043.madgik.di.uoa.gr:8080/'
//CASHost: 'https://login-devel.uoa.gr/login', //CASHost: 'https://login-devel.uoa.gr/login',
//Service: 'http://elkefinman/login' //Service: 'http://elkefinman/login'
} }

2
dmp-frontend/src/environments/environment.ts
View File

@ -4,5 +4,5 @@
// The list of which env maps to which file can be found in `.angular-cli.json`. // The list of which env maps to which file can be found in `.angular-cli.json`.
export const environment = { export const environment = {
production: false production: true
}; };