summaryrefslogtreecommitdiffstats
path: root/auth
diff options
context:
space:
mode:
Diffstat (limited to 'auth')
-rw-r--r--auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java2
-rw-r--r--auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/BCFactory.java2
-rw-r--r--auth/auth-certman/src/test/java/org/onap/aaf/auth/cm/test/CertmanTest.java4
-rw-r--r--auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/Cmd.java2
-rw-r--r--auth/auth-deforg/pom.xml6
-rw-r--r--auth/sample/local/org.osaaf.aaf.p12bin3920 -> 4140 bytes
-rw-r--r--auth/sample/local/org.osaaf.aaf.props4
7 files changed, 13 insertions, 7 deletions
diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java
index 24416c92..46a6393a 100644
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java
@@ -33,7 +33,7 @@ import org.onap.aaf.cadi.cm.Factory;
* Have to put the Cert and resulting Trust Chain together.
* Treating them separately has caused issues
*
- * @author jg1555
+ * @author JonathanGathman
*
*/
public class X509andChain {
diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/BCFactory.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/BCFactory.java
index 4fdac6a6..7f4590f3 100644
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/BCFactory.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/BCFactory.java
@@ -48,7 +48,7 @@ import org.onap.aaf.misc.env.Trans;
* Additional Factory mechanisms for CSRs, and BouncyCastle. The main Factory
* utilizes only Java abstractions, and is useful in Client code.
*
- * @author jg1555
+ * @author JonathanGathman
*
*/
public class BCFactory extends Factory {
diff --git a/auth/auth-certman/src/test/java/org/onap/aaf/auth/cm/test/CertmanTest.java b/auth/auth-certman/src/test/java/org/onap/aaf/auth/cm/test/CertmanTest.java
index 3faa5bbf..7d3f25ca 100644
--- a/auth/auth-certman/src/test/java/org/onap/aaf/auth/cm/test/CertmanTest.java
+++ b/auth/auth-certman/src/test/java/org/onap/aaf/auth/cm/test/CertmanTest.java
@@ -120,8 +120,8 @@ public class CertmanTest {
// @Override
// public Void code(Rcli<?> client) throws APIException, CadiException {
// CertificateRequest cr = new CertificateRequest();
-// cr.setMechid("m12345@aaf.att.com");
-// cr.setSponsor("jg1555");
+// cr.setMechid("a12345@org.osaaf.org");
+// cr.setSponsor("something");
// cr.getFqdns().add("mithrilcsp.sbc.com");
// cr.getFqdns().add("zld01907.vci.att.com");
// cr.getFqdns().add("aaftest.test.att.com");
diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/Cmd.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/Cmd.java
index 896cbb30..7f41650d 100644
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/Cmd.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/Cmd.java
@@ -228,7 +228,7 @@ public abstract class Cmd {
} else if(desc.startsWith("{")) {
StringReader sr = new StringReader(desc);
try {
- // Note: 11-18-2013, JG1555. This rather convoluted Message Structure required by TSS Restful Specs, reflecting "Northbound" practices.
+ // Note: 11-18-2013, JonathanGathman. This rather convoluted Message Structure required by TSS Restful Specs, reflecting "Northbound" practices.
Error err = getDF(Error.class).newData().in(TYPE.JSON).load(sr).asObject();
sb.append(" [");
sb.append(err.getMessageId());
diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index f8dc24de..d282819b 100644
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -179,6 +179,9 @@
<configuration>
<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
</configuration>
</execution>
<execution>
@@ -189,6 +192,9 @@
</goals>
<configuration>
<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+ <includes>
+ <include>**</include>
+ </includes>
<propertyName>failsafeArgLine</propertyName>
</configuration>
</execution>
diff --git a/auth/sample/local/org.osaaf.aaf.p12 b/auth/sample/local/org.osaaf.aaf.p12
index e4d33924..f40a7556 100644
--- a/auth/sample/local/org.osaaf.aaf.p12
+++ b/auth/sample/local/org.osaaf.aaf.p12
Binary files differ
diff --git a/auth/sample/local/org.osaaf.aaf.props b/auth/sample/local/org.osaaf.aaf.props
index f5970b01..975f80cc 100644
--- a/auth/sample/local/org.osaaf.aaf.props
+++ b/auth/sample/local/org.osaaf.aaf.props
@@ -10,8 +10,8 @@ aaf_env=DEV
cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US
cadi_keyfile=/opt/app/osaaf/local/org.osaaf.aaf.keyfile
cadi_keystore=/opt/app/osaaf/local/org.osaaf.aaf.p12
-cadi_keystore_password=enc:4L1xY_7mYTuk57SPWZetza5WlgBUYBe8pbT1-AWKO1-5PAbSTynQEc5TU7ZeomfN
+cadi_keystore_password=enc:3O7HDzEzdYatFYb83-jV69MNzN8qIW975SS70qCs7xri0b1n4r5viHo1lrM6K8om
#cadi_key_password=enc:<KEY PASSWORD (optional if the same as KEYSTORE PASSWORD)>
-cadi_alias=aaf@aaf.osaaf.org
+cadi_alias=aaf-authz@aaf.osaaf.org
cadi_truststore=/opt/app/osaaf/local/org.osaaf.aaf.trust.p12
cadi_truststore_password=enc:5nzj6v3Rb0oZPV1zCxg8EJFfkFvWFGJflLB0i_FN0Np