You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/13 10:39:20 UTC
svn commit: r421546 - in /geronimo/sandbox/svkmerge/m2migration:
configs/client-system/ configs/j2ee-system/ configs/online-deployer/
configs/shutdown/
m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/
Author: jdillon
Date: Thu Jul 13 01:39:20 2006
New Revision: 421546
URL: http://svn.apache.org/viewvc?rev=421546&view=rev
Log:
Changed the 'classPath' property from a string to a list of strings, so that config can be done like:
<classPath>
<element>../lib/geronimo-deployment-${pom.version}.jar</element>
...
</classPath>
The packaging plugin will construct a single-line string to pass to the PackageBuilder
Updated all config poms that use the classPath configuration to use the new style
Modified:
geronimo/sandbox/svkmerge/m2migration/configs/client-system/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
Modified: geronimo/sandbox/svkmerge/m2migration/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/client-system/pom.xml?rev=421546&r1=421545&r2=421546&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/client-system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/client-system/pom.xml Thu Jul 13 01:39:20 2006
@@ -67,25 +67,24 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
<configuration>
- <!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
- <!-- written to Manifest.mf -->
- <classPath>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar \
- ../lib/geronimo-common-${pom.version}.jar \
- ../lib/geronimo-kernel-${pom.version}.jar \
- ../lib/geronimo-system-${pom.version}.jar \
- ../lib/geronimo-util-${pom.version}.jar \
- ../lib/cglib-nodep-${cglibVersion}.jar \
- ../lib/commons-cli-${commonsCliVersion}.jar \
- ../lib/commons-logging-${commonsLoggingVersion}.jar \
- ../lib/log4j-${log4jVersion}.jar \
- ../lib/mx4j-${mx4jVersion}.jar \
- ../lib/mx4j-remote-${mx4jVersion}.jar \
- ../lib/endorsed/xercesImpl-${xercesVersion}.jar \
- ../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar \
- ../lib/xpp3-${xpp3Version}.jar \
- ../lib/xstream-${xstreamVersion}.jar \</classPath>
- <mainClass>org.apache.geronimo.system.main.ClientCommandLine</mainClass>
- <!-- default endorsedDirs and extensionDirs -->
+ <classPath>
+ <element>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar</element>
+ <element>../lib/geronimo-common-${pom.version}.jar</element>
+ <element>../lib/geronimo-kernel-${pom.version}.jar</element>
+ <element>../lib/geronimo-system-${pom.version}.jar</element>
+ <element>../lib/geronimo-util-${pom.version}.jar</element>
+ <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
+ <element>../lib/commons-cli-${commonsCliVersion}.jar</element>
+ <element>../lib/commons-logging-${commonsLoggingVersion}.jar</element>
+ <element>../lib/log4j-${log4jVersion}.jar</element>
+ <element>../lib/mx4j-${mx4jVersion}.jar</element>
+ <element>../lib/mx4j-remote-${mx4jVersion}.jar</element>
+ <element>../lib/endorsed/xercesImpl-${xercesVersion}.jar</element>
+ <element>../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar</element>
+ <element>../lib/xpp3-${xpp3Version}.jar</element>
+ <element>../lib/xstream-${xstreamVersion}.jar</element>
+ </classPath>
+ <mainClass>org.apache.geronimo.system.main.ClientCommandLine</mainClass>
</configuration>
</plugin>
</plugins>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml?rev=421546&r1=421545&r2=421546&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml Thu Jul 13 01:39:20 2006
@@ -62,28 +62,23 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
<configuration>
- <!--
-
- FIXME: Use <classPath><element>...</element> tp configure the manifest's classpath
-
- -->
<classPath>
- ../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar \
- ../lib/geronimo-common-${pom.version}.jar \
- ../lib/geronimo-kernel-${pom.version}.jar \
- ../lib/geronimo-system-${pom.version}.jar \
- ../lib/geronimo-util-${pom.version}.jar \
- ../lib/cglib-nodep-${cglibVersion}.jar \
- ../lib/concurrent-${concurrentVersion}.jar \
- ../lib/commons-cli-${commonsCliVersion}.jar \
- ../lib/commons-logging-${commonsLoggingVersion}.jar \
- ../lib/log4j-${log4jVersion}.jar \
- ../lib/mx4j-${mx4jVersion}.jar \
- ../lib/mx4j-remote-${mx4jVersion}.jar \
- ../lib/endorsed/xercesImpl-${xercesVersion}.jar \
- ../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar \
- ../lib/xpp3-${xpp3Version}.jar \
- ../lib/xstream-${xstreamVersion}.jar
+ <element>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar</element>
+ <element>../lib/geronimo-common-${pom.version}.jar</element>
+ <element>../lib/geronimo-kernel-${pom.version}.jar</element>
+ <element>../lib/geronimo-system-${pom.version}.jar</element>
+ <element>../lib/geronimo-util-${pom.version}.jar</element>
+ <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
+ <element>../lib/concurrent-${concurrentVersion}.jar</element>
+ <element>../lib/commons-cli-${commonsCliVersion}.jar</element>
+ <element>../lib/commons-logging-${commonsLoggingVersion}.jar</element>
+ <element>../lib/log4j-${log4jVersion}.jar</element>
+ <element>../lib/mx4j-${mx4jVersion}.jar</element>
+ <element>../lib/mx4j-remote-${mx4jVersion}.jar</element>
+ <element>../lib/endorsed/xercesImpl-${xercesVersion}.jar</element>
+ <element>../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar</element>
+ <element>../lib/xpp3-${xpp3Version}.jar</element>
+ <element>../lib/xstream-${xstreamVersion}.jar</element>
</classPath>
<mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
<logLevel>DEBUG</logLevel>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml?rev=421546&r1=421545&r2=421546&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml Thu Jul 13 01:39:20 2006
@@ -34,29 +34,29 @@
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
<configuration>
- <!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
- <!-- written to Manifest.mf -->
- <classPath>../lib/geronimo-deployment-${pom.version}.jar \
- ../lib/xpp3-${xpp3_version}.jar \
- ../lib/xstream-${xstream_version}.jar \
- ../lib/geronimo-deploy-jsr88-${pom.version}.jar \
- ../lib/geronimo-deploy-tool-${pom.version}.jar \
- ../lib/geronimo-j2ee-deployment_${geronimoSpecJ2eeDeploymentVersion}_spec.jar \
- ../lib/geronimo-common-${pom.version}.jar \
- ../lib/geronimo-kernel-${pom.version}.jar \
- ../lib/geronimo-system-${pom.version}.jar \
- ../lib/geronimo-util-${pom.version}.jar \
- ../lib/cglib-nodep-${cglibVersion}.jar \
- ../lib/commons-cli-${commonsCliVersion}.jar \
- ../lib/commons-logging-${commonsLoggingVersion}.jar \
- ../lib/log4j-${log4jVersion}.jar \
- ../lib/mx4j-${mx4jVersion}.jar \
- ../lib/mx4j-remote-${mx4jVersion}.jar</classPath>
- <mainClass>org.apache.geronimo.deployment.cli.DeployTool</mainClass>
+ <classPath>
+ <element>../lib/geronimo-deployment-${pom.version}.jar</element>
+ <element>../lib/xpp3-${xpp3_version}.jar</element>
+ <element>../lib/xstream-${xstream_version}.jar</element>
+ <element>../lib/geronimo-deploy-jsr88-${pom.version}.jar</element>
+ <element>../lib/geronimo-deploy-tool-${pom.version}.jar</element>
+ <element>../lib/geronimo-j2ee-deployment_${geronimoSpecJ2eeDeploymentVersion}_spec.jar</element>
+ <element>../lib/geronimo-common-${pom.version}.jar</element>
+ <element>../lib/geronimo-kernel-${pom.version}.jar</element>
+ <element>../lib/geronimo-system-${pom.version}.jar</element>
+ <element>../lib/geronimo-util-${pom.version}.jar</element>
+ <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
+ <element>../lib/commons-cli-${commonsCliVersion}.jar</element>
+ <element>../lib/commons-logging-${commonsLoggingVersion}.jar</element>
+ <element>../lib/log4j-${log4jVersion}.jar</element>
+ <element>../lib/mx4j-${mx4jVersion}.jar</element>
+ <element>../lib/mx4j-remote-${mx4jVersion}.jar</element>
+ </classPath>
+ <mainClass>org.apache.geronimo.deployment.cli.DeployTool</mainClass>
</configuration>
</plugin>
</plugins>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml?rev=421546&r1=421545&r2=421546&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml Thu Jul 13 01:39:20 2006
@@ -38,20 +38,20 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
<configuration>
- <!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
- <!-- written to Manifest.mf -->
- <classPath>../lib/geronimo-deploy-tool-${pom.version}.jar \
- ../lib/geronimo-common-${pom.version}.jar \
- ../lib/geronimo-kernel-${pom.version}.jar \
- ../lib/geronimo-system-${pom.version}.jar \
- ../lib/geronimo-util-${pom.version}.jar \
- ../lib/cglib-nodep-${cglibVersion}.jar \
- ../lib/commons-cli-${commonsCliVersion}.jar \
- ../lib/commons-logging-${commonsLoggingVersion}.jar \
- ../lib/log4j-${log4jVersion}.jar \
- ../lib/mx4j-${mx4jVersion}.jar \
- ../lib/mx4j-remote-${mx4jVersion}.jar</classPath>
- <mainClass>org.apache.geronimo.deployment.cli.StopServer</mainClass>
+ <classPath>
+ <element>../lib/geronimo-deploy-tool-${pom.version}.jar</element>
+ <element>../lib/geronimo-common-${pom.version}.jar</element>
+ <element>../lib/geronimo-kernel-${pom.version}.jar</element>
+ <element>../lib/geronimo-system-${pom.version}.jar</element>
+ <element>../lib/geronimo-util-${pom.version}.jar</element>
+ <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
+ <element>../lib/commons-cli-${commonsCliVersion}.jar</element>
+ <element>../lib/commons-logging-${commonsLoggingVersion}.jar</element>
+ <element>../lib/log4j-${log4jVersion}.jar</element>
+ <element>../lib/mx4j-${mx4jVersion}.jar</element>
+ <element>../lib/mx4j-remote-${mx4jVersion}.jar</element>
+ </classPath>
+ <mainClass>org.apache.geronimo.deployment.cli.StopServer</mainClass>
</configuration>
</plugin>
</plugins>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java?rev=421546&r1=421545&r2=421546&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java Thu Jul 13 01:39:20 2006
@@ -120,9 +120,11 @@
private String configurations;
/**
+ * The classpath to be added to the generated manifest.
+ *
* @parameter
*/
- private String classPath;
+ private ArrayList classPath;
/**
* @parameter expression="lib/endorsed"
@@ -134,13 +136,9 @@
*/
private String extensionDirs;
- //
- // FIXME: Should not need to reach into a parent module to get this.
- // Due to this, Continuum-based m2 builds for configs all fail
- // because modules are checked out/built one by one.
- //
-
/**
+ * The location where the properties mapping will be generated.
+ *
* @parameter expression="${project.build.directory}/explicit-versions.properties"
*/
private File explicitResolutionProperties;
@@ -212,6 +210,29 @@
boot.bootstrap();
}
+ private String getClassPath() {
+ if (classPath == null) {
+ return null;
+ }
+
+ log.debug("Creating classpath from: " + classPath);
+
+ StringBuffer buff = new StringBuffer();
+ Iterator iter = classPath.iterator();
+ while (iter.hasNext()) {
+ String element = (String)iter.next();
+ buff.append(element.trim());
+
+ if (iter.hasNext()) {
+ buff.append(" ");
+ }
+ }
+
+ log.debug("Using classpath: " + buff);
+
+ return buff.toString();
+ }
+
public void executePackageBuilderShell() throws Exception {
PackageBuilder builder = new PackageBuilder();
@@ -221,7 +242,7 @@
// http://www.nabble.com/PackageBuilderShellMojo-%28m2%29-and-classloaders-p5271991.html
//
- builder.setClassPath(classPath);
+ builder.setClassPath(getClassPath());
builder.setDeployerName(deployerName);
builder.setDeploymentConfig(deploymentConfigs);
builder.setEndorsedDirs(endorsedDirs);