You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/11/26 10:31:58 UTC
svn commit: r720774 - in /geronimo/gshell/trunk: gshell-assembly/
gshell-assembly/src/main/underlay/etc/
gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/
gshell-support/gshell-artifact-maven/src/main/resourc...
Author: jdillon
Date: Wed Nov 26 01:31:57 2008
New Revision: 720774
URL: http://svn.apache.org/viewvc?rev=720774&view=rev
Log:
Bring maven-artifact 3.x resolution of artifacts back
Modified:
geronimo/gshell/trunk/gshell-assembly/pom.xml
geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerConfigurator.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactResolverImpl.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/gshell/components.xml
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ClassPathImpl.java
Modified: geronimo/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/pom.xml?rev=720774&r1=720773&r2=720774&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/pom.xml Wed Nov 26 01:31:57 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-artifact-ivy</artifactId>
+ <artifactId>gshell-artifact-maven</artifactId>
</dependency>
<dependency>
Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml?rev=720774&r1=720773&r2=720774&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml Wed Nov 26 01:31:57 2008
@@ -28,9 +28,9 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <!--
- <bean class="org.apache.geronimo.gshell.artifact.maven.ArtifactManagerConfigurator">
+ <bean class="org.apache.geronimo.gshell.artifact.maven.ArtifactManagerConfigurator" init-method="init">
<constructor-arg ref="artifactManager"/>
+
<property name="localRepository" value="${gshell.home}/var/repository"/>
<property name="remoteRepositories">
<map>
@@ -38,7 +38,6 @@
</map>
</property>
</bean>
- -->
<bean class="org.apache.geronimo.gshell.application.model.ApplicationModel">
<property name="groupId" value="org.apache.geronimo.gshell"/>
Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml?rev=720774&r1=720773&r2=720774&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml Wed Nov 26 01:31:57 2008
@@ -72,6 +72,14 @@
<logger name="org.apache.ivy.Ivy">
<level value="DEBUG"/>
</logger>
+
+ <logger name="org.apache.maven">
+ <level value="INFO"/>
+ </logger>
+
+ <logger name="org.apache.maven.artifact.manager.WagonManager:default">
+ <level value="ERROR"/>
+ </logger>
<root>
<level value="${gshell.log.console.level}"/>
Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerConfigurator.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerConfigurator.java?rev=720774&r1=720773&r2=720774&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerConfigurator.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerConfigurator.java Wed Nov 26 01:31:57 2008
@@ -27,7 +27,7 @@
import java.util.Map;
/**
- * ???
+ * Component to configure the {@link ArtifactManager}.
*
* @version $Rev$ $Date$
*/
@@ -59,7 +59,8 @@
// @PostConstruct
public void init() throws Exception {
ArtifactRepositoryManager repositoryManager = artifactManager.getRepositoryManager();
-
+ log.debug("Configuring artifact manager: {}", artifactManager);
+
if (localRepository != null) {
repositoryManager.setLocalRepository(localRepository);
}
Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactResolverImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactResolverImpl.java?rev=720774&r1=720773&r2=720774&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactResolverImpl.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactResolverImpl.java Wed Nov 26 01:31:57 2008
@@ -24,6 +24,8 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,22 +56,34 @@
ArtifactResolutionRequest _request = new ArtifactResolutionRequest();
if (request.artifact != null) {
+ log.debug("Artifact: {}", request.artifact);
+
_request.setArtifact(createArtifact(request.artifact));
}
if (request.artifacts != null) {
Set<org.apache.maven.artifact.Artifact> artifacts = new LinkedHashSet<org.apache.maven.artifact.Artifact>();
+ log.debug("Dependencies:");
+
for (Artifact source : request.artifacts) {
org.apache.maven.artifact.Artifact artifact = createArtifact(source);
+ log.debug(" {}", artifact);
artifacts.add(artifact);
}
_request.setArtifactDependencies(artifacts);
}
+ // Always filter for runtime scope
+ AndArtifactFilter filter = new AndArtifactFilter();
+ _request.setFilter(filter);
+ filter.add(new ScopeArtifactFilter(org.apache.maven.artifact.Artifact.SCOPE_RUNTIME));
+
if (request.filter != null) {
- _request.setFilter(new ArtifactFilter() {
+ log.debug("Filter: {}", request.filter);
+
+ filter.add(new ArtifactFilter() {
public boolean include(final org.apache.maven.artifact.Artifact source) {
assert source != null;
Artifact artifact = createArtifact(source);
@@ -83,8 +97,13 @@
ArtifactResolutionResult _result = artifactManager.resolve(_request);
result.artifacts = new LinkedHashSet<Artifact>();
+ log.debug("Resolved:");
+
for (org.apache.maven.artifact.Artifact source : _result.getArtifacts()) {
Artifact artifact = createArtifact(source);
+
+ log.debug(" {}", artifact);
+
result.artifacts.add(artifact);
}
}
@@ -104,6 +123,7 @@
artifact.setVersion(source.getVersion());
artifact.setClassifier(source.getClassifier());
artifact.setType(source.getType());
+ artifact.setFile(source.getFile());
return artifact;
}
@@ -113,6 +133,10 @@
ArtifactFactory factory = artifactManager.getArtifactFactory();
- return factory.createArtifact(source.getGroup(), source.getName(), source.getVersion(), null, source.getType());
+ org.apache.maven.artifact.Artifact artifact = factory.createArtifact(source.getGroup(), source.getName(), source.getVersion(), null, source.getType());
+
+ artifact.setFile(source.getFile());
+
+ return artifact;
}
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java?rev=720774&r1=720773&r2=720774&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java Wed Nov 26 01:31:57 2008
@@ -32,8 +32,6 @@
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.Map;
@@ -44,12 +42,11 @@
*
* @version $Rev$ $Date$
*/
+@SuppressWarnings({"deprecation"})
@Component(role=ArtifactResolver.class, hint="gshell")
public class GShellArtifactResolver
implements ArtifactResolver
{
- private final Logger log = LoggerFactory.getLogger(getClass());
-
@Requirement(hint="delegate")
private ArtifactResolver delegate;
@@ -60,70 +57,79 @@
// ArtifactResolver
//
- public void resolve(Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository) throws ArtifactResolutionException, ArtifactNotFoundException {
+ @Deprecated
+ public void resolve(final Artifact artifact, final List<ArtifactRepository> remoteRepositories, final ArtifactRepository localRepository) throws ArtifactResolutionException, ArtifactNotFoundException {
assert delegate != null;
assert repositoryManager != null;
delegate.resolve(artifact, repositoryManager.selectRemoteRepositories(remoteRepositories), localRepository);
}
- public ArtifactResolutionResult resolveTransitively(Set<Artifact> artifacts, Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository, ArtifactMetadataSource source) throws ArtifactResolutionException, ArtifactNotFoundException {
+ @Deprecated
+ public ArtifactResolutionResult resolveTransitively(final Set<Artifact> artifacts, final Artifact artifact, final List<ArtifactRepository> remoteRepositories, final ArtifactRepository localRepository, final ArtifactMetadataSource source) throws ArtifactResolutionException, ArtifactNotFoundException {
assert delegate != null;
assert repositoryManager != null;
return delegate.resolveTransitively(artifacts, artifact, repositoryManager.selectRemoteRepositories(remoteRepositories), localRepository, source);
}
- public ArtifactResolutionResult resolveTransitively(Set<Artifact> artifacts, Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository, ArtifactMetadataSource source, List<ResolutionListener> listeners) throws ArtifactResolutionException, ArtifactNotFoundException {
+ @Deprecated
+ public ArtifactResolutionResult resolveTransitively(final Set<Artifact> artifacts, final Artifact artifact, final List<ArtifactRepository> remoteRepositories, final ArtifactRepository localRepository, final ArtifactMetadataSource source, final List<ResolutionListener> listeners) throws ArtifactResolutionException, ArtifactNotFoundException {
assert delegate != null;
assert repositoryManager != null;
return delegate.resolveTransitively(artifacts, artifact, repositoryManager.selectRemoteRepositories(remoteRepositories), localRepository, source, listeners);
}
- public ArtifactResolutionResult resolveTransitively(Set<Artifact> artifacts, Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter) throws ArtifactResolutionException, ArtifactNotFoundException {
+ @Deprecated
+ public ArtifactResolutionResult resolveTransitively(final Set<Artifact> artifacts, final Artifact artifact, final ArtifactRepository localRepository, final List<ArtifactRepository> remoteRepositories, final ArtifactMetadataSource source, final ArtifactFilter filter) throws ArtifactResolutionException, ArtifactNotFoundException {
assert delegate != null;
assert repositoryManager != null;
return delegate.resolveTransitively(artifacts, artifact, localRepository, repositoryManager.selectRemoteRepositories(remoteRepositories), source, filter);
}
- public ArtifactResolutionResult resolveTransitively(Set<Artifact> artifacts, Artifact artifact, Map managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source) throws ArtifactResolutionException, ArtifactNotFoundException {
+ @Deprecated
+ public ArtifactResolutionResult resolveTransitively(final Set<Artifact> artifacts, final Artifact artifact, final Map managedVersions, final ArtifactRepository localRepository, final List<ArtifactRepository> remoteRepositories, final ArtifactMetadataSource source) throws ArtifactResolutionException, ArtifactNotFoundException {
assert delegate != null;
assert repositoryManager != null;
return delegate.resolveTransitively(artifacts, artifact, managedVersions, localRepository, repositoryManager.selectRemoteRepositories(remoteRepositories), source);
}
- public ArtifactResolutionResult resolveTransitively(Set<Artifact> artifacts, Artifact artifact, Map managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter) throws ArtifactResolutionException, ArtifactNotFoundException {
+ @Deprecated
+ public ArtifactResolutionResult resolveTransitively(final Set<Artifact> artifacts, final Artifact artifact, final Map managedVersions, final ArtifactRepository localRepository, final List<ArtifactRepository> remoteRepositories, final ArtifactMetadataSource source, final ArtifactFilter filter) throws ArtifactResolutionException, ArtifactNotFoundException {
assert delegate != null;
assert repositoryManager != null;
return delegate.resolveTransitively(artifacts, artifact, managedVersions, localRepository, repositoryManager.selectRemoteRepositories(remoteRepositories), source, filter);
}
- public ArtifactResolutionResult resolveTransitively(Set<Artifact> artifacts, Artifact artifact, Map managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter, List<ResolutionListener> listeners) throws ArtifactResolutionException, ArtifactNotFoundException {
+ @Deprecated
+ public ArtifactResolutionResult resolveTransitively(final Set<Artifact> artifacts, final Artifact artifact, final Map managedVersions, final ArtifactRepository localRepository, final List<ArtifactRepository> remoteRepositories, final ArtifactMetadataSource source, final ArtifactFilter filter, final List<ResolutionListener> listeners) throws ArtifactResolutionException, ArtifactNotFoundException {
assert delegate != null;
assert repositoryManager != null;
return delegate.resolveTransitively(artifacts, artifact, managedVersions, localRepository, repositoryManager.selectRemoteRepositories(remoteRepositories), source, filter, listeners);
}
- public ArtifactResolutionResult resolveTransitively(Set<Artifact> artifacts, Artifact artifact, Map managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter, List<ResolutionListener> listeners, List<ConflictResolver> conflictResolvers) throws ArtifactResolutionException, ArtifactNotFoundException {
+ @Deprecated
+ public ArtifactResolutionResult resolveTransitively(final Set<Artifact> artifacts, final Artifact artifact, final Map managedVersions, final ArtifactRepository localRepository, final List<ArtifactRepository> remoteRepositories, final ArtifactMetadataSource source, final ArtifactFilter filter, final List<ResolutionListener> listeners, final List<ConflictResolver> conflictResolvers) throws ArtifactResolutionException, ArtifactNotFoundException {
assert delegate != null;
assert repositoryManager != null;
return delegate.resolveTransitively(artifacts, artifact, managedVersions, localRepository, repositoryManager.selectRemoteRepositories(remoteRepositories), source, filter, listeners, conflictResolvers);
}
- public void resolveAlways(Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository) throws ArtifactResolutionException, ArtifactNotFoundException {
+ @Deprecated
+ public void resolveAlways(final Artifact artifact, final List<ArtifactRepository> remoteRepositories, final ArtifactRepository localRepository) throws ArtifactResolutionException, ArtifactNotFoundException {
assert delegate != null;
assert repositoryManager != null;
delegate.resolveAlways(artifact, repositoryManager.selectRemoteRepositories(remoteRepositories), localRepository);
}
- public ArtifactResolutionResult resolve(ArtifactResolutionRequest request) {
+ public ArtifactResolutionResult resolve(final ArtifactResolutionRequest request) {
assert request != null;
assert delegate != null;
assert repositoryManager != null;
Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java?rev=720774&r1=720773&r2=720774&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java Wed Nov 26 01:31:57 2008
@@ -38,13 +38,9 @@
public ResolutionException(final ArtifactResolutionRequest request, final ArtifactResolutionResult result) {
assert request != null;
- assert result != null;
-
this.request = request;
+
+ assert result != null;
this.result = result;
}
-
- //
- // TODO: Add an API to query the results?
- //
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/gshell/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/gshell/components.xml?rev=720774&r1=720773&r2=720774&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/gshell/components.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/gshell/components.xml Wed Nov 26 01:31:57 2008
@@ -22,8 +22,12 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy"
+ default-lazy-init="true">
<bean id="artifactManager" class="org.apache.geronimo.gshell.artifact.maven.ArtifactManagerFactory"/>
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java?rev=720774&r1=720773&r2=720774&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java Wed Nov 26 01:31:57 2008
@@ -46,21 +46,49 @@
"gshell-event",
"gshell-i18n",
"gshell-io",
- "gshell-ivy",
"gshell-model",
"gshell-spring",
"gshell-terminal",
"gshell-wisdom-bootstrap",
"gshell-yarn",
- "ivy",
"jcl-over-slf4j",
"jline",
"log4j",
- "plexus-classworlds",
"slf4j-api",
"slf4j-log4j12",
"spring-core",
- "spring-beans"
+ "spring-beans",
+
+ //
+ // FIXME: Need to hook this filtering up in the ArtifactResolverImpls
+ //
+
+ // gshell-artifact-ivy
+ "gshell-artifact-ivy",
+ "ivy",
+
+ // gshell-artifact-maven
+ "gshell-artifact-maven",
+ "aspectjrt",
+ "maven-artivact",
+ "maven-model",
+ "maven-plugin-registry",
+ "maven-profile",
+ "maven-project",
+ "maven-settings",
+ "plexus-classworlds",
+ "plexus-component-annotations",
+ "plexus-container-default",
+ "plexus-interpolation",
+ "plexus-utils",
+ "wagon-file",
+ "wagon-http-lightweight",
+ "wagon-http-shared",
+ "wagon-provider-api",
+ "xbean-reflect",
+ "xercesMinimal",
+ "nekohtml",
+
};
private final Set<String> excludes = new HashSet<String>();
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ClassPathImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ClassPathImpl.java?rev=720774&r1=720773&r2=720774&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ClassPathImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ClassPathImpl.java Wed Nov 26 01:31:57 2008
@@ -62,18 +62,20 @@
if (urls == null) {
List<URL> list = new ArrayList<URL>(artifacts.size());
- for (Artifact artifact : artifacts) {
- File file = artifact.getFile();
+ try {
+ for (Artifact artifact : artifacts) {
+ File file = artifact.getFile();
- if (file != null) {
- try {
- list.add(file.toURI().toURL());
- }
- catch (MalformedURLException e) {
- throw new RuntimeException(e);
+ if (file == null) {
+ throw new RuntimeException("Artifact missing file reference: " + artifact);
}
+
+ list.add(file.toURI().toURL());
}
}
+ catch (MalformedURLException e) {
+ throw new RuntimeException(e);
+ }
this.urls = Collections.unmodifiableCollection(list);
}