Merge pull request OpenLiberty#4 from gmarcy/more-kernel-test-projects

More kernel test projects

dev/build.image/build-fat-image.xml

@@ -82,9 +82,9 @@
         <include name="fattest.simplicity/autoFVT-defaults/${fat.bootstrap.name}"/>
         <include name="test_build/**"/>
         <!-- We'll need the test features which, handily, are in the wlp folder -->
-        <include name="build.image/wlp/lib/com.ibm.ws.timedexit*.jar"/>
+        <include name="build.image/wlp/lib/com.ibm.ws.timedexit_*.jar"/>
         <include name="build.image/wlp/lib/features/com.ibm.websphere.appserver.timedexit-1.0.mf"/>
-        <include name="build.image/wlp/lib/com.ibm.ws.componenttest*.jar"/>
+        <include name="build.image/wlp/lib/com.ibm.ws.componenttest_*.jar"/>
         <include name="build.image/wlp/lib/features/com.ibm.websphere.appserver.componenttest-1.0.mf"/>
         <!-- Also include default/shared keys files -->
         <include name="build.sharedResources/usrShared"/>

dev/build.image/build.gradle

@@ -2,6 +2,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 task copyPropertiesToBuildImage (type:Copy) {
+    dependsOn jar
     from "${projectDir}/publish/gradle"
     into "${projectDir}/wlp/lib/versions"
     include '*.properties'
@@ -10,34 +11,41 @@ task copyPropertiesToBuildImage (type:Copy) {
 }
 
 task copyReadmeToBuildImage (type:Copy) {
+    dependsOn jar
     from "${projectDir}/publish/gradle"
     into "${rootDir}/build.image/wlp"
     include 'README.TXT'
     filter(ReplaceTokens,
            tokens: [BUILD_ID: bnd.buildID, LIBERTY_VERSION: bnd.libertyRelease])
 }
 
+task copyCopyrightToBuildImage (type:Copy) {
+    dependsOn jar
+    from "${projectDir}"
+    into "${rootDir}/build.image/wlp"
+    include 'Copyright.txt'
+}
+
 task copyGeneratedToBuildImageBinTools (type:Copy) {
+    dependsOn jar
     from "${projectDir}/wlp/lib"
     into "${projectDir}/wlp/bin/tools"
     include 'bootstrap-agent.jar'
     rename 'bootstrap-agent.jar', 'ws-javaagent.jar'
 }
 
 task copyGeneratedToCnfLib (type:Copy) {
+    dependsOn jar
     from "${projectDir}/wlp/dev/api/spec/"
     into "${rootDir}/${bnd_cnf}/lib"
     include 'com.ibm.ws.org.osgi.core.6.0.0_*.jar'
     rename '.*.jar', 'osgi.core.jar'
 }
 
-assemble.dependsOn copyGeneratedToCnfLib
-copyGeneratedToCnfLib.dependsOn jar
-
-assemble.dependsOn copyGeneratedToBuildImageBinTools
-copyGeneratedToBuildImageBinTools.dependsOn jar
-
-assemble.dependsOn copyPropertiesToBuildImage
-assemble.dependsOn copyReadmeToBuildImage
-copyPropertiesToBuildImage.dependsOn jar
-copyReadmeToBuildImage.dependsOn jar
+assemble {
+    dependsOn copyPropertiesToBuildImage
+    dependsOn copyReadmeToBuildImage
+    dependsOn copyCopyrightToBuildImage
+    dependsOn copyGeneratedToBuildImageBinTools
+    dependsOn copyGeneratedToCnfLib
+}

dev/build.sharedResources/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

dev/build.sharedResources/.classpath.gradle

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

dev/build.sharedResources/.project

@@ -5,7 +5,19 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
 	</natures>
 </projectDescription>

dev/build.sharedResources/bnd.bnd

@@ -0,0 +1,3 @@
+-include ~../cnf/resources/bnd/liberty-release.props
+
+-nobundles=true

dev/build.sharedResources/bnd.bnd.gradle

@@ -0,0 +1,3 @@
+-include ~../cnf/resources/bnd/liberty-release.props
+
+-nobundles=true

dev/cnf/.gitignore

@@ -2,4 +2,3 @@
 /bin/
 /release/
 /generated/
-settings.txt

dev/cnf/build.bnd

@@ -2,7 +2,7 @@
 -include ${workspace}/gradle.properties
 
 # Artifactory repository credentials
--connection-settings: ${.}/settings.txt
+-connection-settings: ${.}/settings.xml
 
 # Logging for repository connection when debugging
 #-connection-log: ${.}/connectionlog.txt
@@ -18,24 +18,36 @@
 #		location = ~/.bnd/shacache; \
 #		index = ${build}/central.json
 
--plugin.2.Templates: \
+-plugin.1.MavenLocal: \
+	aQute.bnd.deployer.repository.LocalIndexedRepo; \
+		name = MavenLocal; \
+		pretty = true; \
+		local = ${build}/maven-local
+
+-plugin.2.Local: \
+	aQute.bnd.deployer.repository.LocalIndexedRepo; \
+		name = Local; \
+		pretty = true; \
+		local = ${build}/local
+
+-plugin.3.Templates: \
 	aQute.bnd.deployer.repository.LocalIndexedRepo; \
 		name = Templates; \
 		pretty = true; \
 		local = ${build}/templates
 
--plugin.3.Local = \
-	 aQute.bnd.repository.maven.provider.MavenBndRepository; \
-		index = ~/.m2/was-liberty/local.maven; \
-		local = ~/.m2/was-liberty; \
-		name = "Local";
+-plugin.4.Release: \
+	aQute.bnd.deployer.repository.LocalIndexedRepo; \
+		name = Release; \
+		pretty = true; \
+		local = ${build}/release
 
--plugin.4.Release = \
+-plugin.5.Artifactory = \
 	aQute.bnd.repository.maven.provider.MavenBndRepository; \
 		releaseUrl=${artifactoryReleaseUrl} ; \
 		snapshotUrl=${artifactorySnapshotUrl} ; \
 		index=${build}/release.maven; \
-		name = "Release";
+		name = "Artifactory";
 
 # Don't upload sources or javadoc unless bundle overrides
 -maven-release: remote, sources;path=NONE, javadoc;path=NONE
@@ -49,10 +61,8 @@ javac.encoding: UTF-8
 -pedantic: true
 -fixupmessages.missingexport: "Used bundle version * for exported package";is:=error
 
-# Uncomment this line for releases
-#-snapshot:
--buildrepo: Local
 -releaserepo: Release
+-baselinerepo: Release
 
 # This is the version of JUnit that will be used at build time and run time
 junit: org.apache.servicemix.bundles.junit;version="[4.11,5)"
@@ -67,7 +77,7 @@ mockito: org.mockito.mockito-core;version="[1.9,2)",\
 
 instrument.disabled: false
 instrument.classesIncludes: **/*.class
-instrument.classesExcludes:
+instrument.classesExcludes: 
 instrument.ffdc: true
 instrument.taskInjection: false
 

dev/cnf/gradle/dev.spi.ibm/com.ibm.websphere.appserver.spi.zosCommandProcessing.bnd

@@ -14,4 +14,4 @@ publish.wlp.jar.suffix: dev/spi/ibm
 
 -buildpath: \
 	${javac.bootclasspath.java6}, \
-	com.ibm.ws.zos.command.processing
+	com.ibm.ws.zos.core

dev/cnf/gradle/internal.features/com.ibm.websphere.appserver.apiDiscoveryValidator-1.0.bnd

@@ -0,0 +1,9 @@
+-include ~../cnf/resources/bnd/bundle.props
+bVersion=1.0
+
+Bundle-SymbolicName: com.ibm.websphere.appserver.apiDiscoveryValidator-1.0
+
+publish.feature.resources: *.mf
+
+-buildpath: \
+	com.ibm.ws.rest.api.discovery.validator;version=latest

dev/cnf/gradle/internal.features/com.ibm.websphere.appserver.apiDiscoveryValidator-1.0.mf

@@ -0,0 +1,22 @@
+Bnd-LastModified: 1490282142366
+Created-By: 1.8.0_121 (Oracle Corporation)
+IBM-App-ForceRestart: install,
+ uninstall
+IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
+IBM-Feature-Version: 2
+IBM-Install-Policy: when-satisfied
+IBM-InstallTo: core
+IBM-License-Agreement: wlp/lafiles/LA
+IBM-ProductID: com.ibm.websphere.appserver
+IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.validator-1.0))",
+ osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.apiDiscovery-1.0))"
+Subsystem-Content: com.ibm.ws.rest.api.discovery.validator; version="[1.0.0,1.0.200)"
+Subsystem-Description: %description
+Subsystem-License: http://www.ibm.com/licenses/wlp-featureterms-v1
+Subsystem-Localization: OSGI-INF/l10n/com.ibm.websphere.appserver.apiDiscoveryValidator-1.0
+Subsystem-ManifestVersion: 1
+Subsystem-SymbolicName: com.ibm.websphere.appserver.apiDiscoveryValidator-1.0; visibility:=private; singleton:=false
+Subsystem-Type: osgi.subsystem.feature
+Subsystem-Vendor: IBM Corp.
+Subsystem-Version: 1.0.0
+Tool: Bnd-3.3.0.201609221906

dev/cnf/gradle/internal.features/com.ibm.websphere.appserver.jaxwsClient-2.2.bnd

@@ -6,17 +6,17 @@ Bundle-SymbolicName: com.ibm.websphere.appserver.jaxwsClient-2.2
 publish.feature.resources: *.mf
 
 -buildpath: \
-	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-transports-http-2.6.2-ibm-s20160819-0403.jar;version=file,\
-	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-core-2.6.2-ibm-s20160819-0403.jar;version=file,\
-	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-bindings-soap-2.6.2-ibm-s20160819-0403.jar;version=file,\
-	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-bindings-xml-2.6.2-ibm-s20160819-0403.jar;version=file,\
-	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-databinding-jaxb-2.6.2-ibm-s20160819-0403.jar;version=file,\
-	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-management-2.6.2-ibm-s20160819-0403.jar;version=file,\
-	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-ws-addr-2.6.2-ibm-s20160819-0403.jar;version=file,\
-	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-frontend-simple-2.6.2-ibm-s20160819-0403.jar;version=file,\
-	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-frontend-jaxws-2.6.2-ibm-s20160819-0403.jar;version=file,\
-	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-ws-policy-2.6.2-ibm-s20160819-0403.jar;version=file,\
-	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-api-2.6.2-ibm-s20160819-0403.jar;version=file,\
+	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-transports-http-2.6.2-ibm-s20170216-1739.jar;version=file,\
+	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-core-2.6.2-ibm-s20170216-1739.jar;version=file,\
+	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-bindings-soap-2.6.2-ibm-s20170216-1739.jar;version=file,\
+	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-bindings-xml-2.6.2-ibm-s20170216-1739.jar;version=file,\
+	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-databinding-jaxb-2.6.2-ibm-s20170216-1739.jar;version=file,\
+	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-management-2.6.2-ibm-s20170216-1739.jar;version=file,\
+	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-ws-addr-2.6.2-ibm-s20170216-1739.jar;version=file,\
+	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-frontend-simple-2.6.2-ibm-s20170216-1739.jar;version=file,\
+	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-frontend-jaxws-2.6.2-ibm-s20170216-1739.jar;version=file,\
+	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-rt-ws-policy-2.6.2-ibm-s20170216-1739.jar;version=file,\
+	../com.ibm.ws.org.apache.cxf.jaxws/lib/cxf-api-2.6.2-ibm-s20170216-1739.jar;version=file,\
 	com.ibm.websphere.appserver.injection-1.0;version=latest, \
 	com.ibm.websphere.appserver.containerServices-1.0;version=latest, \
 	com.ibm.websphere.appserver.classloading-1.0;version=latest, \

dev/cnf/gradle/internal.features/com.ibm.websphere.appserver.org.eclipse.microProfileFaultTolerance-0.1.bnd

@@ -0,0 +1,8 @@
+-include ~../cnf/resources/bnd/bundle.props
+bVersion=1.0
+
+Bundle-SymbolicName: com.ibm.websphere.appserver.org.eclipse.microProfileFaultTolerance-0.1
+
+-buildpath: \
+	com.ibm.websphere.org.eclipse.microprofile.faulttolerance.0.1;version=latest
+

dev/cnf/gradle/internal.features/com.ibm.websphere.appserver.org.eclipse.microProfileFaultTolerance-0.1.mf

@@ -0,0 +1,17 @@
+Bnd-LastModified: 1490308521164
+Created-By: 1.8.0_121 (Oracle Corporation)
+IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
+IBM-Feature-Version: 2
+IBM-InstallTo: core
+IBM-License-Agreement: wlp/lafiles/LA
+IBM-ProductID: com.ibm.websphere.appserver
+Subsystem-Content: com.ibm.websphere.org.eclipse.microprofile.faulttolerance.0.1; location:="dev/api/spec/,lib/"; version="[1.0.0,1.0.200)"
+Subsystem-Description: %description
+Subsystem-License: http://www.ibm.com/licenses/wlp-featureterms-v1
+Subsystem-Localization: OSGI-INF/l10n/com.ibm.websphere.appserver.org.eclipse.microProfileFaultTolerance-0.1
+Subsystem-ManifestVersion: 1
+Subsystem-SymbolicName: com.ibm.websphere.appserver.org.eclipse.microProfileFaultTolerance-0.1; visibility:=private; singleton:=true
+Subsystem-Type: osgi.subsystem.feature
+Subsystem-Vendor: IBM Corp.
+Subsystem-Version: 1.0.0
+Tool: Bnd-3.3.0.201609221906

dev/cnf/gradle/public.features/com.ibm.websphere.appserver.microProfileFaultTolerance-0.1.mf

@@ -1,6 +1,7 @@
 Bnd-LastModified: 1489177718859
 Created-By: 1.8.0_121 (Oracle Corporation)
 IBM-API-Package: com.ibm.websphere.microprofile.faulttolerance; version="1.0",
+ com.ibm.websphere.microprofile.faulttolerance.spi; version="1.0",
  org.eclipse.microprofile.faulttolerance; version="1.0",
  org.eclipse.microprofile.faulttolerance.spi; version="1.0"
 IBM-App-ForceRestart: install,
@@ -11,9 +12,9 @@ IBM-InstallTo: core
 IBM-License-Agreement: wlp/lafiles/LA
 IBM-ProductID: com.ibm.websphere.appserver
 IBM-ShortName: microProfileFaultTolerance-0.1
-Subsystem-Content: com.ibm.websphere.microprofile.faulttolerance; version="[1.0.0,1.0.200)",
- com.ibm.ws.net.jodah.failsafe.1.0.1; version="[1.0.0,1.0.200)",
- com.ibm.websphere.microprofile.faulttolerance.failsafe.impl; version="[1.0.0,1.0.200)"
+Subsystem-Content: com.ibm.websphere.appserver.org.eclipse.microProfileFaultTolerance-0.1; type="osgi.subsystem.feature",
+ com.ibm.ws.net.jodah.failsafe.1.0.1; apiJar=false; location:="lib/"; version="[1.0.0,1.0.200)",
+ com.ibm.ws.microprofile.faulttolerance.failsafe.impl; apiJar=false; location:="lib/"; version="[1.0.0,1.0.200)"
 Subsystem-Description: %description
 Subsystem-License: http://www.ibm.com/licenses/wlp-featureterms-v1
 Subsystem-Localization: OSGI-INF/l10n/com.ibm.websphere.appserver.microProfileFaultTolerance-0.1

dev/cnf/gradle/public.features/com.ibm.websphere.appserver.validator-1.0.mf

@@ -0,0 +1,21 @@
+Bnd-LastModified: 1490308491514
+Created-By: 1.8.0_121 (Oracle Corporation)
+IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
+IBM-Feature-Version: 2
+IBM-InstallTo: core
+IBM-License-Agreement: wlp/lafiles/LA
+IBM-ProductID: com.ibm.websphere.appserver
+IBM-ShortName: validator-1.0
+Subsystem-Content: com.ibm.websphere.appserver.apiDiscovery-1.0; type="osgi.subsystem.feature",
+ com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1"; type="osgi.subsystem.feature",
+ com.ibm.ws.config.validator; version="[1.0.0,1.0.200)"
+Subsystem-Description: %description
+Subsystem-License: http://www.ibm.com/licenses/wlp-featureterms-v1
+Subsystem-Localization: OSGI-INF/l10n/com.ibm.websphere.appserver.validator-1.0
+Subsystem-ManifestVersion: 1
+Subsystem-Name: Resource Config Validator 1.0
+Subsystem-SymbolicName: com.ibm.websphere.appserver.validator-1.0; visibility:=public; singleton:=true
+Subsystem-Type: osgi.subsystem.feature
+Subsystem-Vendor: IBM Corp.
+Subsystem-Version: 1.0.0
+Tool: Bnd-3.3.0.201609221906