Author: cziegeler
Date: Mon Aug 14 14:55:39 2017
New Revision: 1805007
URL: http://svn.apache.org/viewvc?rev=1805007&view=rev
Log:
Move services to own package
Added:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/Analyser.java
- copied, changed from r1805006,
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/service/Scanner.java
- copied, changed from r1805006,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/package-info.java
(with props)
Removed:
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/Scanner.java
Modified:
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/ExtensionScanner.java
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
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=1805007&r1=1805006&r2=1805007&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
Mon Aug 14 14:55:39 2017
@@ -17,8 +17,8 @@
package org.apache.sling.feature.analyser.main;
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.analyser.service.Analyser;
+import org.apache.sling.feature.analyser.service.Scanner;
import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.FeatureUtil;
import org.apache.sling.feature.support.json.ApplicationJSONReader;
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/Analyser.java
(from r1805006,
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/service/Analyser.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/Analyser.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java&r1=1805006&r2=1805007&rev=1805007&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/service/Analyser.java
Mon Aug 14 14:55:39 2017
@@ -14,9 +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.service;
import org.apache.sling.feature.Application;
+import org.apache.sling.feature.analyser.ApplicationDescriptor;
import org.apache.sling.feature.analyser.task.AnalyserTask;
import org.apache.sling.feature.analyser.task.AnalyserTaskContext;
import org.slf4j.Logger;
Copied:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/Scanner.java
(from r1805006,
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/Scanner.java?p2=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/Scanner.java&p1=sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java&r1=1805006&r2=1805007&rev=1805007&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/Scanner.java
Mon Aug 14 14:55:39 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.service;
import java.io.File;
import java.io.IOException;
@@ -29,6 +29,10 @@ import org.apache.sling.feature.Bundles;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.analyser.ApplicationDescriptor;
+import org.apache.sling.feature.analyser.BundleDescriptor;
+import org.apache.sling.feature.analyser.ContainerDescriptor;
+import org.apache.sling.feature.analyser.FeatureDescriptor;
import org.apache.sling.feature.analyser.impl.ApplicationDescriptorImpl;
import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
import org.apache.sling.feature.analyser.impl.FeatureDescriptorImpl;
Added:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/package-info.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/package-info.java?rev=1805007&view=auto
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/package-info.java
(added)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/package-info.java
Mon Aug 14 14:55:39 2017
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+@org.osgi.annotation.versioning.Version("1.0.0")
+package org.apache.sling.feature.analyser.service;
+
+
Propchange:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/service/package-info.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
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=1805007&r1=1805006&r2=1805007&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
Mon Aug 14 14:55:39 2017
@@ -21,10 +21,12 @@ import java.io.IOException;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.analyser.ContainerDescriptor;
import org.apache.sling.feature.support.ArtifactManager;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The extension scanner scans an extension.
*/
+@ConsumerType
public interface ExtensionScanner {
/** A unique (short) id. */
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=1805007&r1=1805006&r2=1805007&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
Mon Aug 14 14:55:39 2017
@@ -22,10 +22,12 @@ import java.io.IOException;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.KeyValueMap;
import org.apache.sling.feature.analyser.BundleDescriptor;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The framework scanner scans the framework
*/
+@ConsumerType
public interface FrameworkScanner {
/**
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java?rev=1805007&r1=1805006&r2=1805007&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
Mon Aug 14 14:55:39 2017
@@ -18,6 +18,8 @@ package org.apache.sling.feature.analyse
import org.apache.sling.feature.Application;
import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.analyser.service.Analyser;
+import org.apache.sling.feature.analyser.service.Scanner;
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.FeatureUtil;
