Author: cziegeler
Date: Fri Jul 7 13:10:07 2017
New Revision: 1801154
URL: http://svn.apache.org/viewvc?rev=1801154&view=rev
Log:
Refactoring of package layout
Added:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java
- copied, changed from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactDescriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/BundleDescriptor.java
- copied, changed from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/BundleDescriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java
- copied, changed from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/Descriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/PackageInfo.java
- copied, changed from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/PackageInfo.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java
- copied, changed from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/Scanner.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/
- copied from r1800887,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ApplicationDescriptorImpl.java
- copied, changed from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ApplicationDescriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java
- copied, changed from r1801057,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundleExportsImports.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java
- copied, changed from r1801057,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForInitialContent.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java
- copied, changed from r1801057,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForResources.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java
(with props)
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/FeatureDescriptorImpl.java
- copied, changed from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FeatureDescriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ManifestUtil.java
- copied, changed from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ManifestUtil.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTask.java
- copied, changed from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/AnalyserTask.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTaskContext.java
- copied, changed from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/AnalyserTaskContext.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/package-info.java
- copied, changed from r1800887,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/package-info.java
Removed:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/AnalyserTask.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/AnalyserTaskContext.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ApplicationDescriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactDescriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/BundleDescriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/Descriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FeatureDescriptor.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ManifestUtil.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/PackageInfo.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/Scanner.java
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
sling/whiteboard/cziegeler/feature-analyser/src/main/resources/META-INF/services/org.apache.sling.feature.analyser.AnalyserTask
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=1801154&r1=1801153&r2=1801154&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
Fri Jul 7 13:10:07 2017
@@ -25,8 +25,8 @@ import java.util.ServiceLoader;
import java.util.Set;
import org.apache.sling.feature.Application;
-import org.apache.sling.feature.scanner.ApplicationDescriptor;
-import org.apache.sling.feature.scanner.Scanner;
+import org.apache.sling.feature.analyser.task.AnalyserTask;
+import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java
(from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactDescriptor.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactDescriptor.java&r1=1801153&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactDescriptor.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java
Fri Jul 7 13:10:07 2017
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.scanner;
+package org.apache.sling.feature.analyser;
import java.io.File;
-import java.io.IOException;
import java.util.jar.Manifest;
import org.apache.sling.feature.Artifact;
@@ -25,62 +24,23 @@ import org.apache.sling.feature.Artifact
/**
* Information about an artifact
*/
-public class ArtifactDescriptor implements Descriptor {
-
- /** The physical file for analyzing. */
- private final File artifactFile;
-
- /** The corresponding artifact from the feature. */
- private final Artifact artifact;
-
- public ArtifactDescriptor(final Artifact a,
- final File file) throws IOException {
- this.artifact = a;
- this.artifactFile = file;
- }
+public interface ArtifactDescriptor extends Descriptor {
/**
* Get the artifact file
* @return The artifact file
*/
- public File getArtifactFile() {
- return artifactFile;
- }
+ File getArtifactFile();
/**
* Get the artifact
* @return The artifact
*/
- public Artifact getArtifact() {
- return artifact;
- }
+ Artifact getArtifact();
/**
* If the artifact has a manifest, return it
* @return The manifest or {@code null}
*/
- public Manifest getManifest() {
- return null;
- }
-
-
- @Override
- public boolean equals(final Object obj) {
- if ( obj instanceof ArtifactDescriptor ) {
- return
this.getArtifact().getId().toMvnId().equals(((ArtifactDescriptor)obj).getArtifact().getId().toMvnId());
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return this.getArtifact().getId().toMvnId().hashCode();
-
- }
-
- @Override
- public String toString() {
- return "ArtifactInfo [artifact=" +
this.getArtifact().getId().toMvnId() + "]";
- }
-
+ Manifest getManifest();
}
\ No newline at end of file
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/BundleDescriptor.java
(from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/BundleDescriptor.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/BundleDescriptor.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/BundleDescriptor.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/BundleDescriptor.java&r1=1801153&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/BundleDescriptor.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/BundleDescriptor.java
Fri Jul 7 13:10:07 2017
@@ -14,179 +14,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.scanner;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.jar.Manifest;
-
-import org.apache.sling.feature.Artifact;
-import org.osgi.framework.Constants;
+package org.apache.sling.feature.analyser;
/**
* Information about a bundle
*/
-public class BundleDescriptor extends ArtifactDescriptor implements
Comparable<BundleDescriptor> {
-
- /** The bundle symbolic name. */
- private String symbolicName;
-
- /** The bundle version. */
- private String bundleVersion;
-
- /** The start level of this artifact. */
- private final int startLevel;
-
- /** Information about exported packages. */
- private final Set<PackageInfo> exportedPackages = new HashSet<>();
-
- /** Information about imported packages. */
- private final Set<PackageInfo> importedPackages = new HashSet<>();
-
- /** Information about dynamic imported packages. */
- private final Set<PackageInfo> dynamicImportedPackages = new HashSet<>();
-
- /** Manifest */
- private final Manifest manifest;
-
- public BundleDescriptor(final Artifact a,
- final File file,
- final int startLevel) throws IOException {
- super(a, file);
- this.startLevel = startLevel;
-
- this.manifest = ManifestUtil.getManifest(file);
- if ( this.manifest == null ) {
- throw new IOException("File has no manifest");
- }
- this.analyze();
- }
-
- public BundleDescriptor(final Artifact artifact,
- final Set<PackageInfo> pcks) throws IOException {
- super(artifact, null);
- this.startLevel = 0;
-
- this.symbolicName = Constants.SYSTEM_BUNDLE_SYMBOLICNAME;
- this.bundleVersion = artifact.getId().getOSGiVersion().toString();
- this.exportedPackages.addAll(pcks);
- this.manifest = null;
- }
+public interface BundleDescriptor extends ArtifactDescriptor,
Comparable<BundleDescriptor> {
/**
* Get the bundle symbolic name.
* @return The bundle symbolic name
*/
- public String getBundleSymbolicName() {
- return symbolicName;
- }
+ String getBundleSymbolicName();
/**
* Get the bundle version
* @return The bundle version
*/
- public String getBundleVersion() {
- return bundleVersion;
- }
+ String getBundleVersion();
/**
* Get the start level
- * @return The start level or {@code 0} for the default.
+ * @return The start level.
*/
- public int getBundleStartLevel() {
- return startLevel;
- }
-
- @Override
- public Set<PackageInfo> getExportedPackages() {
- return Collections.unmodifiableSet(this.exportedPackages);
- }
-
- @Override
- public Manifest getManifest() {
- return this.manifest;
- }
-
- public boolean isExportingPackage(final String packageName) {
- if ( getExportedPackages() != null ) {
- for(final PackageInfo i : getExportedPackages()) {
- if ( i.getName().equals(packageName) ) {
- return true;
- }
- }
- }
- return false;
- }
-
- public boolean isExportingPackage(final PackageInfo info) {
- if ( getExportedPackages() != null ) {
- for(final PackageInfo i : getExportedPackages()) {
- if ( i.getName().equals(info.getName())
- && (info.getVersion() == null ||
info.getPackageVersionRange().includes(i.getPackageVersion()))) {
- return true;
- }
- }
- }
- return false;
- }
-
- @Override
- public Set<PackageInfo> getImportedPackages() {
- return Collections.unmodifiableSet(this.importedPackages);
- }
-
- @Override
- public Set<PackageInfo> getDynamicImportedPackages() {
- return Collections.unmodifiableSet(this.dynamicImportedPackages);
- }
-
- protected void analyze() throws IOException {
- final String name =
this.manifest.getMainAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME);
- if ( name != null ) {
- final String version =
this.manifest.getMainAttributes().getValue(Constants.BUNDLE_VERSION);
- if ( version == null ) {
- throw new IOException("Unable to get bundle version from
artifact " + getArtifact().getId().toMvnId());
- }
- this.symbolicName = name;
- this.bundleVersion = version;
- final String newBundleName =
this.getArtifact().getMetadata().get("bundle:rename-bsn");
- if (newBundleName != null) {
- this.symbolicName = newBundleName;
- }
-
-
this.exportedPackages.addAll(ManifestUtil.extractExportedPackages(this.manifest));
-
this.importedPackages.addAll(ManifestUtil.extractImportedPackages(this.manifest));
-
this.dynamicImportedPackages.addAll(ManifestUtil.extractDynamicImportedPackages(this.manifest));
-
- } else {
- throw new IOException("Unable to get bundle symbolic name from
artifact " + getArtifact().getId().toMvnId());
- }
- }
-
- @Override
- public boolean equals(Object obj) {
- if ( obj instanceof BundleDescriptor ) {
- return
this.symbolicName.equals(((BundleDescriptor)obj).symbolicName) &&
this.bundleVersion.equals(((BundleDescriptor)obj).bundleVersion);
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return (this.symbolicName + ':' + this.bundleVersion).hashCode();
-
- }
-
- @Override
- public String toString() {
- return "BundleInfo [symbolicName=" + symbolicName + ", version=" +
this.bundleVersion + "]";
- }
-
- @Override
- public int compareTo(final BundleDescriptor o) {
- return (this.symbolicName + ':' +
this.bundleVersion).compareTo((o.symbolicName + ':' + o.bundleVersion));
- }
+ int getBundleStartLevel();
+
+ boolean isExportingPackage(String packageName);
+
+ boolean isExportingPackage(PackageInfo info);
}
\ No newline at end of file
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java
(from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/Descriptor.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/Descriptor.java&r1=1801153&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/Descriptor.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java
Fri Jul 7 13:10:07 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.scanner;
+package org.apache.sling.feature.analyser;
import java.util.Collections;
import java.util.Set;
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/PackageInfo.java
(from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/PackageInfo.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/PackageInfo.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/PackageInfo.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/PackageInfo.java&r1=1801153&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/PackageInfo.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/PackageInfo.java
Fri Jul 7 13:10:07 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.scanner;
+package org.apache.sling.feature.analyser;
import org.osgi.framework.Version;
import org.osgi.framework.VersionRange;
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java
(from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/Scanner.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/Scanner.java&r1=1801153&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/Scanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java
Fri Jul 7 13:10:07 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.scanner;
+package org.apache.sling.feature.analyser;
import java.io.File;
import java.io.IOException;
@@ -30,6 +30,13 @@ import org.apache.sling.feature.Extensio
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.analyser.impl.ApplicationDescriptorImpl;
+import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
+import org.apache.sling.feature.analyser.impl.ContainerDescriptorImpl;
+import org.apache.sling.feature.analyser.impl.FeatureDescriptorImpl;
+import org.apache.sling.feature.scanner.ArtifactScanner;
+import org.apache.sling.feature.scanner.ExtensionScanner;
+import org.apache.sling.feature.scanner.FrameworkScanner;
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.ArtifactManagerConfig;
@@ -145,7 +152,7 @@ public class Scanner {
throw new IOException("Unable to find file for " + bundle.getId());
}
- return new BundleDescriptor(bundle, file, startLevel);
+ return new BundleDescriptorImpl(bundle, file, startLevel);
}
/**
@@ -154,7 +161,7 @@ public class Scanner {
* @param desc The descriptor
* @throws IOException If something goes wrong or no suitable scanner is
found.
*/
- private void getBundleInfos(final Bundles bundles, final FeatureDescriptor
desc)
+ private void getBundleInfos(final Bundles bundles, final
ContainerDescriptorImpl desc)
throws IOException {
for(final Map.Entry<Integer, List<Artifact>> entry :
bundles.getBundlesByStartLevel().entrySet()) {
for(final Artifact bundle : entry.getValue() ) {
@@ -170,7 +177,7 @@ public class Scanner {
}
}
- private void scan(final Extensions extensions, final FeatureDescriptor
desc)
+ private void scan(final Extensions extensions, final
ContainerDescriptorImpl desc)
throws IOException {
for(final Extension ext : extensions) {
final List<ArtifactDescriptor> infos;
@@ -208,7 +215,7 @@ public class Scanner {
}
}
- private void compact(final FeatureDescriptor desc) {
+ private void compact(final ContainerDescriptorImpl desc) {
// TBD remove all import packages / dynamic import packages which are
resolved by this bundle set
// same with requirements
@@ -221,7 +228,7 @@ public class Scanner {
* @throws IOException If something goes wrong or a scanner is missing
*/
public FeatureDescriptor scan(final Feature feature) throws IOException {
- final FeatureDescriptor desc = new FeatureDescriptor();
+ final FeatureDescriptorImpl desc = new FeatureDescriptorImpl(feature);
getBundleInfos(feature.getBundles(), desc);
scan(feature.getExtensions(), desc);
@@ -239,7 +246,7 @@ public class Scanner {
* @throws IOException If something goes wrong or a scanner is missing
*/
public ApplicationDescriptor scan(final Application app) throws
IOException {
- final ApplicationDescriptor desc = new ApplicationDescriptor();
+ final ApplicationDescriptorImpl desc = new
ApplicationDescriptorImpl(app);
getBundleInfos(app.getBundles(), desc);
scan(app.getExtensions(), desc);
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ApplicationDescriptorImpl.java
(from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ApplicationDescriptor.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ApplicationDescriptorImpl.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ApplicationDescriptorImpl.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ApplicationDescriptor.java&r1=1801153&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ApplicationDescriptor.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ApplicationDescriptorImpl.java
Fri Jul 7 13:10:07 2017
@@ -14,16 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.scanner;
+package org.apache.sling.feature.analyser.impl;
+
+import org.apache.sling.feature.Application;
+import org.apache.sling.feature.analyser.ApplicationDescriptor;
+import org.apache.sling.feature.analyser.Descriptor;
/**
* Information about an application.
* This is the aggregated information.
*/
-public class ApplicationDescriptor extends FeatureDescriptor {
+public class ApplicationDescriptorImpl
+ extends ContainerDescriptorImpl
+ implements ApplicationDescriptor {
private Descriptor frameworkDescriptor = new Descriptor() {};
+ private final Application app;
+
+ public ApplicationDescriptorImpl(final Application app) {
+ this.app = app;
+ }
+
+ @Override
+ public Application getApplication() {
+ return this.app;
+ }
+
+ @Override
public Descriptor getFrameworkDescriptor() {
return frameworkDescriptor;
}
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java
(from r1801057,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundleExportsImports.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundleExportsImports.java&r1=1801057&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundleExportsImports.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java
Fri Jul 7 13:10:07 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.feature.analyser.tasks;
+package org.apache.sling.feature.analyser.impl;
import java.io.IOException;
import java.util.ArrayList;
@@ -27,10 +27,10 @@ import java.util.SortedMap;
import java.util.TreeMap;
import org.apache.sling.feature.Artifact;
-import org.apache.sling.feature.analyser.AnalyserTask;
-import org.apache.sling.feature.analyser.AnalyserTaskContext;
-import org.apache.sling.feature.scanner.BundleDescriptor;
-import org.apache.sling.feature.scanner.PackageInfo;
+import org.apache.sling.feature.analyser.BundleDescriptor;
+import org.apache.sling.feature.analyser.PackageInfo;
+import org.apache.sling.feature.analyser.task.AnalyserTask;
+import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
import org.osgi.framework.Version;
public class CheckBundleExportsImports implements AnalyserTask {
@@ -116,7 +116,7 @@ public class CheckBundleExportsImports i
}
// create a synthetic bundle info for the system bundle
- final BundleDescriptor system = new BundleDescriptor(new
Artifact(ctx.getApplication().getFramework()),
ctx.getDescriptor().getFrameworkDescriptor().getExportedPackages());
+ final BundleDescriptor system = new BundleDescriptorImpl(new
Artifact(ctx.getApplication().getFramework()),
ctx.getDescriptor().getFrameworkDescriptor().getExportedPackages());
// add all system packages
final List<BundleDescriptor> exportingBundles = new ArrayList<>();
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java
(from r1801057,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForInitialContent.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForInitialContent.java&r1=1801057&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForInitialContent.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java
Fri Jul 7 13:10:07 2017
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.feature.analyser.tasks;
+package org.apache.sling.feature.analyser.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.jar.Manifest;
import org.apache.sling.commons.osgi.ManifestHeader;
-import org.apache.sling.feature.analyser.AnalyserTask;
-import org.apache.sling.feature.analyser.AnalyserTaskContext;
-import org.apache.sling.feature.scanner.BundleDescriptor;
+import org.apache.sling.feature.analyser.BundleDescriptor;
+import org.apache.sling.feature.analyser.task.AnalyserTask;
+import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
public class CheckBundlesForInitialContent implements AnalyserTask {
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java
(from r1801057,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForResources.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForResources.java&r1=1801057&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForResources.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java
Fri Jul 7 13:10:07 2017
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.feature.analyser.tasks;
+package org.apache.sling.feature.analyser.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.jar.Manifest;
import org.apache.sling.commons.osgi.ManifestHeader;
-import org.apache.sling.feature.analyser.AnalyserTask;
-import org.apache.sling.feature.analyser.AnalyserTaskContext;
-import org.apache.sling.feature.scanner.BundleDescriptor;
+import org.apache.sling.feature.analyser.BundleDescriptor;
+import org.apache.sling.feature.analyser.task.AnalyserTask;
+import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
public class CheckBundlesForResources implements AnalyserTask {
Added:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java?rev=1801154&view=auto
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java
(added)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java
Fri Jul 7 13:10:07 2017
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.feature.analyser.impl;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.sling.feature.Capability;
+import org.apache.sling.feature.Requirement;
+import org.apache.sling.feature.analyser.ArtifactDescriptor;
+import org.apache.sling.feature.analyser.BundleDescriptor;
+import org.apache.sling.feature.analyser.ContainerDescriptor;
+import org.apache.sling.feature.analyser.PackageInfo;
+
+/**
+ * Information about a container (feature/application).
+ * This is the aggregated information.
+ */
+public class ContainerDescriptorImpl implements ContainerDescriptor {
+
+ private final Set<Requirement> requirements = new HashSet<>();
+
+ private final Set<Capability> capabilities = new HashSet<>();
+
+ private final Set<PackageInfo> exports = new HashSet<>();
+
+ private final Set<PackageInfo> imports = new HashSet<>();
+
+ private final Set<PackageInfo> dynamicImports = new HashSet<>();
+
+ private final Set<BundleDescriptor> bundles = new HashSet<>();
+
+ private final Set<ArtifactDescriptor> artifacts = new HashSet<>();
+
+ @Override
+ public Set<PackageInfo> getExportedPackages() {
+ return this.exports;
+ }
+
+ @Override
+ public Set<BundleDescriptor> getBundleDescriptors() {
+ return this.bundles;
+ }
+
+ @Override
+ public Set<ArtifactDescriptor> getArtifactDescriptors() {
+ return this.artifacts;
+ }
+
+ @Override
+ public Set<PackageInfo> getImportedPackages() {
+ return this.imports;
+ }
+
+ @Override
+ public Set<PackageInfo> getDynamicImportedPackages() {
+ return this.dynamicImports;
+ }
+
+ @Override
+ public Set<Requirement> getRequirements() {
+ return this.requirements;
+ }
+
+ @Override
+ public Set<Capability> getCapabilities() {
+ return this.capabilities;
+ }
+
+}
\ No newline at end of file
Propchange:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/FeatureDescriptorImpl.java
(from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FeatureDescriptor.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/FeatureDescriptorImpl.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/FeatureDescriptorImpl.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FeatureDescriptor.java&r1=1801153&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FeatureDescriptor.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/FeatureDescriptorImpl.java
Fri Jul 7 13:10:07 2017
@@ -14,65 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.scanner;
+package org.apache.sling.feature.analyser.impl;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.sling.feature.Capability;
-import org.apache.sling.feature.Requirement;
+import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.analyser.FeatureDescriptor;
/**
* Information about a feature.
* This is the aggregated information.
*/
-public class FeatureDescriptor implements Descriptor {
-
- private final Set<Requirement> requirements = new HashSet<>();
-
- private final Set<Capability> capabilities = new HashSet<>();
-
- private final Set<PackageInfo> exports = new HashSet<>();
-
- private final Set<PackageInfo> imports = new HashSet<>();
-
- private final Set<PackageInfo> dynamicImports = new HashSet<>();
-
- private final Set<BundleDescriptor> bundles = new HashSet<>();
-
- private final Set<ArtifactDescriptor> artifacts = new HashSet<>();
-
- @Override
- public Set<PackageInfo> getExportedPackages() {
- return this.exports;
- }
+public class FeatureDescriptorImpl
+ extends ContainerDescriptorImpl
+ implements FeatureDescriptor {
- public Set<BundleDescriptor> getBundleDescriptors() {
- return this.bundles;
- }
-
- public Set<ArtifactDescriptor> getArtifactDescriptors() {
- return this.artifacts;
- }
+ private final Feature feature;
- @Override
- public Set<PackageInfo> getImportedPackages() {
- return this.imports;
+ public FeatureDescriptorImpl(final Feature feature) {
+ this.feature = feature;
}
@Override
- public Set<PackageInfo> getDynamicImportedPackages() {
- return this.dynamicImports;
+ public Feature getFeature() {
+ return this.feature;
}
-
- @Override
- public Set<Requirement> getRequirements() {
- return this.requirements;
- }
-
- @Override
- public Set<Capability> getCapabilities() {
- return this.capabilities;
- }
-
}
\ No newline at end of file
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ManifestUtil.java
(from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ManifestUtil.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ManifestUtil.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ManifestUtil.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ManifestUtil.java&r1=1801153&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ManifestUtil.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ManifestUtil.java
Fri Jul 7 13:10:07 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.scanner;
+package org.apache.sling.feature.analyser.impl;
import java.io.File;
import java.io.IOException;
@@ -25,6 +25,7 @@ import java.util.jar.JarFile;
import java.util.jar.Manifest;
import org.apache.sling.commons.osgi.ManifestHeader;
+import org.apache.sling.feature.analyser.PackageInfo;
import org.osgi.framework.Constants;
public class ManifestUtil {
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java?rev=1801154&r1=1801153&r2=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java
Fri Jul 7 13:10:07 2017
@@ -22,8 +22,8 @@ import java.io.IOException;
import org.apache.sling.feature.Application;
import org.apache.sling.feature.analyser.Analyser;
+import org.apache.sling.feature.analyser.Scanner;
import org.apache.sling.feature.json.ApplicationJSONReader;
-import org.apache.sling.feature.scanner.Scanner;
import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.FeatureUtil;
import org.slf4j.Logger;
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTask.java
(from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/AnalyserTask.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTask.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTask.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/AnalyserTask.java&r1=1801153&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/AnalyserTask.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTask.java
Fri Jul 7 13:10:07 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.analyser;
+package org.apache.sling.feature.analyser.task;
/**
* A analyser task analyses a specific part of the assembled
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTaskContext.java
(from r1801153,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/AnalyserTaskContext.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTaskContext.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTaskContext.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/AnalyserTaskContext.java&r1=1801153&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/AnalyserTaskContext.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTaskContext.java
Fri Jul 7 13:10:07 2017
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.feature.analyser;
+package org.apache.sling.feature.analyser.task;
import org.apache.sling.feature.Application;
-import org.apache.sling.feature.scanner.ApplicationDescriptor;
+import org.apache.sling.feature.analyser.ApplicationDescriptor;
public interface AnalyserTaskContext {
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/package-info.java
(from r1800887,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/package-info.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/package-info.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/package-info.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/package-info.java&r1=1800887&r2=1801154&rev=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/package-info.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/package-info.java
Fri Jul 7 13:10:07 2017
@@ -18,6 +18,6 @@
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.feature.analyser;
+package org.apache.sling.feature.analyser.task;
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java?rev=1801154&r1=1801153&r2=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java
Fri Jul 7 13:10:07 2017
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.sling.feature.Artifact;
+import org.apache.sling.feature.analyser.ArtifactDescriptor;
/**
* The artifact scanner scans an artifact.
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java?rev=1801154&r1=1801153&r2=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java
Fri Jul 7 13:10:07 2017
@@ -20,6 +20,8 @@ import java.io.IOException;
import java.util.List;
import org.apache.sling.feature.Extension;
+import org.apache.sling.feature.analyser.ArtifactDescriptor;
+import org.apache.sling.feature.analyser.Descriptor;
import org.apache.sling.feature.support.ArtifactManager;
/**
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java?rev=1801154&r1=1801153&r2=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java
Fri Jul 7 13:10:07 2017
@@ -21,6 +21,7 @@ import java.io.IOException;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.KeyValueMap;
+import org.apache.sling.feature.analyser.Descriptor;
/**
* The framework scanner scans the framework
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java?rev=1801154&r1=1801153&r2=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
Fri Jul 7 13:10:07 2017
@@ -30,9 +30,9 @@ import java.util.zip.ZipInputStream;
import org.apache.sling.commons.osgi.ManifestHeader;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.KeyValueMap;
-import org.apache.sling.feature.scanner.Descriptor;
+import org.apache.sling.feature.analyser.Descriptor;
+import org.apache.sling.feature.analyser.PackageInfo;
import org.apache.sling.feature.scanner.FrameworkScanner;
-import org.apache.sling.feature.scanner.PackageInfo;
import org.osgi.framework.Constants;
public class FelixFrameworkScanner implements FrameworkScanner {
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/resources/META-INF/services/org.apache.sling.feature.analyser.AnalyserTask
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/resources/META-INF/services/org.apache.sling.feature.analyser.AnalyserTask?rev=1801154&r1=1801153&r2=1801154&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/resources/META-INF/services/org.apache.sling.feature.analyser.AnalyserTask
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/resources/META-INF/services/org.apache.sling.feature.analyser.AnalyserTask
Fri Jul 7 13:10:07 2017
@@ -1,4 +1,4 @@
-org.apache.sling.feature.analyser.tasks.CheckBundleExportsImports
-org.apache.sling.feature.analyser.tasks.CheckBundlesForInitialContent
-org.apache.sling.feature.analyser.tasks.CheckBundlesForResources
+org.apache.sling.feature.analyser.impl.CheckBundleExportsImports
+org.apache.sling.feature.analyser.impl.CheckBundlesForInitialContent
+org.apache.sling.feature.analyser.impl.CheckBundlesForResources
