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 2006/04/20 06:41:23 UTC
svn commit: r395478 - in /geronimo/branches/1.1: etc/
modules/kernel/src/java/org/apache/geronimo/kernel/repository/
modules/system/src/java/org/apache/geronimo/system/repository/
plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/d...
Author: djencks
Date: Wed Apr 19 21:41:20 2006
New Revision: 395478
URL: http://svn.apache.org/viewcvs?rev=395478&view=rev
Log:
GERONIMO-1872, GERONIMO-1636. Change dependency list file name to geronimo-dependency.xml. Remove versions from it
Modified:
geronimo/branches/1.1/etc/project.xml
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Repository.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java
geronimo/branches/1.1/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java
Modified: geronimo/branches/1.1/etc/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/project.xml?rev=395478&r1=395477&r2=395478&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/project.xml (original)
+++ geronimo/branches/1.1/etc/project.xml Wed Apr 19 21:41:20 2006
@@ -378,7 +378,7 @@
<resource>
<directory>${basedir}/target/etc</directory>
<includes>
- <include>META-INF/geronimo-service.xml</include>
+ <include>META-INF/geronimo-dependency.xml</include>
</includes>
</resource>
</resources>
Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Repository.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Repository.java?rev=395478&r1=395477&r2=395478&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Repository.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Repository.java Wed Apr 19 21:41:20 2006
@@ -49,7 +49,7 @@
/**
* Loads any dependencies for this artifact declared in
- * META-INF/geronimo-service.xml within the configuration archive. This
+ * META-INF/geronimo-dependency.xml within the configuration archive. This
* does not do anything special if the artifact is a configuration (which
* means it doesn't see dependencies in the ConfigurationData, etc.) so
* it's mainly useful for JAR-type artifacts.
@@ -58,7 +58,7 @@
* entry you're interested in.
*
* @return a LinkedHashSet (with elements of type Artifact) listing any
- * dependencies declared in META-INF/geronimo-service.xml for the
+ * dependencies declared in META-INF/geronimo-dependency.xml for the
* specified artifact.
*/
LinkedHashSet getDependencies(Artifact artifact);
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java?rev=395478&r1=395477&r2=395478&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java Wed Apr 19 21:41:20 2006
@@ -119,7 +119,7 @@
throw (IllegalStateException)new IllegalStateException("Unable to get URL for dependency " + artifact).initCause(e);
}
ClassLoader depCL = new URLClassLoader(new URL[]{url}, ClassLoader.getSystemClassLoader());
- InputStream is = depCL.getResourceAsStream("META-INF/geronimo-service.xml");
+ InputStream is = depCL.getResourceAsStream("META-INF/geronimo-dependency.xml");
if (is != null) {
InputSource in = new InputSource(is);
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
@@ -140,11 +140,11 @@
dependencies.add(new Artifact(groupId, artifactId, version, type));
}
} catch (IOException e) {
- throw (IllegalStateException)new IllegalStateException("Unable to parse geronimo-service.xml file in " + url).initCause(e);
+ throw (IllegalStateException)new IllegalStateException("Unable to parse geronimo-dependency.xml file in " + url).initCause(e);
} catch (ParserConfigurationException e) {
- throw (IllegalStateException)new IllegalStateException("Unable to parse geronimo-service.xml file in " + url).initCause(e);
+ throw (IllegalStateException)new IllegalStateException("Unable to parse geronimo-dependency.xml file in " + url).initCause(e);
} catch (SAXException e) {
- throw (IllegalStateException)new IllegalStateException("Unable to parse geronimo-service.xml file in " + url).initCause(e);
+ throw (IllegalStateException)new IllegalStateException("Unable to parse geronimo-dependency.xml file in " + url).initCause(e);
}
}
return dependencies;
Modified: geronimo/branches/1.1/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java?rev=395478&r1=395477&r2=395478&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java (original)
+++ geronimo/branches/1.1/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java Wed Apr 19 21:41:20 2006
@@ -65,16 +65,16 @@
ServiceType serviceType = serviceDocument.addNewService();
for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
Artifact artifact = (Artifact) iterator.next();
- Dependency dependency = (Dependency) artifact.getDependency();
+ Dependency dependency = artifact.getDependency();
if ("true".equals(dependency.getProperty(DEPENDENCY_PROPERTY))) {
String groupId = dependency.getGroupId();
String artifactId = dependency.getArtifactId();
- String version = dependency.getVersion();
+// String version = dependency.getVersion();
String type = dependency.getType();
org.apache.geronimo.deployment.xbeans.ArtifactType dependencyType = serviceType.addNewDependency();
dependencyType.setGroupId(groupId);
dependencyType.setArtifactId(artifactId);
- dependencyType.setVersion(version);
+// dependencyType.setVersion(version);
if (type != null && !"jar".equals(type)) {
dependencyType.setType(type);
}
@@ -90,7 +90,7 @@
} else {
targetDir.mkdirs();
}
- File output = new File(targetDir, "geronimo-service.xml");
+ File output = new File(targetDir, "geronimo-dependency.xml");
XmlOptions xmlOptions = new XmlOptions();
xmlOptions.setSavePrettyPrint();
serviceDocument.save(output, xmlOptions);