10 files changed, 90 insertions, 32 deletions
diff --git a/build-root/deb/debian/.gitignore b/build-root/deb/debian/.gitignore
index 75d8fbbcfdb..c5e915a8219 100644
--- a/build-root/deb/debian/.gitignore
+++ b/build-root/deb/debian/.gitignore
@@ -11,4 +11,6 @@ vpp-dpdk-dev/
 vpp-dpdk-dkms/
 vpp-dbg/
 vppctl/
-vpp-python-api/
+vpp-api-lua/
+vpp-api-java/
+vpp-api-python/
diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control
index 643774e3061..de48c903f63 100644
--- a/build-root/deb/debian/control
+++ b/build-root/deb/debian/control
@@ -60,7 +60,21 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: DPDK 2.1 igb_uio_driver
  This package contains Linux kernel modules distributed with DPDK.
 
-Package: vpp-python-api
+Package: vpp-api-lua
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends}, vpp (= ${source:Version})
+Description: VPP LUA API bindings
+  This package contains VPP lua api bindings
+  .
+
+Package: vpp-api-java
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends}, vpp (= ${source:Version})
+Description: VPP Java API bindings
+  This package contains VPP java api bindings
+  .
+
+Package: vpp-api-python
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, vpp (= ${source:Version})
 Description: VPP Python API bindings
diff --git a/build-root/packages/tools.mk b/build-root/packages/tools.mk
index 506e024b727..d64a7959b7d 100644
--- a/build-root/packages/tools.mk
+++ b/build-root/packages/tools.mk
@@ -1,3 +1,3 @@
 tools_source = src
-tools_configure_args = --disable-vlib
+tools_configure_args = --disable-vlib --disable-svm --disable-japi
 
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 654424c083f..149ac51cc11 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -71,12 +71,28 @@ Requires: vpp = %{_version}-%{_release}
 %description plugins
 This package contains VPP plugins
 
-%package python-api
+%package api-lua
+Summary: VPP api lua bindings
+Group: Development/Libraries
+Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
+
+%description api-lua
+This package contains the lua bindings for the vpp api
+
+%package api-java
+Summary: VPP api java bindings
+Group: Development/Libraries
+Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
+
+%description api-java
+This package contains the java bindings for the vpp api
+
+%package api-python
 Summary: VPP api python bindings
 Group: Development/Libraries
 Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}, python-setuptools
 
-%description python-api
+%description api-python
 This package contains the python bindings for the vpp api
 
 %prep
@@ -131,6 +147,22 @@ do
 	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
 done
 
+# Lua bindings
+mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/cli
+mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/lute
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && git ls-files .)
+do
+	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua/$file \
+	   %{buildroot}/usr/share/doc/vpp/examples/lua/$file
+done
+
+# Java bindings
+mkdir -p -m755 %{buildroot}/usr/share/java
+for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/java -type f -name '*.jar' -print )
+do
+	install -p -m 644 $file %{buildroot}/usr/share/java
+done
+
 # Python bindings
 mkdir -p -m755 %{buildroot}%{python2_sitelib}
 install -p -m 666 %{_mu_build_dir}/%{_vpp_install_dir}/*/lib/python2.7/site-packages/vpp_papi-*.egg %{buildroot}%{python2_sitelib}
@@ -151,16 +183,16 @@ do
 done
 
 mkdir -p -m755 %{buildroot}%{python2_sitelib}/jvppgen
-install -p -m755 %{_mu_build_dir}/../vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
-for i in $(ls %{_mu_build_dir}/../vpp-api/java/jvpp/gen/jvppgen/*.py); do
+install -p -m755 %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
+for i in $(ls %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do
    install -p -m666 ${i} %{buildroot}%{python2_sitelib}/jvppgen
 done;
 
 # sample plugin
 mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/sample
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../plugins/sample-plugin && git ls-files .)
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && git ls-files .)
 do
-	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../plugins/sample-plugin/$file \
+	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin/$file \
 	   %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/$file
 done
 
@@ -170,24 +202,12 @@ done
 # 
 mkdir -p -m755 %{buildroot}/usr/lib/vpp_plugins
 mkdir -p -m755 %{buildroot}/usr/lib/vpp_api_test_plugins
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_plugins && find -type f -print)
-do
-        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_plugins/$file \
-           %{buildroot}/usr/lib/vpp_plugins/$file
-done
-
 for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins && find -type f -print)
 do
         install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins/$file \
            %{buildroot}/usr/lib/vpp_plugins/$file
 done
 
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins && find -type f -print)
-do
-        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins/$file \
-           %{buildroot}/usr/lib/vpp_api_test_plugins/$file
-done
-
 for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins && find -type f -print)
 do
         install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins/$file \
@@ -208,13 +228,13 @@ done
 sysctl --system
 %systemd_post vpp.service
 
-%post python-api
+%post api-python
 easy_install -z %{python2_sitelib}/vpp_papi-*.egg
 
 %preun
 %systemd_preun vpp.service
 
-%preun python-api
+%preun api-python
 easy_install -mxNq vpp_papi
 
 %postun
@@ -255,7 +275,15 @@ fi
 %{_libdir}/*
 /usr/share/vpp/api/*
 
-%files python-api
+%files api-lua
+%defattr(644,root,root)
+/usr/share/doc/vpp/examples/lua
+
+%files api-java
+%defattr(644,root,root)
+/usr/share/java/*
+
+%files api-python
 %defattr(644,root,root)
 %{python2_sitelib}/vpp_papi-*.egg
 
diff --git a/build-root/scripts/find-api-core-contents b/build-root/scripts/find-api-core-contents
index f1f96f1f12a..c1af69db8fc 100755
--- a/build-root/scripts/find-api-core-contents
+++ b/build-root/scripts/find-api-core-contents
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-for i in $(find ${1}/vpp -name *.api.json -type f -print); do
+for i in $(find ${1}/vpp/share/vpp/api/core -name *.api.json -type f -print); do
     echo ../${i} /usr/share/vpp/api/ >> ${2}
 done
 for i in $(find ${1}/vlib-api -name *.api.json -type f -print); do
diff --git a/build-root/scripts/find-dev-contents b/build-root/scripts/find-dev-contents
index 2dc6cc4d734..d4f7b63fb86 100755
--- a/build-root/scripts/find-dev-contents
+++ b/build-root/scripts/find-dev-contents
@@ -16,16 +16,16 @@ do
 done        
 
 # sample plugin
-paths=`(cd ..; find plugins/sample-plugin -type f -print | grep -v autom4te)`
+paths=`(cd ..; find src/examples/sample-plugin -type f -print | grep -v autom4te)`
 
 for path in $paths
 do
-    relpath=`echo $path | sed -e 's:.*plugins/::'`
+    relpath=`echo $path | sed -e 's:.*src/examples/::'`
     dir=`dirname $relpath`
     if [ $dir = "sample-plugin" ] ; then
-        echo ../../$path /usr/share/doc/vpp/examples/plugins/sample-plugin >> $2
+        echo ../../$path /usr/share/doc/vpp/examples/sample-plugin/ >> $2
     else
         echo ../../$path \
-        /usr/share/doc/vpp/examples/plugins/$dir >> $2
+        /usr/share/doc/vpp/examples/$dir >> $2
     fi
 done        
diff --git a/build-root/scripts/find-plugins-contents b/build-root/scripts/find-plugins-contents
index 4108f7905ea..ae2a4271d81 100755
--- a/build-root/scripts/find-plugins-contents
+++ b/build-root/scripts/find-plugins-contents
@@ -2,11 +2,11 @@
 
 rm -f $2
 
-for i in ${1}/{plugins,vpp}/lib64/vpp_plugins/*.so; do
+for i in ${1}/vpp/lib64/vpp_plugins/*.so; do
 	echo ../${i} /usr/lib/vpp_plugins >> ${2}
 done
 
-for i in ${1}/{plugins,vpp}/lib64/vpp_api_test_plugins/*.so; do
+for i in ${1}/vpp/lib64/vpp_api_test_plugins/*.so; do
 	echo ../${i} /usr/lib/vpp_api_test_plugins >> ${2}
 done
 
diff --git a/build-root/scripts/find-vpp-api-java-contents b/build-root/scripts/find-vpp-api-java-contents
new file mode 100755
index 00000000000..5f1bf197c05
--- /dev/null
+++ b/build-root/scripts/find-vpp-api-java-contents
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm -f $2
+
+for i in $(find ${1}/vpp/share/java/ -type f -print); do
+  echo ../${i} /usr/share/java >> ${2}
+done
+
diff --git a/build-root/scripts/find-vpp-api-lua-contents b/build-root/scripts/find-vpp-api-lua-contents
new file mode 100755
index 00000000000..f1173db8e11
--- /dev/null
+++ b/build-root/scripts/find-vpp-api-lua-contents
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+#i for now put everything into examples directory
+
+echo ../../src/vpp-api/lua /usr/share/vpp/examples > ${2}
+
diff --git a/build-root/scripts/find-python-api-contents b/build-root/scripts/find-vpp-api-python-contents
index 24e8532c670..819c9122aba 100755
--- a/build-root/scripts/find-python-api-contents
+++ b/build-root/scripts/find-vpp-api-python-contents
@@ -2,7 +2,7 @@
 
 rm -f $2
 
-for i in $(find ${1}/{vpp,vpp-api}/lib/python2.7/site-packages/ -type f -print); do
+for i in $(find ${1}/vpp/lib/python2.7/site-packages/ -type f -print); do
     echo ../${i} /usr/lib/python2.7/site-packages/vpp_papi >> ${2}
 done