Merge pull request #18 from Cognifide/feature/secureCQ-update-bugfix

author url is empty after installation (publish url is there)
wttech · Sep 28, 2016 · 15b5a0c · 15b5a0c
2 parents 7c3de26 + 7c96988
commit 15b5a0c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/src/main/aem/jcr_root/apps/cognifide/secureaem/renderers/mainRenderer/dialog.xml b/src/main/aem/jcr_root/apps/cognifide/secureaem/renderers/mainRenderer/dialog.xml
@@ -40,12 +40,11 @@
                             xtype="textfield"/>
                         <publishCredentials
                             jcr:primaryType="cq:Widget"
-                            allowBlank="false"
+                            allowBlank="true"
                             fieldLabel="Publish Credentials"
                             name="./publishCredentials"
                             defaultValue="admin:admin"
                             xtype="textfield"/>
-
                     </items>
                 </configuration>
             </items>

diff --git a/src/main/java/com/cognifide/secureaem/AbstractTest.java b/src/main/java/com/cognifide/secureaem/AbstractTest.java
@@ -37,7 +37,7 @@ public AbstractTest(Configuration config) {
 
 	public void test() throws IOException {
 		result = null;
-
+		appendEnvironmentInfo();
 		if ("true".equals(config.getStringValue("enabled", "false"))) {
 			try {
 				result = doTest();
@@ -53,6 +53,19 @@ public void test() throws IOException {
 		}
 	}
 
+	private void appendEnvironmentInfo() {
+		environments = new HashSet<>();
+		if (this instanceof AuthorTest) {
+			environments.add(AuthorTest.ENVIRONMENT_NAME);
+		}
+		if (this instanceof PublishTest) {
+			environments.add(PublishTest.ENVIRONMENT_NAME);
+		}
+		if (this instanceof DispatcherTest) {
+			environments.add(DispatcherTest.ENVIRONMENT_NAME);
+		}
+	}
+
 	/**
 	 * Perform test.
 	 *
@@ -68,24 +81,20 @@ public void test() throws IOException {
 	private TestResult doTest() throws Exception {
 		boolean success = true;
 		boolean testDone = false;
-		infoMessages = new ArrayList<String>();
-		errorMessages = new ArrayList<String>();
-		environments = new HashSet<String>();
+		infoMessages = new ArrayList<>();
+		errorMessages = new ArrayList<>();
 
 		if (this instanceof AuthorTest && StringUtils.isNotBlank(config.getAuthor())) {
-			environments.add(AuthorTest.ENVIRONMENT_NAME);
 			success = doTest(config.getAuthor(), AuthorTest.ENVIRONMENT_NAME);
 			testDone = true;
 		}
 
 		if (this instanceof PublishTest && StringUtils.isNotBlank(config.getPublish())) {
-			environments.add(PublishTest.ENVIRONMENT_NAME);
 			success = doTest(config.getPublish(), PublishTest.ENVIRONMENT_NAME) && success;
 			testDone = true;
 		}
 
 		if (this instanceof DispatcherTest && StringUtils.isNotBlank(config.getDispatcherUrl())) {
-			environments.add(DispatcherTest.ENVIRONMENT_NAME);
 			success = doTest(config.getDispatcherUrl(), DispatcherTest.ENVIRONMENT_NAME) && success;
 			testDone = true;
 		}

diff --git a/src/main/java/com/cognifide/secureaem/sling/DefaultConfigurationProvider.java b/src/main/java/com/cognifide/secureaem/sling/DefaultConfigurationProvider.java
@@ -36,7 +36,7 @@ public class DefaultConfigurationProvider {
 
 	private static final Pattern P_ARGUMENT = Pattern.compile("-p (\\d+)");
 
-	private static final Pattern JAR_FILENAME = Pattern.compile("-(\\d+)\\.jar");
+	private static final Pattern JAR_FILENAME = Pattern.compile("-.(\\d+)\\.jar");
 
 	private static final String CONFIG_NODE = "/etc/secureaem/jcr:content/globalConfig";