You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2016/11/24 10:53:22 UTC

[18/50] [abbrv] aries-jax-rs-whiteboard git commit: [maven] convert to maven build using bnd-maven-plugin

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-jaxrs-common/build.gradle
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-jaxrs-common/build.gradle b/portal-remote-cxf-jaxrs-common/build.gradle
deleted file mode 100644
index 767a928..0000000
--- a/portal-remote-cxf-jaxrs-common/build.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-dependencies {
-	compile group: "javax.annotation", name: "javax.annotation-api", version: "1.2"
-	compile group: "javax.json", name: "javax.json-api", version: "1.0"
-	compile group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.0.1"
-	compile group: "org.apache.cxf", name: "cxf-core", version: "3.1.7"
-	compile group: "org.apache.cxf", name: "cxf-rt-frontend-jaxrs", version: "3.1.7"
-	compile group: "org.apache.cxf", name: "cxf-rt-rs-extension-providers", version: "3.1.7"
-	compile group: "org.apache.felix", name: "org.apache.felix.dependencymanager", version: "3.2.0"
-	compile group: "org.codehaus.jettison", name: "jettison", version: "1.3.3"
-	compile group: "org.osgi", name: "org.osgi.core", version: "5.0.0"
-	compile group: "org.osgi", name: "org.osgi.service.http", version: "1.2.1"
-	compile group: "org.osgi", name: "org.osgi.service.http.whiteboard", version: "1.0.0"
-}

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-jaxrs-common/portal-remote-cxf-jaxrs-common.iml
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-jaxrs-common/portal-remote-cxf-jaxrs-common.iml b/portal-remote-cxf-jaxrs-common/portal-remote-cxf-jaxrs-common.iml
deleted file mode 100644
index d8085ca..0000000
--- a/portal-remote-cxf-jaxrs-common/portal-remote-cxf-jaxrs-common.iml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":portal-remote-cxf-jaxrs-common" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="osgi-rest" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: javax.annotation:javax.annotation-api:1.2" level="project" />
-    <orderEntry type="library" name="Gradle: javax.json:javax.json-api:1.0" level="project" />
-    <orderEntry type="library" name="Gradle: javax.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-core:3.1.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-frontend-jaxrs:3.1.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-rs-extension-providers:3.1.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.dependencymanager:3.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.codehaus.jettison:jettison:1.3.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.osgi:org.osgi.core:5.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.osgi:org.osgi.service.http:1.2.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.osgi:org.osgi.service.http.whiteboard:1.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-transports-http:3.1.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.osgi:org.osgi.compendium:4.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.ws.xmlschema:xmlschema-core:2.2.1" level="project" />
-  </component>
-</module>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-dependency-manager-tccl/.gitignore
----------------------------------------------------------------------
diff --git a/portal-remote-dependency-manager-tccl/.gitignore b/portal-remote-dependency-manager-tccl/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/portal-remote-dependency-manager-tccl/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build/
-/bin/

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/.gitignore
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/.gitignore b/portal-remote-rest-extender/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/portal-remote-rest-extender/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build/
-/bin/

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/.lfrbuild-portal
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/.lfrbuild-portal b/portal-remote-rest-extender/.lfrbuild-portal
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/bnd.bnd
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/bnd.bnd b/portal-remote-rest-extender/bnd.bnd
deleted file mode 100644
index 0ccde96..0000000
--- a/portal-remote-rest-extender/bnd.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-Activator: com.liferay.portal.remote.rest.extender.activator.CXFJaxRsBundleActivator
-Bundle-Name: Liferay Portal Remote REST Extender
-Bundle-SymbolicName: com.liferay.portal.remote.rest.extender
-Bundle-Version: 2.0.3
-Liferay-Releng-Module-Group-Description:
-Liferay-Releng-Module-Group-Title: Remote Service Engines
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/build.gradle
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/build.gradle b/portal-remote-rest-extender/build.gradle
deleted file mode 100644
index 2f601fa..0000000
--- a/portal-remote-rest-extender/build.gradle
+++ /dev/null
@@ -1,12 +0,0 @@
-dependencies {
-	compile group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "3.1.0"
-	compile group: "com.liferay", name: "com.liferay.portal.remote.cxf.jaxrs.common", version: "2.0.0"
-	compile group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.0.1"
-	compile group: "org.apache.cxf", name: "cxf-core", version: "3.1.7"
-	compile group: "org.apache.cxf", name: "cxf-rt-frontend-jaxrs", version: "3.1.7"
-	compile group: "org.apache.cxf", name: "cxf-rt-rs-extension-providers", version: "3.1.7"
-	compile group: "org.apache.felix", name: "org.apache.felix.dependencymanager", version: "3.2.0"
-	compile group: "org.codehaus.jettison", name: "jettison", version: "1.3.3"
-	compile group: "org.osgi", name: "org.osgi.core", version: "5.0.0"
-	compile group: "org.osgi", name: "org.osgi.service.http.whiteboard", version: "1.0.0"
-}

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.class
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.class b/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.class
deleted file mode 100644
index 3254713..0000000
Binary files a/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.class and /dev/null differ

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/configuration/RestExtenderConfiguration.class
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/configuration/RestExtenderConfiguration.class b/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/configuration/RestExtenderConfiguration.class
deleted file mode 100644
index 4c7615f..0000000
Binary files a/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/configuration/RestExtenderConfiguration.class and /dev/null differ

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.class
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.class b/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.class
deleted file mode 100644
index 98df67f..0000000
Binary files a/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.class and /dev/null differ

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/internal/RestExtender.class
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/internal/RestExtender.class b/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/internal/RestExtender.class
deleted file mode 100644
index 205f813..0000000
Binary files a/portal-remote-rest-extender/classes/com/liferay/portal/remote/rest/extender/internal/RestExtender.class and /dev/null differ

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language.properties b/portal-remote-rest-extender/classes/content/Language.properties
deleted file mode 100644
index ff2b883..0000000
--- a/portal-remote-rest-extender/classes/content/Language.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_ar.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_ar.properties b/portal-remote-rest-extender/classes/content/Language_ar.properties
deleted file mode 100644
index f7ddde5..0000000
--- a/portal-remote-rest-extender/classes/content/Language_ar.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u0628\u0642\u064a\u0629 \u0645\u0648\u0633\u0639 (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_bg.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_bg.properties b/portal-remote-rest-extender/classes/content/Language_bg.properties
deleted file mode 100644
index 93f99d3..0000000
--- a/portal-remote-rest-extender/classes/content/Language_bg.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u041f\u041e\u0427\u0418\u0412\u041a\u0410 Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_ca.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_ca.properties b/portal-remote-rest-extender/classes/content/Language_ca.properties
deleted file mode 100644
index 9476a3e..0000000
--- a/portal-remote-rest-extender/classes/content/Language_ca.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=Amplificador REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_cs.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_cs.properties b/portal-remote-rest-extender/classes/content/Language_cs.properties
deleted file mode 100644
index 76bc497..0000000
--- a/portal-remote-rest-extender/classes/content/Language_cs.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=OSTATN� za\u0159�zen� Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_da.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_da.properties b/portal-remote-rest-extender/classes/content/Language_da.properties
deleted file mode 100644
index 9b885db..0000000
--- a/portal-remote-rest-extender/classes/content/Language_da.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=RESTEN Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_de.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_de.properties b/portal-remote-rest-extender/classes/content/Language_de.properties
deleted file mode 100644
index ff2b883..0000000
--- a/portal-remote-rest-extender/classes/content/Language_de.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_el.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_el.properties b/portal-remote-rest-extender/classes/content/Language_el.properties
deleted file mode 100644
index 1fd60a7..0000000
--- a/portal-remote-rest-extender/classes/content/Language_el.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u03a5\u03a0\u038c\u039b\u039f\u0399\u03a0\u039f \u03b1\u03c1\u03b1\u03af\u03c9\u03c3\u03b7\u03c2 (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_en.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_en.properties b/portal-remote-rest-extender/classes/content/Language_en.properties
deleted file mode 100644
index ff2b883..0000000
--- a/portal-remote-rest-extender/classes/content/Language_en.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_es.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_es.properties b/portal-remote-rest-extender/classes/content/Language_es.properties
deleted file mode 100644
index cc489da..0000000
--- a/portal-remote-rest-extender/classes/content/Language_es.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=Extensor REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_et.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_et.properties b/portal-remote-rest-extender/classes/content/Language_et.properties
deleted file mode 100644
index 824e6e1..0000000
--- a/portal-remote-rest-extender/classes/content/Language_et.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=�LEJ��NUD Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_eu.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_eu.properties b/portal-remote-rest-extender/classes/content/Language_eu.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/classes/content/Language_eu.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender (Automatic Copy)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_fa.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_fa.properties b/portal-remote-rest-extender/classes/content/Language_fa.properties
deleted file mode 100644
index 64e00d0..0000000
--- a/portal-remote-rest-extender/classes/content/Language_fa.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u06af\u0633\u062a\u0631\u0634 \u062f\u0647\u0646\u062f\u0647 REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_fi.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_fi.properties b/portal-remote-rest-extender/classes/content/Language_fi.properties
deleted file mode 100644
index d0e0a1d..0000000
--- a/portal-remote-rest-extender/classes/content/Language_fi.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST laajennin
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_fr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_fr.properties b/portal-remote-rest-extender/classes/content/Language_fr.properties
deleted file mode 100644
index 52e43d9..0000000
--- a/portal-remote-rest-extender/classes/content/Language_fr.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=Extendeur REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_gl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_gl.properties b/portal-remote-rest-extender/classes/content/Language_gl.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/classes/content/Language_gl.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender (Automatic Copy)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_hi_IN.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_hi_IN.properties b/portal-remote-rest-extender/classes/content/Language_hi_IN.properties
deleted file mode 100644
index 340d552..0000000
--- a/portal-remote-rest-extender/classes/content/Language_hi_IN.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u092c\u093e\u0915\u0940 \u092d\u0930\u0928\u0947\u0935\u093e\u0932\u093e (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_hr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_hr.properties b/portal-remote-rest-extender/classes/content/Language_hr.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/classes/content/Language_hr.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender (Automatic Copy)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_hu.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_hu.properties b/portal-remote-rest-extender/classes/content/Language_hu.properties
deleted file mode 100644
index cdc65c6..0000000
--- a/portal-remote-rest-extender/classes/content/Language_hu.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST kiterjeszt\u0151
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_in.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_in.properties b/portal-remote-rest-extender/classes/content/Language_in.properties
deleted file mode 100644
index b60839d..0000000
--- a/portal-remote-rest-extender/classes/content/Language_in.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=SISANYA Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_it.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_it.properties b/portal-remote-rest-extender/classes/content/Language_it.properties
deleted file mode 100644
index ff2b883..0000000
--- a/portal-remote-rest-extender/classes/content/Language_it.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_iw.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_iw.properties b/portal-remote-rest-extender/classes/content/Language_iw.properties
deleted file mode 100644
index 667e11d..0000000
--- a/portal-remote-rest-extender/classes/content/Language_iw.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u05de\u05d0\u05e8\u05d9\u05da REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_ja.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_ja.properties b/portal-remote-rest-extender/classes/content/Language_ja.properties
deleted file mode 100644
index ff2b883..0000000
--- a/portal-remote-rest-extender/classes/content/Language_ja.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_ko.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_ko.properties b/portal-remote-rest-extender/classes/content/Language_ko.properties
deleted file mode 100644
index 3b3ecce..0000000
--- a/portal-remote-rest-extender/classes/content/Language_ko.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\ub098\uba38\uc9c0 \uc775\uc2a4\ud150\ub354 (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_lo.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_lo.properties b/portal-remote-rest-extender/classes/content/Language_lo.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/classes/content/Language_lo.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender (Automatic Copy)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_lt.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_lt.properties b/portal-remote-rest-extender/classes/content/Language_lt.properties
deleted file mode 100644
index 4f37958..0000000
--- a/portal-remote-rest-extender/classes/content/Language_lt.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=POILSIO pl\u0117stuvo (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_nb.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_nb.properties b/portal-remote-rest-extender/classes/content/Language_nb.properties
deleted file mode 100644
index 9b885db..0000000
--- a/portal-remote-rest-extender/classes/content/Language_nb.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=RESTEN Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_nl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_nl.properties b/portal-remote-rest-extender/classes/content/Language_nl.properties
deleted file mode 100644
index b62adc9..0000000
--- a/portal-remote-rest-extender/classes/content/Language_nl.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST-extenders
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_nl_BE.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_nl_BE.properties b/portal-remote-rest-extender/classes/content/Language_nl_BE.properties
deleted file mode 100644
index d137e77..0000000
--- a/portal-remote-rest-extender/classes/content/Language_nl_BE.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_pl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_pl.properties b/portal-remote-rest-extender/classes/content/Language_pl.properties
deleted file mode 100644
index 0055a27..0000000
--- a/portal-remote-rest-extender/classes/content/Language_pl.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=RESZTA Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_pt_BR.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_pt_BR.properties b/portal-remote-rest-extender/classes/content/Language_pt_BR.properties
deleted file mode 100644
index cc489da..0000000
--- a/portal-remote-rest-extender/classes/content/Language_pt_BR.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=Extensor REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_pt_PT.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_pt_PT.properties b/portal-remote-rest-extender/classes/content/Language_pt_PT.properties
deleted file mode 100644
index cc489da..0000000
--- a/portal-remote-rest-extender/classes/content/Language_pt_PT.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=Extensor REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_ro.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_ro.properties b/portal-remote-rest-extender/classes/content/Language_ro.properties
deleted file mode 100644
index 2c26380..0000000
--- a/portal-remote-rest-extender/classes/content/Language_ro.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=RESTUL Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_ru.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_ru.properties b/portal-remote-rest-extender/classes/content/Language_ru.properties
deleted file mode 100644
index 068b2cd..0000000
--- a/portal-remote-rest-extender/classes/content/Language_ru.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u041e\u0421\u0422\u0410\u041b\u042c\u041d\u042b\u0415 \u0440\u0430\u0441\u0448\u0438\u0440\u0438\u0442\u0435\u043b\u044c (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_sk.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_sk.properties b/portal-remote-rest-extender/classes/content/Language_sk.properties
deleted file mode 100644
index 05a4cbe..0000000
--- a/portal-remote-rest-extender/classes/content/Language_sk.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=Roz\u0161irova\u010d REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_sl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_sl.properties b/portal-remote-rest-extender/classes/content/Language_sl.properties
deleted file mode 100644
index 393ff7f..0000000
--- a/portal-remote-rest-extender/classes/content/Language_sl.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=OSTALI Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_sr_RS.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_sr_RS.properties b/portal-remote-rest-extender/classes/content/Language_sr_RS.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/classes/content/Language_sr_RS.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender (Automatic Copy)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_sr_RS_latin.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_sr_RS_latin.properties b/portal-remote-rest-extender/classes/content/Language_sr_RS_latin.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/classes/content/Language_sr_RS_latin.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender (Automatic Copy)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_sv.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_sv.properties b/portal-remote-rest-extender/classes/content/Language_sv.properties
deleted file mode 100644
index 9b885db..0000000
--- a/portal-remote-rest-extender/classes/content/Language_sv.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=RESTEN Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_tr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_tr.properties b/portal-remote-rest-extender/classes/content/Language_tr.properties
deleted file mode 100644
index 87ddb28..0000000
--- a/portal-remote-rest-extender/classes/content/Language_tr.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=D\u0130\u011eER Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_uk.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_uk.properties b/portal-remote-rest-extender/classes/content/Language_uk.properties
deleted file mode 100644
index 2e65121..0000000
--- a/portal-remote-rest-extender/classes/content/Language_uk.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u0420\u0415\u0428\u0422\u0410 Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_vi.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_vi.properties b/portal-remote-rest-extender/classes/content/Language_vi.properties
deleted file mode 100644
index e01047a..0000000
--- a/portal-remote-rest-extender/classes/content/Language_vi.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=C�n l\u1ea1i Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_zh_CN.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_zh_CN.properties b/portal-remote-rest-extender/classes/content/Language_zh_CN.properties
deleted file mode 100644
index 1d4ebb9..0000000
--- a/portal-remote-rest-extender/classes/content/Language_zh_CN.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u5176\u4ed6\u6269\u5c55\u7a0b\u5e8f
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/classes/content/Language_zh_TW.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/classes/content/Language_zh_TW.properties b/portal-remote-rest-extender/classes/content/Language_zh_TW.properties
deleted file mode 100644
index 36dac4d..0000000
--- a/portal-remote-rest-extender/classes/content/Language_zh_TW.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST\u64f4\u5145\u5668
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/portal-remote-rest-extender.iml
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/portal-remote-rest-extender.iml b/portal-remote-rest-extender/portal-remote-rest-extender.iml
deleted file mode 100644
index 16c78d3..0000000
--- a/portal-remote-rest-extender/portal-remote-rest-extender.iml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":portal-remote-rest-extender" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="osgi-rest" external.system.module.version="unspecified" relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/classes" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: biz.aQute.bnd:biz.aQute.bndlib:3.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.liferay:com.liferay.portal.remote.cxf.jaxrs.common:2.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: javax.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-core:3.1.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-frontend-jaxrs:3.1.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-rs-extension-providers:3.1.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.dependencymanager:3.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.codehaus.jettison:jettison:1.3.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.osgi:org.osgi.core:5.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.osgi:org.osgi.service.http.whiteboard:1.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
-    <orderEntry type="library" name="Gradle: javax.annotation:javax.annotation-api:1.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-transports-http:3.1.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.osgi:org.osgi.compendium:4.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.ws.xmlschema:xmlschema-core:2.2.1" level="project" />
-  </component>
-</module>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
deleted file mode 100644
index 04017d6..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portal.remote.rest.extender.activator;
-
-import javax.ws.rs.ext.RuntimeDelegate;
-
-import com.liferay.portal.remote.rest.extender.internal.BusServiceTrackerCustomizer;
-import com.liferay.portal.remote.rest.extender.internal.ServicesServiceTrackerCustomizer;
-import org.apache.cxf.Bus;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Filter;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class CXFJaxRsBundleActivator implements BundleActivator {
-
-	private ServiceTracker<?, ?> _busServiceTracker;
-	private ServiceTracker<?, ?> _singletonsTracker;
-
-	@Override
-	public void start(BundleContext bundleContext) throws Exception {
-		Thread thread = Thread.currentThread();
-
-		ClassLoader contextClassLoader = thread.getContextClassLoader();
-
-		ClassLoader classLoader = RuntimeDelegate.class.getClassLoader();
-
-		thread.setContextClassLoader(classLoader);
-
-		try {
-
-			// Initialize instance so it is never looked up again
-
-			RuntimeDelegate.getInstance();
-		}
-		finally {
-			thread.setContextClassLoader(contextClassLoader);
-		}
-
-		_busServiceTracker = new ServiceTracker<>(
-			bundleContext, Bus.class,
-			new BusServiceTrackerCustomizer(bundleContext));
-
-		_busServiceTracker.open();
-
-		Filter filter = bundleContext.createFilter(
-			"(jaxrs.application.select=*)");
-
-		_singletonsTracker = new ServiceTracker<>(
-			bundleContext, filter,
-			new ServicesServiceTrackerCustomizer(bundleContext));
-
-		_singletonsTracker.open();
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		_busServiceTracker.close();
-
-		_singletonsTracker.close();
-	}
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
deleted file mode 100644
index 8900ded..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- * <p>
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * <p>
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portal.remote.rest.extender.internal;
-
-import com.liferay.portal.remote.rest.extender.internal.CXFJaxRsServiceRegistrator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-import javax.ws.rs.ext.Provider;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class AddonsServiceTrackerCustomizer
-	implements ServiceTrackerCustomizer<CXFJaxRsServiceRegistrator, CXFJaxRsServiceRegistrator> {
-
-	private final BundleContext _bundleContext;
-	private final ClassLoader _classLoader;
-	private final Class<?> _serviceClass;
-	private final Object _service;
-
-	public AddonsServiceTrackerCustomizer(
-		BundleContext bundleContext, ClassLoader classLoader,
-		Object service) {
-
-		_bundleContext = bundleContext;
-		_classLoader = classLoader;
-		_service = service;
-
-		_serviceClass = service.getClass();
-	}
-
-	@Override
-	public CXFJaxRsServiceRegistrator addingService(
-		ServiceReference<CXFJaxRsServiceRegistrator> reference) {
-
-		Thread thread = Thread.currentThread();
-
-		ClassLoader contextClassLoader =
-			thread.getContextClassLoader();
-
-		CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator =
-			_bundleContext.getService(reference);
-
-		try {
-			thread.setContextClassLoader(_classLoader);
-
-			if (_serviceClass.isAnnotationPresent(Provider.class)) {
-				cxfJaxRsServiceRegistrator.addProvider(_service);
-			} else {
-				cxfJaxRsServiceRegistrator.addService(_service);
-			}
-
-			return cxfJaxRsServiceRegistrator;
-		}
-		catch (Exception e) {
-			_bundleContext.ungetService(reference);
-
-			throw e;
-		}
-		finally {
-			thread.setContextClassLoader(contextClassLoader);
-		}
-	}
-
-	@Override
-	public void modifiedService(
-		ServiceReference<CXFJaxRsServiceRegistrator> reference,
-		CXFJaxRsServiceRegistrator registrator) {
-
-		removedService(reference, registrator);
-
-		addingService(reference);
-	}
-
-	@Override
-	public void removedService(
-		ServiceReference<CXFJaxRsServiceRegistrator> reference,
-		CXFJaxRsServiceRegistrator registrator) {
-
-		if (_serviceClass.isAnnotationPresent(Provider.class)) {
-			registrator.removeProvider(_service);
-		} else {
-			registrator.removeService(_service);
-		}
-
-		_bundleContext.ungetService(reference);
-	}
-}

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
deleted file mode 100644
index 2594ac3..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- * <p>
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * <p>
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portal.remote.rest.extender.internal;
-
-import org.apache.cxf.Bus;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-import javax.ws.rs.core.Application;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-class ApplicationServiceTrackerCustomizer
-	implements ServiceTrackerCustomizer
-		<Application, ApplicationServiceTrackerCustomizer.Tracked> {
-
-	private BundleContext _bundleContext;
-	private Bus _bus;
-
-	public ApplicationServiceTrackerCustomizer(
-		BundleContext bundleContext, Bus bus) {
-
-		_bundleContext = bundleContext;
-		_bus = bus;
-	}
-
-	@Override
-	public Tracked addingService(
-		ServiceReference<Application> serviceReference) {
-
-		Application application = _bundleContext.getService(
-			serviceReference);
-
-		try {
-			String[] propertyKeys = serviceReference.getPropertyKeys();
-
-			Map<String, Object> properties = new HashMap<>(
-				propertyKeys.length);
-
-			for (String propertyKey : propertyKeys) {
-				properties.put(
-					propertyKey, serviceReference.getProperty(propertyKey));
-			}
-
-			properties.put(
-				"CXF_ENDPOINT_ADDRESS",
-				serviceReference.getProperty("osgi.jaxrs.application.base").
-					toString());
-
-			CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator =
-				new CXFJaxRsServiceRegistrator(_bus, application, properties);
-
-			return new Tracked(
-				cxfJaxRsServiceRegistrator, application,
-				_bundleContext.registerService(
-					CXFJaxRsServiceRegistrator.class,
-					cxfJaxRsServiceRegistrator, new Hashtable<>(properties)));
-		}
-		catch (Exception e) {
-			_bundleContext.ungetService(serviceReference);
-
-			throw e;
-		}
-	}
-
-	@Override
-	public void modifiedService(
-		ServiceReference<Application> serviceReference, Tracked tracked) {
-
-		removedService(serviceReference, tracked);
-
-		addingService(serviceReference);
-	}
-
-	@Override
-	public void removedService(
-		ServiceReference<Application> reference, Tracked tracked) {
-
-		_bundleContext.ungetService(reference);
-
-		tracked.getCxfJaxRsServiceRegistrator().close();
-
-		tracked.getCxfJaxRsServiceRegistratorServiceRegistration().unregister();
-	}
-
-	public static class Tracked {
-
-		private final CXFJaxRsServiceRegistrator _cxfJaxRsServiceRegistrator;
-		private final Application _application;
-		private final ServiceRegistration<CXFJaxRsServiceRegistrator>
-			_cxfJaxRsServiceRegistratorServiceRegistration;
-
-		public Application getApplication() {
-			return _application;
-		}
-
-		public CXFJaxRsServiceRegistrator getCxfJaxRsServiceRegistrator() {
-			return _cxfJaxRsServiceRegistrator;
-		}
-
-		public ServiceRegistration<CXFJaxRsServiceRegistrator>
-			getCxfJaxRsServiceRegistratorServiceRegistration() {
-
-			return _cxfJaxRsServiceRegistratorServiceRegistration;
-		}
-
-		public Tracked(
-			CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator,
-			Application application,
-			ServiceRegistration<CXFJaxRsServiceRegistrator>
-				cxfJaxRsServiceRegistratorServiceRegistration) {
-
-			_cxfJaxRsServiceRegistrator = cxfJaxRsServiceRegistrator;
-			_application = application;
-			_cxfJaxRsServiceRegistratorServiceRegistration =
-				cxfJaxRsServiceRegistratorServiceRegistration;
-		}
-
-	}
-}
-
-

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
deleted file mode 100644
index 8440196..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- * <p>
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * <p>
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portal.remote.rest.extender.internal;
-
-import org.apache.cxf.Bus;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Filter;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-import javax.ws.rs.core.Application;
-import java.util.Arrays;
-import java.util.Collection;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class BusServiceTrackerCustomizer
-	implements ServiceTrackerCustomizer<Bus, Collection<ServiceTracker<?, ?>>> {
-
-	private BundleContext _bundleContext;
-
-	public BusServiceTrackerCustomizer(BundleContext bundleContext) {
-		_bundleContext = bundleContext;
-	}
-
-	@Override
-	public Collection<ServiceTracker<?, ?>>
-	addingService(ServiceReference<Bus> serviceReference) {
-
-		Bus bus = _bundleContext.getService(serviceReference);
-
-		try {
-			ServiceTracker<Application,?> applicationTracker =
-				new ServiceTracker<>(_bundleContext, getApplicationFilter(),
-					new ApplicationServiceTrackerCustomizer(
-						_bundleContext, bus));
-
-			applicationTracker.open();
-
-			ServiceTracker<Object, ?> singletonsServiceTracker =
-				new ServiceTracker<>(_bundleContext, getSingletonsFilter(),
-					new SingletonServiceTrackerCustomizer(_bundleContext, bus));
-
-			singletonsServiceTracker.open();
-
-			ServiceTracker<Object, ?> filtersAndInterceptorsServiceTracker =
-				new ServiceTracker<>(_bundleContext, getFiltersFilter(),
-					new FiltersAndInterceptorsServiceTrackerCustomizer(
-						_bundleContext));
-
-			filtersAndInterceptorsServiceTracker.open();
-
-			return Arrays.asList(applicationTracker, singletonsServiceTracker);
-		}
-		catch (InvalidSyntaxException ise) {
-			throw new RuntimeException(ise);
-		}
-		catch (Exception e) {
-			_bundleContext.ungetService(serviceReference);
-
-			throw e;
-		}
-	}
-
-	private Filter getFiltersFilter() throws InvalidSyntaxException {
-		return _bundleContext.createFilter("(osgi.jaxrs.filter.base=*)");
-	}
-
-	private Filter getApplicationFilter() throws InvalidSyntaxException {
-		return _bundleContext.createFilter(
-			"(&(objectClass=" + Application.class.getName() + ")" +
-				"(osgi.jaxrs.application.base=*))");
-	}
-
-	private Filter getSingletonsFilter() throws InvalidSyntaxException {
-		return _bundleContext.createFilter("(osgi.jaxrs.resource.base=*)");
-	}
-
-	@Override
-	public void modifiedService(
-		ServiceReference<Bus> reference,
-		Collection<ServiceTracker<?, ?>> serviceTrackers) {
-
-		removedService(reference, serviceTrackers);
-
-		addingService(reference);
-	}
-
-	@Override
-	public void removedService(
-		ServiceReference<Bus> serviceReference,
-		Collection<ServiceTracker<?, ?>> serviceTrackers) {
-
-		_bundleContext.ungetService(serviceReference);
-
-		for (ServiceTracker<?, ?> serviceTracker : serviceTrackers) {
-			serviceTracker.close();
-		}
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
deleted file mode 100644
index 7449ec8..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portal.remote.rest.extender.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-
-import javax.ws.rs.core.Application;
-import javax.ws.rs.ext.RuntimeDelegate;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
-import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.apache.cxf.jaxrs.provider.json.JSONProvider;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class CXFJaxRsServiceRegistrator {
-
-	public CXFJaxRsServiceRegistrator(
-		Bus bus, Application application, Map<String, Object> properties) {
-
-		_bus = bus;
-		_application = application;
-		_properties = properties;
-
-		rewire();
-	}
-
-	public void close() {
-		if (_closed) {
-			return;
-		}
-
-		if (_server != null) {
-			_server.destroy();
-		}
-
-		_closed = true;
-	}
-
-	public void addProvider(Object provider) {
-		if (_closed) {
-			return;
-		}
-
-		_providers.add(provider);
-
-		rewire();
-	}
-
-	public void addService(Object service) {
-		if (_closed) {
-			return;
-		}
-
-		_services.add(service);
-
-		rewire();
-	}
-
-	public void removeProvider(Object provider) {
-		if (_closed) {
-			return;
-		}
-
-		_providers.remove(provider);
-
-		rewire();
-	}
-
-	public void removeService(Object service) {
-		if (_closed) {
-			return;
-		}
-
-		_services.remove(service);
-
-		rewire();
-	}
-
-	protected synchronized void rewire() {
-		if (_server != null) {
-			_server.destroy();
-		}
-
-		RuntimeDelegate runtimeDelegate = RuntimeDelegate.getInstance();
-
-		JAXRSServerFactoryBean jaxRsServerFactoryBean =
-			runtimeDelegate.createEndpoint(
-				_application, JAXRSServerFactoryBean.class);
-
-		jaxRsServerFactoryBean.setBus(_bus);
-		jaxRsServerFactoryBean.setProperties(_properties);
-
-		JSONProvider<Object> jsonProvider = new JSONProvider<>();
-
-		jsonProvider.setDropCollectionWrapperElement(true);
-		jsonProvider.setDropRootElement(true);
-		jsonProvider.setSerializeAsArray(true);
-		jsonProvider.setSupportUnwrapped(true);
-
-		jaxRsServerFactoryBean.setProvider(jsonProvider);
-
-		for (Object provider : _providers) {
-			jaxRsServerFactoryBean.setProvider(provider);
-		}
-
-		for (Object service : _services) {
-			jaxRsServerFactoryBean.setResourceProvider(
-				new SingletonResourceProvider(service, true));
-		}
-
-		String address = _properties.get("CXF_ENDPOINT_ADDRESS").toString();
-
-		if (address != null) {
-			jaxRsServerFactoryBean.setAddress(address);
-		}
-
-		_server = jaxRsServerFactoryBean.create();
-
-		_server.start();
-	}
-
-	private volatile boolean _closed = false;
-	private final Application _application;
-	private final Bus _bus;
-	private final Map<String, Object> _properties;
-	private final Collection<Object> _providers = new ArrayList<>();
-	private Server _server;
-	private final Collection<Object> _services = new ArrayList<>();
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
deleted file mode 100644
index 07e8c7a..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- * <p>
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * <p>
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portal.remote.rest.extender.internal;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class FiltersAndInterceptorsServiceTrackerCustomizer
-	implements ServiceTrackerCustomizer<Object, ServiceTracker<?, ?>> {
-
-	private BundleContext _bundleContext;
-
-	public FiltersAndInterceptorsServiceTrackerCustomizer(
-		BundleContext bundleContext) {
-
-		_bundleContext = bundleContext;
-	}
-
-	@Override
-	public ServiceTracker<?, ?> addingService(final ServiceReference<Object> reference) {
-		final String filterBase =
-			reference.getProperty("osgi.jaxrs.filter.base").toString();
-
-		final Object service = _bundleContext.getService(reference);
-
-		ServiceTracker<CXFJaxRsServiceRegistrator, CXFJaxRsServiceRegistrator> serviceTracker = new ServiceTracker<>(
-			_bundleContext, CXFJaxRsServiceRegistrator.class,
-			new ServiceTrackerCustomizer
-				<CXFJaxRsServiceRegistrator, CXFJaxRsServiceRegistrator>() {
-
-				@Override
-				public CXFJaxRsServiceRegistrator addingService(
-					ServiceReference<CXFJaxRsServiceRegistrator> cxfReference) {
-
-					Object resourceBaseObject =
-						cxfReference.getProperty("CXF_ENDPOINT_ADDRESS");
-
-					if (resourceBaseObject == null) {
-						return null;
-					}
-
-					String resourceBase = resourceBaseObject.toString();
-
-					if (resourceBase.startsWith(filterBase)) {
-						CXFJaxRsServiceRegistrator serviceRegistrator =
-							_bundleContext.getService(cxfReference);
-						try {
-							serviceRegistrator.addProvider(service);
-
-							return serviceRegistrator;
-						}
-						finally {
-							_bundleContext.ungetService(reference);
-						}
-					}
-
-					return null;
-				}
-
-				@Override
-				public void modifiedService(
-					ServiceReference<CXFJaxRsServiceRegistrator> reference,
-					CXFJaxRsServiceRegistrator service) {
-
-					removedService(reference, service);
-					addingService(reference);
-				}
-
-				@Override
-				public void removedService(
-					ServiceReference<CXFJaxRsServiceRegistrator> reference,
-					CXFJaxRsServiceRegistrator service) {
-
-					CXFJaxRsServiceRegistrator serviceRegistrator =
-						_bundleContext.getService(reference);
-					try {
-						serviceRegistrator.removeProvider(service);
-					}
-					finally {
-						_bundleContext.ungetService(reference);
-					}
-				}
-			});
-
-		serviceTracker.open();
-
-		return serviceTracker;
-	}
-
-	@Override
-	public void modifiedService(
-		ServiceReference<Object> reference, ServiceTracker<?, ?> serviceTracker) {
-
-		removedService(reference, serviceTracker);
-		addingService(reference);
-	}
-
-	@Override
-	public void removedService(
-		ServiceReference<Object> reference, ServiceTracker<?, ?> serviceTracker) {
-
-		_bundleContext.ungetService(reference);
-
-		serviceTracker.close();
-	}
-}

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
deleted file mode 100644
index 433f70c..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- * <p>
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * <p>
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portal.remote.rest.extender.internal;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Filter;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class ServicesServiceTrackerCustomizer
-	implements ServiceTrackerCustomizer
-		<Object, ServiceTracker
-			<CXFJaxRsServiceRegistrator, CXFJaxRsServiceRegistrator>> {
-
-	private final BundleContext _bundleContext;
-
-	public ServicesServiceTrackerCustomizer(BundleContext bundleContext) {
-		_bundleContext = bundleContext;
-	}
-
-	@Override
-	public ServiceTracker
-		<CXFJaxRsServiceRegistrator, CXFJaxRsServiceRegistrator>
-	addingService(ServiceReference<Object> reference) {
-
-		String applicationSelector =
-			reference.getProperty("jaxrs.application.select").toString();
-
-		Bundle bundle = reference.getBundle();
-
-		BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
-
-		ClassLoader classLoader = bundleWiring.getClassLoader();
-
-		Object service = _bundleContext.getService(reference);
-
-		try {
-			Filter filter = _bundleContext.createFilter(
-				"(&(objectClass=" + CXFJaxRsServiceRegistrator.class.getName() + ")" +
-					applicationSelector + ")");
-
-			ServiceTracker
-				<CXFJaxRsServiceRegistrator, CXFJaxRsServiceRegistrator>
-				serviceTracker = new ServiceTracker<>(
-					_bundleContext, filter,
-					new AddonsServiceTrackerCustomizer(
-						_bundleContext, classLoader,
-						service));
-
-			serviceTracker.open();
-
-			return serviceTracker;
-		}
-		catch (InvalidSyntaxException ise) {
-			_bundleContext.ungetService(reference);
-
-			throw new RuntimeException(ise);
-		}
-	}
-
-	@Override
-	public void modifiedService(
-		ServiceReference<Object> reference,
-		ServiceTracker
-			<CXFJaxRsServiceRegistrator, CXFJaxRsServiceRegistrator>
-			serviceTracker) {
-
-		removedService(reference, serviceTracker);
-
-		addingService(reference);
-	}
-
-	@Override
-	public void removedService(
-		ServiceReference<Object> reference,
-		ServiceTracker
-			<CXFJaxRsServiceRegistrator, CXFJaxRsServiceRegistrator>
-			serviceTracker) {
-
-		serviceTracker.close();
-
-		_bundleContext.ungetService(reference);
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
deleted file mode 100644
index 8645504..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- * <p>
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * <p>
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portal.remote.rest.extender.internal;
-
-import org.apache.cxf.Bus;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-import javax.ws.rs.core.Application;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-class SingletonServiceTrackerCustomizer
-	implements ServiceTrackerCustomizer
-		<Object, SingletonServiceTrackerCustomizer.Tracked> {
-
-	private BundleContext _bundleContext;
-	private Bus _bus;
-
-	public SingletonServiceTrackerCustomizer(
-		BundleContext bundleContext, Bus bus) {
-
-		_bundleContext = bundleContext;
-		_bus = bus;
-	}
-
-	@Override
-	public Tracked addingService(
-		ServiceReference<Object> serviceReference) {
-
-		final Object service = _bundleContext.getService(
-			serviceReference);
-
-		try {
-			String[] propertyKeys = serviceReference.getPropertyKeys();
-
-			Map<String, Object> properties = new HashMap<>(
-				propertyKeys.length);
-
-			for (String propertyKey : propertyKeys) {
-				if (propertyKey.equals("osgi.jaxrs.resource.base")) {
-					continue;
-				}
-				properties.put(
-					propertyKey, serviceReference.getProperty(propertyKey));
-			}
-
-			properties.put(
-				"CXF_ENDPOINT_ADDRESS",
-				serviceReference.getProperty("osgi.jaxrs.resource.base").
-					toString());
-
-			CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator =
-				new CXFJaxRsServiceRegistrator(
-					_bus,
-					new Application() {
-						@Override
-						public Set<Object> getSingletons() {
-							return Collections.singleton(service);
-						}
-					},
-					properties);
-
-			return new Tracked(
-				cxfJaxRsServiceRegistrator, service,
-				_bundleContext.registerService(
-					CXFJaxRsServiceRegistrator.class,
-					cxfJaxRsServiceRegistrator, new Hashtable<>(properties)));
-		}
-		catch (Exception e) {
-			_bundleContext.ungetService(serviceReference);
-
-			throw e;
-		}
-	}
-
-	@Override
-	public void modifiedService(
-		ServiceReference<Object> serviceReference, Tracked tracked) {
-
-		removedService(serviceReference, tracked);
-
-		addingService(serviceReference);
-	}
-
-	@Override
-	public void removedService(
-		ServiceReference<Object> reference, Tracked tracked) {
-
-		_bundleContext.ungetService(reference);
-
-		Object service = tracked.getService();
-
-		CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator =
-			tracked.getCxfJaxRsServiceRegistrator();
-
-		cxfJaxRsServiceRegistrator.close();
-
-		tracked.getCxfJaxRsServiceRegistratorServiceRegistration().unregister();
-	}
-
-	public static class Tracked {
-
-		private final CXFJaxRsServiceRegistrator _cxfJaxRsServiceRegistrator;
-		private final Object _service;
-		private final ServiceRegistration<CXFJaxRsServiceRegistrator>
-			_cxfJaxRsServiceRegistratorServiceRegistration;
-
-		public Object getService() {
-			return _service;
-		}
-
-		public CXFJaxRsServiceRegistrator getCxfJaxRsServiceRegistrator() {
-			return _cxfJaxRsServiceRegistrator;
-		}
-
-		public ServiceRegistration<CXFJaxRsServiceRegistrator>
-			getCxfJaxRsServiceRegistratorServiceRegistration() {
-
-			return _cxfJaxRsServiceRegistratorServiceRegistration;
-		}
-
-		public Tracked(
-			CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator,
-			Object service,
-			ServiceRegistration<CXFJaxRsServiceRegistrator>
-				cxfJaxRsServiceRegistratorServiceRegistration) {
-
-			_cxfJaxRsServiceRegistrator = cxfJaxRsServiceRegistrator;
-			_service = service;
-			_cxfJaxRsServiceRegistratorServiceRegistration =
-				cxfJaxRsServiceRegistratorServiceRegistration;
-		}
-
-	}
-
-}
-
-

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language.properties b/portal-remote-rest-extender/src/main/resources/content/Language.properties
deleted file mode 100644
index ff2b883..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_ar.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_ar.properties b/portal-remote-rest-extender/src/main/resources/content/Language_ar.properties
deleted file mode 100644
index f7ddde5..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_ar.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u0628\u0642\u064a\u0629 \u0645\u0648\u0633\u0639 (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_bg.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_bg.properties b/portal-remote-rest-extender/src/main/resources/content/Language_bg.properties
deleted file mode 100644
index 93f99d3..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_bg.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u041f\u041e\u0427\u0418\u0412\u041a\u0410 Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_ca.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_ca.properties b/portal-remote-rest-extender/src/main/resources/content/Language_ca.properties
deleted file mode 100644
index 9476a3e..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_ca.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=Amplificador REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_cs.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_cs.properties b/portal-remote-rest-extender/src/main/resources/content/Language_cs.properties
deleted file mode 100644
index 76bc497..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_cs.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=OSTATN� za\u0159�zen� Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_da.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_da.properties b/portal-remote-rest-extender/src/main/resources/content/Language_da.properties
deleted file mode 100644
index 9b885db..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_da.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=RESTEN Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_de.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_de.properties b/portal-remote-rest-extender/src/main/resources/content/Language_de.properties
deleted file mode 100644
index ff2b883..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_de.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_el.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_el.properties b/portal-remote-rest-extender/src/main/resources/content/Language_el.properties
deleted file mode 100644
index 1fd60a7..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_el.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u03a5\u03a0\u038c\u039b\u039f\u0399\u03a0\u039f \u03b1\u03c1\u03b1\u03af\u03c9\u03c3\u03b7\u03c2 (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_en.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_en.properties b/portal-remote-rest-extender/src/main/resources/content/Language_en.properties
deleted file mode 100644
index ff2b883..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_en.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_es.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_es.properties b/portal-remote-rest-extender/src/main/resources/content/Language_es.properties
deleted file mode 100644
index cc489da..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_es.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=Extensor REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_et.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_et.properties b/portal-remote-rest-extender/src/main/resources/content/Language_et.properties
deleted file mode 100644
index 824e6e1..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_et.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=�LEJ��NUD Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_eu.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_eu.properties b/portal-remote-rest-extender/src/main/resources/content/Language_eu.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_eu.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender (Automatic Copy)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_fa.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_fa.properties b/portal-remote-rest-extender/src/main/resources/content/Language_fa.properties
deleted file mode 100644
index 64e00d0..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_fa.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u06af\u0633\u062a\u0631\u0634 \u062f\u0647\u0646\u062f\u0647 REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_fi.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_fi.properties b/portal-remote-rest-extender/src/main/resources/content/Language_fi.properties
deleted file mode 100644
index d0e0a1d..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_fi.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST laajennin
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_fr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_fr.properties b/portal-remote-rest-extender/src/main/resources/content/Language_fr.properties
deleted file mode 100644
index 52e43d9..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_fr.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=Extendeur REST
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_gl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_gl.properties b/portal-remote-rest-extender/src/main/resources/content/Language_gl.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_gl.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender (Automatic Copy)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_hi_IN.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_hi_IN.properties b/portal-remote-rest-extender/src/main/resources/content/Language_hi_IN.properties
deleted file mode 100644
index 340d552..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_hi_IN.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u092c\u093e\u0915\u0940 \u092d\u0930\u0928\u0947\u0935\u093e\u0932\u093e (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_hr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_hr.properties b/portal-remote-rest-extender/src/main/resources/content/Language_hr.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_hr.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender (Automatic Copy)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_hu.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_hu.properties b/portal-remote-rest-extender/src/main/resources/content/Language_hu.properties
deleted file mode 100644
index cdc65c6..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_hu.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST kiterjeszt\u0151
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_in.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_in.properties b/portal-remote-rest-extender/src/main/resources/content/Language_in.properties
deleted file mode 100644
index b60839d..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_in.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=SISANYA Extender (Automatic Translation)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_it.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_it.properties b/portal-remote-rest-extender/src/main/resources/content/Language_it.properties
deleted file mode 100644
index ff2b883..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_it.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=REST Extender
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_iw.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_iw.properties b/portal-remote-rest-extender/src/main/resources/content/Language_iw.properties
deleted file mode 100644
index 667e11d..0000000
--- a/portal-remote-rest-extender/src/main/resources/content/Language_iw.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=\u05de\u05d0\u05e8\u05d9\u05da REST
\ No newline at end of file