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/11/19 08:47:52 UTC
svn commit: r882064 - in /geronimo/server/trunk/framework:
buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/
modules/geronimo-system/src/main...
Author: djencks
Date: Thu Nov 19 07:47:51 2009
New Revision: 882064
URL: http://svn.apache.org/viewvc?rev=882064&view=rev
Log:
Remove nested dependency structure as osgi figures out its own wiring
Modified:
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java
geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=882064&r1=882063&r2=882064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Thu Nov 19 07:47:51 2009
@@ -400,12 +400,6 @@
DependencyType toDependencyType(Artifact artifact, Map<String, DependencyType> explicitDependencyMap, Map<Artifact, Set<Artifact>> localDependencies, boolean includeVersion, boolean includeImport) {
DependencyType explicitDependency = explicitDependencyMap.get(getKey(artifact));
DependencyType dependency = toDependencyType(artifact, includeVersion, explicitDependency, includeImport);
- Set<Artifact> artifactSet = localDependencies.get(artifact);
- if (artifactSet != null) {
- for (Artifact parent : artifactSet) {
- dependency.getDependency().add(toDependencyType(parent, explicitDependencyMap, localDependencies, includeVersion, includeImport));
- }
- }
return dependency;
}
@@ -424,7 +418,6 @@
}
if (explicitDependency != null) {
dependency.setStart(explicitDependency.isStart());
- dependency.getDependency().addAll(explicitDependency.getDependency());
}
return dependency;
}
@@ -630,7 +623,7 @@
private void setLoggingLevel() {
if (System.getProperty("org.ops4j.pax.logging.DefaultServiceLog.level") == null) {
System.setProperty("org.ops4j.pax.logging.DefaultServiceLog.level",
- log.isDebugEnabled() ? "DEBUG" : "ERROR");
+ log.isDebugEnabled() ? "DEBUG" : "INFO");
}
}
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java?rev=882064&r1=882063&r2=882064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Dependency.java Thu Nov 19 07:47:51 2009
@@ -20,12 +20,9 @@
package org.apache.geronimo.mavenplugins.car;
-import java.util.List;
-import java.util.ArrayList;
-
import org.apache.geronimo.kernel.repository.ImportType;
-import org.apache.geronimo.system.plugin.model.DependencyType;
import org.apache.geronimo.system.plugin.model.ArtifactType;
+import org.apache.geronimo.system.plugin.model.DependencyType;
/**
* @version $Rev$ $Date$
@@ -37,11 +34,6 @@
*/
private Boolean start;
- /**
- * @parameter
- */
- private List<Dependency> dependencies = new ArrayList<Dependency>();
-
public Boolean isStart() {
if (start == null) {
return Boolean.TRUE;
@@ -53,14 +45,6 @@
this.start = start;
}
- public List<Dependency> getDependencies() {
- return dependencies;
- }
-
- public void setDependencies(List<Dependency> dependencies) {
- this.dependencies = dependencies;
- }
-
public DependencyType toDependencyType() {
DependencyType dependency = new DependencyType();
dependency.setGroupId(groupId);
@@ -71,9 +55,6 @@
dependency.setImport(getImport() == null? org.apache.geronimo.system.plugin.model.ImportType.ALL:
org.apache.geronimo.system.plugin.model.ImportType.fromValue(getImport()));
- for (Dependency artifact: this.dependencies) {
- dependency.getDependency().add(artifact.toArtifact());
- }
return dependency;
}
@@ -111,8 +92,7 @@
Dependency that = (Dependency) o;
if (!super.equals(that)) return false;
- if (!isStart().equals(that.isStart())) return false;
- return getDependencies().equals(that.getDependencies());
+ return isStart().equals(that.isStart());
}
//rely on super.hashcode();
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java?rev=882064&r1=882063&r2=882064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java Thu Nov 19 07:47:51 2009
@@ -98,7 +98,6 @@
try {
Collection<DependencyType> dependencies = toDependencies(this.dependencies, useMavenDependencies, false);
for (DependencyType test: dependencies) {
- test.getDependency().clear();
test.setStart(null);
test.setImport(null);
}
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java?rev=882064&r1=882063&r2=882064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java Thu Nov 19 07:47:51 2009
@@ -34,7 +34,6 @@
* <extension base="{http://geronimo.apache.org/xml/ns/plugins-1.3}artifactType">
* <sequence>
* <element name="import" type="{http://geronimo.apache.org/xml/ns/plugins-1.3}importType" minOccurs="0"/>
- * <element name="dependency" type="{http://geronimo.apache.org/xml/ns/plugins-1.3}artifactType" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* <attribute name="start" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
* </extension>
@@ -46,9 +45,7 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "dependencyType", propOrder = {
- "_import",
- "dependency"
-})
+ "_import"})
public class DependencyType
extends ArtifactType
implements Serializable
@@ -57,7 +54,6 @@
private final static long serialVersionUID = 12343L;
@XmlElement(name = "import")
protected ImportType _import;
- protected List<ArtifactType> dependency;
@XmlAttribute
protected Boolean start;
@@ -86,35 +82,6 @@
}
/**
- * Gets the value of the dependency property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the dependency property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDependency().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link ArtifactType }
- *
- *
- */
- public List<ArtifactType> getDependency() {
- if (dependency == null) {
- dependency = new ArrayList<ArtifactType>();
- }
- return this.dependency;
- }
-
- /**
* Gets the value of the start property.
*
* @return
@@ -151,7 +118,6 @@
DependencyType that = (DependencyType) o;
if (_import != that._import) return false;
- if ((dependency != null && !dependency.isEmpty())? !dependency.equals(that.dependency) : (that.dependency != null && !that.dependency.isEmpty())) return false;
if (start != null ? !start.equals(that.start) : that.start != null) return false;
return true;
@@ -161,7 +127,6 @@
public int hashCode() {
int result = super.hashCode();
result = 31 * result + (_import != null ? _import.hashCode() : 0);
- result = 31 * result + (dependency != null && !dependency.isEmpty()? dependency.hashCode() : 0);
result = 31 * result + (start != null ? start.hashCode() : 0);
return result;
}
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd?rev=882064&r1=882063&r2=882064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd Thu Nov 19 07:47:51 2009
@@ -478,7 +478,6 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="dependency" type="list:artifactType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="start" use="optional" type="xs:boolean" default="true">
<xs:annotation>