Author: bdelacretaz
Date: Fri Sep 6 14:42:14 2013
New Revision: 1520585
URL: http://svn.apache.org/r1520585
Log:
SLING-3034 - move OsgiScriptBindingsProvider to samples module
Added:
sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/
sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/
sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/
sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/
sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/
sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/
sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/impl/
sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProvider.java
- copied, changed from r1520576,
sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/OsgiScriptBinding.java
sling/trunk/contrib/extensions/healthcheck/samples/src/test/
sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/
sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/org/
sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/org/apache/
sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/org/apache/sling/
sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/org/apache/sling/hc/
sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/org/apache/sling/hc/samples/
sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/org/apache/sling/hc/samples/impl/
sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProviderTest.java
- copied, changed from r1520576,
sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/impl/OsgiScriptBindingTest.java
Removed:
sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/OsgiScriptBinding.java
sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/impl/OsgiScriptBindingTest.java
Modified:
sling/trunk/contrib/extensions/healthcheck/samples/pom.xml
Modified: sling/trunk/contrib/extensions/healthcheck/samples/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/samples/pom.xml?rev=1520585&r1=1520584&r2=1520585&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/healthcheck/samples/pom.xml (original)
+++ sling/trunk/contrib/extensions/healthcheck/samples/pom.xml Fri Sep 6
14:42:14 2013
@@ -25,10 +25,18 @@
Sling Health Check sample content and configurations
</description>
+ <properties>
+ <sling.java.version>6</sling.java.version>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
@@ -39,4 +47,53 @@
</plugin>
</plugins>
</build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.hc.core</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.api</artifactId>
+ <version>2.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Copied:
sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProvider.java
(from r1520576,
sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/OsgiScriptBinding.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProvider.java?p2=sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProvider.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/OsgiScriptBinding.java&r1=1520576&r2=1520585&rev=1520585&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/OsgiScriptBinding.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/samples/src/main/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProvider.java
Fri Sep 6 14:42:14 2013
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.hc.core.impl;
+package org.apache.sling.hc.samples.impl;
import javax.script.Bindings;
@@ -41,7 +41,7 @@ import aQute.bnd.annotation.component.De
@Component
@Service
@Property(name="context", value="healthcheck")
-public class OsgiScriptBinding implements BindingsValuesProvider {
+public class OsgiScriptBindingsProvider implements BindingsValuesProvider {
private BundleContext bundleContext;
private final Logger log = LoggerFactory.getLogger(getClass());
public static final String OSGI_BINDING_NAME = "osgi";
Copied:
sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProviderTest.java
(from r1520576,
sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/impl/OsgiScriptBindingTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProviderTest.java?p2=sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProviderTest.java&p1=sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/impl/OsgiScriptBindingTest.java&r1=1520576&r2=1520585&rev=1520585&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/impl/OsgiScriptBindingTest.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/samples/src/test/java/org/apache/sling/hc/samples/impl/OsgiScriptBindingsProviderTest.java
Fri Sep 6 14:42:14 2013
@@ -15,14 +15,13 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.sling.hc.core.impl;
+package org.apache.sling.hc.samples.impl;
import static org.junit.Assert.assertEquals;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.sling.hc.core.impl.OsgiScriptBinding;
import org.apache.sling.hc.util.FormattingResultLog;
import org.junit.Test;
import org.mockito.Mockito;
@@ -30,7 +29,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
-public class OsgiScriptBindingTest {
+public class OsgiScriptBindingsProviderTest {
private Bundle mockBundle(boolean isFragment, boolean isActive) {
final Bundle b = Mockito.mock(Bundle.class);
@@ -57,7 +56,7 @@ public class OsgiScriptBindingTest {
Mockito.when(ctx.getBundles()).thenReturn(bundles);
final FormattingResultLog resultLog = new FormattingResultLog();
- final OsgiScriptBinding.OsgiBinding b = new
OsgiScriptBinding.OsgiBinding(ctx, resultLog);
+ final OsgiScriptBindingsProvider.OsgiBinding b = new
OsgiScriptBindingsProvider.OsgiBinding(ctx, resultLog);
assertEquals(1, b.inactiveBundlesCount());
}
}
\ No newline at end of file
