diff options
author | kh5325.kim <kh5325.kim@samsung.com> | 2013-12-16 11:44:31 +0900 |
---|---|---|
committer | kh5325.kim <kh5325.kim@samsung.com> | 2013-12-16 12:03:14 +0900 |
commit | 236e90681428f1bdcce7782efe1bdd4d781857e3 (patch) | |
tree | db0a9a10c037d5fc14e6cfbed9a45896bd032145 /org.tizen.common.sign | |
parent | c3e077f3e05653c2411bfd69b45db359e69adc91 (diff) | |
download | common-eplugin-236e90681428f1bdcce7782efe1bdd4d781857e3.tar.gz common-eplugin-236e90681428f1bdcce7782efe1bdd4d781857e3.tar.bz2 common-eplugin-236e90681428f1bdcce7782efe1bdd4d781857e3.zip |
LAUNCH: Marks warning when RDS error occurs
Marks warning to project when RDS error occurs. (RDS Problem)
Refactors RdsDeployer's preDeploy().
Change-Id: I2b5e40e1af57cbb8084831384a8133c1e6324caa
Signed-off-by: kh5325.kim <kh5325.kim@samsung.com>
Diffstat (limited to 'org.tizen.common.sign')
-rw-r--r-- | org.tizen.common.sign/src/org/tizen/common/sign/model/Certification.java | 4 | ||||
-rw-r--r-- | org.tizen.common.sign/src/org/tizen/common/sign/signer/TizenSigner.java | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/model/Certification.java b/org.tizen.common.sign/src/org/tizen/common/sign/model/Certification.java index 4cf731637..2f98d9e2a 100644 --- a/org.tizen.common.sign/src/org/tizen/common/sign/model/Certification.java +++ b/org.tizen.common.sign/src/org/tizen/common/sign/model/Certification.java @@ -264,7 +264,6 @@ public class Certification { } } - protected void loadCertificate( final String location ) throws KeyStoreException, ComplicatedCertificationException { final Certificate cert = keyStore.getCertificate(privateKeyAlias); if (cert instanceof X509Certificate) { @@ -274,8 +273,7 @@ public class Certification { } } - - protected void loadCertificateChain() throws CertificationException{ + protected void loadCertificateChain() throws CertificationException { certificationChain = new ArrayList<X509Certificate>(); try { Certificate[] chain = keyStore.getCertificateChain( privateKeyAlias ); diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/signer/TizenSigner.java b/org.tizen.common.sign/src/org/tizen/common/sign/signer/TizenSigner.java index 38f852b22..9c1bd8e0f 100644 --- a/org.tizen.common.sign/src/org/tizen/common/sign/signer/TizenSigner.java +++ b/org.tizen.common.sign/src/org/tizen/common/sign/signer/TizenSigner.java @@ -88,7 +88,7 @@ public class TizenSigner { signer.sign( false ); } - public static void authorSign(String targetDir, String authorP12Path, String authorPass, String authorCAPath, String rootCaPath) throws Exception{ + public static void authorSign(String targetDir, String authorP12Path, String authorPass, String authorCAPath, String rootCaPath) throws Exception { checkNullParameters(targetDir, authorP12Path, authorPass); // HashingSigning.AuthorSignature(targetDir, authorP12Path, authorPass, authorCAPath, null); @@ -103,7 +103,7 @@ public class TizenSigner { signer.sign( item, SigningProfile.AUTHOR_ORDINAL, new File( targetDir, signatureName ), false ); } - public static void distSign(String targetDir, String distP12Path, String distPass, String distCAPath, String distRootPath, int distNumber) throws Exception{ + public static void distSign(String targetDir, String distP12Path, String distPass, String distCAPath, String distRootPath, int distNumber) throws Exception { checkNullParameters(targetDir, distP12Path, distPass); // HashingSigning.DistributorSignature(targetDir, distP12Path, distPass, distCAPath, distRootPath, distNumber); @@ -118,7 +118,7 @@ public class TizenSigner { signer.sign( item, distNumber, new File( targetDir, signatureName ), false ); } - public static void authorIncrementalSign(String targetDir, String authorP12Path, String authorPass, String authorCAPath, String rootCaPath) throws Exception{ + public static void authorIncrementalSign(String targetDir, String authorP12Path, String authorPass, String authorCAPath, String rootCaPath) throws Exception { checkNullParameters(targetDir, authorP12Path, authorPass); // HashingSigning.AuthorSignatureRDS(targetDir, authorP12Path, authorPass, authorCAPath, null); @@ -133,7 +133,7 @@ public class TizenSigner { signer.sign( item, SigningProfile.AUTHOR_ORDINAL, new File( targetDir, signatureName ), true ); } - public static void distIncrementalSign(String targetDir, String distP12Path, String distPass, String distCAPath, String distRootPath, int distNumber) throws Exception{ + public static void distIncrementalSign(String targetDir, String distP12Path, String distPass, String distCAPath, String distRootPath, int distNumber) throws Exception { checkNullParameters(targetDir, distP12Path, distPass); // HashingSigning.DistributorSignatureRDS(targetDir, distP12Path, distPass, distCAPath, distRootPath, distNumber); @@ -148,7 +148,7 @@ public class TizenSigner { signer.sign( item, distNumber, new File( targetDir, signatureName ), true ); } - private static void checkNullParameters(String targetDir, String p12Path, String pass) throws IllegalArgumentException{ + private static void checkNullParameters(String targetDir, String p12Path, String pass) throws IllegalArgumentException { String emptyParameter = null; if(StringUtil.isEmpty(targetDir)) { emptyParameter = "target directory"; @@ -165,7 +165,7 @@ public class TizenSigner { throw new IllegalArgumentException(emptyParameter + " is empty"); } - public static void dist2SignWithParameterCheck(String targetDir, String dist2P12Path, String dist2Pass, String dist2CAPath, String dist2RootPath) throws Exception{ + public static void dist2SignWithParameterCheck(String targetDir, String dist2P12Path, String dist2Pass, String dist2CAPath, String dist2RootPath) throws Exception { if(!StringUtil.isEmpty(dist2P12Path) && !StringUtil.isEmpty(dist2Pass)) { if(StringUtil.isEmpty(dist2CAPath) || StringUtil.isEmpty(dist2RootPath)) { dist2CAPath = null; @@ -175,7 +175,7 @@ public class TizenSigner { } } - public static void dist2IncrementalSignWithParameterCheck(String targetDir, String dist2P12Path, String dist2Pass, String dist2CAPath, String dist2RootPath) throws Exception{ + public static void dist2IncrementalSignWithParameterCheck(String targetDir, String dist2P12Path, String dist2Pass, String dist2CAPath, String dist2RootPath) throws Exception { if(!StringUtil.isEmpty(dist2P12Path) && !StringUtil.isEmpty(dist2Pass)) { if(StringUtil.isEmpty(dist2CAPath) || StringUtil.isEmpty(dist2RootPath)) { dist2CAPath = null; |