if (baseName.endsWith("-sources")) {
String bundle = baseName.substring(0, baseName.length()
- "-sources".length());
if (baseName.endsWith("-sources")) {
String bundle = baseName.substring(0, baseName.length()
- "-sources".length());
- log.debug(name + "," + baseName + ", " + bundle);
+ // log.debug(name + "," + baseName + ", " + bundle);
String bundlePath = FilenameUtils.getPath(name) + bundle
+ ".jar";
if (wrappers.containsKey(bundlePath)) {
String bundlePath = FilenameUtils.getPath(name) + bundle
+ ".jar";
if (wrappers.containsKey(bundlePath)) {
+ // FIXME Fail if not all wrappers matched
} catch (Exception e) {
throw new SlcException("Cannot wrap distribution " + uri, e);
} finally {
} catch (Exception e) {
throw new SlcException("Cannot wrap distribution " + uri, e);
} finally {
String sourceSymbolicName = sourceManifest.getMainAttributes()
.getValue(BUNDLE_SYMBOLICNAME);
if (sourceSymbolicName != null
String sourceSymbolicName = sourceManifest.getMainAttributes()
.getValue(BUNDLE_SYMBOLICNAME);
if (sourceSymbolicName != null
- && sourceSymbolicName.equals(name))
+ && !sourceSymbolicName.equals(name))
log.warn("The new symbolic name ("
+ name
+ ") is not consistant with the wrapped bundle symbolic name ("
log.warn("The new symbolic name ("
+ name
+ ") is not consistant with the wrapped bundle symbolic name ("
try {
distSession = osgiFactory.openDistSession();
javaSession = osgiFactory.openJavaSession();
try {
distSession = osgiFactory.openDistSession();
javaSession = osgiFactory.openJavaSession();
- Node origArtifact = osgiFactory.getMaven(distSession, sourceCoords);
+ Node origArtifact;
+ try {
+ origArtifact = osgiFactory.getMaven(distSession, sourceCoords);
+ } catch (Exception e1) {
+ origArtifact = osgiFactory.getMaven(distSession, sourceCoords
+ + ":" + getVersion());
+ }
in = origArtifact.getNode(Node.JCR_CONTENT)
.getProperty(Property.JCR_DATA).getBinary().getStream();
in = origArtifact.getNode(Node.JCR_CONTENT)
.getProperty(Property.JCR_DATA).getBinary().getStream();
this.mirrors = mirrors;
}
this.mirrors = mirrors;
}
+ public void setMavenRepositories(List<String> mavenRepositories) {
+ this.mavenRepositories = mavenRepositories;
+ }
+
+ public void setMavenProxyBase(String mavenProxyBase) {
+ this.mavenProxyBase = mavenProxyBase;
+ }
+