You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/12/11 21:54:02 UTC
svn commit: r356017 - in /geronimo/trunk: etc/
plugins/geronimo-assembly-plugin/
plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/
Author: djencks
Date: Sun Dec 11 12:54:00 2005
New Revision: 356017
URL: http://svn.apache.org/viewcvs?rev=356017&view=rev
Log:
GERONIMO-1334 assembly plugin should not reinstall configs that are already present
Modified:
geronimo/trunk/etc/project.properties
geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java
geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java
geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoConfigInstaller.java
Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=356017&r1=356016&r2=356017&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Sun Dec 11 12:54:00 2005
@@ -87,7 +87,7 @@
tranql_vendors_version=1.1
geronimo_packaging_plugin_version=1.1.0
-geronimo_assembly_plugin_version=1.1.0
+geronimo_assembly_plugin_version=1.1.1
geronimo_deployment_plugin_version=1.1.0
geronimo_dependency_plugin_version=1.1.0
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml?rev=356017&r1=356016&r2=356017&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml Sun Dec 11 12:54:00 2005
@@ -23,7 +23,7 @@
<id>geronimo-assembly-plugin</id>
<name>Geronimo :: Maven Assembly Plugin</name>
<description>A plugin used to assemble a distribution of Geronimo</description>
- <currentVersion>1.1.0</currentVersion>
+ <currentVersion>1.1.1</currentVersion>
<dependencies>
<dependency>
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java?rev=356017&r1=356016&r2=356017&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java Sun Dec 11 12:54:00 2005
@@ -113,9 +113,13 @@
}
protected void execute(URI configId, InstallAdapter installAdapter, Repository sourceRepo, FileSystemRepository targetRepo) throws IOException, InvalidConfigException {
+ if (installAdapter.containsConfiguration(configId)) {
+ System.out.println("Configuration " + configId + " already present in repository");
+ return;
+ }
GBeanData config = installAdapter.install(sourceRepo, configId);
List dependencies = (List) config.getAttribute("dependencies");
- System.out.println("Installed configuration " + artifact);
+ System.out.println("Installed configuration " + configId);
FileWriteMonitor monitor = new StartFileWriteMonitor();
@@ -143,6 +147,7 @@
GBeanData install(Repository sourceRepo, URI configId) throws IOException, InvalidConfigException;
+ boolean containsConfiguration(URI configID);
}
protected static class StartFileWriteMonitor implements FileWriteMonitor {
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java?rev=356017&r1=356016&r2=356017&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java Sun Dec 11 12:54:00 2005
@@ -48,6 +48,10 @@
GBeanData config = store.install2(artifact);
return config;
}
+
+ public boolean containsConfiguration(URI configID) {
+ return store.containsConfiguration(configID);
+ }
};
Repository sourceRepo = new InnerRepository();
URI rootURI = targetRoot.toURI().resolve(targetRepository);
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoConfigInstaller.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoConfigInstaller.java?rev=356017&r1=356016&r2=356017&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoConfigInstaller.java (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoConfigInstaller.java Sun Dec 11 12:54:00 2005
@@ -87,6 +87,10 @@
}
return config;
}
+
+ public boolean containsConfiguration(URI configID) {
+ return targetRepo.hasURI(configID);
+ }
}
}