http://blog.gmane.org/gmane.comp.java.cargo.devel hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.comp.java.cargo.devel/12880 <pre>Author: alitokmen Date: 2012-05-24 03:28:14 -0500 (Thu, 24 May 2012) New Revision: 3331 Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss71xInstalledLocalContainer.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss7xInstalledLocalContainer.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java Log: Fix CARGO-1111: Unable to set bind address to 0.0.0.0 when starting JBoss 7.1.x Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss71xInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss71xInstalledLocalContainer.java2012-05-24 06:32:12 UTC (rev 3330) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss71xInstalledLocalContainer.java2012-05-24 08:28:14 UTC (rev 3331) &lt; at &gt;&lt; at &gt; -71,13 +71,7 &lt; at &gt;&lt; at &gt; &lt; at &gt;Override protected void doStart(JvmLauncher java) throws Exception { - java.addJvmArguments( - "-Dorg.jboss.boot.log.file=" + getConfiguration().getHome() + "/log/boot.log", - "-Dlogging.configuration=" - + new File(getConfiguration().getHome() - + "/configuration/logging.properties").toURI().toURL(), - "-Djboss.home.dir=" + getHome(), - "-Djboss.server.base.dir=" + getConfiguration().getHome()); + setProperties(java); java.setJarFile(new File(getHome(), "jboss-modules.jar")); Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss7xInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss7xInstalledLocalContainer.java2012-05-24 06:32:12 UTC (rev 3330) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss7xInstalledLocalContainer.java2012-05-24 08:28:14 UTC (rev 3331) &lt; at &gt;&lt; at &gt; -20,11 +20,14 &lt; at &gt;&lt; at &gt; package org.codehaus.cargo.container.jboss; import java.io.File; +import java.net.MalformedURLException; +import java.util.Map; import java.util.jar.JarFile; import org.codehaus.cargo.container.ContainerCapability; import org.codehaus.cargo.container.configuration.LocalConfiguration; import org.codehaus.cargo.container.jboss.internal.JBoss7xContainerCapability; +import org.codehaus.cargo.container.property.GeneralPropertySet; import org.codehaus.cargo.container.spi.AbstractInstalledLocalContainer; import org.codehaus.cargo.container.spi.jvm.JvmLauncher; &lt; at &gt;&lt; at &gt; -155,13 +158,7 &lt; at &gt;&lt; at &gt; &lt; at &gt;Override protected void doStart(JvmLauncher java) throws Exception { - java.addJvmArguments( - "-Dorg.jboss.boot.log.file=" + getConfiguration().getHome() + "/log/boot.log", - "-Dlogging.configuration=" - + new File(getConfiguration().getHome() - + "/configuration/logging.properties").toURI().toURL(), - "-Djboss.home.dir=" + getHome(), - "-Djboss.server.base.dir=" + getConfiguration().getHome()); + setProperties(java); java.setJarFile(new File(getHome(), "jboss-modules.jar")); &lt; at &gt;&lt; at &gt; -193,4 +190,35 &lt; at &gt;&lt; at &gt; java.start(); } + + /** + * Set the properties on the JVM launcher.&lt;br/&gt; + * &lt;br/&gt; + * CARGO-1111: To allow JBoss 7.x and onwards to be accessed from remote machines, + * the system property &lt;code&gt;jboss.bind.address&lt;code&gt; must be set. + * &lt; at &gt;param java JVM launcher to set the properties on. + * &lt; at &gt;throws MalformedURLException If URL construction fails. + */ + protected void setProperties(JvmLauncher java) throws MalformedURLException + { + java.setSystemProperty("org.jboss.boot.log.file", + getConfiguration().getHome() + "/log/boot.log"); + java.setSystemProperty("logging.configuration", + new File(getConfiguration().getHome() + "/configuration/logging.properties") + .toURI().toURL().toString()); + java.setSystemProperty("jboss.home.dir", getHome()); + java.setSystemProperty("jboss.server.base.dir", getConfiguration().getHome()); + + final Map&lt;String, String&gt; systemProperties = getSystemProperties(); + if (!systemProperties.containsKey("jboss.bind.address")) + { + String hostname = getConfiguration().getPropertyValue(GeneralPropertySet.HOSTNAME); + if ("localhost".equals(hostname)) + { + hostname = "0.0.0.0"; + } + + java.setSystemProperty("jboss.bind.address", hostname); + } + } } Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java2012-05-24 06:32:12 UTC (rev 3330) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java2012-05-24 08:28:14 UTC (rev 3331) &lt; at &gt;&lt; at &gt; -89,26 +89,7 &lt; at &gt;&lt; at &gt; java.addAppArguments("--configuration=" + getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION)); - // CARGO-758 and CARGO-1111: To allow JBoss to be accessed from remote machines, - // it must be started with the arguments -b 0.0.0.0 or --host 0.0.0.0 and - // the system property jboss.bind.address must be set. - String hostname = getConfiguration().getPropertyValue(GeneralPropertySet.HOSTNAME); - if ("localhost".equals(hostname)) - { - hostname = "0.0.0.0"; - } - final String runtimeArguments = getConfiguration().getPropertyValue( - GeneralPropertySet.RUNTIME_ARGS); - if (runtimeArguments == null || !runtimeArguments.contains("--host ") - &amp;&amp; !runtimeArguments.contains("-b ")) - { - java.addAppArguments("--host=" + hostname); - } - Map&lt;String, String&gt; systemProperties = getSystemProperties(); - if (!systemProperties.containsKey("jboss.bind.address")) - { - systemProperties.put("jboss.bind.address", hostname); - } + setHostname(java); java.addClasspathEntries(new File(getHome(), "bin/run.jar")); addToolsJarToClasspath(java); &lt; at &gt;&lt; at &gt; -187,6 +168,34 &lt; at &gt;&lt; at &gt; } /** + * CARGO-758 and CARGO-1111: To allow JBoss to be accessed from remote machines, + * it must be started with the arguments &lt;code&gt;-b 0.0.0.0&lt;code&gt; or + * &lt;code&gt;--host 0.0.0.0&lt;code&gt; and the system property &lt;code&gt;jboss.bind.address&lt;code&gt; + * must be set. + * &lt; at &gt;param java JVM launcher to set the properties on. + */ + protected void setHostname(JvmLauncher java) + { + String hostname = getConfiguration().getPropertyValue(GeneralPropertySet.HOSTNAME); + if ("localhost".equals(hostname)) + { + hostname = "0.0.0.0"; + } + final String runtimeArguments = getConfiguration().getPropertyValue( + GeneralPropertySet.RUNTIME_ARGS); + if (runtimeArguments == null || !runtimeArguments.contains("--host ") + &amp;&amp; !runtimeArguments.contains("-b ")) + { + java.addAppArguments("--host=" + hostname); + } + final Map&lt;String, String&gt; systemProperties = getSystemProperties(); + if (!systemProperties.containsKey("jboss.bind.address")) + { + java.setSystemProperty("jboss.bind.address", hostname); + } + } + + /** * {&lt; at &gt;inheritDoc} * &lt; at &gt;see org.codehaus.cargo.container.Container#getCapability() */ --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email </pre> alitokmen-yCVjj/EcxBJg9hUCZPvPmw< at >public.gmane.org 2012-05-24T08:28:14 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12879 <pre></pre> Savas Ali Tokmen (JIRA 2012-05-24T06:36:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12878 <pre></pre> Savas Ali Tokmen (JIRA 2012-05-24T06:34:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12877 <pre>Author: alitokmen Date: 2012-05-24 01:32:12 -0500 (Thu, 24 May 2012) New Revision: 3330 Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java Log: Fix CARGO-1111: Unable to set bind address to 0.0.0.0 when starting JBoss 7.1.x Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java2012-05-23 06:19:12 UTC (rev 3329) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java2012-05-24 06:32:12 UTC (rev 3330) &lt; at &gt;&lt; at &gt; -25,6 +25,7 &lt; at &gt;&lt; at &gt; import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.jar.JarFile; import java.util.zip.ZipEntry; &lt; at &gt;&lt; at &gt; -85,21 +86,29 &lt; at &gt;&lt; at &gt; new File(getConfiguration().getHome(), "lib").toURI().toURL().toString()); java.setSystemProperty("jboss.server.log.threshold", getJBossLogLevel(getConfiguration().getPropertyValue(GeneralPropertySet.LOGGING))); + java.addAppArguments("--configuration=" + + getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION)); - // CARGO-758: To allow JBoss to be accessed from remote machines, - // it must be started with the arguments -b 0.0.0.0 or --host 0.0.0.0 - // - // As a result, allow the --host or -b to be different than GeneralPropertySet.HOSTNAME + // CARGO-758 and CARGO-1111: To allow JBoss to be accessed from remote machines, + // it must be started with the arguments -b 0.0.0.0 or --host 0.0.0.0 and + // the system property jboss.bind.address must be set. + String hostname = getConfiguration().getPropertyValue(GeneralPropertySet.HOSTNAME); + if ("localhost".equals(hostname)) + { + hostname = "0.0.0.0"; + } final String runtimeArguments = getConfiguration().getPropertyValue( GeneralPropertySet.RUNTIME_ARGS); - if (runtimeArguments == null || !runtimeArguments.contains("--host 0.0.0.0") - &amp;&amp; !runtimeArguments.contains("-b 0.0.0.0")) + if (runtimeArguments == null || !runtimeArguments.contains("--host ") + &amp;&amp; !runtimeArguments.contains("-b ")) { - java.addAppArguments("--host=" - + getConfiguration().getPropertyValue(GeneralPropertySet.HOSTNAME)); + java.addAppArguments("--host=" + hostname); } - java.addAppArguments("--configuration=" - + getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION)); + Map&lt;String, String&gt; systemProperties = getSystemProperties(); + if (!systemProperties.containsKey("jboss.bind.address")) + { + systemProperties.put("jboss.bind.address", hostname); + } java.addClasspathEntries(new File(getHome(), "bin/run.jar")); addToolsJarToClasspath(java); --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email </pre> alitokmen-yCVjj/EcxBJg9hUCZPvPmw< at >public.gmane.org 2012-05-24T06:32:12 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12876 <pre></pre> Damian Nowak (JIRA 2012-05-23T12:06:24 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12875 <pre></pre> Savas Ali Tokmen (JIRA 2012-05-23T06:21:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12874 <pre>Author: alitokmen Date: 2012-05-23 01:19:12 -0500 (Wed, 23 May 2012) New Revision: 3329 Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBossStandaloneLocalConfiguration.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xInstalledLocalContainer.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xStandaloneLocalConfiguration.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBoss5xInstalledLocalContainer.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainer.java core/trunk/containers/jboss/src/test/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainerTest.java Log: Fix CARGO-1110: Maven Cargo plugin incorrectly replaces jboss.server.lib.url Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBossStandaloneLocalConfiguration.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBossStandaloneLocalConfiguration.java2012-05-23 05:17:58 UTC (rev 3328) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBossStandaloneLocalConfiguration.java2012-05-23 06:19:12 UTC (rev 3329) &lt; at &gt;&lt; at &gt; -139,10 +139,12 &lt; at &gt;&lt; at &gt; // Copy resources from jboss installation folder and exclude files // that already copied from cargo resources folder copyExternalResources( - new File(jbossContainer.getConfDir()), new File(confDir), cargoFiles); + new File(jbossContainer.getConfDir(getPropertyValue(JBossPropertySet.CONFIGURATION))), + new File(confDir), cargoFiles); // Copy the files within the JBoss Deploy directory to the cargo deploy directory - copyExternalResources(new File(jbossContainer.getDeployDir()), new File(deployDir)); + copyExternalResources(new File(jbossContainer.getDeployDir(getPropertyValue( + JBossPropertySet.CONFIGURATION))), new File(deployDir)); // Deploy the CPC (Cargo Ping Component) to the webapps directory getResourceUtils().copyResource(RESOURCE_PATH + "cargocpc.war", &lt; at &gt;&lt; at &gt; -387,7 +389,8 &lt; at &gt;&lt; at &gt; getAntUtils().addTokenToFilterChain(filterChain, GeneralPropertySet.LOGGING, getJBossLogLevel(getPropertyValue(GeneralPropertySet.LOGGING))); - File libDir = new File(container.getLibDir()); + File libDir = + new File(container.getLibDir(getPropertyValue(JBossPropertySet.CONFIGURATION))); getAntUtils().addTokenToFilterChain(filterChain, "cargo.server.lib.url", libDir.toURI().toURL().toString()); &lt; at &gt;&lt; at &gt; -396,7 +399,8 &lt; at &gt;&lt; at &gt; // Initiate the value of scanned folder or archive with cargo deploy // directory and existing jboss deploy directory - File deployDir = new File(container.getDeployDir()); + File deployDir = + new File(container.getDeployDir(getPropertyValue(JBossPropertySet.CONFIGURATION))); buffer.append("deploy/, ").append(deployDir.toURI().toURL().toString()); // just use the original deploy directory and copy all the deployables from the server Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xInstalledLocalContainer.java2012-05-23 05:17:58 UTC (rev 3328) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xInstalledLocalContainer.java2012-05-23 06:19:12 UTC (rev 3329) &lt; at &gt;&lt; at &gt; -61,9 +61,9 &lt; at &gt;&lt; at &gt; /** * {&lt; at &gt;inheritDoc} */ - public String getDeployersDir() + public String getDeployersDir(String configurationName) { - return getSpecificConfigurationDir("deployers"); + return getSpecificConfigurationDir("deployers", configurationName); } /** Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xStandaloneLocalConfiguration.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xStandaloneLocalConfiguration.java2012-05-23 05:17:58 UTC (rev 3328) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xStandaloneLocalConfiguration.java2012-05-23 06:19:12 UTC (rev 3329) &lt; at &gt;&lt; at &gt; -77,7 +77,8 &lt; at &gt;&lt; at &gt; } // Copy the files within the JBoss Configuration directory to the cargo conf directory - copyExternalResources(new File(jbossContainer.getConfDir()), new File(confDir)); + copyExternalResources(new File(jbossContainer.getConfDir(getPropertyValue( + JBossPropertySet.CONFIGURATION))), new File(confDir)); // Setup the shared classpath String jbossServiceXml = getFileHandler().append(confDir, "jboss-service.xml"); &lt; at &gt;&lt; at &gt; -89,11 +90,12 &lt; at &gt;&lt; at &gt; getFileHandler().replaceInFile(jbossServiceXml, replacements, "UTF-8"); // Copy the files within the JBoss Deploy directory to the cargo deploy directory - copyExternalResources(new File(jbossContainer.getDeployDir()), new File(deployDir)); + copyExternalResources(new File(jbossContainer.getDeployDir(getPropertyValue( + JBossPropertySet.CONFIGURATION))), new File(deployDir)); // Copy the files within the JBoss Deployers directory to the cargo deployers directory - copyExternalResources( - new File(((JBoss5xInstalledLocalContainer) jbossContainer).getDeployersDir()), + copyExternalResources(new File(((JBoss5xInstalledLocalContainer) jbossContainer) + .getDeployersDir(getPropertyValue(JBossPropertySet.CONFIGURATION))), new File(deployersDir)); // Deploy the CPC (Cargo Ping Component) to the webapps directory Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java2012-05-23 05:17:58 UTC (rev 3328) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java2012-05-23 06:19:12 UTC (rev 3329) &lt; at &gt;&lt; at &gt; -82,7 +82,7 &lt; at &gt;&lt; at &gt; java.setSystemProperty("jboss.server.name", getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION)); java.setSystemProperty("jboss.server.lib.url", - new File(getLibDir()).toURI().toURL().toString()); + new File(getConfiguration().getHome(), "lib").toURI().toURL().toString()); java.setSystemProperty("jboss.server.log.threshold", getJBossLogLevel(getConfiguration().getPropertyValue(GeneralPropertySet.LOGGING))); &lt; at &gt;&lt; at &gt; -240,46 +240,48 &lt; at &gt;&lt; at &gt; /** * {&lt; at &gt;inheritDoc} - * &lt; at &gt;see JBossInstalledLocalContainer#getConfDir() + * &lt; at &gt;see JBossInstalledLocalContainer#getConfDir(String) */ - public String getConfDir() + public String getConfDir(String configurationName) { - return getSpecificConfigurationDir("conf"); + return getSpecificConfigurationDir("conf", configurationName); } /** * {&lt; at &gt;inheritDoc} - * &lt; at &gt;see JBossInstalledLocalContainer#getLibDir() + * &lt; at &gt;see JBossInstalledLocalContainer#getLibDir(String) */ - public String getLibDir() + public String getLibDir(String configurationName) { - return getSpecificConfigurationDir("lib"); + return getSpecificConfigurationDir("lib", configurationName); } /** * {&lt; at &gt;inheritDoc} - * &lt; at &gt;see JBossInstalledLocalContainer#getDeployDir() + * &lt; at &gt;see JBossInstalledLocalContainer#getDeployDir(String) */ - public String getDeployDir() + public String getDeployDir(String configurationName) { String clustered = getConfiguration().getPropertyValue(JBossPropertySet.CLUSTERED); if (Boolean.valueOf(clustered).booleanValue()) { - return getSpecificConfigurationDir("farm"); + return getSpecificConfigurationDir("farm", configurationName); } else { - return getSpecificConfigurationDir("deploy"); + return getSpecificConfigurationDir("deploy", configurationName); } } /** * &lt; at &gt;param location the name of the directory to return inside the server configuration + * &lt; at &gt;param configurationName the server configuration name to use. A server configuration is + * located in the &lt;code&gt;server/&lt;/code&gt; directory inside the JBoss installation dir. * &lt; at &gt;return the location of the passed directory name inside the server configuration, as a File */ - protected String getSpecificConfigurationDir(String location) + protected String getSpecificConfigurationDir(String location, String configurationName) { - return getFileHandler().append(getConfiguration().getHome(), location); + return getFileHandler().append(getHome(), "server/" + configurationName + "/" + location); } /** Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBoss5xInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBoss5xInstalledLocalContainer.java2012-05-23 05:17:58 UTC (rev 3328) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBoss5xInstalledLocalContainer.java2012-05-23 06:19:12 UTC (rev 3329) &lt; at &gt;&lt; at &gt; -29,9 +29,11 &lt; at &gt;&lt; at &gt; { /** - * &lt; at &gt;return The deployer directory located under the container's configuration directory + * &lt; at &gt;param configurationName the JBoss server configuration name for which to return the deployer + * dir. + * &lt; at &gt;return The deployer directory located under the container's home installation directory */ - String getDeployersDir(); + String getDeployersDir(String configurationName); /** * Return the location of the common lib directory. Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainer.java2012-05-23 05:17:58 UTC (rev 3328) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainer.java2012-05-23 06:19:12 UTC (rev 3329) &lt; at &gt;&lt; at &gt; -30,17 +30,20 &lt; at &gt;&lt; at &gt; public interface JBossInstalledLocalContainer extends InstalledLocalContainer { /** - * &lt; at &gt;return The conf directory located under the container's configuration directory + * &lt; at &gt;param configurationName the JBoss server configuration name for which to return the conf dir + * &lt; at &gt;return The conf directory located under the container's home installation directory */ - String getConfDir(); + String getConfDir(String configurationName); /** - * &lt; at &gt;return The lib directory located under the container's configuration directory + * &lt; at &gt;param configurationName the JBoss server configuration name for which to return the conf dir + * &lt; at &gt;return The lib directory located under the container's home installation directory */ - String getLibDir(); + String getLibDir(String configurationName); /** - * &lt; at &gt;return The deploy directory located under the container's configuration directory + * &lt; at &gt;param configurationName the JBoss server configuration name for which to return the conf dir + * &lt; at &gt;return The deploy directory located under the container's home installation directory */ - String getDeployDir(); + String getDeployDir(String configurationName); } Modified: core/trunk/containers/jboss/src/test/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainerTest.java =================================================================== --- core/trunk/containers/jboss/src/test/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainerTest.java2012-05-23 05:17:58 UTC (rev 3328) +++ core/trunk/containers/jboss/src/test/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainerTest.java2012-05-23 06:19:12 UTC (rev 3329) &lt; at &gt;&lt; at &gt; -102,7 +102,8 &lt; at &gt;&lt; at &gt; public void testGetConfDir() { String expected = this.fileHandler.append(CONFIGURATION_HOME, "conf"); - assertEquals(expected, this.container.getConfDir()); + assertEquals(expected, this.container.getConfDir( + this.container.getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION))); } /** &lt; at &gt;&lt; at &gt; -111,7 +112,8 &lt; at &gt;&lt; at &gt; public void testGetLibDir() { String expected = this.fileHandler.append(CONFIGURATION_HOME, "lib"); - assertEquals(expected, this.container.getLibDir()); + assertEquals(expected, this.container.getLibDir( + this.container.getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION))); } /** &lt; at &gt;&lt; at &gt; -120,7 +122,8 &lt; at &gt;&lt; at &gt; public void testGetDeployDir() { String expected = this.fileHandler.append(CONFIGURATION_HOME, "deploy"); - assertEquals(expected, this.container.getDeployDir()); + assertEquals(expected, this.container.getDeployDir( + this.container.getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION))); } /** &lt; at &gt;&lt; at &gt; -130,7 +133,8 &lt; at &gt;&lt; at &gt; { this.container.getConfiguration().setProperty(JBossPropertySet.CLUSTERED, "true"); String expected = this.fileHandler.append(CONFIGURATION_HOME, "farm"); - assertEquals(expected, this.container.getDeployDir()); + assertEquals(expected, this.container.getDeployDir( + this.container.getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION))); } /** --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email </pre> alitokmen-yCVjj/EcxBJg9hUCZPvPmw< at >public.gmane.org 2012-05-23T06:19:13 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12873 <pre></pre> Savas Ali Tokmen (JIRA 2012-05-23T05:19:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12872 <pre>Author: alitokmen Date: 2012-05-23 00:17:58 -0500 (Wed, 23 May 2012) New Revision: 3328 Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBossStandaloneLocalConfiguration.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xInstalledLocalContainer.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xStandaloneLocalConfiguration.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBoss5xInstalledLocalContainer.java core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainer.java core/trunk/containers/jboss/src/test/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainerTest.java Log: Fix CARGO-1110: Maven Cargo plugin incorrectly replaces jboss.server.lib.url Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBossStandaloneLocalConfiguration.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBossStandaloneLocalConfiguration.java2012-05-22 18:16:47 UTC (rev 3327) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBossStandaloneLocalConfiguration.java2012-05-23 05:17:58 UTC (rev 3328) &lt; at &gt;&lt; at &gt; -139,12 +139,10 &lt; at &gt;&lt; at &gt; // Copy resources from jboss installation folder and exclude files // that already copied from cargo resources folder copyExternalResources( - new File(jbossContainer.getConfDir(getPropertyValue(JBossPropertySet.CONFIGURATION))), - new File(confDir), cargoFiles); + new File(jbossContainer.getConfDir()), new File(confDir), cargoFiles); // Copy the files within the JBoss Deploy directory to the cargo deploy directory - copyExternalResources(new File(jbossContainer.getDeployDir(getPropertyValue( - JBossPropertySet.CONFIGURATION))), new File(deployDir)); + copyExternalResources(new File(jbossContainer.getDeployDir()), new File(deployDir)); // Deploy the CPC (Cargo Ping Component) to the webapps directory getResourceUtils().copyResource(RESOURCE_PATH + "cargocpc.war", &lt; at &gt;&lt; at &gt; -389,8 +387,7 &lt; at &gt;&lt; at &gt; getAntUtils().addTokenToFilterChain(filterChain, GeneralPropertySet.LOGGING, getJBossLogLevel(getPropertyValue(GeneralPropertySet.LOGGING))); - File libDir = - new File(container.getLibDir(getPropertyValue(JBossPropertySet.CONFIGURATION))); + File libDir = new File(container.getLibDir()); getAntUtils().addTokenToFilterChain(filterChain, "cargo.server.lib.url", libDir.toURI().toURL().toString()); &lt; at &gt;&lt; at &gt; -399,8 +396,7 &lt; at &gt;&lt; at &gt; // Initiate the value of scanned folder or archive with cargo deploy // directory and existing jboss deploy directory - File deployDir = - new File(container.getDeployDir(getPropertyValue(JBossPropertySet.CONFIGURATION))); + File deployDir = new File(container.getDeployDir()); buffer.append("deploy/, ").append(deployDir.toURI().toURL().toString()); // just use the original deploy directory and copy all the deployables from the server Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xInstalledLocalContainer.java2012-05-22 18:16:47 UTC (rev 3327) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xInstalledLocalContainer.java2012-05-23 05:17:58 UTC (rev 3328) &lt; at &gt;&lt; at &gt; -61,9 +61,9 &lt; at &gt;&lt; at &gt; /** * {&lt; at &gt;inheritDoc} */ - public String getDeployersDir(String configurationName) + public String getDeployersDir() { - return getSpecificConfigurationDir("deployers", configurationName); + return getSpecificConfigurationDir("deployers"); } /** Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xStandaloneLocalConfiguration.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xStandaloneLocalConfiguration.java2012-05-22 18:16:47 UTC (rev 3327) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBoss5xStandaloneLocalConfiguration.java2012-05-23 05:17:58 UTC (rev 3328) &lt; at &gt;&lt; at &gt; -77,8 +77,7 &lt; at &gt;&lt; at &gt; } // Copy the files within the JBoss Configuration directory to the cargo conf directory - copyExternalResources(new File(jbossContainer.getConfDir(getPropertyValue( - JBossPropertySet.CONFIGURATION))), new File(confDir)); + copyExternalResources(new File(jbossContainer.getConfDir()), new File(confDir)); // Setup the shared classpath String jbossServiceXml = getFileHandler().append(confDir, "jboss-service.xml"); &lt; at &gt;&lt; at &gt; -90,12 +89,11 &lt; at &gt;&lt; at &gt; getFileHandler().replaceInFile(jbossServiceXml, replacements, "UTF-8"); // Copy the files within the JBoss Deploy directory to the cargo deploy directory - copyExternalResources(new File(jbossContainer.getDeployDir(getPropertyValue( - JBossPropertySet.CONFIGURATION))), new File(deployDir)); + copyExternalResources(new File(jbossContainer.getDeployDir()), new File(deployDir)); // Copy the files within the JBoss Deployers directory to the cargo deployers directory - copyExternalResources(new File(((JBoss5xInstalledLocalContainer) jbossContainer) - .getDeployersDir(getPropertyValue(JBossPropertySet.CONFIGURATION))), + copyExternalResources( + new File(((JBoss5xInstalledLocalContainer) jbossContainer).getDeployersDir()), new File(deployersDir)); // Deploy the CPC (Cargo Ping Component) to the webapps directory Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java2012-05-22 18:16:47 UTC (rev 3327) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java2012-05-23 05:17:58 UTC (rev 3328) &lt; at &gt;&lt; at &gt; -31,7 +31,6 &lt; at &gt;&lt; at &gt; import org.codehaus.cargo.container.ContainerCapability; import org.codehaus.cargo.container.ContainerException; -import org.codehaus.cargo.container.configuration.ExistingLocalConfiguration; import org.codehaus.cargo.container.configuration.LocalConfiguration; import org.codehaus.cargo.container.jboss.JBossPropertySet; import org.codehaus.cargo.container.property.GeneralPropertySet; &lt; at &gt;&lt; at &gt; -82,11 +81,8 &lt; at &gt;&lt; at &gt; new File(getConfiguration().getHome()).toURI().toURL().toString()); java.setSystemProperty("jboss.server.name", getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION)); - java.setSystemProperty( - "jboss.server.lib.url", - new File(getLibDir(getConfiguration().getPropertyValue( - JBossPropertySet.CONFIGURATION))) - .toURI().toURL().toString()); + java.setSystemProperty("jboss.server.lib.url", + new File(getLibDir()).toURI().toURL().toString()); java.setSystemProperty("jboss.server.log.threshold", getJBossLogLevel(getConfiguration().getPropertyValue(GeneralPropertySet.LOGGING))); &lt; at &gt;&lt; at &gt; -244,56 +240,46 &lt; at &gt;&lt; at &gt; /** * {&lt; at &gt;inheritDoc} - * &lt; at &gt;see JBossInstalledLocalContainer#getConfDir(String) + * &lt; at &gt;see JBossInstalledLocalContainer#getConfDir() */ - public String getConfDir(String configurationName) + public String getConfDir() { - return getSpecificConfigurationDir("conf", configurationName); + return getSpecificConfigurationDir("conf"); } /** * {&lt; at &gt;inheritDoc} - * &lt; at &gt;see JBossInstalledLocalContainer#getLibDir(String) + * &lt; at &gt;see JBossInstalledLocalContainer#getLibDir() */ - public String getLibDir(String configurationName) + public String getLibDir() { - return getSpecificConfigurationDir("lib", configurationName); + return getSpecificConfigurationDir("lib"); } /** * {&lt; at &gt;inheritDoc} - * &lt; at &gt;see JBossInstalledLocalContainer#getDeployDir(String) + * &lt; at &gt;see JBossInstalledLocalContainer#getDeployDir() */ - public String getDeployDir(String configurationName) + public String getDeployDir() { String clustered = getConfiguration().getPropertyValue(JBossPropertySet.CLUSTERED); if (Boolean.valueOf(clustered).booleanValue()) { - return getSpecificConfigurationDir("farm", configurationName); + return getSpecificConfigurationDir("farm"); } else { - return getSpecificConfigurationDir("deploy", configurationName); + return getSpecificConfigurationDir("deploy"); } } /** * &lt; at &gt;param location the name of the directory to return inside the server configuration - * &lt; at &gt;param configurationName the server configuration name to use. A server configuration is - * located in the &lt;code&gt;server/&lt;/code&gt; directory inside the JBoss installation dir. * &lt; at &gt;return the location of the passed directory name inside the server configuration, as a File */ - protected String getSpecificConfigurationDir(String location, String configurationName) + protected String getSpecificConfigurationDir(String location) { - if (getConfiguration() instanceof ExistingLocalConfiguration) - { - return getFileHandler().append(getConfiguration().getHome(), location); - } - else - { - return getFileHandler().append(getHome(), - "server/" + configurationName + "/" + location); - } + return getFileHandler().append(getConfiguration().getHome(), location); } /** Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBoss5xInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBoss5xInstalledLocalContainer.java2012-05-22 18:16:47 UTC (rev 3327) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBoss5xInstalledLocalContainer.java2012-05-23 05:17:58 UTC (rev 3328) &lt; at &gt;&lt; at &gt; -29,11 +29,9 &lt; at &gt;&lt; at &gt; { /** - * &lt; at &gt;param configurationName the JBoss server configuration name for which to return the deployer - * dir. - * &lt; at &gt;return The deployer directory located under the container's home installation directory + * &lt; at &gt;return The deployer directory located under the container's configuration directory */ - String getDeployersDir(String configurationName); + String getDeployersDir(); /** * Return the location of the common lib directory. Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainer.java2012-05-22 18:16:47 UTC (rev 3327) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainer.java2012-05-23 05:17:58 UTC (rev 3328) &lt; at &gt;&lt; at &gt; -30,20 +30,17 &lt; at &gt;&lt; at &gt; public interface JBossInstalledLocalContainer extends InstalledLocalContainer { /** - * &lt; at &gt;param configurationName the JBoss server configuration name for which to return the conf dir - * &lt; at &gt;return The conf directory located under the container's home installation directory + * &lt; at &gt;return The conf directory located under the container's configuration directory */ - String getConfDir(String configurationName); + String getConfDir(); /** - * &lt; at &gt;param configurationName the JBoss server configuration name for which to return the conf dir - * &lt; at &gt;return The lib directory located under the container's home installation directory + * &lt; at &gt;return The lib directory located under the container's configuration directory */ - String getLibDir(String configurationName); + String getLibDir(); /** - * &lt; at &gt;param configurationName the JBoss server configuration name for which to return the conf dir - * &lt; at &gt;return The deploy directory located under the container's home installation directory + * &lt; at &gt;return The deploy directory located under the container's configuration directory */ - String getDeployDir(String configurationName); + String getDeployDir(); } Modified: core/trunk/containers/jboss/src/test/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainerTest.java =================================================================== --- core/trunk/containers/jboss/src/test/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainerTest.java2012-05-22 18:16:47 UTC (rev 3327) +++ core/trunk/containers/jboss/src/test/java/org/codehaus/cargo/container/jboss/internal/JBossInstalledLocalContainerTest.java2012-05-23 05:17:58 UTC (rev 3328) &lt; at &gt;&lt; at &gt; -102,8 +102,7 &lt; at &gt;&lt; at &gt; public void testGetConfDir() { String expected = this.fileHandler.append(CONFIGURATION_HOME, "conf"); - assertEquals(expected, this.container.getConfDir( - this.container.getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION))); + assertEquals(expected, this.container.getConfDir()); } /** &lt; at &gt;&lt; at &gt; -112,8 +111,7 &lt; at &gt;&lt; at &gt; public void testGetLibDir() { String expected = this.fileHandler.append(CONFIGURATION_HOME, "lib"); - assertEquals(expected, this.container.getLibDir( - this.container.getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION))); + assertEquals(expected, this.container.getLibDir()); } /** &lt; at &gt;&lt; at &gt; -122,8 +120,7 &lt; at &gt;&lt; at &gt; public void testGetDeployDir() { String expected = this.fileHandler.append(CONFIGURATION_HOME, "deploy"); - assertEquals(expected, this.container.getDeployDir( - this.container.getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION))); + assertEquals(expected, this.container.getDeployDir()); } /** &lt; at &gt;&lt; at &gt; -133,8 +130,7 &lt; at &gt;&lt; at &gt; { this.container.getConfiguration().setProperty(JBossPropertySet.CLUSTERED, "true"); String expected = this.fileHandler.append(CONFIGURATION_HOME, "farm"); - assertEquals(expected, this.container.getDeployDir( - this.container.getConfiguration().getPropertyValue(JBossPropertySet.CONFIGURATION))); + assertEquals(expected, this.container.getDeployDir()); } /** --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email </pre> alitokmen-yCVjj/EcxBJg9hUCZPvPmw< at >public.gmane.org 2012-05-23T05:17:58 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12871 <pre></pre> James Davis (JIRA 2012-05-22T23:49:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12870 <pre></pre> Savas Ali Tokmen (JIRA 2012-05-22T18:19:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12869 <pre></pre> Savas Ali Tokmen (JIRA 2012-05-22T18:17:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12868 <pre>Author: alitokmen Date: 2012-05-22 13:16:47 -0500 (Tue, 22 May 2012) New Revision: 3327 Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java Log: Fix CARGO-1110: Maven Cargo plugin incorrectly replaces jboss.server.lib.url Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java =================================================================== --- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java2012-05-22 18:13:15 UTC (rev 3326) +++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/internal/AbstractJBossInstalledLocalContainer.java2012-05-22 18:16:47 UTC (rev 3327) &lt; at &gt;&lt; at &gt; -31,6 +31,7 &lt; at &gt;&lt; at &gt; import org.codehaus.cargo.container.ContainerCapability; import org.codehaus.cargo.container.ContainerException; +import org.codehaus.cargo.container.configuration.ExistingLocalConfiguration; import org.codehaus.cargo.container.configuration.LocalConfiguration; import org.codehaus.cargo.container.jboss.JBossPropertySet; import org.codehaus.cargo.container.property.GeneralPropertySet; &lt; at &gt;&lt; at &gt; -279,12 +280,20 &lt; at &gt;&lt; at &gt; /** * &lt; at &gt;param location the name of the directory to return inside the server configuration * &lt; at &gt;param configurationName the server configuration name to use. A server configuration is - * located in the &lt;code&gt;server/&lt;/code&gt; directory inside the JBoss installation ir. + * located in the &lt;code&gt;server/&lt;/code&gt; directory inside the JBoss installation dir. * &lt; at &gt;return the location of the passed directory name inside the server configuration, as a File */ protected String getSpecificConfigurationDir(String location, String configurationName) { - return getFileHandler().append(getHome(), "server/" + configurationName + "/" + location); + if (getConfiguration() instanceof ExistingLocalConfiguration) + { + return getFileHandler().append(getConfiguration().getHome(), location); + } + else + { + return getFileHandler().append(getHome(), + "server/" + configurationName + "/" + location); + } } /** --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email </pre> alitokmen-yCVjj/EcxBJg9hUCZPvPmw< at >public.gmane.org 2012-05-22T18:16:47 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12867 <pre></pre> Savas Ali Tokmen (JIRA 2012-05-22T18:15:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12866 <pre></pre> Savas Ali Tokmen (JIRA 2012-05-22T18:15:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12865 <pre></pre> Savas Ali Tokmen (JIRA 2012-05-22T18:13:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12864 <pre>Author: alitokmen Date: 2012-05-22 13:13:15 -0500 (Tue, 22 May 2012) New Revision: 3326 Modified: core/trunk/api/container/src/main/java/org/codehaus/cargo/container/property/User.java core/trunk/api/container/src/test/java/org/codehaus/cargo/container/property/UserTest.java Log: Fix CARGO-526: The configuration of &lt;cargo.servlet.users&gt; requires a role Modified: core/trunk/api/container/src/main/java/org/codehaus/cargo/container/property/User.java =================================================================== --- core/trunk/api/container/src/main/java/org/codehaus/cargo/container/property/User.java2012-05-19 16:51:42 UTC (rev 3325) +++ core/trunk/api/container/src/main/java/org/codehaus/cargo/container/property/User.java2012-05-22 18:13:15 UTC (rev 3326) &lt; at &gt;&lt; at &gt; -188,18 +188,35 &lt; at &gt;&lt; at &gt; else { user.setPassword(token); - if (!":".equals(fieldTokens.nextToken())) - { - throw new ContainerException("Invalid format for [" + userAsString + "]"); - } } + } + catch (NoSuchElementException exception) + { + throw new ContainerException("Invalid format for [" + userAsString + "]"); + } + try + { + if (user.getPassword().length() &gt; 0 &amp;&amp; !":".equals(fieldTokens.nextToken())) + { + throw new ContainerException("Invalid format for [" + userAsString + "]"); + } user.addRoles(parseRoles(fieldTokens.nextToken())); } catch (NoSuchElementException exception) { + // CARGO-526: No roles defined, that's OK + } + + try + { + fieldTokens.nextToken(); throw new ContainerException("Invalid format for [" + userAsString + "]"); } + catch (NoSuchElementException exception) + { + // That's expected: we only have 3 tokens + } return user; } Modified: core/trunk/api/container/src/test/java/org/codehaus/cargo/container/property/UserTest.java =================================================================== --- core/trunk/api/container/src/test/java/org/codehaus/cargo/container/property/UserTest.java2012-05-19 16:51:42 UTC (rev 3325) +++ core/trunk/api/container/src/test/java/org/codehaus/cargo/container/property/UserTest.java2012-05-22 18:13:15 UTC (rev 3326) &lt; at &gt;&lt; at &gt; -87,12 +87,12 &lt; at &gt;&lt; at &gt; { try { - User.parseUser("name:role"); + User.parseUser("name:password:role:"); fail("Should have raised an exception here"); } catch (ContainerException expected) { - assertEquals("Invalid format for [name:role]", expected.getMessage()); + assertEquals("Invalid format for [name:password:role:]", expected.getMessage()); } } &lt; at &gt;&lt; at &gt; -111,6 +111,19 &lt; at &gt;&lt; at &gt; } /** + * Test user parsing with no roles. + */ + public void testParseUserWithNoRoles() + { + User expectedUser = new User(); + expectedUser.setName("name"); + expectedUser.setPassword("pwd"); + + User user = User.parseUser("name:pwd"); + assertEquals(expectedUser, user); + } + + /** * Test role to users list map creation. */ public void testCreateRoleMap() --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email </pre> alitokmen-yCVjj/EcxBJg9hUCZPvPmw< at >public.gmane.org 2012-05-22T18:13:15 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12863 <pre></pre> James Davis (JIRA 2012-05-22T05:30:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12862 <pre></pre> Savas Ali Tokmen (JIRA 2012-05-22T05:02:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12861 <pre></pre> Savas Ali Tokmen (JIRA 2012-05-22T05:02:21 http://permalink.gmane.org/gmane.comp.java.cargo.devel/12860 <pre></pre> James Davis (JIRA 2012-05-21T21:21:21 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.java.cargo.devel