diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..b21186bf
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,75 @@
+# Text files with LF eol
+*.auth crlf=input
+*.awk crlf=input
+*.bnd crlf=input
+*.bndrun crlf=input
+*.c crlf=input ident
+*.conf crlf=input
+*.cpp crlf=input ident
+*.css crlf=input
+*.ddf crlf=input
+*.ee crlf=input
+*.gradle crlf=input
+*.groovy crlf=input
+*.h crlf=input ident
+*.html crlf=input ident
+*.java crlf=input ident
+*.js crlf=input
+*.lib crlf=input
+*.md crlf=input
+*.MF crlf=input
+*.mf crlf=input
+*.perm crlf=input
+*.php crlf=input
+*.pl crlf=input
+*.pom crlf=input
+*.prefs crlf=input
+*.properties crlf=input
+*.py crlf=input
+*.schema crlf=input
+*.SF crlf=input
+*.sh crlf=input
+*.tcl crlf=input
+*.txt crlf=input
+*.xml crlf=input
+*.xsd crlf=input ident
+*.xsl crlf=input
+*.xslt crlf=input
+*.yml crlf=input
+.classpath crlf=input
+.project crlf=input
+gradlew crlf=input
+packageinfo crlf=input
+Makefile crlf=input
+README crlf=input
+LICENSE crlf=input
+
+# No EOL translation
+*.bat -crlf
+
+# Binary. No EOL translation, no diff
+*.ico binary
+*.jpeg binary
+*.jpg binary
+*.png binary
+*.crt binary
+*.pdf binary
+*.dll binary
+*.jar binary
+*.jnilib binary
+*.so binary
+*.zip binary
+*.doc binary
+*.ppt binary
+*.xls binary
+*.odg binary
+*.odp binary
+*.ods binary
+*.odt binary
+*.otg binary
+*.otp binary
+*.ots binary
+*.ott binary
+*.key binary
+*.numbers binary
+*.pages binary
diff --git a/.gradle-wrapper/gradle-wrapper.jar b/.gradle-wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..457aad0d
Binary files /dev/null and b/.gradle-wrapper/gradle-wrapper.jar differ
diff --git a/.gradle-wrapper/gradle-wrapper.properties b/.gradle-wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..75b8c7c8
--- /dev/null
+++ b/.gradle-wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/cnf/.classpath b/cnf/.classpath
index 6d3c62a7..7a6fc254 100644
--- a/cnf/.classpath
+++ b/cnf/.classpath
@@ -1,6 +1,12 @@
-
+
+
+
+
+
+
+
diff --git a/cnf/.gitignore b/cnf/.gitignore
index 5bf807c7..44684685 100644
--- a/cnf/.gitignore
+++ b/cnf/.gitignore
@@ -1,3 +1,4 @@
/bin/
/generated/
-/cache/
\ No newline at end of file
+/cache/
+/bin_test/
diff --git a/cnf/central.maven b/cnf/central.maven
new file mode 100644
index 00000000..22e35f95
--- /dev/null
+++ b/cnf/central.maven
@@ -0,0 +1,2 @@
+# List repository contents using GAV coordinates
+
diff --git a/cnf/local/index.xml b/cnf/local/index.xml
new file mode 100644
index 00000000..0bfa6dca
--- /dev/null
+++ b/cnf/local/index.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/cnf/local/index.xml.sha b/cnf/local/index.xml.sha
new file mode 100644
index 00000000..001203e7
--- /dev/null
+++ b/cnf/local/index.xml.sha
@@ -0,0 +1 @@
+8de8e8866152096f0c4ea5ddd6ed1d633b4d1a6edfbd823245cb57f6639732fd
\ No newline at end of file
diff --git a/cnf/localrepo/index.xml b/cnf/localrepo/index.xml
index 0bfa6dca..50d64455 100644
--- a/cnf/localrepo/index.xml
+++ b/cnf/localrepo/index.xml
@@ -1,3 +1,2 @@
-
-
-
\ No newline at end of file
+
+
diff --git a/cnf/localrepo/index.xml.sha b/cnf/localrepo/index.xml.sha
index 308d47a0..fdbf5c49 100644
--- a/cnf/localrepo/index.xml.sha
+++ b/cnf/localrepo/index.xml.sha
@@ -1 +1 @@
-00d32998f75fb42424a40b7de9e81e4dc9be2ca6a9fc3f2d3bec406919d62140
\ No newline at end of file
+47b98cc836de03e99f8f39473717e64ae1e49982c81a80893e99fc87cca005a8
\ No newline at end of file
diff --git a/cnf/release/index.xml b/cnf/release/index.xml
new file mode 100644
index 00000000..c89dffca
--- /dev/null
+++ b/cnf/release/index.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/cnf/release/index.xml.sha b/cnf/release/index.xml.sha
new file mode 100644
index 00000000..f2b26bf5
--- /dev/null
+++ b/cnf/release/index.xml.sha
@@ -0,0 +1 @@
+262a924c4164db96f2409bfbe8d20793eb0c91a51c3dcd7c2160cde2bac8a492
\ No newline at end of file
diff --git a/cnf/releaserepo/index.xml b/cnf/releaserepo/index.xml
index ac26e047..ad126592 100644
--- a/cnf/releaserepo/index.xml
+++ b/cnf/releaserepo/index.xml
@@ -1,46 +1,46 @@
-
-
+
+
+
-
-
-
-
-
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
-
+
@@ -48,45 +48,51 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -94,45 +100,30 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
-
+
@@ -140,97 +131,57 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
@@ -238,48 +189,38 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
-
-
-
+
@@ -287,97 +228,71 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
@@ -385,48 +300,71 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
@@ -434,48 +372,51 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -483,48 +424,84 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -532,48 +509,45 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
@@ -581,48 +555,30 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
-
+
@@ -630,56 +586,57 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -687,56 +644,45 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
@@ -744,56 +690,38 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
@@ -801,56 +729,45 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
@@ -858,56 +775,38 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
@@ -915,56 +814,84 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -972,56 +899,60 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1029,56 +960,71 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1086,56 +1032,51 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1143,86 +1084,71 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -1230,29 +1156,38 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
@@ -1260,89 +1195,71 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
@@ -1350,29 +1267,45 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
@@ -1380,29 +1313,30 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
+
+
+
-
+
-
+
@@ -1410,29 +1344,51 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1440,29 +1396,30 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
+
+
+
-
+
-
+
@@ -1470,32 +1427,45 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1503,72 +1473,57 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1576,72 +1531,84 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1649,72 +1616,71 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1722,72 +1688,57 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1795,72 +1746,90 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1868,72 +1837,115 @@
-
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1941,72 +1953,94 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -2014,72 +2048,45 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
@@ -2087,72 +2094,71 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2160,239 +2166,84 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
@@ -2400,39 +2251,38 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -2440,90 +2290,60 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2531,203 +2351,151 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2735,50 +2503,45 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2786,50 +2549,71 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
@@ -2837,50 +2621,73 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -2888,59 +2695,57 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2948,59 +2753,97 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
@@ -3008,59 +2851,57 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3068,83 +2909,124 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3152,83 +3034,84 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3236,83 +3119,71 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3320,83 +3191,84 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3404,83 +3276,158 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
@@ -3488,83 +3435,115 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3572,83 +3551,84 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3656,83 +3636,103 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3740,83 +3740,71 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
@@ -3824,83 +3812,84 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3908,83 +3897,51 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3992,83 +3949,84 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4076,83 +4034,116 @@
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4160,83 +4151,84 @@
+
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4244,65 +4236,88 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4310,72 +4325,48 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4383,117 +4374,84 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4501,47 +4459,71 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4549,36 +4531,41 @@
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
\ No newline at end of file
+
diff --git a/cnf/releaserepo/index.xml.sha b/cnf/releaserepo/index.xml.sha
index 99cfcd60..a7a5f672 100644
--- a/cnf/releaserepo/index.xml.sha
+++ b/cnf/releaserepo/index.xml.sha
@@ -1 +1 @@
-11b48e5330364fac1fb35f837d3672857c541979eb579d74a764fb94891d5c7b
\ No newline at end of file
+1f60b381825d408866a79046be320b2f181c1cc50ca91e6b6bfcbf587a25e264
\ No newline at end of file
diff --git a/cnf/templates/index.xml b/cnf/templates/index.xml
new file mode 100644
index 00000000..4c764933
--- /dev/null
+++ b/cnf/templates/index.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cnf/templates/index.xml.sha b/cnf/templates/index.xml.sha
new file mode 100644
index 00000000..c363d86b
--- /dev/null
+++ b/cnf/templates/index.xml.sha
@@ -0,0 +1 @@
+61275256eb23a6404cfbbb35fee55ecba044ba36319684fd106af299857d019e
\ No newline at end of file
diff --git a/cnf/templates/org.bndtools.templates.osgi/org.bndtools.templates.osgi-7.0.0.jar b/cnf/templates/org.bndtools.templates.osgi/org.bndtools.templates.osgi-7.0.0.jar
new file mode 100644
index 00000000..792c5967
Binary files /dev/null and b/cnf/templates/org.bndtools.templates.osgi/org.bndtools.templates.osgi-7.0.0.jar differ
diff --git a/pnnl.goss.core.itests/.classpath b/pnnl.goss.core.itests/.classpath
index 4f775bc1..7a6fc254 100644
--- a/pnnl.goss.core.itests/.classpath
+++ b/pnnl.goss.core.itests/.classpath
@@ -1,7 +1,12 @@
-
-
+
+
+
+
+
+
+
diff --git a/pnnl.goss.core.runner/.classpath b/pnnl.goss.core.runner/.classpath
index 4f775bc1..7a6fc254 100644
--- a/pnnl.goss.core.runner/.classpath
+++ b/pnnl.goss.core.runner/.classpath
@@ -1,7 +1,12 @@
-
-
+
+
+
+
+
+
+
diff --git a/pnnl.goss.core.testutil/.classpath b/pnnl.goss.core.testutil/.classpath
index 57c70f3f..7a6fc254 100644
--- a/pnnl.goss.core.testutil/.classpath
+++ b/pnnl.goss.core.testutil/.classpath
@@ -1,8 +1,12 @@
-
-
-
+
+
+
+
+
+
+
diff --git a/pnnl.goss.core/.classpath b/pnnl.goss.core/.classpath
index 3eac70d8..7a6fc254 100644
--- a/pnnl.goss.core/.classpath
+++ b/pnnl.goss.core/.classpath
@@ -1,8 +1,12 @@
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/pnnl.goss.core/core-api.bnd b/pnnl.goss.core/core-api.bnd
index ee7ee9cb..fac405c6 100644
--- a/pnnl.goss.core/core-api.bnd
+++ b/pnnl.goss.core/core-api.bnd
@@ -1,4 +1,4 @@
Export-Package: \
com.northconcepts.exception,\
pnnl.goss.core
-Bundle-Version: 7.1.1.${tstamp}
\ No newline at end of file
+Bundle-Version: 7.1.2.${tstamp}
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-client.bnd b/pnnl.goss.core/goss-client.bnd
index dd9c9e4b..8b66c2a8 100644
--- a/pnnl.goss.core/goss-client.bnd
+++ b/pnnl.goss.core/goss-client.bnd
@@ -1,3 +1,3 @@
Private-Package: \
pnnl.goss.core.client
-Bundle-Version: 2.0.29.${tstamp}
\ No newline at end of file
+Bundle-Version: 2.0.30.${tstamp}
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-core-commands.bnd b/pnnl.goss.core/goss-core-commands.bnd
index a3e861ec..be7e7895 100644
--- a/pnnl.goss.core/goss-core-commands.bnd
+++ b/pnnl.goss.core/goss-core-commands.bnd
@@ -1,3 +1,3 @@
Private-Package: \
pnnl.goss.core.commands
-Bundle-Version: 2.0.18.${tstamp}
\ No newline at end of file
+Bundle-Version: 2.0.19.${tstamp}
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-core-exceptions.bnd b/pnnl.goss.core/goss-core-exceptions.bnd
index 454e059a..b089125f 100644
--- a/pnnl.goss.core/goss-core-exceptions.bnd
+++ b/pnnl.goss.core/goss-core-exceptions.bnd
@@ -1,5 +1,5 @@
Private-Package: \
pnnl.goss.core.exception
-Bundle-Version: 2.1.0.${tstamp}
+Bundle-Version: 2.1.1.${tstamp}
Export-Package: \
com.northconcepts.exception
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-core-security.bnd b/pnnl.goss.core/goss-core-security.bnd
index e7095f69..e1c4fdcd 100644
--- a/pnnl.goss.core/goss-core-security.bnd
+++ b/pnnl.goss.core/goss-core-security.bnd
@@ -4,4 +4,4 @@ Private-Package: \
Bundle-Activator: pnnl.goss.core.security.impl.Activator
Export-Package: \
pnnl.goss.core.security
-Bundle-Version: 2.1.17.${tstamp}
\ No newline at end of file
+Bundle-Version: 2.1.18.${tstamp}
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-core-server-api.bnd b/pnnl.goss.core/goss-core-server-api.bnd
index 427a6550..95dac414 100644
--- a/pnnl.goss.core/goss-core-server-api.bnd
+++ b/pnnl.goss.core/goss-core-server-api.bnd
@@ -1,3 +1,3 @@
Export-Package: \
pnnl.goss.core.server
-Bundle-Version: 2.0.18.${tstamp}
\ No newline at end of file
+Bundle-Version: 2.0.19.${tstamp}
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-core-server-registry.bnd b/pnnl.goss.core/goss-core-server-registry.bnd
index 077ef702..a8f45f7c 100644
--- a/pnnl.goss.core/goss-core-server-registry.bnd
+++ b/pnnl.goss.core/goss-core-server-registry.bnd
@@ -1,4 +1,4 @@
-Bundle-Version: 1.0.18.${tstamp}
+Bundle-Version: 1.0.19.${tstamp}
Private-Package: \
pnnl.goss.server.registry
DynamicImport-Package: *
\ No newline at end of file
diff --git a/pnnl.goss.core/goss-core-server-web.bnd b/pnnl.goss.core/goss-core-server-web.bnd
index d594abf0..9317c173 100644
--- a/pnnl.goss.core/goss-core-server-web.bnd
+++ b/pnnl.goss.core/goss-core-server-web.bnd
@@ -2,7 +2,7 @@ DynamicImport-Package: *
Private-Package: \
pnnl.goss.core.server.web
-Bundle-Version: 1.1.1.${tstamp}
+Bundle-Version: 1.1.2.${tstamp}
# Import webroot folder to path resources/webroot
Include-Resource: resources/webroot=webroot
diff --git a/pnnl.goss.core/goss-core-server.bnd b/pnnl.goss.core/goss-core-server.bnd
index e3bea498..fd795d0d 100644
--- a/pnnl.goss.core/goss-core-server.bnd
+++ b/pnnl.goss.core/goss-core-server.bnd
@@ -3,4 +3,4 @@ Private-Package: \
DynamicImport-Package: *
#Include-Resource: \
# OSGI-INF/blueprint/blueprint.xml=config/blueprint.xml
-Bundle-Version: 2.0.27.${tstamp}
\ No newline at end of file
+Bundle-Version: 2.0.28.${tstamp}
\ No newline at end of file
diff --git a/pnnl.goss.core/security-ldap.bnd b/pnnl.goss.core/security-ldap.bnd
index 4e5573ec..9ae99a52 100644
--- a/pnnl.goss.core/security-ldap.bnd
+++ b/pnnl.goss.core/security-ldap.bnd
@@ -1,3 +1,3 @@
Private-Package: \
pnnl.goss.core.security.ldap
-Bundle-Version: 1.0.5.${tstamp}
+Bundle-Version: 1.0.6.${tstamp}
diff --git a/pnnl.goss.core/security-propertyfile.bnd b/pnnl.goss.core/security-propertyfile.bnd
index b21c75e6..9caa9c6e 100644
--- a/pnnl.goss.core/security-propertyfile.bnd
+++ b/pnnl.goss.core/security-propertyfile.bnd
@@ -1,3 +1,3 @@
Private-Package: \
pnnl.goss.core.security.propertyfile
-Bundle-Version: 2.0.8.${tstamp}
+Bundle-Version: 2.0.9.${tstamp}