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/07 15:54:59 UTC
svn commit: r1797959 - in /sling/whiteboard/cziegeler:
feature-launcher/pom.xml feature-support/pom.xml
feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
feature/src/main/java/org/apache/sling/feature/Extensions.java
Author: cziegeler
Date: Wed Jun 7 15:54:58 2017
New Revision: 1797959
URL: http://svn.apache.org/viewvc?rev=1797959&view=rev
Log:
Update poms, fix getByName
Modified:
sling/whiteboard/cziegeler/feature-launcher/pom.xml
sling/whiteboard/cziegeler/feature-support/pom.xml
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Extensions.java
Modified: sling/whiteboard/cziegeler/feature-launcher/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/pom.xml?rev=1797959&r1=1797958&r2=1797959&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature-launcher/pom.xml (original)
+++ sling/whiteboard/cziegeler/feature-launcher/pom.xml Wed Jun 7 15:54:58 2017
@@ -55,7 +55,7 @@
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
- <includeArtifactIds>org.apache.sling.feature,org.apache.sling.feature.support,org.apache.sling.commons.johnzon,commons-cli</includeArtifactIds>
+ <includeArtifactIds>org.apache.sling.feature,org.apache.sling.feature.support,org.apache.sling.commons.johnzon,org.apache.felix.converter,commons-cli</includeArtifactIds>
</configuration>
</execution>
</executions>
@@ -90,6 +90,12 @@
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.converter</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.3.1</version>
Modified: sling/whiteboard/cziegeler/feature-support/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/pom.xml?rev=1797959&r1=1797958&r2=1797959&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature-support/pom.xml (original)
+++ sling/whiteboard/cziegeler/feature-support/pom.xml Wed Jun 7 15:54:58 2017
@@ -22,7 +22,8 @@
<artifactId>org.apache.sling.feature.support</artifactId>
<version>0.0.1-SNAPSHOT</version>
-
+ <packaging>bundle</packaging>
+
<name>Apache Sling Feature Launcher</name>
<description>
Support classes for the feature tools
@@ -38,6 +39,16 @@
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/support/feature-support</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
Modified: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java?rev=1797959&r1=1797958&r2=1797959&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java (original)
+++ sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java Wed Jun 7 15:54:58 2017
@@ -195,9 +195,6 @@ public class FeatureUtil {
return paths;
}
- // Framework extension
- private static final String EXT_NAME = "framework";
-
/**
* Assemble an application based on the given files.
*
@@ -239,18 +236,13 @@ public class FeatureUtil {
}, features.toArray(new Feature[features.size()]));
// search for framework extension
- Extension fwk = null;
- for(final Extension e : app.getExtensions()) {
- if ( e.getName().equals(EXT_NAME) ) {
- fwk = e;
- }
- }
+ Extension fwk = app.getExtensions().getByName(Extension.NAME_FRAMEWORK);
if ( fwk != null ) {
if ( fwk.getType() != ExtensionType.ARTIFACTS ) {
- throw new IOException("Extension " + EXT_NAME + " is of wrong type: " + fwk.getType());
+ throw new IOException("Extension " + Extension.NAME_FRAMEWORK + " is of wrong type: " + fwk.getType());
}
if ( fwk.getArtifacts().size() != 1 ) {
- throw new IOException("Extension " + EXT_NAME + " must have exactly one artifact: " + fwk.getArtifacts().size());
+ throw new IOException("Extension " + Extension.NAME_FRAMEWORK + " must have exactly one artifact: " + fwk.getArtifacts().size());
}
app.setFramework(fwk.getArtifacts().get(0).getId());
app.getExtensions().remove(fwk);
Modified: sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Extensions.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Extensions.java?rev=1797959&r1=1797958&r2=1797959&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Extensions.java (original)
+++ sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Extensions.java Wed Jun 7 15:54:58 2017
@@ -23,6 +23,8 @@ import java.util.ArrayList;
*/
public class Extensions extends ArrayList<Extension> {
+ private static final long serialVersionUID = -3850006820840607498L;
+
/**
* Get an extension by name
* @param name The name
@@ -30,7 +32,7 @@ public class Extensions extends ArrayLis
*/
public Extension getByName(final String name) {
for(final Extension ext : this) {
- if ( ext.equals(name) ) {
+ if ( ext.getName().equals(name) ) {
return ext;
}
}