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 2010/09/20 18:52:33 UTC
svn commit: r999007 - in /sling/trunk/installer/it: ./
src/main/java/org/apache/sling/installer/it/
src/main/java/org/apache/sling/installer/it/a/
src/main/java/org/apache/sling/installer/it/b/
src/test/java/org/apache/sling/installer/it/
Author: cziegeler
Date: Mon Sep 20 16:52:32 2010
New Revision: 999007
URL: http://svn.apache.org/viewvc?rev=999007&view=rev
Log:
SLING-1787 : Unify symbolic names and check package names
Modified:
sling/trunk/installer/it/pom.xml
sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/Dummy.java
sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/a/ClassA.java
sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/b/ClassB.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleDependenciesTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallStressTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallUpgradeDowngradeTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundlePrioritiesTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleSnapshotUpdateTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleStatePreservedTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigPrioritiesTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ContextBundleUpdateTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/EventsDetector.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/InvalidBundlesTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/MockInstallableResource.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/RegisterResourcesTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/RemovedResourceDetectionTest.java
Modified: sling/trunk/installer/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/pom.xml?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/pom.xml (original)
+++ sling/trunk/installer/it/pom.xml Mon Sep 20 16:52:32 2010
@@ -26,7 +26,7 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <artifactId>org.apache.sling.osgi.installer.it</artifactId>
+ <artifactId>org.apache.sling.installer.it</artifactId>
<version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -240,7 +240,7 @@
<attribute name="Manifest-Version" value="2"/>
<attribute name="Bundle-Name" value="OSGi controller test bundle"/>
<attribute name="Bundle-SymbolicName" value="osgi-installer-testB"/>
- <attribute name="Export-Package" value='org.apache.sling.osgi.installer.it.a;version="1.0"'/>
+ <attribute name="Export-Package" value='org.apache.sling.installer.it.a;version="1.0"'/>
<attribute name="Bundle-Version" value="1.0"/>
</manifest>
</jar>
@@ -265,7 +265,7 @@
<attribute name="Bundle-Name" value="OSGi controller test bundle"/>
<attribute name="Bundle-SymbolicName" value="osgi-installer-needsB"/>
<attribute name="Bundle-Version" value="1.0"/>
- <attribute name="Import-Package" value='org.apache.sling.osgi.installer.it.a;version="1.0"'/>
+ <attribute name="Import-Package" value='org.apache.sling.installer.it.a;version="1.0"'/>
</manifest>
</jar>
</tasks>
Modified: sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/Dummy.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/Dummy.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/Dummy.java (original)
+++ sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/Dummy.java Mon Sep 20 16:52:32 2010
@@ -1,4 +1,4 @@
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/a/ClassA.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/a/ClassA.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/a/ClassA.java (original)
+++ sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/a/ClassA.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it.a;
+package org.apache.sling.installer.it.a;
/** Dummy class used in test bundles */
public class ClassA {
Modified: sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/b/ClassB.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/b/ClassB.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/b/ClassB.java (original)
+++ sling/trunk/installer/it/src/main/java/org/apache/sling/installer/it/b/ClassB.java Mon Sep 20 16:52:32 2010
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it.b;
+package org.apache.sling.installer.it.b;
-import org.apache.sling.osgi.installer.it.a.ClassA;
+import org.apache.sling.installer.it.a.ClassA;
/** Dummy class used in test bundles */
public class ClassB {
- ClassA a = new ClassA();
+ ClassA a = new ClassA();
}
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleDependenciesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleDependenciesTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleDependenciesTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleDependenciesTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallStressTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallStressTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallStressTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallStressTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.fail;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallUpgradeDowngradeTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallUpgradeDowngradeTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallUpgradeDowngradeTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallUpgradeDowngradeTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundlePrioritiesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundlePrioritiesTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundlePrioritiesTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundlePrioritiesTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleSnapshotUpdateTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleSnapshotUpdateTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleSnapshotUpdateTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleSnapshotUpdateTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleStatePreservedTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleStatePreservedTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleStatePreservedTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleStatePreservedTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigPrioritiesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigPrioritiesTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigPrioritiesTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigPrioritiesTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.fail;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ContextBundleUpdateTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ContextBundleUpdateTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ContextBundleUpdateTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ContextBundleUpdateTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.assertNull;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/EventsDetector.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/EventsDetector.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/EventsDetector.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/EventsDetector.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -28,14 +28,14 @@ import org.osgi.service.cm.Configuration
import org.osgi.service.cm.ConfigurationListener;
/** Utility that waits for no OSGi events to happen in a given amount
- * of time.
+ * of time.
*/
class EventsDetector implements FrameworkListener, BundleListener, ConfigurationListener, ServiceListener {
private long lastEvent;
private final ServiceRegistration configReg;
private final BundleContext ctx;
-
+
EventsDetector(BundleContext ctx) {
this.ctx = ctx;
ctx.addBundleListener(this);
@@ -43,14 +43,14 @@ class EventsDetector implements Framewor
ctx.addServiceListener(this);
configReg = ctx.registerService(ConfigurationListener.class.getName(), this, null);
}
-
+
void close() {
configReg.unregister();
ctx.removeServiceListener(this);
ctx.removeFrameworkListener(this);
ctx.removeBundleListener(this);
}
-
+
void waitForNoEvents(long timeWithoutEventsMsec, long timeoutMsec) throws InterruptedException {
final long endTime = System.currentTimeMillis() + timeoutMsec;
final long exitTime = lastEvent + timeWithoutEventsMsec;
@@ -62,11 +62,11 @@ class EventsDetector implements Framewor
}
throw new IllegalStateException("Did not get " + timeWithoutEventsMsec + " msec without events after waiting " + timeoutMsec);
}
-
+
private void recordLastEvent() {
lastEvent = System.currentTimeMillis();
}
-
+
public void frameworkEvent(FrameworkEvent arg0) {
recordLastEvent();
}
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/InvalidBundlesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/InvalidBundlesTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/InvalidBundlesTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/InvalidBundlesTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.assertNull;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/MockInstallableResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/MockInstallableResource.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/MockInstallableResource.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/MockInstallableResource.java Mon Sep 20 16:52:32 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -66,7 +66,7 @@ class OsgiInstallerTestBase implements F
protected OsgiInstaller installer;
public static final long WAIT_FOR_ACTION_TIMEOUT_MSEC = 5000;
- public static final String BUNDLE_BASE_NAME = "org.apache.sling.osgi.installer.it-" + POM_VERSION;
+ public static final String BUNDLE_BASE_NAME = "org.apache.sling.installer.it-" + POM_VERSION;
@Inject
protected BundleContext bundleContext;
@@ -109,7 +109,7 @@ class OsgiInstallerTestBase implements F
* Restart the installer.
*/
protected void restartInstaller() throws BundleException {
- final String symbolicName = "org.apache.sling.osgi.installer";
+ final String symbolicName = "org.apache.sling.installer.core";
final Bundle b = findBundle(symbolicName);
if (b == null) {
fail("Bundle " + symbolicName + " not found");
@@ -122,7 +122,7 @@ class OsgiInstallerTestBase implements F
protected void generateBundleEvent() throws Exception {
// install a bundle manually to generate a bundle event
- final File f = getTestBundle("org.apache.sling.osgi.installer.it-" + POM_VERSION + "-testbundle-1.0.jar");
+ final File f = getTestBundle("org.apache.sling.installer.it-" + POM_VERSION + "-testbundle-1.0.jar");
final InputStream is = new FileInputStream(f);
Bundle b = null;
try {
@@ -383,7 +383,7 @@ class OsgiInstallerTestBase implements F
mavenBundle("org.apache.felix", "org.apache.felix.scr"),
mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
mavenBundle("org.apache.sling", "org.apache.sling.commons.log"),
- mavenBundle("org.apache.sling", "org.apache.sling.osgi.installer", POM_VERSION)
+ mavenBundle("org.apache.sling", "org.apache.sling.installer.core", POM_VERSION)
)
);
}
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/RegisterResourcesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/RegisterResourcesTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/RegisterResourcesTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/RegisterResourcesTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/RemovedResourceDetectionTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/RemovedResourceDetectionTest.java?rev=999007&r1=999006&r2=999007&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/RemovedResourceDetectionTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/RemovedResourceDetectionTest.java Mon Sep 20 16:52:32 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.installer.it;
+package org.apache.sling.installer.it;
import static org.junit.Assert.assertNull;