geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r232610 - in /geronimo/trunk/modules/service-builder/src: java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java schema/geronimo-config.xsd
Date Sun, 14 Aug 2005 14:17:15 GMT
Author: jboynes
Date: Sun Aug 14 07:17:09 2005
New Revision: 232610

URL: http://svn.apache.org/viewcvs?rev=232610&view=rev
Log:
Support dependency types other than jar

Modified:
    geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
    geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd

Modified: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=232610&r1=232609&r2=232610&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
(original)
+++ geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
Sun Aug 14 07:17:09 2005
@@ -27,9 +27,7 @@
 import java.net.URLClassLoader;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.ArrayList;
 import java.util.jar.JarFile;
 import javax.management.MalformedObjectNameException;
@@ -64,11 +62,10 @@
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlOptions;
 import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.QNameSet;
 
 /**
- * @version $Rev$ $Date$
+ * @version $Rev: 216115 $ $Date: 2005-07-12 22:22:18 -0700 (Tue, 12 Jul 2005) $
  */
 public class ServiceConfigBuilder implements ConfigurationBuilder {
     private final URI defaultParentId;
@@ -358,8 +355,11 @@
                 throw new DeploymentException("Invalid dependency URI " + dep.getUri(), e);
             }
         } else {
-            // @todo support more than just jars
-            String id = dep.getGroupId() + "/jars/" + dep.getArtifactId() + '-' + dep.getVersion()
+ ".jar";
+            String groupId = dep.getGroupId();
+            String type = dep.isSetType() ? dep.getType() : "jar";
+            String artifactId = dep.getArtifactId();
+            String version = dep.getVersion();
+            String id = groupId + "/" + type + "s/" + artifactId + '-' + version + "." +
type;
             try {
                 uri = new URI(id);
             } catch (URISyntaxException e) {

Modified: geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd?rev=232610&r1=232609&r2=232610&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd (original)
+++ geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd Sun Aug 14 07:17:09
2005
@@ -60,6 +60,7 @@
         <xs:choice>
             <xs:sequence>
                 <xs:element name="groupId" type="xs:string"/>
+                <xs:element name="type" type="xs:string" minOccurs="0"/>
                 <xs:element name="artifactId" type="xs:string"/>
                 <xs:element name="version" type="xs:string"/>
             </xs:sequence>



Mime
View raw message