"add" all OSGi packages from 4.2 and up

Not all dependencies are worked out; but osgi50-enterprise builds.

13 files changed, 47 insertions, 7 deletions

diff --git a/conf/dependencies.mk b/conf/dependencies.mk
index f7d607f..6ce8f0b 100644
--- a/conf/dependencies.mk
+++ b/conf/dependencies.mk
@@ -30,7 +30,16 @@ dep-junit = /usr/share/java/junit.jar
 
 # Implementations of standards
 dep-jsr305 = build/packages/jsr305                # "Annotations for Software Defect Detection"
+dep-jsr315 = $(dep-servlet30)                     # "Java Servlet 3.0 Specification"
 dep-jsr330 = build/packages/atinject-javax.inject # "Dependency Injection for Java"
+dep-jsr340 = $(dep-servlet31)                     # "Java Servlet 3.1 Specification"
+
+dep-jpa20 = build/packages/eclipselink-persistence20
+dep-jpa21 = build/packages/eclipselink-persistence21
+
+dep-servlet25 = /usr/share/java/tomcat6/servlet-api.jar
+dep-servlet30 = /usr/share/java/tomcat7/servlet-api.jar
+dep-servlet31 = /usr/share/java/tomcat8/servlet-api.jar
 
 ################################################################################
 
@@ -134,6 +143,9 @@ build/packages/plexus-container-default: \
 	build/packages/plexus-utils \
 	build/packages/xbean-bootstrap
 
+# OSGi
+build/packages/osgi50-enterprise: build/packages/osgi50-core $(dep-servlet31) $(dep-jpa21)
+
 # Misc
 
 build/packages/aether-core-bootstrap: \
@@ -176,6 +188,10 @@ build/packages/hawtjni-bootstrap: \
 	build/packages/commons-cli \
 	build/packages/xbean-bootstrap
 
+build/packages/eclipselink-persistence20: \
+	build/packages/osgi50-core # any version would probably work
+build/packages/eclipselink-persistence21: \
+	build/packages/osgi50-core # any version would probably work
 # ASM
 build/packages/ow-util-ant-tasks: build/packages/asm2
 build/packages/asm1: build/packages/ow-util-ant-tasks
diff --git a/conf/sources.mk b/conf/sources.mk
index 2a1658a..776a0fd 100644
--- a/conf/sources.mk
+++ b/conf/sources.mk
@@ -45,6 +45,25 @@ plexus-component-annotations                =  tar|https://github.com/sonatype/p
 plexus-component-metadata-bootstrap         =  tar|https://github.com/sonatype/plexus-containers/archive/plexus-containers-1.5.5.tar.gz|plexus-component-metadata
 plexus-container-default                    =  tar|https://github.com/sonatype/plexus-containers/archive/plexus-containers-1.5.5.tar.gz|plexus-container-default
 
+# OSGi code (starting at 4.2)
+osgi42-core                                 =  tar|http://www.osgi.org/download/r4v42/osgi.core.jar|OSGI-OPT
+osgi42-cmpn                                 =  tar|http://www.osgi.org/download/r4v42/osgi.cmpn.jar|OSGI-OPT
+osgi42-enterprise                           =  tar|http://www.osgi.org/download/r4v42/osgi.enterprise.jar|OSGI-OPT
+_tarbombs += $(osgi42-core) $(osgi42-cmpn) $(osgi42-enterprise)
+
+osgi43-core                                 =  tar|http://www.osgi.org/download/r4v43/osgi.core-4.3.1.jar|OSGI-OPT
+osgi43-cmpn                                 =  tar|http://www.osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar|OSGI-OPT
+osgi43-residential                          =  tar|http://www.osgi.org/download/r4v43/osgi.residential-4.3.0.jar|OSGI-OPT
+_tarbombs += $(osgi43-core) $(osgi43-cmpn) $(osgi43-residential)
+
+osgi50-core                                 =  tar|http://www.osgi.org/download/r5/osgi.core-5.0.0.jar|OSGI-OPT
+osgi50-cmpn                                 =  tar|http://www.osgi.org/download/r5/osgi.cmpn-5.0.0.jar|OSGI-OPT
+osgi50-enterprise                           =  tar|http://www.osgi.org/download/r5/osgi.enterprise-5.0.0.jar|OSGI-OPT
+_tarbombs += $(osgi50-core) $(osgi50-cmpn) $(osgi50-enterprise)
+
+osgi60-core                                 =  tar|http://www.osgi.org/download/r6/osgi.core-6.0.0.jar|OSGI-OPT
+_tarbombs += $(osgi60-core)
+
 # Misc tarballs
 bnd                                         =  tar|https://github.com/bndtools/bnd/archive/2.3.0.REL.tar.gz
 cal10n                                      =  tar|https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz
@@ -61,11 +80,8 @@ qdox                                        =  tar|https://nexus.codehaus.org/co
 slf4j-api                                   =  tar|http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz|slf4j-api # HTTPS is mis-configured
 wagon                                       =  tar|$(_apache_mirror)/maven/wagon/wagon-2.6-source-release.zip
 
-
-osgi42-core                                 =  tar|http://www.osgi.org/download/r4v42/osgi.core.jar|OSGI-OPT
-osgi43-core                                 =  tar|http://www.osgi.org/download/r4v43/osgi.core-4.3.1.jar|OSGI-OPT
-osgi50-core                                 =  tar|http://www.osgi.org/download/r5/osgi.core-5.0.0.jar|OSGI-OPT
-_tarbombs += $(osgi42-core) $(osgi43-core) $(osgi50-core)
+eclispelink-persistence20                   =  tar|http://git.eclipse.org/c/eclipselink/javax.persistence.git/snapshot/javax.persistence-2.0.6.v201308211412.tar.gz
+eclipselink-persistence21                   =  tar|http://git.eclipse.org/c/eclipselink/javax.persistence.git/snapshot/javax.persistence-2.1.0.v201304241213.tar.gz
 
 # Misc Git
 aether-core-bootstrap                       =  git|git://git.eclipse.org/gitroot/aether/aether-core.git|aether-1.0.0.v20140518
diff --git a/rules/osgi42-core/Makefile b/rules/common-osgi/Makefile
index 30eb1f7..30eb1f7 100644
--- a/rules/osgi42-core/Makefile
+++ b/rules/common-osgi/Makefile
diff --git a/rules/osgi42-cmpn b/rules/osgi42-cmpn
new file mode 120000
index 0000000..c77da21
--- /dev/null
+++ b/rules/osgi42-cmpn
@@ -0,0 +1 @@
+common-osgi
\ No newline at end of file
diff --git a/rules/osgi42-core b/rules/osgi42-core
new file mode 120000
index 0000000..c77da21
--- /dev/null
+++ b/rules/osgi42-core
@@ -0,0 +1 @@
+common-osgi
\ No newline at end of file
diff --git a/rules/osgi42-enterprise b/rules/osgi42-enterprise
new file mode 120000
index 0000000..c77da21
--- /dev/null
+++ b/rules/osgi42-enterprise
@@ -0,0 +1 @@
+common-osgi
\ No newline at end of file
diff --git a/rules/osgi43-cmpn b/rules/osgi43-cmpn
new file mode 120000
index 0000000..c77da21
--- /dev/null
+++ b/rules/osgi43-cmpn
@@ -0,0 +1 @@
+common-osgi
\ No newline at end of file
diff --git a/rules/osgi43-core b/rules/osgi43-core
index 548ca5d..c77da21 120000
--- a/rules/osgi43-core
+++ b/rules/osgi43-core
@@ -1 +1 @@
-osgi42-core
\ No newline at end of file
+common-osgi
\ No newline at end of file
diff --git a/rules/osgi43-residential b/rules/osgi43-residential
new file mode 120000
index 0000000..c77da21
--- /dev/null
+++ b/rules/osgi43-residential
@@ -0,0 +1 @@
+common-osgi
\ No newline at end of file
diff --git a/rules/osgi50-cmpn b/rules/osgi50-cmpn
new file mode 120000
index 0000000..c77da21
--- /dev/null
+++ b/rules/osgi50-cmpn
@@ -0,0 +1 @@
+common-osgi
\ No newline at end of file
diff --git a/rules/osgi50-core b/rules/osgi50-core
index 548ca5d..c77da21 120000
--- a/rules/osgi50-core
+++ b/rules/osgi50-core
@@ -1 +1 @@
-osgi42-core
\ No newline at end of file
+common-osgi
\ No newline at end of file
diff --git a/rules/osgi50-enterprise b/rules/osgi50-enterprise
new file mode 120000
index 0000000..c77da21
--- /dev/null
+++ b/rules/osgi50-enterprise
@@ -0,0 +1 @@
+common-osgi
\ No newline at end of file
diff --git a/rules/osgi60-core b/rules/osgi60-core
new file mode 120000
index 0000000..c77da21
--- /dev/null
+++ b/rules/osgi60-core
@@ -0,0 +1 @@
+common-osgi
\ No newline at end of file