Author: rmannibucau
Date: Sun May 13 22:02:16 2012
New Revision: 1337992
URL: http://svn.apache.org/viewvc?rev=1337992&view=rev
Log:
(re)activating repository attribute in provisionning module (paxurl)
Modified:
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/AetherBasedResolver.java
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Connection.java
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Parser.java
Modified:
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/AetherBasedResolver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/AetherBasedResolver.java?rev=1337992&r1=1337991&r2=1337992&view=diff
==============================================================================
---
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/AetherBasedResolver.java
(original)
+++
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/AetherBasedResolver.java
Sun May 13 22:02:16 2012
@@ -83,20 +83,24 @@ public class AetherBasedResolver {
final private MavenConfigurationImpl m_config;
final private MirrorSelector m_mirrorSelector;
final private ProxySelector m_proxySelector;
+ final private MavenRepositoryURL m_repositoryUrl;
/**
* Create a AetherBasedResolver
*
+ *
* @param configuration (must be not null)
+ * @param repositoryURL
* @throws java.net.MalformedURLException in case of url problems in
configuration.
*/
- public AetherBasedResolver(final MavenConfigurationImpl configuration)
throws MalformedURLException {
+ public AetherBasedResolver(final MavenConfigurationImpl configuration,
MavenRepositoryURL repositoryURL) throws MalformedURLException {
m_repoSystem = newRepositorySystem();
m_config = configuration;
m_remoteRepos =
selectRepositories(getRemoteRepositories(configuration));
m_mirrorSelector = selectMirrors();
m_proxySelector = selectProxies();
+ m_repositoryUrl = repositoryURL;
assignProxyAndMirrors();
}
@@ -141,6 +145,10 @@ public class AetherBasedResolver {
for (MavenRepositoryURL s : configuration.getRepositories()) {
r.add(s);
}
+ if (m_repositoryUrl != null) {
+ // 0 should be local so add it just after to downlad the
dependency quicker
+ r.add(r.size() == 0 ? 0 : 1, m_repositoryUrl);
+ }
r.add(new
MavenRepositoryURL("https://repository.apache.org/content/repositories/snapshots/@snapshots@id=apache-snapshot";));
r.add(new
MavenRepositoryURL("https://repository.apache.org/content/repositories/releases/@id=apache-release";));
return r;
Modified:
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Connection.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Connection.java?rev=1337992&r1=1337991&r2=1337992&view=diff
==============================================================================
---
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Connection.java
(original)
+++
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Connection.java
Sun May 13 22:02:16 2012
@@ -31,7 +31,7 @@ public class Connection extends URLConne
public Connection( final URL url, final MavenConfigurationImpl
configuration ) throws MalformedURLException {
super(url);
m_parser = new Parser( url.getPath() );
- m_aetherBasedResolver = new AetherBasedResolver( configuration );
+ m_aetherBasedResolver = new AetherBasedResolver( configuration,
m_parser.getRepositoryURL() );
}
@Override
Modified:
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Parser.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Parser.java?rev=1337992&r1=1337991&r2=1337992&view=diff
==============================================================================
---
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Parser.java
(original)
+++
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Parser.java
Sun May 13 22:02:16 2012
@@ -17,6 +17,7 @@
package org.apache.openejb.resolver.maven;
import java.net.MalformedURLException;
+import org.ops4j.pax.url.maven.commons.MavenRepositoryURL;
public class Parser {
public static final String VERSION_LATEST = "LATEST";
@@ -38,6 +39,7 @@ public class Parser {
private String m_type;
private String m_classifier;
private String m_fullClassifier;
+ private MavenRepositoryURL m_repositoryURL;
public Parser(final String rawPath)
throws MalformedURLException {
@@ -53,7 +55,7 @@ public class Parser {
if (path.contains(REPOSITORY_SEPARATOR)) {
int pos = path.lastIndexOf(REPOSITORY_SEPARATOR);
parseArtifactPart(path.substring(pos + 1));
- //m_repositoryURL = new MavenRepositoryURL(path.substring(0, pos)
+ "@snapshots");
+ m_repositoryURL = new MavenRepositoryURL(path.substring(0, pos) +
"@snapshots");
} else {
parseArtifactPart(path);
}
@@ -198,4 +200,8 @@ public class Parser {
.append(METADATA_FILE)
.toString();
}
+
+ public MavenRepositoryURL getRepositoryURL() {
+ return m_repositoryURL;
+ }
}
