You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2017/06/01 13:03:10 UTC
svn commit: r1797219 - in /sling/whiteboard/cziegeler:
feature-analyser/src/main/java/org/apache/sling/feature/analyser/
feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/
feature-support/src/main/java/org/apache/sling/f...
Author: cziegeler
Date: Thu Jun 1 13:03:10 2017
New Revision: 1797219
URL: http://svn.apache.org/viewvc?rev=1797219&view=rev
Log:
Update analyser
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
Modified: sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java?rev=1797219&r1=1797218&r2=1797219&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java (original)
+++ sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java Thu Jun 1 13:03:10 2017
@@ -58,13 +58,7 @@ public class Analyser {
// get framework properties
- KeyValueMap p = null;
- try {
- p = getFrameworkProperties(app);
- } catch (final IOException io) {
- new Exception("Unable to read framework properties", io);
- }
- final KeyValueMap slingProps = p;
+ final KeyValueMap slingProps = getFrameworkProperties(app);
final List<PackageInfo> systemPackages = calculateSystemPackages(slingProps);
final List<BundleInfo> bundleInfos = getBundleInfos(app);
@@ -192,7 +186,7 @@ public class Analyser {
private KeyValueMap getFrameworkProperties(final Application app)
throws IOException {
- final File framework = this.artifactManager.getArtifactHandler(app.getFramework().toMvnId()).getFile();
+ final File framework = this.artifactManager.getArtifactHandler(app.getFramework().toMvnUrl()).getFile();
final Map<String, Properties> propsMap = new HashMap<>();
try (final ZipInputStream zis = new ZipInputStream(new FileInputStream(framework)) ) {
Modified: sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java?rev=1797219&r1=1797218&r2=1797219&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java (original)
+++ sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java Thu Jun 1 13:03:10 2017
@@ -116,7 +116,7 @@ public class Main {
newArtifact.getMetadata().put(entry.getKey(), entry.getValue());
}
- if ( newArtifact.getId().getArtifactId().endsWith(".zip") ) {
+ if ( newArtifact.getId().getType().equals("zip") ) {
if ( cpExtension == null ) {
cpExtension = new Extension(ExtensionType.ARTIFACTS, "content-packages", true);
app.getExtensions().add(cpExtension);
Modified: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java?rev=1797219&r1=1797218&r2=1797219&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java (original)
+++ sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java Thu Jun 1 13:03:10 2017
@@ -47,7 +47,7 @@ public class ArtifactManagerConfig imple
// set defaults
this.repositoryUrls = new String[] {
"file://" + System.getProperty("user.home") + "/.m2/repository",
- "https://repo.maven.apache.org/maven2/"
+ "https://repo.maven.apache.org/maven2"
};
try {
this.cacheDirectory = Files.createTempDirectory("slingfeature").toFile();