@@ -2056,68 +2056,60 @@ protected String generateSamplesInfoText(String containerId)
20562056 output .append (FileHandler .NEW_LINE );
20572057 output .append (FileHandler .NEW_LINE );
20582058
2059- if (url .startsWith ("https://caucho.com/download/" ))
2059+ output .append ("This container is automatically tested by the "
2060+ + "[Continous Integration (CI) system|https://codehaus-cargo.semaphoreci.com/"
2061+ + "projects/cargo] every time there is a code change." );
2062+ output .append (FileHandler .NEW_LINE );
2063+ if (containerId .startsWith ("wildfly-swarm" ))
20602064 {
2061- output .append ("Due incompatibilities between the Caucho Web site's SSL provider "
2062- + "and the Java stack, regular testing of the Resin containers is suspended." );
2065+ output .append ("The WildFly Swarm version used during tests is: {{" );
2066+ output .append (url );
2067+ output .append ("}}" );
20632068 }
20642069 else
20652070 {
2066- output .append ("This container is automatically tested by the "
2067- + "[Continous Integration (CI) system|https://codehaus-cargo.semaphoreci.com/"
2068- + "projects/cargo] every time there is a code change." );
2069- output .append (FileHandler .NEW_LINE );
2070- if (containerId .startsWith ("wildfly-swarm" ))
2071- {
2072- output .append ("The WildFly Swarm version used during tests is: {{" );
2073- output .append (url );
2074- output .append ("}}" );
2075- }
2076- else
2071+ output .append ("The server used for tests is downloaded from: " );
2072+ output .append (url );
2073+
2074+ File pom = new File (SAMPLES_DIRECTORY , POM ).getAbsoluteFile ();
2075+ Document samples = XML_UTILS .loadXmlFromFile (pom .getAbsolutePath ());
2076+ NodeList urls = samples .getElementsByTagName ("cargo." + containerId + ".url" );
2077+ if (urls .getLength () > 1 )
20772078 {
2078- output .append ("The server used for tests is downloaded from: " );
2079- output .append (url );
2079+ output .append (FileHandler . NEW_LINE );
2080+ output .append (FileHandler . NEW_LINE );
20802081
2081- File pom = new File (SAMPLES_DIRECTORY , POM ).getAbsoluteFile ();
2082- Document samples = XML_UTILS .loadXmlFromFile (pom .getAbsolutePath ());
2083- NodeList urls = samples .getElementsByTagName ("cargo." + containerId + ".url" );
2084- if (urls .getLength () > 1 )
2082+ List <String > sortedUrls = new ArrayList <String >(urls .getLength () - 1 );
2083+ for (int i = 0 ; i < urls .getLength (); i ++)
20852084 {
2086- output .append (FileHandler .NEW_LINE );
2087- output .append (FileHandler .NEW_LINE );
2088-
2089- List <String > sortedUrls = new ArrayList <String >(urls .getLength () - 1 );
2090- for (int i = 0 ; i < urls .getLength (); i ++)
2085+ String otherUrl = urls .item (i ).getTextContent ().trim ();
2086+ if (!url .equals (otherUrl ))
20912087 {
2092- String otherUrl = urls .item (i ).getTextContent ().trim ();
2093- if (!url .equals (otherUrl ))
2094- {
2095- sortedUrls .add (otherUrl );
2096- }
2088+ sortedUrls .add (otherUrl );
20972089 }
2098- Collections .sort (sortedUrls );
2090+ }
2091+ Collections .sort (sortedUrls );
20992092
2100- output .append ("Moreover, the below other branch" );
2101- if (urls .getLength () > 2 )
2102- {
2103- output .append ("es are" );
2104- }
2105- else
2106- {
2107- output .append (" is" );
2108- }
2109- output .append (" also tested by the CI system:" );
2110- for (String otherUrl : sortedUrls )
2111- {
2112- output .append (FileHandler .NEW_LINE );
2113- output .append ("* " );
2114- output .append (otherUrl );
2115- }
2116- output .append (FileHandler .NEW_LINE );
2093+ output .append ("Moreover, the below other branch" );
2094+ if (urls .getLength () > 2 )
2095+ {
2096+ output .append ("es are" );
2097+ }
2098+ else
2099+ {
2100+ output .append (" is" );
2101+ }
2102+ output .append (" also tested by the CI system:" );
2103+ for (String otherUrl : sortedUrls )
2104+ {
21172105 output .append (FileHandler .NEW_LINE );
2118- output .append (
2119- "Branches not tested by the CI might not be consistently supported." );
2106+ output .append ("* " );
2107+ output . append ( otherUrl );
21202108 }
2109+ output .append (FileHandler .NEW_LINE );
2110+ output .append (FileHandler .NEW_LINE );
2111+ output .append (
2112+ "Branches not tested by the CI might not be consistently supported." );
21212113 }
21222114 }
21232115 output .append (FileHandler .NEW_LINE );
0 commit comments