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://comments.gmane.org/gmane.comp.java.cargo.devel/12890 <pre>----------------------------------------------------------- Cargo &gt; CARGO trunks - Compile and test (JDK 7, Maven3) &gt; #290 was successful after 2 failures. ----------------------------------------------------------- This build was triggered at the scheduled time of 5:00 AM 749 tests in total. This plan has been failing since CARGO-TRUNKM3JDK7-288 (This build was triggered at the scheduled time of 5:00 AM, 1 week before). http://bamboo.ci.codehaus.org/browse/CARGO-TRUNKM3JDK7-290/ -------------- Tests -------------- Fixed Tests (1) - RunMojoTest: Simple war jsp -- This message is automatically generated by Atlassian Bamboo</pre> Codehaus Bamboo 2012-05-26T10:19:20 http://comments.gmane.org/gmane.comp.java.cargo.devel/12889 <pre>----------------------------------------------------------- Cargo &gt; CARGO trunks - Compile and test (JDK 7, Maven3) &gt; #289 has failed (2 times). ----------------------------------------------------------- This build occurred because it is a dependant of CARGO-TRUNKM2JDK15-1327. 1/744 tests failed. This plan has been failing since CARGO-TRUNKM3JDK7-288 (This build was triggered at the scheduled time of 5:00 AM, 6 days before). http://bamboo.ci.codehaus.org/browse/CARGO-TRUNKM3JDK7-289/ -------------- Failing Jobs -------------- - Default Job (Default Stage): 1 of 744 tests failed. -------------- Code Changes -------------- alitokmen (3329): alitokmen (3327): alitokmen (3328): -------------- Tests -------------- New Test Failures (1) - RunMojoTest: Simple war jsp -- This message is automatically generated by Atlassian Bamboo</pre> Codehaus Bamboo 2012-05-25T20:24:17 http://comments.gmane.org/gmane.comp.java.cargo.devel/12888 <pre> ----------------------------------------------------------------------- Cargo &gt; CARGO trunks - Compile, test and deploy (JDK 6, Maven3) &gt; #603 was successful. ----------------------------------------------------------------------- This build was manually triggered by alitokmen. 749 tests in total. http://bamboo.ci.codehaus.org/browse/CARGO-TRUNKM3JDK16-603/ -- This message is automatically generated by Atlassian Bamboo</pre> Codehaus Bamboo 2012-05-25T20:02:12 http://comments.gmane.org/gmane.comp.java.cargo.devel/12887 <pre>----------------------------------------------------------- Cargo &gt; Containers - JBoss 7.1.x &gt; #177 has failed (6 times). ----------------------------------------------------------- This build was triggered at the scheduled time of 1:30 PM 1/15 tests failed, no failures were new. This plan has been failing since CARGO-SAMPLESJBOSS71X-172 (This build was triggered at the scheduled time of 1:30 PM, 3 weeks before). http://bamboo.ci.codehaus.org/browse/CARGO-SAMPLESJBOSS71X-177/ -------------- Failing Jobs -------------- - Default Job (Default Stage): 1 of 15 tests failed. -------------- Tests -------------- Existing Test Failures (1) - ExistingConfigurationTest: Deploy war statically -- This message is automatically generated by Atlassian Bamboo</pre> Codehaus Bamboo 2012-05-25T18:38:09 http://comments.gmane.org/gmane.comp.java.cargo.devel/12886 <pre>----------------------------------------------------------- Cargo &gt; Containers - JBoss 6.1.x &gt; #240 has failed (2 times). ----------------------------------------------------------- This build was triggered at the scheduled time of 12:00 PM 19/19 tests failed, 17 failures were new. This plan has been failing since CARGO-SAMPLESJBOSS61X-239 (This build was triggered at the scheduled time of 12:00 PM, 1 week before). http://bamboo.ci.codehaus.org/browse/CARGO-SAMPLESJBOSS61X-240/ -------------- Failing Jobs -------------- - Default Job (Default Stage): 19 of 19 tests failed. -------------- Tests -------------- New Test Failures (17) - AllLocalContainerTest: Start with no deployable - DataSourceOnStandaloneConfigurationTest: User configures driver and requests data source - DataSourceOnStandaloneConfigurationTest: Multiple data sources - EarCapabilityContainerTest: Start with one empty ear deployed - EarCapabilityContainerTest: Start with one ear with one war deployed - ExistingConfigurationTest: Start with one expanded war deployed - ExistingConfigurationTest: Deploy war statically - ExtraClasspathOnStandaloneConfigurationTest: Load class - AopCapabilityContainerTest: Deploy aop statically - RemoteDeploymentTest: Deploy undeploy redeploy war remotely - RemoteDeploymentTest: Change war context and deploy undeploy remotely - SystemPropertyCapabilityTest: System property - TransactionEmulationDataSourceOnStandaloneConfigurationTest: User configures driver and requests data source with local transaction support - WarAndDeployerCapabilityContainerTest: War hot deployment - WarCapabilityContainerTest: Deploy war defined with relative path - WarCapabilityContainerTest: Deploy war statically - WarCapabilityContainerTest: Start with one expanded war deployed Existing Test Failures (2) - EjbCapabilityContainerTest: Deploy ejb statically - HarCapabilityContainerTest: Deploy har statically -- This message is automatically generated by Atlassian Bamboo</pre> Codehaus Bamboo 2012-05-25T18:07:30 http://comments.gmane.org/gmane.comp.java.cargo.devel/12885 <pre> ----------------------------------------------------------------------- Cargo &gt; CARGO trunks - Compile, test and deploy (JDK 6, Maven3) &gt; #602 failed. ----------------------------------------------------------------------- This build was manually triggered by alitokmen. No failed tests found, a possible compilation error. http://bamboo.ci.codehaus.org/browse/CARGO-TRUNKM3JDK16-602/ -------------- Failing Jobs -------------- - Default Job (Default Stage): 424 tests passed. -- This message is automatically generated by Atlassian Bamboo</pre> Codehaus Bamboo 2012-05-25T15:23:11 http://comments.gmane.org/gmane.comp.java.cargo.devel/12884 <pre> ----------------------------------------------------------------------- Cargo &gt; CARGO trunks - Compile, test and deploy (JDK 6, Maven3) &gt; #601 failed. ----------------------------------------------------------------------- This build was manually triggered by alitokmen. 1/749 tests failed, no failures were new. http://bamboo.ci.codehaus.org/browse/CARGO-TRUNKM3JDK16-601/ -------------- Failing Jobs -------------- - Default Job (Default Stage): 1 of 749 tests failed. -------------- Tests -------------- Existing Test Failures (1) - WebappIT: Call index page -- This message is automatically generated by Atlassian Bamboo</pre> Codehaus Bamboo 2012-05-25T10:14:55 http://comments.gmane.org/gmane.comp.java.cargo.devel/12883 <pre> ----------------------------------------------------------------------- Cargo &gt; CARGO trunks - Compile, test and deploy (JDK 6, Maven3) &gt; #600 failed. ----------------------------------------------------------------------- This build was manually triggered by alitokmen. 1/749 tests failed, no failures were new. http://bamboo.ci.codehaus.org/browse/CARGO-TRUNKM3JDK16-600/ -------------- Failing Jobs -------------- - Default Job (Default Stage): 1 of 749 tests failed. -------------- Tests -------------- Existing Test Failures (1) - WebappIT: Call index page -- This message is automatically generated by Atlassian Bamboo</pre> Codehaus Bamboo 2012-05-24T21:09:06 http://comments.gmane.org/gmane.comp.java.cargo.devel/12882 <pre> ----------------------------------------------------------------------- Cargo &gt; CARGO trunks - Compile, test and deploy (JDK 6, Maven3) &gt; #599 failed. ----------------------------------------------------------------------- This build was manually triggered by alitokmen. 1/749 tests failed. http://bamboo.ci.codehaus.org/browse/CARGO-TRUNKM3JDK16-599/ -------------- Failing Jobs -------------- - Default Job (Default Stage): 1 of 749 tests failed. -------------- Tests -------------- New Test Failures (1) - WebappIT: Call index page -- This message is automatically generated by Atlassian Bamboo</pre> Codehaus Bamboo 2012-05-24T20:46:54 http://comments.gmane.org/gmane.comp.java.cargo.devel/12881 <pre> ----------------------------------------------------------------------- Cargo &gt; CARGO trunks - Compile, test and deploy (JDK 6, Maven3) &gt; #598 failed. ----------------------------------------------------------------------- Code has been updated by alitokmen. No failed tests found, a possible compilation error. http://bamboo.ci.codehaus.org/browse/CARGO-TRUNKM3JDK16-598/ -------------- Failing Jobs -------------- - Default Job (Default Stage): 748 tests passed. -------------- Code Changes -------------- alitokmen (3329): alitokmen (3327): alitokmen (3328): -- This message is automatically generated by Atlassian Bamboo</pre> Codehaus Bamboo 2012-05-24T20:01:31 http://comments.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://comments.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://comments.gmane.org/gmane.comp.java.cargo.devel/12876 <pre></pre> Damian Nowak (JIRA 2012-05-23T12:06:24 http://comments.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://comments.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://comments.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://comments.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://comments.gmane.org/gmane.comp.java.cargo.devel/12858 <pre></pre> James Davis (JIRA 2012-05-21T21:13:21 http://comments.gmane.org/gmane.comp.java.cargo.devel/12857 <pre>Dear CARGO enthusiasts After about 7 weeks after the last release, I decided we have enough changes and fixed bugs in order to go ahead with CARGO 1.2.2. As for what's new, the list is this time small (12 entries): *Improvements and new features* (5) * o Jetty containers now support datasources (CARGO-1107 &lt;https://jira.codehaus.org/browse/CARGO-1107&gt;) o Jetty 7.x standalone local container is now the default container for the CARGO Maven2/Maven3 plugin (CARGO-1106 &lt;https://jira.codehaus.org/browse/CARGO-1106&gt;) and downloads its container via the artifactInstaller o The usage of an external jetty-env.xml file has finally been documented (CARGO-861 &lt;https://jira.codehaus.org/browse/CARGO-861&gt;) o The XML/properties replacement engine can now WARN when a replacement is not possible (instead of failing) (CARGO-1099 &lt;https://jira.codehaus.org/browse/CARGO-1099&gt;) o Deployers (and mostly undeployers) can now intelligently ignore failures when deploy/undeploy fails (for example, if the application is not deployed but one attempts to undeploy it) (CARGO-1100 &lt;https://jira.codehaus.org/browse/CARGO-1100&gt;) *Bug fixes* (7) * o Proxies that would be previously set by Maven are not used during deployment anymore (CARGO-1042 &lt;https://jira.codehaus.org/browse/CARGO-1042&gt;) o Module names in JBoss do not contain any periods anymore -allowing the deployment of datasources via Maven2/Maven3 plugin (CARGO-1091 &lt;https://jira.codehaus.org/browse/CARGO-1091&gt;) o Logging level is now interpreted properly for containers that output their messages on stderr (CARGO-1095 &lt;https://jira.codehaus.org/browse/CARGO-1095&gt;) o Jetty can deploy to root (/) context (CARGO-1103 &lt;https://jira.codehaus.org/browse/CARGO-1103&gt;) o cargo.jboss.invoker.pool.port configuration property works properly for JBoss 5+ (CARGO-1104 &lt;https://jira.codehaus.org/browse/CARGO-1104&gt;) o Merging of XML files doesn't throw a ConcurrentModificationException anymore (CARGO-1105 &lt;https://jira.codehaus.org/browse/CARGO-1105&gt;) o JVM properties on Glassfish now work (CARGO-1108 &lt;https://jira.codehaus.org/browse/CARGO-1108&gt;) In addition to these, we have done various changes in the documentation as well as the Maven archetypes. For example, a profile for JBoss 7.1.x &lt;http://cargo.codehaus.org/JBoss+7.1.x&gt; has been added to all archetypes and is configured with an artifactInstaller. The full release notes can be found on https://jira.codehaus.org/secure/ReleaseNote.jspa?version=18384&amp;styleName=Html&amp;projectId=10730 &lt;https://jira.codehaus.org/secure/ReleaseNote.jspa?version=18384&amp;styleName=Html&amp;projectId=10730&gt; To use this new version: * Users of the Java API and/or the ANT tasks can download the required components (be it the uberjar, ANT tasks and others) via the CARGO Downloads page &lt;http://cargo.codehaus.org/Downloads&gt;. * Users of the Maven2/Maven3 plugin simply need to change their plugin version to 1.2.2. Please provide your feedback to the user-z8XaHfFCYGOxIXFVlbCvtR2eb7JE58TQ&lt; at &gt;public.gmane.org &lt;mailto:user-z8XaHfFCYGOxIXFVlbCvtR2eb7JE58TQ&lt; at &gt;public.gmane.org&gt; mailing list. Enjoy! </pre> S. Ali Tokmen 2012-05-21T18:26:22 http://comments.gmane.org/gmane.comp.java.cargo.devel/12856 <pre> ----------------------------------------------------------------------- Cargo &gt; CARGO trunks - Compile, test and deploy (JDK 6, Maven3) &gt; #597 failed. ----------------------------------------------------------------------- Code has been updated by alitokmen. No failed tests found, a possible compilation error. http://bamboo.ci.codehaus.org/browse/CARGO-TRUNKM3JDK16-597/ -------------- Failing Jobs -------------- - Default Job (Default Stage): 747 tests passed. -------------- Code Changes -------------- alitokmen (3325): -- This message is automatically generated by Atlassian Bamboo</pre> Codehaus Bamboo 2012-05-21T00:23:51 http://comments.gmane.org/gmane.comp.java.cargo.devel/12855 <pre>Author: alitokmen Date: 2012-05-19 11:51:42 -0500 (Sat, 19 May 2012) New Revision: 3325 Modified: extensions/trunk/maven2/archetypes/webapp-functional-tests-module/src/main/resources/archetype-resources/__rootArtifactId__-functional-tests/pom.xml extensions/trunk/maven2/archetypes/webapp-single-module/src/main/resources/archetype-resources/pom.xml extensions/trunk/maven2/archetypes/webapp-with-datasource/src/main/resources/archetype-resources/pom.xml Log: Sort the profiles in various archetypes in the same order to make it look nicer Modified: extensions/trunk/maven2/archetypes/webapp-functional-tests-module/src/main/resources/archetype-resources/__rootArtifactId__-functional-tests/pom.xml =================================================================== --- extensions/trunk/maven2/archetypes/webapp-functional-tests-module/src/main/resources/archetype-resources/__rootArtifactId__-functional-tests/pom.xml2012-05-18 19:19:47 UTC (rev 3324) +++ extensions/trunk/maven2/archetypes/webapp-functional-tests-module/src/main/resources/archetype-resources/__rootArtifactId__-functional-tests/pom.xml2012-05-19 16:51:42 UTC (rev 3325) &lt; at &gt;&lt; at &gt; -175,7 +175,7 &lt; at &gt;&lt; at &gt; &lt;/build&gt; &lt;/profile&gt; &lt;profile&gt; - &lt;id&gt;jonas5x&lt;/id&gt; + &lt;id&gt;jboss51x&lt;/id&gt; &lt;build&gt; &lt;pluginManagement&gt; &lt;plugins&gt; &lt; at &gt;&lt; at &gt; -184,13 +184,10 &lt; at &gt;&lt; at &gt; &lt;artifactId&gt;cargo-maven2-plugin&lt;/artifactId&gt; &lt;configuration&gt; &lt;container&gt; - &lt;containerId&gt;jonas5x&lt;/containerId&gt; - &lt;artifactInstaller&gt; - &lt;groupId&gt;org.ow2.jonas.assemblies.profiles&lt;/groupId&gt; - &lt;artifactId&gt;jonas-full&lt;/artifactId&gt; - &lt;version&gt;5.2.3&lt;/version&gt; - &lt;classifier&gt;bin&lt;/classifier&gt; - &lt;/artifactInstaller&gt; + &lt;containerId&gt;jboss51x&lt;/containerId&gt; + &lt;zipUrlInstaller&gt; + &lt;url&gt;http://downloads.sourceforge.net/jboss/jboss-5.1.0.GA.zip?big_mirror=1&lt;/url&gt; + &lt;/zipUrlInstaller&gt; &lt;/container&gt; &lt;/configuration&gt; &lt;/plugin&gt; &lt; at &gt;&lt; at &gt; -199,7 +196,7 &lt; at &gt;&lt; at &gt; &lt;/build&gt; &lt;/profile&gt; &lt;profile&gt; - &lt;id&gt;jboss51x&lt;/id&gt; + &lt;id&gt;jboss71x&lt;/id&gt; &lt;build&gt; &lt;pluginManagement&gt; &lt;plugins&gt; &lt; at &gt;&lt; at &gt; -208,10 +205,12 &lt; at &gt;&lt; at &gt; &lt;artifactId&gt;cargo-maven2-plugin&lt;/artifactId&gt; &lt;configuration&gt; &lt;container&gt; - &lt;containerId&gt;jboss51x&lt;/containerId&gt; - &lt;zipUrlInstaller&gt; - &lt;url&gt;http://downloads.sourceforge.net/jboss/jboss-5.1.0.GA.zip?big_mirror=1&lt;/url&gt; - &lt;/zipUrlInstaller&gt; + &lt;containerId&gt;jboss71x&lt;/containerId&gt; + &lt;artifactInstaller&gt; + &lt;groupId&gt;org.jboss.as&lt;/groupId&gt; + &lt;artifactId&gt;jboss-as-dist&lt;/artifactId&gt; + &lt;version&gt;7.1.1.Final&lt;/version&gt; + &lt;/artifactInstaller&gt; &lt;/container&gt; &lt;/configuration&gt; &lt;/plugin&gt; &lt; at &gt;&lt; at &gt; -220,7 +219,7 &lt; at &gt;&lt; at &gt; &lt;/build&gt; &lt;/profile&gt; &lt;profile&gt; - &lt;id&gt;jboss71x&lt;/id&gt; + &lt;id&gt;jonas5x&lt;/id&gt; &lt;build&gt; &lt;pluginManagement&gt; &lt;plugins&gt; &lt; at &gt;&lt; at &gt; -229,11 +228,12 &lt; at &gt;&lt; at &gt; &lt;artifactId&gt;cargo-maven2-plugin&lt;/artifactId&gt; &lt;configuration&gt; &lt;container&gt; - &lt;containerId&gt;jboss71x&lt;/containerId&gt; + &lt;containerId&gt;jonas5x&lt;/containerId&gt; &lt;artifactInstaller&gt; - &lt;groupId&gt;org.jboss.as&lt;/groupId&gt; - &lt;artifactId&gt;jboss-as-dist&lt;/artifactId&gt; - &lt;version&gt;7.1.1.Final&lt;/version&gt; + &lt;groupId&gt;org.ow2.jonas.assemblies.profiles&lt;/groupId&gt; + &lt;artifactId&gt;jonas-full&lt;/artifactId&gt; + &lt;version&gt;5.2.3&lt;/version&gt; + &lt;classifier&gt;bin&lt;/classifier&gt; &lt;/artifactInstaller&gt; &lt;/container&gt; &lt;/configuration&gt; Modified: extensions/trunk/maven2/archetypes/webapp-single-module/src/main/resources/archetype-resources/pom.xml =================================================================== --- extensions/trunk/maven2/archetypes/webapp-single-module/src/main/resources/archetype-resources/pom.xml2012-05-18 19:19:47 UTC (rev 3324) +++ extensions/trunk/maven2/archetypes/webapp-single-module/src/main/resources/archetype-resources/pom.xml2012-05-19 16:51:42 UTC (rev 3325) &lt; at &gt;&lt; at &gt; -184,7 +184,7 &lt; at &gt;&lt; at &gt; &lt;/build&gt; &lt;/profile&gt; &lt;profile&gt; - &lt;id&gt;jonas5x&lt;/id&gt; + &lt;id&gt;jboss51x&lt;/id&gt; &lt;build&gt; &lt;pluginManagement&gt; &lt;plugins&gt; &lt; at &gt;&lt; at &gt; -193,13 +193,10 &lt; at &gt;&lt; at &gt; &lt;artifactId&gt;cargo-maven2-plugin&lt;/artifactId&gt; &lt;configuration&gt; &lt;container&gt; - &lt;containerId&gt;jonas5x&lt;/containerId&gt; - &lt;artifactInstaller&gt; - &lt;groupId&gt;org.ow2.jonas.assemblies.profiles&lt;/groupId&gt; - &lt;artifactId&gt;jonas-full&lt;/artifactId&gt; - &lt;version&gt;5.2.3&lt;/version&gt; - &lt;classifier&gt;bin&lt;/classifier&gt; - &lt;/artifactInstaller&gt; + &lt;containerId&gt;jboss51x&lt;/containerId&gt; + &lt;zipUrlInstaller&gt; + &lt;url&gt;http://downloads.sourceforge.net/jboss/jboss-5.1.0.GA.zip?big_mirror=1&lt;/url&gt; + &lt;/zipUrlInstaller&gt; &lt;/container&gt; &lt;/configuration&gt; &lt;/plugin&gt; &lt; at &gt;&lt; at &gt; -208,7 +205,7 &lt; at &gt;&lt; at &gt; &lt;/build&gt; &lt;/profile&gt; &lt;profile&gt; - &lt;id&gt;jboss51x&lt;/id&gt; + &lt;id&gt;jboss71x&lt;/id&gt; &lt;build&gt; &lt;pluginManagement&gt; &lt;plugins&gt; &lt; at &gt;&lt; at &gt; -217,10 +214,12 &lt; at &gt;&lt; at &gt; &lt;artifactId&gt;cargo-maven2-plugin&lt;/artifactId&gt; &lt;configuration&gt; &lt;container&gt; - &lt;containerId&gt;jboss51x&lt;/containerId&gt; - &lt;zipUrlInstaller&gt; - &lt;url&gt;http://downloads.sourceforge.net/jboss/jboss-5.1.0.GA.zip?big_mirror=1&lt;/url&gt; - &lt;/zipUrlInstaller&gt; + &lt;containerId&gt;jboss71x&lt;/containerId&gt; + &lt;artifactInstaller&gt; + &lt;groupId&gt;org.jboss.as&lt;/groupId&gt; + &lt;artifactId&gt;jboss-as-dist&lt;/artifactId&gt; + &lt;version&gt;7.1.1.Final&lt;/version&gt; + &lt;/artifactInstaller&gt; &lt;/container&gt; &lt;/configuration&gt; &lt;/plugin&gt; &lt; at &gt;&lt; at &gt; -229,7 +228,7 &lt; at &gt;&lt; at &gt; &lt;/build&gt; &lt;/profile&gt; &lt;profile&gt; - &lt;id&gt;jboss71x&lt;/id&gt; + &lt;id&gt;jonas5x&lt;/id&gt; &lt;build&gt; &lt;pluginManagement&gt; &lt;plugins&gt; &lt; at &gt;&lt; at &gt; -238,11 +237,12 &lt; at &gt;&lt; at &gt; &lt;artifactId&gt;cargo-maven2-plugin&lt;/artifactId&gt; &lt;configuration&gt; &lt;container&gt; - &lt;containerId&gt;jboss71x&lt;/containerId&gt; + &lt;containerId&gt;jonas5x&lt;/containerId&gt; &lt;artifactInstaller&gt; - &lt;groupId&gt;org.jboss.as&lt;/groupId&gt; - &lt;artifactId&gt;jboss-as-dist&lt;/artifactId&gt; - &lt;version&gt;7.1.1.Final&lt;/version&gt; + &lt;groupId&gt;org.ow2.jonas.assemblies.profiles&lt;/groupId&gt; + &lt;artifactId&gt;jonas-full&lt;/artifactId&gt; + &lt;version&gt;5.2.3&lt;/version&gt; + &lt;classifier&gt;bin&lt;/classifier&gt; &lt;/artifactInstaller&gt; &lt;/container&gt; &lt;/configuration&gt; Modified: extensions/trunk/maven2/archetypes/webapp-with-datasource/src/main/resources/archetype-resources/pom.xml =================================================================== --- extensions/trunk/maven2/archetypes/webapp-with-datasource/src/main/resources/archetype-resources/pom.xml2012-05-18 19:19:47 UTC (rev 3324) +++ extensions/trunk/maven2/archetypes/webapp-with-datasource/src/main/resources/archetype-resources/pom.xml2012-05-19 16:51:42 UTC (rev 3325) &lt; at &gt;&lt; at &gt; -149,7 +149,7 &lt; at &gt;&lt; at &gt; &lt;profiles&gt; &lt;profile&gt; - &lt;id&gt;tomcat6x&lt;/id&gt; + &lt;id&gt;jetty7x&lt;/id&gt; &lt;activation&gt; &lt;activeByDefault&gt;true&lt;/activeByDefault&gt; &lt;/activation&gt; &lt; at &gt;&lt; at &gt; -161,10 +161,12 &lt; at &gt;&lt; at &gt; &lt;artifactId&gt;cargo-maven2-plugin&lt;/artifactId&gt; &lt;configuration&gt; &lt;container&gt; - &lt;containerId&gt;tomcat6x&lt;/containerId&gt; - &lt;zipUrlInstaller&gt; - &lt;url&gt;http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.zip&lt;/url&gt; - &lt;/zipUrlInstaller&gt; + &lt;containerId&gt;jetty7x&lt;/containerId&gt; + &lt;artifactInstaller&gt; + &lt;groupId&gt;org.eclipse.jetty&lt;/groupId&gt; + &lt;artifactId&gt;jetty-distribution&lt;/artifactId&gt; + &lt;version&gt;7.6.3.v20120416&lt;/version&gt; + &lt;/artifactInstaller&gt; &lt;/container&gt; &lt;/configuration&gt; &lt;/plugin&gt; &lt; at &gt;&lt; at &gt; -173,7 +175,7 &lt; at &gt;&lt; at &gt; &lt;/build&gt; &lt;/profile&gt; &lt;profile&gt; - &lt;id&gt;glassfish3x&lt;/id&gt; + &lt;id&gt;tomcat6x&lt;/id&gt; &lt;build&gt; &lt;pluginManagement&gt; &lt;plugins&gt; &lt; at &gt;&lt; at &gt; -182,22 +184,10 &lt; at &gt;&lt; at &gt; &lt;artifactId&gt;cargo-maven2-plugin&lt;/artifactId&gt; &lt;configuration&gt; &lt;container&gt; - &lt;containerId&gt;glassfish3x&lt;/containerId&gt; + &lt;containerId&gt;tomcat6x&lt;/containerId&gt; &lt;zipUrlInstaller&gt; - &lt;url&gt;http://download.java.net/glassfish/3.1.2/release/glassfish-3.1.2.zip&lt;/url&gt; + &lt;url&gt;http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.zip&lt;/url&gt; &lt;/zipUrlInstaller&gt; - &lt;dependencies&gt; - &lt;!-- - Remove the org.apache.derby dependency since GlassFish 3.x is already - shipped with Derby, and adding the dependency twice results in a - java.lang.SecurityException: sealing violation: package org.apache.derby. - --&gt; - &lt;dependency&gt; - &lt;groupId&gt;org.apache.derby&lt;/groupId&gt; - &lt;artifactId&gt;derby&lt;/artifactId&gt; - &lt;classpath&gt;none&lt;/classpath&gt; - &lt;/dependency&gt; - &lt;/dependencies&gt; &lt;/container&gt; &lt;/configuration&gt; &lt;/plugin&gt; &lt; at &gt;&lt; at &gt; -273,5 +263,38 &lt; at &gt;&lt; at &gt; &lt;/pluginManagement&gt; &lt;/build&gt; &lt;/profile&gt; + &lt;profile&gt; + &lt;id&gt;glassfish3x&lt;/id&gt; + &lt;build&gt; + &lt;pluginManagement&gt; + &lt;plugins&gt; + &lt;plugin&gt; + &lt;groupId&gt;org.codehaus.cargo&lt;/groupId&gt; + &lt;artifactId&gt;cargo-maven2-plugin&lt;/artifactId&gt; + &lt;configuration&gt; + &lt;container&gt; + &lt;containerId&gt;glassfish3x&lt;/containerId&gt; + &lt;zipUrlInstaller&gt; + &lt;url&gt;http://download.java.net/glassfish/3.1.2/release/glassfish-3.1.2.zip&lt;/url&gt; + &lt;/zipUrlInstaller&gt; + &lt;dependencies&gt; + &lt;!-- + Remove the org.apache.derby dependency since GlassFish 3.x is already + shipped with Derby, and adding the dependency twice results in a + java.lang.SecurityException: sealing violation: package org.apache.derby. + --&gt; + &lt;dependency&gt; + &lt;groupId&gt;org.apache.derby&lt;/groupId&gt; + &lt;artifactId&gt;derby&lt;/artifactId&gt; + &lt;classpath&gt;none&lt;/classpath&gt; + &lt;/dependency&gt; + &lt;/dependencies&gt; + &lt;/container&gt; + &lt;/configuration&gt; + &lt;/plugin&gt; + &lt;/plugins&gt; + &lt;/pluginManagement&gt; + &lt;/build&gt; + &lt;/profile&gt; &lt;/profiles&gt; &lt;/project&gt; --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email </pre> alitokmen-yCVjj/EcxBJg9hUCZPvPmw< at >public.gmane.org 2012-05-19T16:51:43 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.java.cargo.devel