Modified: geronimo/branches/configid/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=378459&r1=378458&r2=378459&view=diff
==============================================================================
--- geronimo/branches/configid/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
(original)
+++ geronimo/branches/configid/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Fri Feb 17 00:37:43 2006
@@ -22,6 +22,7 @@
import java.io.ObjectOutputStream;
import java.net.URI;
import java.net.URL;
+import java.net.MalformedURLException;
import java.security.PermissionCollection;
import java.security.Permissions;
import java.util.Collection;
@@ -537,6 +538,10 @@
}
public File createNewConfigurationDir() {
+ return null;
+ }
+
+ public URL resolve(Artifact configId, URI uri) throws NoSuchConfigException, MalformedURLException
{
return null;
}
Modified: geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java?rev=378459&r1=378458&r2=378459&view=diff
==============================================================================
--- geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
(original)
+++ geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
Fri Feb 17 00:37:43 2006
@@ -21,6 +21,8 @@
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.net.URL;
+import java.net.URI;
+import java.net.MalformedURLException;
import java.util.List;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -115,6 +117,11 @@
// doh why can't I throw this?
return null;
}
+ }
+
+ public URL resolve(Artifact configId, URI uri) throws NoSuchConfigException, MalformedURLException
{
+ //unless we actually need to set up the configuration's classloader, this won't get
called
+ return null;
}
public Artifact install(URL source) throws IOException, InvalidConfigException {
|