incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r803855 - in /sling/trunk/installer/osgi/it: ./ src/main/java/org/apache/sling/jcr/ src/main/java/org/apache/sling/osgi/ src/main/java/org/apache/sling/osgi/installer/ src/main/java/org/apache/sling/osgi/installer/it/ src/main/java/org/apac...
Date Thu, 13 Aug 2009 12:09:49 GMT
Author: bdelacretaz
Date: Thu Aug 13 12:09:49 2009
New Revision: 803855

URL: http://svn.apache.org/viewvc?rev=803855&view=rev
Log:
SLING-1078 - remove remaining references to jcrinstall, this module has no JCR dependencies
anymore

Added:
    sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/
    sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/
    sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/
    sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/Dummy.java
      - copied, changed from r803805, sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/Dummy.java
    sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/a/
    sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/a/ClassA.java
      - copied, changed from r803805, sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/a/ClassA.java
    sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/b/
    sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/b/ClassB.java
      - copied, changed from r803805, sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/b/ClassB.java
    sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/
    sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/
    sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/
    sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTest.java
      - copied, changed from r803805, sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java
    sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/SimpleFileInstallableData.java
      - copied, changed from r803805, sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/SimpleFileInstallableData.java
Removed:
    sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/
    sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/jcr/
Modified:
    sling/trunk/installer/osgi/it/pom.xml

Modified: sling/trunk/installer/osgi/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/pom.xml?rev=803855&r1=803854&r2=803855&view=diff
==============================================================================
--- sling/trunk/installer/osgi/it/pom.xml (original)
+++ sling/trunk/installer/osgi/it/pom.xml Thu Aug 13 12:09:49 2009
@@ -77,11 +77,11 @@
                             <value>${pax.exam.debug.port}</value>
                         </property>
                         <property>
-                            <name>jcrinstall.pom.version</name>
+                            <name>osgi.installer.pom.version</name>
                             <value>${pom.version}</value>
                         </property>
                         <property>
-                            <name>jcrinstall.base.dir</name>
+                            <name>osgi.installer.base.dir</name>
                             <value>${project.build.directory}</value>
                         </property>
                     </systemProperties>
@@ -123,8 +123,8 @@
                             <archive>
                                 <manifestEntries>
                                     <Manifest-Version>2</Manifest-Version>
-                                    <Bundle-Name>JCRinstall test bundle</Bundle-Name>
-                                    <Bundle-SymbolicName>jcrinstall-testbundle</Bundle-SymbolicName>
+                                    <Bundle-Name>OSGi controller test bundle</Bundle-Name>
+                                    <Bundle-SymbolicName>osgi-installer-testbundle</Bundle-SymbolicName>
                                     <Bundle-Version>1.0</Bundle-Version>
                                 </manifestEntries>
                             </archive>
@@ -141,8 +141,8 @@
                             <archive>
                                 <manifestEntries>
                                     <Manifest-Version>2</Manifest-Version>
-                                    <Bundle-Name>JCRinstall test bundle</Bundle-Name>
-                                    <Bundle-SymbolicName>jcrinstall-testbundle</Bundle-SymbolicName>
+                                    <Bundle-Name>OSGi controller test bundle</Bundle-Name>
+                                    <Bundle-SymbolicName>osgi-installer-testbundle</Bundle-SymbolicName>
                                     <Bundle-Version>1.1</Bundle-Version>
                                 </manifestEntries>
                             </archive>
@@ -159,8 +159,8 @@
                             <archive>
                                 <manifestEntries>
                                     <Manifest-Version>2</Manifest-Version>
-                                    <Bundle-Name>JCRinstall test bundle</Bundle-Name>
-                                    <Bundle-SymbolicName>jcrinstall-testbundle</Bundle-SymbolicName>
+                                    <Bundle-Name>OSGi controller test bundle</Bundle-Name>
+                                    <Bundle-SymbolicName>osgi-installer-testbundle</Bundle-SymbolicName>
                                     <Bundle-Version>1.2</Bundle-Version>
                                 </manifestEntries>
                             </archive>
@@ -177,8 +177,8 @@
                             <archive>
                                 <manifestEntries>
                                     <Manifest-Version>2</Manifest-Version>
-                                    <Bundle-Name>JCRinstall test bundle</Bundle-Name>
-                                    <Bundle-SymbolicName>jcrinstall-testA</Bundle-SymbolicName>
+                                    <Bundle-Name>OSGi controller test bundle</Bundle-Name>
+                                    <Bundle-SymbolicName>osgi-installer-testA</Bundle-SymbolicName>
                                     <Bundle-Version>1.0</Bundle-Version>
                                 </manifestEntries>
                             </archive>
@@ -199,10 +199,10 @@
                             <archive>
                                 <manifestEntries>
                                     <Manifest-Version>2</Manifest-Version>
-                                    <Bundle-Name>JCRinstall test bundle</Bundle-Name>
-                                    <Bundle-SymbolicName>jcrinstall-testB</Bundle-SymbolicName>
+                                    <Bundle-Name>OSGi controller test bundle</Bundle-Name>
+                                    <Bundle-SymbolicName>osgi-installer-testB</Bundle-SymbolicName>
                                     <Bundle-Version>1.0</Bundle-Version>
-                                    <Export-Package>org.apache.sling.jcr.jcrinstall.it.a;version="1.0"</Export-Package>
+                                    <Export-Package>org.apache.sling.osgi.installer.it.a;version="1.0"</Export-Package>
                                 </manifestEntries>
                             </archive>
                         </configuration>
@@ -222,10 +222,10 @@
                             <archive>
                                 <manifestEntries>
                                     <Manifest-Version>2</Manifest-Version>
-                                    <Bundle-Name>JCRinstall test bundle</Bundle-Name>
-                                    <Bundle-SymbolicName>jcrinstall-needsB</Bundle-SymbolicName>
+                                    <Bundle-Name>OSGi controller test bundle</Bundle-Name>
+                                    <Bundle-SymbolicName>osgi-installer-needsB</Bundle-SymbolicName>
                                     <Bundle-Version>1.0</Bundle-Version>
-                                    <Import-Package>org.apache.sling.jcr.jcrinstall.it.a;version="1.0"</Import-Package>
+                                    <Import-Package>org.apache.sling.osgi.installer.it.a;version="1.0"</Import-Package>
                                 </manifestEntries>
                             </archive>
                         </configuration>

Copied: sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/Dummy.java
(from r803805, sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/Dummy.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/Dummy.java?p2=sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/Dummy.java&p1=sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/Dummy.java&r1=803805&r2=803855&rev=803855&view=diff
==============================================================================
--- sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/Dummy.java
(original)
+++ sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/Dummy.java
Thu Aug 13 12:09:49 2009
@@ -1,4 +1,4 @@
-package org.apache.sling.jcr.jcrinstall.it;
+package org.apache.sling.osgi.installer.it;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

Copied: sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/a/ClassA.java
(from r803805, sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/a/ClassA.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/a/ClassA.java?p2=sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/a/ClassA.java&p1=sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/a/ClassA.java&r1=803805&r2=803855&rev=803855&view=diff
==============================================================================
--- sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/a/ClassA.java
(original)
+++ sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/a/ClassA.java
Thu Aug 13 12:09:49 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.jcr.jcrinstall.it.a;
+package org.apache.sling.osgi.installer.it.a;
 
 /** Dummy class used in test bundles */
 public class ClassA {

Copied: sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/b/ClassB.java
(from r803805, sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/b/ClassB.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/b/ClassB.java?p2=sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/b/ClassB.java&p1=sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/b/ClassB.java&r1=803805&r2=803855&rev=803855&view=diff
==============================================================================
--- sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/jcr/jcrinstall/it/b/ClassB.java
(original)
+++ sling/trunk/installer/osgi/it/src/main/java/org/apache/sling/osgi/installer/it/b/ClassB.java
Thu Aug 13 12:09:49 2009
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.jcr.jcrinstall.it.b;
+package org.apache.sling.osgi.installer.it.b;
 
-import org.apache.sling.jcr.jcrinstall.it.a.ClassA;
+import org.apache.sling.osgi.installer.it.a.ClassA;
 
 /** Dummy class used in test bundles */
 public class ClassB {

Copied: sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTest.java
(from r803805, sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTest.java?p2=sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTest.java&p1=sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java&r1=803805&r2=803855&rev=803855&view=diff
==============================================================================
--- sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java
(original)
+++ sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTest.java
Thu Aug 13 12:09:49 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.jcr.jcrinstall.it;
+package org.apache.sling.osgi.installer.it;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -62,7 +62,7 @@
  */
 @RunWith(JUnit4TestRunner.class)
 public class OsgiControllerTest implements FrameworkListener {
-	public final static String POM_VERSION = System.getProperty("jcrinstall.pom.version");
+	public final static String POM_VERSION = System.getProperty("osgi.installer.pom.version");
 	public final static String JAR_EXT = ".jar";
 	private int packageRefreshEventsCount;
 	
@@ -158,7 +158,7 @@
     }
     
     protected File getTestBundle(String bundleName) {
-    	return new File(System.getProperty("jcrinstall.base.dir"), bundleName);
+    	return new File(System.getProperty("osgi.installer.base.dir"), bundleName);
     }
     
     protected void waitForConfigAdmin(boolean shouldBePresent) throws InterruptedException
{
@@ -239,7 +239,7 @@
     
     @Test
     public void testInstallUpgradeDowngradeBundle() throws Exception {
-    	final String symbolicName = "jcrinstall-testbundle";
+    	final String symbolicName = "osgi-installer-testbundle";
     	final String uri = symbolicName + JAR_EXT;
     	final String BUNDLE_VERSION = "Bundle-Version";
     	
@@ -315,16 +315,16 @@
         	c.scheduleInstallOrUpdate("testB.jar", 
         			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testB-1.0.jar")));
         	c.executeScheduledOperations();
-        	final Bundle b = findBundle("jcrinstall-testB");
+        	final Bundle b = findBundle("osgi-installer-testB");
         	assertNotNull("Test bundle must be found", b);
         	b.stop();
     	}
     	
-    	assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("jcrinstall-testA").getState());
-    	assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("jcrinstall-testB").getState());
+    	assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("osgi-installer-testA").getState());
+    	assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("osgi-installer-testB").getState());
     	
     	// Execute some OsgiController operations
-    	final String symbolicName = "jcrinstall-testbundle";
+    	final String symbolicName = "osgi-installer-testbundle";
     	final String uri = symbolicName + JAR_EXT;
     	final String BUNDLE_VERSION = "Bundle-Version";
     	c.scheduleInstallOrUpdate(uri, 
@@ -342,19 +342,18 @@
     	assertEquals("Version must be 1.2", "1.2", b.getHeaders().get(BUNDLE_VERSION));
     	
     	// And check that bundles A and B have kept their states
-    	assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("jcrinstall-testA").getState());
-    	assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("jcrinstall-testB").getState());
+    	assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("osgi-installer-testA").getState());
+    	assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("osgi-installer-testB").getState());
     }
     
-    /** needsB bundle requires testB, try loading needsB first,
-     *	then testB, and verify that in the end needsB is started 	
-     */
+    // needsB bundle requires testB, try loading needsB first,
+	// then testB, and verify that in the end needsB is started 	
     @Test
     public void testBundleDependencies() throws Exception {
     	final OsgiController c = getService(OsgiController.class);
     	
-    	final String testB = "jcrinstall-testB";
-    	final String needsB = "jcrinstall-needsB";
+    	final String testB = "osgi-installer-testB";
+    	final String needsB = "osgi-installer-needsB";
     	
     	{
         	final Bundle b = findBundle(testB);
@@ -432,13 +431,13 @@
 
     @org.ops4j.pax.exam.junit.Configuration
     public static Option[] configuration() {
-    	String vmOpt = "-Djrcinstall.testing";
+    	String vmOpt = "-Dosgi.installer.testing";
     	
     	// This runs in the VM that runs the build, but the tests run in another one.
-    	// Make all jcrinstall.* system properties available to OSGi framework VM
+    	// Make all osgi.installer.* system properties available to OSGi framework VM
     	for(Object o : System.getProperties().keySet()) {
     		final String key = (String)o;
-    		if(key.startsWith("jcrinstall.")) {
+    		if(key.startsWith("osgi.installer.")) {
     			vmOpt += " -D" + key + "=" + System.getProperty(key);
     		}
     	}
@@ -454,7 +453,6 @@
                 vmOption(vmOpt),
                 waitForFrameworkStartup(),
         		provision(
-        				// TODO use latest scr?
         	            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"),

Copied: sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/SimpleFileInstallableData.java
(from r803805, sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/SimpleFileInstallableData.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/SimpleFileInstallableData.java?p2=sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/SimpleFileInstallableData.java&p1=sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/SimpleFileInstallableData.java&r1=803805&r2=803855&rev=803855&view=diff
==============================================================================
--- sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/SimpleFileInstallableData.java
(original)
+++ sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/SimpleFileInstallableData.java
Thu Aug 13 12:09:49 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.jcr.jcrinstall.it;
+package org.apache.sling.osgi.installer.it;
 
 import java.io.File;
 import java.io.FileInputStream;



Mime
View raw message