Adapt build to restructured code base

Change-Id: I4c43270b95a62e2e090a42a10fad6e0f0d04f121 Signed-off-by: Jochen Hiller <j.hiller@telekom.de>
eclipse-archived · Nov 14, 2015 · 4041a1a · 4041a1a
1 parent 16e95b5
commit 4041a1a
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 42 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,4 @@
 // Build script for Concierge
-// third change using Gerrit
 
 // sample usages:
 // Cleanup:                               ./gradlew clean
@@ -56,7 +55,8 @@ allprojects {
 }
 
 // configure all java projects
-configure(subprojects.findAll {it.name != 'distribution'}) {
+// ignore distribution and intermediate projects
+configure(subprojects.findAll {! (it.name in ['distribution', 'bundles', 'framework', 'tests']) }) {
 	apply plugin: 'java'
 	apply plugin: 'maven-publish'
 
@@ -76,7 +76,7 @@ configure(subprojects.findAll {it.name != 'distribution'}) {
             	srcDir 'src'
         	}
 	        resources {
-    	        srcDirs = [ ".", "../distribution/src/config" ]
+    	        srcDirs = [ ".", "../../distribution/src/config" ]
 				include "META-INF/services/**", "META-INF/micro-services", "about.html", "about_files/**"
         	}
 	    }
@@ -126,6 +126,8 @@ configure(subprojects.findAll {it.name != 'distribution'}) {
 	// name jar file to given bundle symbolic name and version, NOT to project version
 	// as project version is for overall packaging
 	// we maintain the bundle version manually (or using bndtools)
+	// for debugging
+	// println ("configure: jar=" + jar)
 	jar.archiveName = jar.manifest.getEffectiveManifest().getAttributes().get("Bundle-SymbolicName") \
 						+ "-" + jar.manifest.getEffectiveManifest().getAttributes().get("Bundle-Version") \
 						+ ".jar"
@@ -143,9 +145,9 @@ configure(subprojects.findAll {it.name != 'distribution'}) {
 	        	// https://repo.eclipse.org/content/repositories/concierge-releases/
 	        	// println ("project.version=" + project.version)
 	        	if(project.version.contains('SNAPSHOT')) {
-	        	    url "../distribution/build/repo/snapshots"
+	        	    url "../../distribution/build/repo/snapshots"
  		        } else {
-	        	    url "../distribution/build/repo/releases"
+	        	    url "../../distribution/build/repo/releases"
           		}
 	        	// println ("url=" + url)
         	}
@@ -154,44 +156,44 @@ configure(subprojects.findAll {it.name != 'distribution'}) {
 }
 
 
-project(':org.eclipse.concierge.extension.permission') {
+project(':framework:org.eclipse.concierge.extension.permission') {
     dependencies {
-        compile project(':org.eclipse.concierge')
+        compile project(':framework:org.eclipse.concierge')
     }
 }
-project(':org.eclipse.concierge.service.permission') {
+project(':bundles:org.eclipse.concierge.service.permission') {
     dependencies {
-        compile project(':org.eclipse.concierge')
+        compile project(':framework:org.eclipse.concierge')
     }
 }
-project(':org.eclipse.concierge.service.packageadmin') {
+project(':bundles:org.eclipse.concierge.service.packageadmin') {
     dependencies {
-        compile project(':org.eclipse.concierge')
+        compile project(':framework:org.eclipse.concierge')
     }
 }
-project(':org.eclipse.concierge.service.eventadmin') {
+project(':bundles:org.eclipse.concierge.service.eventadmin') {
     dependencies {
-        compile project(':org.eclipse.concierge')
+        compile project(':framework:org.eclipse.concierge')
     }
 }
-project(':org.eclipse.concierge.service.startlevel') {
+project(':bundles:org.eclipse.concierge.service.startlevel') {
     dependencies {
-        compile project(':org.eclipse.concierge')
+        compile project(':framework:org.eclipse.concierge')
     }
 }
-project(':org.eclipse.concierge.service.xmlparser') {
+project(':bundles:org.eclipse.concierge.service.xmlparser') {
     dependencies {
-        compile project(':org.eclipse.concierge')
+        compile project(':framework:org.eclipse.concierge')
     }
 }
-project(':org.eclipse.concierge.shell') {
+project(':bundles:org.eclipse.concierge.shell') {
     dependencies {
-        compile project(':org.eclipse.concierge')
+        compile project(':framework:org.eclipse.concierge')
     }
 }
-project(':org.eclipse.concierge.tests.integration') {
+project(':tests:org.eclipse.concierge.tests.integration') {
     dependencies {
-        compile project(':org.eclipse.concierge')
+        compile project(':framework:org.eclipse.concierge')
     }
 }
 

diff --git a/distribution/build.gradle b/distribution/build.gradle
@@ -28,17 +28,17 @@ distributions {
 		baseName 'concierge-incubation'
 		contents {
 			into('framework') {
-                from { project(':org.eclipse.concierge').jar }
-                from { project(':org.eclipse.concierge').strippedJar }
+                from { project(':framework:org.eclipse.concierge').jar }
+                from { project(':framework:org.eclipse.concierge').strippedJar }
+                from { project(':framework:org.eclipse.concierge.extension.permission').jar }
 			}
 			into('bundles') {
-                from { project(':org.eclipse.concierge.extension.permission').jar }
-                from { project(':org.eclipse.concierge.service.permission').jar }
-                from { project(':org.eclipse.concierge.service.packageadmin').jar }
-                from { project(':org.eclipse.concierge.service.eventadmin').jar }
-                from { project(':org.eclipse.concierge.service.startlevel').jar }
-                from { project(':org.eclipse.concierge.service.xmlparser').jar }
-                from { project(':org.eclipse.concierge.shell').jar }
+                from { project(':bundles:org.eclipse.concierge.service.permission').jar }
+                from { project(':bundles:org.eclipse.concierge.service.packageadmin').jar }
+                from { project(':bundles:org.eclipse.concierge.service.eventadmin').jar }
+                from { project(':bundles:org.eclipse.concierge.service.startlevel').jar }
+                from { project(':bundles:org.eclipse.concierge.service.xmlparser').jar }
+                from { project(':bundles:org.eclipse.concierge.shell').jar }
             }
 			into('docs') {
                 from ('build/gen-html/docs')

diff --git a/distribution/src/main/dist/samples/concierge.xargs b/distribution/src/main/dist/samples/concierge.xargs
@@ -7,7 +7,7 @@
 -Dorg.eclipse.concierge.profile=concierge
 
 # install framework extensions
--install bundles/org.eclipse.concierge.extension.permission-5.1.0.*.jar
+-install framework/org.eclipse.concierge.extension.permission-5.1.0.*.jar
 
 # install and start bundles
 -istart bundles/org.eclipse.concierge.shell-5.0.0.*.jar

diff --git a/distribution/src/main/dist/samples/equinox-console.xargs b/distribution/src/main/dist/samples/equinox-console.xargs
@@ -34,7 +34,7 @@
 
 # equinox.console requires condpermadmin, taken as framework extension
 # As this is a fragment just install, not start
--install bundles/org.eclipse.concierge.extension.permission-5.1.0.*.jar
+-install framework/org.eclipse.concierge.extension.permission-5.1.0.*.jar
 
 # Finally install and start Equinox console
 -istart ${repo.equinox}/org.eclipse.equinox.console_1.1.100.v20141023-1406.jar
diff --git a/distribution/src/markdown/docs/concierge-bundles.markdown b/distribution/src/markdown/docs/concierge-bundles.markdown
@@ -8,7 +8,8 @@ Lightweight shell implementation for interacting with the Concierge Framework.
 
 ### org.eclipse.concierge.extension.permission
 
-Provides the `org.osgi.service.condpermadmin` and `org.osgi.service.permissionadmin` interfaces
+Provides the `org.osgi.service.condpermadmin` and `org.osgi.service.permissionadmin` interfaces as framework extension
+Note: there is also a bundle org.eclipse.concierge.service.permission which contains same classes but not as framework extension but as separate bundle.
 
 ### org.eclipse.concierge.service.packageadmin
 
@@ -22,3 +23,6 @@ Provides an implementation of the `StartLevel` service.
 
 Allows any JAXP compliant XML Parser to register itself as an OSGi parser service.
 
+### org.eclipse.concierge.service.eventadmin
+
+Provides a very lightweight implementation of EventAdmin (just 3 clasees).
diff --git a/distribution/src/markdown/docs/release-notes.markdown b/distribution/src/markdown/docs/release-notes.markdown
@@ -2,6 +2,7 @@
 
 ## Release 5.1.0 (SNAPSHOT)
 
+* Restructured code base, moved extension.permission to framework folder
 * Added EventAdmin to distribution
 * Removed System.err message when restoring bundle
 * Added documentation for contributing with Gerrit

diff --git a/settings.gradle b/settings.gradle
@@ -1,11 +1,11 @@
 // all projects to include in build
-include	'org.eclipse.concierge',
-		'org.eclipse.concierge.extension.permission',
-		'org.eclipse.concierge.service.packageadmin',
-		'org.eclipse.concierge.service.permission',
-		'org.eclipse.concierge.service.startlevel',
-		'org.eclipse.concierge.service.xmlparser',
-		'org.eclipse.concierge.service.eventadmin',
-		'org.eclipse.concierge.shell',
-		'org.eclipse.concierge.tests.integration',
+include	'framework:org.eclipse.concierge',
+		'framework:org.eclipse.concierge.extension.permission',
+		'bundles:org.eclipse.concierge.service.packageadmin',
+		'bundles:org.eclipse.concierge.service.permission',
+		'bundles:org.eclipse.concierge.service.startlevel',
+		'bundles:org.eclipse.concierge.service.xmlparser',
+		'bundles:org.eclipse.concierge.service.eventadmin',
+		'bundles:org.eclipse.concierge.shell',
+		'tests:org.eclipse.concierge.tests.integration',
 		'distribution'