Project

General

Profile

« Previous | Next » 

Revision febf715a

Added by Andreas Müller about 5 years ago

adapt app-import to new AccountStore package

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/BerlinModelDestinations.java
1 1

  
2 2
/**
3 3
* Copyright (C) 2007 EDIT
4
* European Distributed Institute of Taxonomy 
4
* European Distributed Institute of Taxonomy
5 5
* http://www.e-taxonomy.eu
6
* 
6
*
7 7
* The contents of this file are subject to the Mozilla Public License Version 1.1
8 8
* See LICENSE.TXT at the top of this package for the full license terms.
9 9
*/
......
12 12

  
13 13
import org.apache.log4j.Logger;
14 14

  
15
import eu.etaxonomy.cdm.common.AccountStore;
15
import eu.etaxonomy.cdm.config.AccountStore;
16 16
import eu.etaxonomy.cdm.io.common.Source;
17 17

  
18 18

  
19 19
public class BerlinModelDestinations {
20 20
	@SuppressWarnings("unused")
21 21
	private static final Logger logger = Logger.getLogger(BerlinModelDestinations.class);
22
	
22

  
23 23
	public static Source El_Salvador_Andreas(){
24 24
		//	BerlinModel - El_Salvador
25 25
		String dbms = Source.SQL_SERVER_2005;
......
29 29
		String userName = "salvadorExport";
30 30
		return  makeSource(dbms, strServer, strDB, port, userName, null);
31 31
	}
32
	
32

  
33 33
	/**
34 34
	 * Initializes the source.
35 35
	 * @param dbms
......
45 45
		Source source = null;
46 46
		source = new Source(dbms, strServer, strDB);
47 47
		source.setPort(port);
48
			
48

  
49 49
		pwd = AccountStore.readOrStorePassword(dbms, strServer, userName, pwd);
50 50
		source.setUserAndPwd(userName, pwd);
51 51
		// write pwd to account store
app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/BerlinModelSources.java
12 12

  
13 13
import org.apache.log4j.Logger;
14 14

  
15
import eu.etaxonomy.cdm.common.AccountStore;
15
import eu.etaxonomy.cdm.config.AccountStore;
16 16
import eu.etaxonomy.cdm.io.common.Source;
17 17

  
18 18

  
app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/SourceBase.java
1 1
/**
2 2
* Copyright (C) 2009 EDIT
3
* European Distributed Institute of Taxonomy 
3
* European Distributed Institute of Taxonomy
4 4
* http://www.e-taxonomy.eu
5
* 
5
*
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
9 9
package eu.etaxonomy.cdm.app.berlinModelImport;
10 10

  
11
import eu.etaxonomy.cdm.common.AccountStore;
11
import eu.etaxonomy.cdm.config.AccountStore;
12 12
import eu.etaxonomy.cdm.io.common.Source;
13 13

  
14 14
/**
......
18 18
 */
19 19
public abstract class SourceBase {
20 20

  
21
	
21

  
22 22
	/**
23 23
	 * Initializes the source.
24 24
	 * @param dbms
......
34 34
		Source source = null;
35 35
		source = new Source(dbms, strServer, strDB);
36 36
		source.setPort(port);
37
			
37

  
38 38
		pwd = AccountStore.readOrStorePassword(dbms, strServer, userName, pwd);
39 39
		source.setUserAndPwd(userName, pwd);
40 40
		// write pwd to account store
app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
13 13

  
14 14
import org.apache.log4j.Logger;
15 15

  
16
import eu.etaxonomy.cdm.common.AccountStore;
16
import eu.etaxonomy.cdm.config.AccountStore;
17 17
import eu.etaxonomy.cdm.database.CdmDataSource;
18 18
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
19 19
import eu.etaxonomy.cdm.database.ICdmDataSource;
app-import/src/main/java/eu/etaxonomy/cdm/app/common/ImportUtils.java
1 1
/**
2 2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy 
3
* European Distributed Institute of Taxonomy
4 4
* http://www.e-taxonomy.eu
5
* 
5
*
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
9 9

  
10 10
package eu.etaxonomy.cdm.app.common;
11 11

  
12
import eu.etaxonomy.cdm.common.AccountStore;
12
import eu.etaxonomy.cdm.config.AccountStore;
13 13
import eu.etaxonomy.cdm.io.common.Source;
14 14

  
15 15
/**
......
18 18
 *
19 19
 */
20 20
public class ImportUtils {
21
	
21

  
22 22
	/**
23 23
	 * Initializes the source.
24 24
	 * @param dbms
......
34 34
		Source source = null;
35 35
		source = new Source(dbms, strServer, strDB);
36 36
		source.setPort(port);
37
			
37

  
38 38
		pwd = AccountStore.readOrStorePassword(dbms, strServer, userName, pwd);
39 39
		source.setUserAndPwd(userName, pwd);
40 40
		// write pwd to account store
app-import/src/main/java/eu/etaxonomy/cdm/app/util/TestDatabase.java
14 14
import org.springframework.transaction.TransactionStatus;
15 15

  
16 16
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
17
import eu.etaxonomy.cdm.common.AccountStore;
17
import eu.etaxonomy.cdm.config.AccountStore;
18 18
import eu.etaxonomy.cdm.database.CdmDataSource;
19 19
import eu.etaxonomy.cdm.database.DbSchemaValidation;
20 20
import eu.etaxonomy.cdm.database.ICdmDataSource;
app-import/src/main/java/eu/etaxonomy/cdm/app/viennaImport/ViennaActivator.java
20 20
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
21 21
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
22 22
import eu.etaxonomy.cdm.app.common.CdmDestinations;
23
import eu.etaxonomy.cdm.common.AccountStore;
24 23
import eu.etaxonomy.cdm.common.CdmUtils;
24
import eu.etaxonomy.cdm.config.AccountStore;
25 25
import eu.etaxonomy.cdm.io.common.Source;
26 26
import eu.etaxonomy.cdm.model.agent.Person;
27 27
import eu.etaxonomy.cdm.model.common.Annotation;
app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/UseImport.java
39 39
import eu.etaxonomy.cdm.api.service.ITermService;
40 40
import eu.etaxonomy.cdm.api.service.IVocabularyService;
41 41
import eu.etaxonomy.cdm.api.service.pager.Pager;
42
import eu.etaxonomy.cdm.common.AccountStore;
42
import eu.etaxonomy.cdm.config.AccountStore;
43 43
import eu.etaxonomy.cdm.database.CdmDataSource;
44 44
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
45 45
import eu.etaxonomy.cdm.database.ICdmDataSource;
app-import/src/main/java/eu/etaxonomy/cdm/database/update/BgbmInstancesUpdater.java
6 6
import org.apache.log4j.Logger;
7 7

  
8 8
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
9
import eu.etaxonomy.cdm.common.AccountStore;
10 9
import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor;
10
import eu.etaxonomy.cdm.config.AccountStore;
11 11
import eu.etaxonomy.cdm.database.CdmDataSource;
12 12
import eu.etaxonomy.cdm.database.DbSchemaValidation;
13 13
import eu.etaxonomy.cdm.database.ICdmDataSource;
cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/CdmDestinations.java
14 14

  
15 15
import org.apache.log4j.Logger;
16 16

  
17
import eu.etaxonomy.cdm.common.AccountStore;
17
import eu.etaxonomy.cdm.config.AccountStore;
18 18
import eu.etaxonomy.cdm.database.CdmDataSource;
19 19
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
20 20
import eu.etaxonomy.cdm.database.ICdmDataSource;
cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/CdmImportSources.java
1 1
/**
2 2
* Copyright (C) 2009 EDIT
3
* European Distributed Institute of Taxonomy 
3
* European Distributed Institute of Taxonomy
4 4
* http://www.e-taxonomy.eu
5
* 
5
*
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
......
13 13

  
14 14
import org.apache.log4j.Logger;
15 15

  
16
import eu.etaxonomy.cdm.common.AccountStore;
16
import eu.etaxonomy.cdm.config.AccountStore;
17 17
import eu.etaxonomy.cdm.io.common.Source;
18 18

  
19 19
/**
......
24 24
public class CdmImportSources {
25 25
	@SuppressWarnings("unused")
26 26
	private static final Logger logger = Logger.getLogger(CdmImportSources.class);
27
	
27

  
28 28

  
29 29
	public static Source AFRICA_CHECKLIST_ACCESS(){
30
		//	
30
		//
31 31
		String dbms = Source.ACCESS;
32 32
		String strServer = null;
33 33
		//String strDB = "fernsTest";
......
37 37
		return  makeSource(dbms, strServer, strDB, port, userName, null);
38 38
	}
39 39

  
40
	
40

  
41 41
	public static Source AFRICA_FERNS_ACCESS(){
42
		//	
42
		//
43 43
		String dbms = Source.ACCESS;
44 44
		String strServer = null;
45 45
		//String strDB = "fernsTest";
......
48 48
		String userName = "";
49 49
		return  makeSource(dbms, strServer, strDB, port, userName, null);
50 50
	}
51
	
51

  
52 52
	public static Source GLOBIS(){
53 53
		String dbms = Source.SQL_SERVER_2005;
54 54
		String strServer = "LENOVO-T61";
......
66 66
		String userName = "sa";
67 67
		return  makeSource(dbms, strServer, strDB, port, userName, null);
68 68
	}
69
	
69

  
70 70
	public static Source GLOBIS_MDB(){
71 71
		String dbms = Source.ACCESS;
72 72
		String strServer = null;
......
75 75
		String userName = "";
76 76
		return  makeSource(dbms, strServer, strDB, port, userName, null);
77 77
	}
78
	
79
	
78

  
79

  
80 80
	public static URI SYNTHESYS_SPECIMEN(){
81 81
		//		tcsXmlTest.xml
82 82
		URL url = new CdmImportSources().getClass().getResource("/specimen/SynthesysSpecimenExample.xls");
83 83
		String sourceUrl = url.toString();
84 84
		URI uri = URI.create(sourceUrl);
85
		return uri;	
85
		return uri;
86 86
	}
87
	
87

  
88 88
	/**
89 89
	 * Initializes the source.
90 90
	 * @param dbms
......
100 100
		Source source = null;
101 101
		source = new Source(dbms, strServer, strDB);
102 102
		source.setPort(port);
103
			
103

  
104 104
		pwd = AccountStore.readOrStorePassword(dbms, strServer, userName, pwd);
105 105
		source.setUserAndPwd(userName, pwd);
106 106
		// write pwd to account store
cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
14 14

  
15 15
import org.apache.log4j.Logger;
16 16

  
17
import eu.etaxonomy.cdm.common.AccountStore;
17
import eu.etaxonomy.cdm.config.AccountStore;
18 18
import eu.etaxonomy.cdm.database.CdmDataSource;
19 19
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
20 20
import eu.etaxonomy.cdm.database.ICdmDataSource;
cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/ImportUtils.java
1 1
/**
2 2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy 
3
* European Distributed Institute of Taxonomy
4 4
* http://www.e-taxonomy.eu
5
* 
5
*
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
9 9

  
10 10
package eu.etaxonomy.cdm.app.common;
11 11

  
12
import java.util.regex.Matcher;
13
import java.util.regex.Pattern;
14

  
15
import eu.etaxonomy.cdm.common.AccountStore;
12
import eu.etaxonomy.cdm.config.AccountStore;
16 13
import eu.etaxonomy.cdm.io.common.Source;
17 14

  
18 15

  
......
22 19
 *
23 20
 */
24 21
public class ImportUtils {
25
	
22

  
26 23
	/**
27 24
	 * Initializes the source.
28 25
	 * @param dbms
......
38 35
		Source source = null;
39 36
		source = new Source(dbms, strServer, strDB);
40 37
		source.setPort(port);
41
			
38

  
42 39
		pwd = AccountStore.readOrStorePassword(dbms, strServer, userName, pwd);
43 40
		source.setUserAndPwd(userName, pwd);
44 41
		// write pwd to account store
45 42
		return source;
46 43
	}
47
	
48
	
49
	
50
	
44

  
45

  
46

  
47

  
51 48

  
52 49
}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/PesiDestinations.java
1 1
/**
2 2
* Copyright (C) 2009 EDIT
3
* European Distributed Institute of Taxonomy 
3
* European Distributed Institute of Taxonomy
4 4
* http://www.e-taxonomy.eu
5
* 
5
*
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
......
11 11

  
12 12
import org.apache.log4j.Logger;
13 13

  
14
import eu.etaxonomy.cdm.common.AccountStore;
14
import eu.etaxonomy.cdm.config.AccountStore;
15 15
import eu.etaxonomy.cdm.io.common.Source;
16 16

  
17 17
/**
......
22 22
public class PesiDestinations {
23 23
	@SuppressWarnings("unused")
24 24
	private static final Logger logger = Logger.getLogger(PesiDestinations.class);
25
	
25

  
26 26
	public static Source pesi_test_local_CDM_EM2PESI(){
27 27
		//	CDM - PESI
28 28
		String dbms = Source.SQL_SERVER_2008;
......
32 32
		String userName =  "pesiexport";// "pesiexport3";
33 33
		return makeSource(dbms, strServer, strDB, port, userName, null);
34 34
	}
35
	
35

  
36 36
	public static Source pesi_test_local_CDM_EM2PESI_tmp(){
37 37
		//	CDM - PESI
38 38
		String dbms = Source.SQL_SERVER_2008;
......
42 42
		String userName = "pesiexport";
43 43
		return makeSource(dbms, strServer, strDB, port, userName, null);
44 44
	}
45
	
45

  
46 46
	public static Source pesi_test_local_CDM_FE2PESI(){
47 47
		//	CDM - PESI
48 48
		String dbms = Source.SQL_SERVER_2008;
......
53 53
		return makeSource(dbms, strServer, strDB, port, userName, null);
54 54
	}
55 55

  
56
	
56

  
57 57
	public static Source pesi_test_local_CDM_IF2PESI(){
58 58
		//	CDM - PESI
59 59
		String dbms = Source.SQL_SERVER_2008;
......
63 63
		String userName = "pesiExportFaunaEu";
64 64
		return makeSource(dbms, strServer, strDB, port, userName, null);
65 65
	}
66
	
66

  
67 67
	public static Source pesi_test_local_CDM_ERMS2PESI(){
68 68
		//	CDM - PESI
69 69
		String dbms = Source.SQL_SERVER_2008;
......
73 73
		String userName = "pesiexport";
74 74
		return makeSource(dbms, strServer, strDB, port, userName, null);
75 75
	}
76
	
77 76

  
78
	
77

  
78

  
79 79
	public static Source pesi_test_bgbm42_CDM_DWH_FaEu(){
80 80
		//	CDM - PESI
81 81
		String dbms = Source.SQL_SERVER_2008;
......
85 85
		String userName = "WebUser";
86 86
		return makeSource(dbms, strServer, strDB, port, userName, null);
87 87
	}
88
	
88

  
89 89
	public static Source pesi_test_bgbm42_PESI_V11(){
90 90
		//	CDM - PESI
91 91
		String dbms = Source.SQL_SERVER_2008;
......
95 95
		String userName = "WebUser";
96 96
		return makeSource(dbms, strServer, strDB, port, userName, null);
97 97
	}
98
	
98

  
99 99
	/**
100 100
	 * Initializes the source.
101 101
	 * @param dbms
......
111 111
		Source source = null;
112 112
		source = new Source(dbms, strServer, strDB);
113 113
		source.setPort(port);
114
			
114

  
115 115
		pwd = AccountStore.readOrStorePassword(dbms, strServer, userName, pwd);
116 116
		source.setUserAndPwd(userName, pwd);
117 117
		// write pwd to account store
cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/PesiSources.java
12 12
import org.apache.log4j.Logger;
13 13

  
14 14
import eu.etaxonomy.cdm.app.common.ImportUtils;
15
import eu.etaxonomy.cdm.common.AccountStore;
15
import eu.etaxonomy.cdm.config.AccountStore;
16 16
import eu.etaxonomy.cdm.io.common.Source;
17 17

  
18 18
/**
cdm-pesi/src/test/java/eu/etaxonomy/cdm/io/common/TestConnection.java
2 2

  
3 3
import java.sql.Connection;
4 4

  
5
import eu.etaxonomy.cdm.common.AccountStore;
6
import eu.etaxonomy.cdm.io.common.Source;
5
import eu.etaxonomy.cdm.config.AccountStore;
7 6

  
8 7
public class TestConnection {
9
	
10
	
8

  
9

  
11 10
	public static void main(String[] args){
12
		
11

  
13 12
		System.out.println("start");
14 13
		Source source = new Source(Source.SQL_SERVER_2008, "localhost", "PESI_v12", true);
15 14
//		Source source = new Source(Source.SQL_SERVER_2008, "(local)", "PESI_v12", "SELECT DISTINCT AreaId FROM Area");
16
		
15

  
17 16
//  	Source source = new Source(Source.SQL_SERVER_2008, "PESIIMPORT3", "PESI_v122", "SELECT DISTINCT AreaId FROM Area");
18 17
//		Source source = new Source(Source.SQL_SERVER_2008, "LENOVO-T61", "globis", "SELECT DISTINCT AreaId FROM Area");
19 18
		String user = "pesiexport";

Also available in: Unified diff