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 2009/04/10 20:35:12 UTC
svn commit: r763999 [1/4] - in /geronimo/sandbox/djencks/framework:
buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/
buildsupport/car-maven-plugin/src/te...
Author: djencks
Date: Fri Apr 10 18:35:10 2009
New Revision: 763999
URL: http://svn.apache.org/viewvc?rev=763999&view=rev
Log:
base one-classloader-per-jar on metadata in geronimo-plugin.xml extracted from poms
Added:
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/classloading/
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/classloading/DependencyResolverTest.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.plugin-metadata (contents, props changed)
- copied, changed from r761814, geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ArtifactType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributeType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/AttributesType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ConfigXmlContentType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/CopyFileType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/GbeanType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/HashType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ImportType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/LicenseType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ModuleType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ObjectFactory.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PluginArtifactType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PluginListType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PluginType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PrerequisiteType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PropertyType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ReferenceType.java (with props)
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/package-info.java (with props)
Removed:
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/HierarchyHandler.java
Modified:
geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java
geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java
geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java
geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/DependencyTest.java
geronimo/sandbox/djencks/framework/configs/client-system/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/configs/geronimo-boilerplate/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
geronimo/sandbox/djencks/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/configs/j2ee-system/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/configs/jee-specs/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/configs/jsr88-cli/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/configs/online-deployer/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/configs/shutdown/src/main/history/dependencies.xml
geronimo/sandbox/djencks/framework/modules/geronimo-core/pom.xml
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/pom.xml
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/BasicGBeanInfoFactory.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/JarFileClassLoaderFactory.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/BasicGlobalClassLoaderRegister.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/DependencySAXHandler.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/GlobalClassLoader.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/GlobalClassLoaderDependencyResolver.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/GlobalClassLoaderRegister.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/MavenDependencyResolver.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/MultiParentClassLoader2.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/OneClassLoaderPerJarClassLoaderBuilder.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/ImportType.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationManagerTest.java
geronimo/sandbox/djencks/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockRepository.java
geronimo/sandbox/djencks/framework/modules/geronimo-security/pom.xml
geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
geronimo/sandbox/djencks/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml
geronimo/sandbox/djencks/framework/modules/geronimo-system/pom.xml
geronimo/sandbox/djencks/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd
Modified: geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Fri Apr 10 18:35:10 2009
@@ -31,9 +31,12 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import java.util.LinkedHashMap;
+import java.util.ArrayList;
-import org.apache.geronimo.kernel.repository.ImportType;
import org.apache.geronimo.system.plugin.model.ArtifactType;
+import org.apache.geronimo.system.plugin.model.DependencyType;
+import org.apache.geronimo.system.plugin.model.ImportType;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -49,6 +52,7 @@
import org.apache.maven.plugin.logging.SystemStreamLog;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.shared.dependency.tree.DependencyNode;
import org.apache.maven.shared.dependency.tree.DependencyTreeResolutionListener;
@@ -79,6 +83,15 @@
protected MavenProject project;
/**
+ * The maven project's helper.
+ *
+ * @component
+ * @required
+ * @readonly
+ */
+ protected MavenProjectHelper projectHelper;
+
+ /**
* The basedir of the project.
*
* @parameter expression="${basedir}"
@@ -88,7 +101,7 @@
protected File basedir;
protected Set<Artifact> dependencies;
- protected Set<Artifact> localDependencies;
+ protected Map<Artifact, Set<Artifact>> localDependencies;
/**
@@ -333,7 +346,7 @@
protected static org.apache.geronimo.kernel.repository.Dependency toGeronimoDependency(final Artifact dependency, boolean includeVersion) {
org.apache.geronimo.kernel.repository.Artifact artifact = toGeronimoArtifact(dependency, includeVersion);
- return new org.apache.geronimo.kernel.repository.Dependency(artifact, ImportType.ALL);
+ return new org.apache.geronimo.kernel.repository.Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.ALL);
}
private static org.apache.geronimo.kernel.repository.Artifact toGeronimoArtifact(final Artifact dependency, boolean includeVersion) {
@@ -345,46 +358,57 @@
return new org.apache.geronimo.kernel.repository.Artifact(groupId, artifactId, version, type);
}
- protected LinkedHashSet<Dependency> toDependencies(Collection<Dependency> listedDependencies, UseMavenDependencies useMavenDependencies, boolean includeImport) throws InvalidDependencyVersionException, ArtifactResolutionException, ProjectBuildingException, MojoExecutionException {
- LinkedHashSet<Dependency> dependencies = new LinkedHashSet<Dependency>();
+ protected LinkedHashSet<DependencyType> toDependencies(Collection<Dependency> listedDependencies, UseMavenDependencies useMavenDependencies, boolean includeImport) throws InvalidDependencyVersionException, ArtifactResolutionException, ProjectBuildingException, MojoExecutionException {
+ List<DependencyType> dependencyTypes = new ArrayList<DependencyType>();
+ for (Dependency dependency: listedDependencies) {
+ dependencyTypes.add(dependency.toDependencyType());
+ }
+ LinkedHashSet<DependencyType> dependencies = new LinkedHashSet<DependencyType>();
if (useMavenDependencies == null || !useMavenDependencies.isValue()) {
- dependencies.addAll(listedDependencies);
+ dependencies.addAll(dependencyTypes);
} else {
- Map<String, Dependency> explicitDependencyMap = new HashMap<String, Dependency>();
- for (Dependency dependency : listedDependencies) {
+ Map<String, DependencyType> explicitDependencyMap = new HashMap<String, DependencyType>();
+ for (DependencyType dependency : dependencyTypes) {
explicitDependencyMap.put(getKey(dependency), dependency);
}
getDependencies(project, useMavenDependencies.isUseTransitiveDependencies());
- for (org.apache.maven.artifact.Artifact artifact : localDependencies) {
- Dependency explicitDependency = explicitDependencyMap.get(getKey(artifact));
- dependencies.add(toDependency(artifact, useMavenDependencies.isIncludeVersion(), explicitDependency, includeImport));
+ for (Map.Entry<Artifact, Set<Artifact>> entry : localDependencies.entrySet()) {
+ Artifact artifact = entry.getKey();
+ DependencyType explicitDependency = explicitDependencyMap.get(getKey(artifact));
+ DependencyType dependency = toDependency(artifact, useMavenDependencies.isIncludeVersion(), explicitDependency, includeImport);
+ for (Artifact parent: entry.getValue()) {
+ dependency.getDependency().add(toDependency(parent, true, null, false));
+ }
+ dependencies.add(dependency);
}
}
return dependencies;
}
- private Dependency toDependency(Artifact artifact, boolean includeVersion, Dependency explicitDependency, boolean includeImport) {
- Dependency dependency = new Dependency();
+ private DependencyType toDependency(Artifact artifact, boolean includeVersion, DependencyType explicitDependency, boolean includeImport) {
+ DependencyType dependency = new DependencyType();
dependency.setGroupId(artifact.getGroupId());
dependency.setArtifactId(artifact.getArtifactId());
dependency.setVersion(includeVersion ? artifact.getVersion() : null);
dependency.setType(artifact.getType());
- String importType = ImportType.ALL.getName();
- if (includeImport && explicitDependency != null && explicitDependency.getImport() != null) {
- importType = explicitDependency.getImport();
+ if (includeImport) {
+ ImportType importType = ImportType.ALL;
+ if (explicitDependency != null && explicitDependency.getImport() != null) {
+ importType = explicitDependency.getImport();
+ }
+ dependency.setImport(importType);
}
- dependency.setImport(importType);
if (explicitDependency != null) {
dependency.setStart(explicitDependency.isStart());
}
return dependency;
}
- private String getKey(Dependency dependency) {
+ private String getKey(DependencyType dependency) {
return dependency.getGroupId() + "/" + dependency.getArtifactId() + "/" + dependency.getType();
}
@@ -426,27 +450,28 @@
}
//all the dependencies needed for this car, with provided dependencies removed
- private final Set<Artifact> localDependencies = new LinkedHashSet<Artifact>();
+ private final Map<Artifact, Set<Artifact>> localDependencies = new LinkedHashMap<Artifact, Set<Artifact>>();
//dependencies from ancestor cars, to be removed from localDependencies.
private final Set<Artifact> carDependencies = new LinkedHashSet<Artifact>();
private final StringBuilder log = new StringBuilder();
public void scan(DependencyNode rootNode, boolean useTransitiveDependencies) {
+ Set<Artifact> children = new LinkedHashSet<Artifact>();
for (DependencyNode child : (List<DependencyNode>) rootNode.getChildren()) {
- scan(child, Accept.ACCEPT, useTransitiveDependencies, false, "");
+ scan(child, Accept.ACCEPT, useTransitiveDependencies, false, "", children);
}
if (useTransitiveDependencies) {
- localDependencies.removeAll(carDependencies);
+ localDependencies.keySet().removeAll(carDependencies);
}
}
- private void scan(DependencyNode rootNode, Accept parentAccept, boolean useTransitiveDependencies, boolean isFromCar, String indent) {
+ private void scan(DependencyNode rootNode, Accept parentAccept, boolean useTransitiveDependencies, boolean isFromCar, String indent, Set<Artifact> parentsChildren) {
Artifact artifact = getArtifact(rootNode);
Accept accept = accept(artifact, parentAccept);
if (accept.isContinue()) {
-// if (accept.isLocal()) {
+ Set<Artifact> children = localDependencies.get(artifact);
if (isFromCar) {
if (!artifact.getType().equals("car")) {
log.append(indent).append("from car:").append(artifact).append("\n");
@@ -458,16 +483,20 @@
log.append(indent).append("local:").append(artifact).append("\n");
if (carDependencies.contains(artifact)) {
log.append(indent).append("already in car, returning:").append(artifact).append("\n");
+ parentsChildren.add(artifact);
return;
}
- localDependencies.add(artifact);
+ parentsChildren.add(artifact);
+ if (children == null) {
+ children = new LinkedHashSet<Artifact>();
+ localDependencies.put(artifact, children);
+ }
if (artifact.getType().equals("car") || !useTransitiveDependencies) {
isFromCar = true;
-// localDependencies = carDependencies;
}
}
for (DependencyNode child : (List<DependencyNode>) rootNode.getChildren()) {
- scan(child, accept, useTransitiveDependencies, isFromCar, indent + " ");
+ scan(child, accept, useTransitiveDependencies, isFromCar, indent + " ", children);
}
}
}
@@ -492,9 +521,6 @@
if (scope == null || "runtime".equalsIgnoreCase(scope) || "compile".equalsIgnoreCase(scope)) {
return previous;
}
-// if ("provided".equalsIgnoreCase(scope)) {
-// return Accept.PROVIDED;
-// }
return Accept.STOP;
}
Modified: geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java (original)
+++ geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java Fri Apr 10 18:35:10 2009
@@ -48,14 +48,6 @@
*/
private File destDir;
- /**
- * The maven project's helper.
- *
- * @component
- * @required
- * @readonly
- */
- private MavenProjectHelper projectHelper;
/**
* The location of the server repository.
Modified: geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java (original)
+++ geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java Fri Apr 10 18:35:10 2009
@@ -52,6 +52,8 @@
dependency.setVersion(version);
dependency.setType(type);
dependency.setStart(start);
+ dependency.setImport(getImport() == null? org.apache.geronimo.system.plugin.model.ImportType.ALL:
+ org.apache.geronimo.system.plugin.model.ImportType.fromValue(getImport()));
return dependency;
}
@@ -61,6 +63,15 @@
return new org.apache.geronimo.kernel.repository.Dependency(artifact, importType);
}
+ public static org.apache.geronimo.kernel.repository.Dependency toKernelDependency(DependencyType dependency) {
+ org.apache.geronimo.kernel.repository.Artifact artifact = new org.apache.geronimo.kernel.repository.Artifact(dependency.getGroupId(),
+ dependency.getArtifactId(),
+ dependency.getVersion(),
+ dependency.getType());
+ ImportType importType = dependency.getImport() == null? ImportType.ALL: ImportType.getByName(dependency.getImport().name());
+ return new org.apache.geronimo.kernel.repository.Dependency(artifact, importType);
+ }
+
public String toString() {
return groupId + ":" + artifactId + ":" + version + ":" + type;
}
Modified: geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java (original)
+++ geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java Fri Apr 10 18:35:10 2009
@@ -32,6 +32,8 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
import javax.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamException;
@@ -94,7 +96,13 @@
UseMavenDependencies useMavenDependencies = new UseMavenDependencies(true, false, this.useMavenDependencies.isUseTransitiveDependencies());
try {
- Collection<Dependency> dependencies = toDependencies(this.dependencies, useMavenDependencies, false);
+ Collection<DependencyType> dependencies = toDependencies(this.dependencies, useMavenDependencies, false);
+ for (DependencyType test: dependencies) {
+ test.getDependency().clear();
+ test.setStart(null);
+ test.setImport(null);
+ }
+ dependencies = new LinkedHashSet<DependencyType>(dependencies);
if (dependencyFile.exists()) {
//filter dependencies file
filter(dependencyFile, filteredDependencyFile);
@@ -104,8 +112,17 @@
PluginArtifactType pluginArtifactType = PluginXmlUtil.loadPluginArtifactMetadata(in);
PluginArtifactType removed = new PluginArtifactType();
for (DependencyType test: pluginArtifactType.getDependency()) {
- Dependency testDependency = Dependency.newDependency(test);
- if (!dependencies.remove(testDependency)) {
+ boolean t1 = dependencies.contains(test);
+ int s1 = dependencies.size();
+ boolean t2 = dependencies.remove(test);
+ int s2 = dependencies.size();
+ if (t1 != t2) {
+ getLogger().warn("dependencies.contains: " + t1 + ", dependencies.remove(test): " + t2);
+ }
+ if (t1 == (s1 == s2)) {
+ getLogger().warn("dependencies.contains: " + t1 + ", size before: " + s1 + ", size after: " + s2);
+ }
+ if (!t2) {
removed.getDependency().add(test);
}
}
@@ -125,7 +142,7 @@
}
}
- protected void saveDependencyChanges(Collection<Dependency> dependencies, PluginArtifactType removed)
+ protected void saveDependencyChanges(Collection<DependencyType> dependencies, PluginArtifactType removed)
throws Exception {
File addedFile = new File(dependencyFile.getParentFile(), "dependencies.added.xml");
PluginArtifactType added = toPluginArtifactType(dependencies);
@@ -167,10 +184,10 @@
return treeListFile;
}
- private PluginArtifactType toPluginArtifactType(Collection<Dependency> dependencies) throws IOException, XMLStreamException, JAXBException {
+ private PluginArtifactType toPluginArtifactType(Collection<DependencyType> dependencies) throws IOException, XMLStreamException, JAXBException {
PluginArtifactType pluginArtifactType = new PluginArtifactType();
- for (Dependency dependency: dependencies) {
- pluginArtifactType.getDependency().add(dependency.toDependencyType());
+ for (DependencyType dependency: dependencies) {
+ pluginArtifactType.getDependency().add(dependency);
}
return pluginArtifactType;
}
Modified: geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java (original)
+++ geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ModuleId.java Fri Apr 10 18:35:10 2009
@@ -21,6 +21,7 @@
package org.apache.geronimo.mavenplugins.car;
import org.apache.geronimo.system.plugin.model.ArtifactType;
+import org.apache.geronimo.kernel.repository.Artifact;
/**
* @version $Rev$ $Date$
Modified: geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Fri Apr 10 18:35:10 2009
@@ -21,6 +21,7 @@
import java.io.File;
import java.net.URI;
+import java.net.URL;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
@@ -43,6 +44,8 @@
import org.apache.geronimo.kernel.config.KernelConfigurationManager;
import org.apache.geronimo.kernel.config.LifecycleException;
import org.apache.geronimo.kernel.config.RecordingLifecycleMonitor;
+import org.apache.geronimo.kernel.config.classloading.MavenDependencyResolver;
+import org.apache.geronimo.kernel.config.classloading.OneClassLoaderPerJarClassLoaderBuilder;
import org.apache.geronimo.kernel.management.State;
import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
@@ -159,6 +162,22 @@
*/
private static ThreadLocal<Maven2RepositoryAdapter.ArtifactLookup> lookupHolder = new ThreadLocal<Maven2RepositoryAdapter.ArtifactLookup>();
+ /**
+ * Directory for generated plugin metadata file.
+ *
+ * @parameter expression="${project.build.directory}/resources/"
+ * @required
+ */
+ protected File targetDir = null;
+
+ /**
+ * Name of generated plugin metadata file.
+ *
+ * @parameter default-value="META-INF/geronimo-plugin.xml"
+ * @required
+ */
+ protected String pluginMetadataFileName = null;
+
//
// Mojo
//
@@ -239,6 +258,9 @@
// Generate expanded so we can use Maven to generate the archive
boot.setExpanded(true);
+ File targetFile = new File(targetDir.toURI().resolve(pluginMetadataFileName));
+ URL artifactURL = targetFile.toURL();
+ new MavenDependencyResolver().resolve(artifactURL, OneClassLoaderPerJarClassLoaderBuilder.GLOBAL_CL_REGISTER);
boot.bootstrap();
}
@@ -422,6 +444,11 @@
configManagerGBean.setReferencePatterns("Repositories", repoPatterns);
ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, cl);
+
+ File targetFile = new File(targetDir.toURI().resolve(pluginMetadataFileName));
+ URL artifactURL = targetFile.toURL();
+ new MavenDependencyResolver().resolve(artifactURL, OneClassLoaderPerJarClassLoaderBuilder.GLOBAL_CL_REGISTER);
+
}
/**
Modified: geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java (original)
+++ geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java Fri Apr 10 18:35:10 2009
@@ -31,6 +31,7 @@
import org.apache.geronimo.deployment.xbeans.EnvironmentType;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.system.plugin.model.DependencyType;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -224,9 +225,9 @@
protected LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency> toKernelDependencies(List<Dependency> listedDependencies, UseMavenDependencies useMavenDependencies) throws InvalidDependencyVersionException, ArtifactResolutionException, ProjectBuildingException, MojoExecutionException {
LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency> kernelDependencies = new LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency>();
- LinkedHashSet<Dependency> dependencies = toDependencies(listedDependencies, useMavenDependencies, true);
- for (Dependency dependency: dependencies) {
- kernelDependencies.add(dependency.toKernelDependency());
+ LinkedHashSet<DependencyType> dependencies = toDependencies(listedDependencies, useMavenDependencies, true);
+ for (DependencyType dependency: dependencies) {
+ kernelDependencies.add(Dependency.toKernelDependency(dependency));
}
return kernelDependencies;
}
Modified: geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java (original)
+++ geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java Fri Apr 10 18:35:10 2009
@@ -27,14 +27,17 @@
import java.util.Collections;
import java.util.List;
import java.util.LinkedHashSet;
+import java.util.ArrayList;
import org.apache.geronimo.kernel.config.InvalidConfigException;
import org.apache.geronimo.kernel.config.NoSuchConfigException;
+import org.apache.geronimo.kernel.repository.Maven2Repository;
import org.apache.geronimo.system.plugin.PluginXmlUtil;
import org.apache.geronimo.system.plugin.model.ArtifactType;
import org.apache.geronimo.system.plugin.model.LicenseType;
import org.apache.geronimo.system.plugin.model.PluginArtifactType;
import org.apache.geronimo.system.plugin.model.PluginType;
+import org.apache.geronimo.system.plugin.model.DependencyType;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.model.License;
import org.apache.maven.model.Plugin;
@@ -241,16 +244,16 @@
resource.setDirectory(targetDir.getPath());
resource.addInclude(pluginMetadataFileName);
getProject().getResources().add(resource);
+ //also attach plugin metadata as an additional artifact, like the pom
+ projectHelper.attachArtifact(getProject(), "plugin-metadata", targetFile);
} catch (Exception e) {
throw new MojoExecutionException("Could not create plugin metadata", e);
}
}
private void addDependencies(PluginArtifactType instance) throws InvalidConfigException, IOException, NoSuchConfigException, InvalidDependencyVersionException, ArtifactResolutionException, ProjectBuildingException, MojoExecutionException {
- LinkedHashSet<Dependency> resolvedDependencies = toDependencies(dependencies, useMavenDependencies, false);
- for (Dependency dependency: resolvedDependencies) {
- instance.getDependency().add(dependency.toDependencyType());
- }
+ LinkedHashSet<DependencyType> resolvedDependencies = toDependencies(dependencies, useMavenDependencies, false);
+ instance.getDependency().addAll(resolvedDependencies);
}
}
Modified: geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml Fri Apr 10 18:35:10 2009
@@ -41,11 +41,11 @@
<compile>
org.apache.geronimo.buildsupport:car-maven-plugin:validate-configuration,
org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan,
- org.apache.geronimo.buildsupport:car-maven-plugin:verify-no-dependency-change
+ org.apache.geronimo.buildsupport:car-maven-plugin:verify-no-dependency-change,
+ org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata
</compile>
<package>
org.apache.geronimo.buildsupport:car-maven-plugin:package,
- org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata,
org.apache.geronimo.buildsupport:car-maven-plugin:archive-car
</package>
<install>
@@ -147,6 +147,17 @@
<language>xml</language>
</configuration>
</component>
+
+ <component>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role-hint>plugin-metadata</role-hint>
+ <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>plugin-metadata</type>
+ <extension>plugin-metadata</extension>
+ <language>xml</language>
+ </configuration>
+ </component>
</components>
</component-set>
Modified: geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/DependencyTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/DependencyTest.java?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/DependencyTest.java (original)
+++ geronimo/sandbox/djencks/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/DependencyTest.java Fri Apr 10 18:35:10 2009
@@ -91,7 +91,7 @@
d.setVersion(version);
d.setType("car");
d.setStart(start);
- d.setImport("ALL");
+ d.setImport("all");
return d;
}
}
Modified: geronimo/sandbox/djencks/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/configs/client-system/src/main/history/dependencies.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/configs/client-system/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/framework/configs/client-system/src/main/history/dependencies.xml Fri Apr 10 18:35:10 2009
@@ -7,33 +7,43 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
+ <artifactId>geronimo-logging</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -42,13 +52,13 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -58,62 +68,62 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-crypto</artifactId>
+ <artifactId>geronimo-system</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-crypto</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-system</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-cli</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/framework/configs/geronimo-boilerplate/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/configs/geronimo-boilerplate/src/main/history/dependencies.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/configs/geronimo-boilerplate/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/framework/configs/geronimo-boilerplate/src/main/history/dependencies.xml Fri Apr 10 18:35:10 2009
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
<module-id>
- <groupId>org.apache.geronimo.assemblies</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-boilerplate</artifactId>
<version>2.2-SNAPSHOT</version>
<type>car</type>
@@ -22,13 +22,18 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-logging</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/sandbox/djencks/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml Fri Apr 10 18:35:10 2009
@@ -7,98 +7,83 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<type>jar</type>
</dependency>
- <!--<dependency>-->
- <!--<groupId>asm</groupId>-->
- <!--<artifactId>asm-tree</artifactId>-->
- <!--<type>jar</type>-->
- <!--</dependency>-->
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
+ <artifactId>geronimo-logging</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <artifactId>asm-commons</artifactId>
<type>jar</type>
</dependency>
- <!--<dependency>-->
- <!--<groupId>xpp3</groupId>-->
- <!--<artifactId>xpp3</artifactId>-->
- <!--<type>jar</type>-->
- <!--</dependency>-->
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
<type>jar</type>
</dependency>
- <!--<dependency>-->
- <!--<groupId>commons-lang</groupId>-->
- <!--<artifactId>commons-lang</artifactId>-->
- <!--<type>jar</type>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
+ <artifactId>geronimo-deployment</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -107,28 +92,33 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deployment</artifactId>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>jul-to-slf4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-system</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-cli</artifactId>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -136,4 +126,14 @@
<artifactId>geronimo-service-builder</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml Fri Apr 10 18:35:10 2009
@@ -8,27 +8,27 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <type>jar</type>
+ <artifactId>xmlbeans</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>xmlbeans</artifactId>
- <type>car</type>
+ <artifactId>geronimo-deployment</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<type>jar</type>
</dependency>
- <dependency start="true">
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</artifactId>
- <type>car</type>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>plugin</artifactId>
+ <type>car</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml (original)
+++ geronimo/sandbox/djencks/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml Fri Apr 10 18:35:10 2009
@@ -35,12 +35,12 @@
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-config</artifactId>
<version>${version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-api</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
Modified: geronimo/sandbox/djencks/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml Fri Apr 10 18:35:10 2009
@@ -7,13 +7,18 @@
<type>car</type>
</module-id>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-config</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/configs/gshell-geronimo/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/framework/configs/gshell-geronimo/src/main/history/dependencies.xml Fri Apr 10 18:35:10 2009
@@ -7,63 +7,68 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>gshell-framework</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-commands</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-plugin</artifactId>
+ <artifactId>geronimo-kernel</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
+ <artifactId>geronimo-logging</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all-minimal</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -72,78 +77,88 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-tool</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
+ <artifactId>geronimo-service-builder</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deployment</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-commands</artifactId>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-crypto</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all-minimal</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deployment</artifactId>
+ <artifactId>geronimo-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-system</artifactId>
+ <artifactId>geronimo-crypto</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>gshell-framework</artifactId>
- <type>car</type>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-cli</artifactId>
+ <artifactId>geronimo-plugin</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-service-builder</artifactId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/configs/j2ee-system/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/framework/configs/j2ee-system/src/main/history/dependencies.xml Fri Apr 10 18:35:10 2009
@@ -7,53 +7,48 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.envoisolutions.sxc</groupId>
- <artifactId>sxc-jaxb</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
+ <artifactId>geronimo-logging</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -62,83 +57,93 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-config-groovy-transformer</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all-minimal</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
+ <artifactId>geronimo-crypto</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-crypto</artifactId>
+ <artifactId>geronimo-transformer</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.envoisolutions.sxc</groupId>
- <artifactId>sxc-runtime</artifactId>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all-minimal</artifactId>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-system</artifactId>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
+ <groupId>com.envoisolutions.sxc</groupId>
+ <artifactId>sxc-jaxb</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-transformer</artifactId>
+ <groupId>com.envoisolutions.sxc</groupId>
+ <artifactId>sxc-runtime</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -147,8 +152,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-cli</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/framework/configs/jee-specs/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/configs/jee-specs/src/main/history/dependencies.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/configs/jee-specs/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/framework/configs/jee-specs/src/main/history/dependencies.xml Fri Apr 10 18:35:10 2009
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>${connectorSpec}</artifactId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -88,7 +88,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>${servletSpec}</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -126,7 +126,7 @@
<artifactId>geronimo-jdbc</artifactId>
<type>jar</type>
</dependency>
- <dependency start="true">
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-system</artifactId>
<type>car</type>
Modified: geronimo/sandbox/djencks/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=763999&r1=763998&r2=763999&view=diff
==============================================================================
--- geronimo/sandbox/djencks/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/framework/configs/jsr88-cli/src/main/history/dependencies.xml Fri Apr 10 18:35:10 2009
@@ -7,138 +7,143 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-plugin</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
+ <artifactId>geronimo-logging</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
+ <artifactId>geronimo-system</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-crypto</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-plugin</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <artifactId>plexus-archiver</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-crypto</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-tool</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -147,13 +152,18 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-system</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -162,13 +172,18 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-cli</artifactId>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-service-builder</artifactId>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>