You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/02/07 13:05:48 UTC
svn commit: r1565627 - in
/juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool:
Common.java Import.java
Author: alexoree
Date: Fri Feb 7 12:05:48 2014
New Revision: 1565627
URL: http://svn.apache.org/r1565627
Log:
JUDDI-839 fixed
Modified:
juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Common.java
juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java
Modified: juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Common.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Common.java?rev=1565627&r1=1565626&r2=1565627&view=diff
==============================================================================
--- juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Common.java (original)
+++ juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Common.java Fri Feb 7 12:05:48 2014
@@ -33,31 +33,35 @@ import org.uddi.v3_service.UDDISecurityP
*/
public class Common {
- public static String GetOwner(String key, String token, UDDIInquiryPortType inquiry) {
- GetOperationalInfo goi = new GetOperationalInfo();
- goi.setAuthInfo(token);
- goi.getEntityKey().add(key);
- OperationalInfos operationalInfo = null;
- try {
- operationalInfo = inquiry.getOperationalInfo(goi);
- if (operationalInfo!=null && operationalInfo.getOperationalInfo()!=null &&
- !operationalInfo.getOperationalInfo().isEmpty())
- return operationalInfo.getOperationalInfo().get(0).getAuthorizedName();
- } catch (Exception ex) {
- ex.printStackTrace();
+ public static String GetOwner(String key, String token, UDDIInquiryPortType inquiry) {
+ GetOperationalInfo goi = new GetOperationalInfo();
+ goi.setAuthInfo(token);
+ goi.getEntityKey().add(key);
+ OperationalInfos operationalInfo = null;
+ try {
+ operationalInfo = inquiry.getOperationalInfo(goi);
+ if (operationalInfo != null && operationalInfo.getOperationalInfo() != null
+ && !operationalInfo.getOperationalInfo().isEmpty()) {
+ return operationalInfo.getOperationalInfo().get(0).getAuthorizedName();
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return null;
}
- return null;
- }
- public static String GetAuthToken(String username, String password, UDDISecurityPortType sec) {
- try {
- GetAuthToken getAuthTokenRoot = new GetAuthToken();
- getAuthTokenRoot.setUserID(username);
- getAuthTokenRoot.setCred(password);
- return sec.getAuthToken(getAuthTokenRoot).getAuthInfo();
- } catch (Exception ex) {
- ex.printStackTrace();
+ public static String GetAuthToken(String username, String password, UDDISecurityPortType sec) {
+ try {
+ System.out.println(username + " logging in");
+ GetAuthToken getAuthTokenRoot = new GetAuthToken();
+ getAuthTokenRoot.setUserID(username);
+ getAuthTokenRoot.setCred(password);
+ String authInfo = sec.getAuthToken(getAuthTokenRoot).getAuthInfo();
+ System.out.println(username + " login success");
+ return authInfo;
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return null;
}
- return null;
- }
}
Modified: juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java?rev=1565627&r1=1565626&r2=1565627&view=diff
==============================================================================
--- juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java (original)
+++ juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java Fri Feb 7 12:05:48 2014
@@ -56,6 +56,7 @@ public class Import {
private JUDDIApiPortType juddi;
String token = null;
String username = null;
+ String pass=null;
String tmodelfile = null;
String businessfile = null;
String publishersfile = null;
@@ -105,12 +106,16 @@ public class Import {
juddi = transport.getJUDDIApiService();
token = null;
if (username == null || pass == null) {
- username = clerk.getPublisher();
- pass = clerk.getPassword();
+ this.username = clerk.getPublisher();
+ this.pass = clerk.getPassword();
}
- if (username != null && pass != null) {
+ else
+ {
+ this.username=username;
+ this.pass=pass;
}
-
+ token = Common.GetAuthToken(username, pass, security);
+
//load mapping files
//prompt for credentials
@@ -143,7 +148,10 @@ public class Import {
}
private void ImportTmodels() throws Exception {
+
SaveTModel stm = JAXB.unmarshal(new File(tmodelfile), SaveTModel.class);
+ System.out.println();
+ System.out.println("Attempting to save " + stm.getTModel().size() + " tModels");
if (stripSig) {
int x=0;
for (int i = 0; i < stm.getTModel().size(); i++) {
@@ -269,7 +277,7 @@ public class Import {
for (int i = 0; i < stm.getPublisher().size(); i++) {
if (!PublisherExists(stm.getPublisher().get(i).getAuthorizedName(), token)) {
SavePublisher stm2 = new SavePublisher();
- stm2.setAuthInfo(token);
+ stm2.setAuthInfo(Common.GetAuthToken(username, pass, security));
stm2.getPublisher().add(stm.getPublisher().get(i));
try {
juddi.savePublisher(stm2);
@@ -308,6 +316,7 @@ public class Import {
try {
FileInputStream fos = new FileInputStream(mappingsfile);
mapping.load(fos);
+ System.out.println(mapping.size() + " entity to user mappings loaded");
fos.close();
} catch (Exception ex) {
ex.printStackTrace();
@@ -318,6 +327,7 @@ public class Import {
try {
FileInputStream fos = new FileInputStream(credFile);
userpwd.load(fos);
+ System.out.println(userpwd.size() + " user credentials loaded");
fos.close();
} catch (Exception ex) {
ex.printStackTrace();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org