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:05 UTC
[01/50] [abbrv] aries-jax-rs-whiteboard git commit: cleanup
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master [created] 837e00b66
cleanup
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/871ac16e
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/871ac16e
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/871ac16e
Branch: refs/heads/master
Commit: 871ac16e4c4056becd90be888e7ac9a450ad1959
Parents: 87965d0
Author: Carlos Sierra <ca...@liferay.com>
Authored: Wed Sep 7 14:23:48 2016 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Oct 4 15:46:54 2016 +0200
----------------------------------------------------------------------
example-jaxrs-application/build/tmp/jar/bnd.bnd | 4 +
.../portal/rest/example/ExampleApplication.java | 1 -
.../remote/cxf/common/CXFEndpointPublisher.java | 77 -------
.../remote/cxf/common/ExtensionManager.java | 43 ----
.../remote/cxf/common/ServicesRegistrator.java | 2 +-
.../CXFEndpointPublisherConfiguration.java | 41 ----
.../.lfrbuild-portal | 0
.../.lfrbuild-static | 0
portal-remote-dependency-manager-tccl/bnd.bnd | 8 -
.../build.gradle | 4 -
.../portal-remote-dependency-manager-tccl.iml | 21 --
.../ServiceReferenceTCCLServiceDependency.java | 93 ---------
.../manager/tccl/TCCLDependencyManager.java | 39 ----
.../remote/dependency/manager/tccl/packageinfo | 1 -
portal-remote-rest-extender/build.gradle | 1 -
.../portal-remote-rest-extender.iml | 1 -
.../AddonsServiceTrackerCustomizer.java | 102 ----------
.../ApplicationServiceTrackerCustomizer.java | 151 --------------
.../activator/BusServiceTrackerCustomizer.java | 105 ----------
.../activator/CXFJaxRsBundleActivator.java | 8 +-
.../ServicesServiceTrackerCustomizer.java | 105 ----------
.../SingletonServiceTrackerCustomizer.java | 159 ---------------
.../RestExtenderConfiguration.java | 41 ----
.../AddonsServiceTrackerCustomizer.java | 102 ++++++++++
.../ApplicationServiceTrackerCustomizer.java | 140 +++++++++++++
.../internal/BusServiceTrackerCustomizer.java | 105 ++++++++++
.../internal/CXFJaxRsServiceRegistrator.java | 124 ++++--------
.../rest/extender/internal/RestExtender.java | 202 -------------------
.../ServicesServiceTrackerCustomizer.java | 104 ++++++++++
.../SingletonServiceTrackerCustomizer.java | 159 +++++++++++++++
settings.gradle | 1 -
test-cxf/build.gradle | 1 -
32 files changed, 663 insertions(+), 1282 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/example-jaxrs-application/build/tmp/jar/bnd.bnd
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/build/tmp/jar/bnd.bnd b/example-jaxrs-application/build/tmp/jar/bnd.bnd
new file mode 100644
index 0000000..37c72f2
--- /dev/null
+++ b/example-jaxrs-application/build/tmp/jar/bnd.bnd
@@ -0,0 +1,4 @@
+#Wed Sep 07 14:15:05 CEST 2016
+Bundle-SymbolicName=com.liferay.portal.rest.example
+Bundle-Version=1.0.0
+Bundle-Name=Example OSGi Rest Application
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
index 4c09a82..25234b2 100644
--- a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
+++ b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
@@ -16,7 +16,6 @@ package com.liferay.portal.rest.example;
import org.osgi.service.component.annotations.Component;
-import javax.ws.rs.ApplicationPath;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Application;
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher.java
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher.java b/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher.java
deleted file mode 100644
index b49b210..0000000
--- a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher.java
+++ /dev/null
@@ -1,77 +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.cxf.common;
-
-import aQute.bnd.annotation.metatype.Configurable;
-import com.liferay.portal.remote.cxf.common.configuration.CXFEndpointPublisherConfiguration;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.apache.felix.dm.Component;
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.ServiceDependency;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class CXFEndpointPublisher {
-
- private Component _serviceRegistratorComponent;
-
- protected void update(
- Component component, Dictionary<String, Object> properties) {
-
- _dependencyManager = component.getDependencyManager();
-
- if (_serviceRegistratorComponent != null) {
- _serviceRegistratorComponent.stop();
-
- _dependencyManager.remove(_serviceRegistratorComponent);
- }
-
- _serviceRegistratorComponent = _dependencyManager.createComponent();
-
- CXFEndpointPublisherConfiguration cxfEndpointPublisherConfiguration =
- Configurable.createConfigurable(
- CXFEndpointPublisherConfiguration.class, properties);
-
- ServicesRegistrator servicesRegistrator = new ServicesRegistrator(
- _dependencyManager.getBundleContext(), (Hashtable)properties);
-
- _serviceRegistratorComponent.setImplementation(servicesRegistrator);
-
- String[] extensions = cxfEndpointPublisherConfiguration.extensions();
-
- if (extensions != null) {
- for (String extension : extensions) {
- ServiceDependency serviceDependency =
- _dependencyManager.createServiceDependency();
-
- serviceDependency.setCallbacks(
- servicesRegistrator, "addExtension", "-");
- serviceDependency.setRequired(true);
- serviceDependency.setService(Object.class, extension);
-
- _serviceRegistratorComponent.add(serviceDependency);
- }
- }
-
- _dependencyManager.add(_serviceRegistratorComponent);
- }
-
- private DependencyManager _dependencyManager;
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ExtensionManager.java
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ExtensionManager.java b/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ExtensionManager.java
deleted file mode 100644
index 7a16185..0000000
--- a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ExtensionManager.java
+++ /dev/null
@@ -1,43 +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.cxf.common;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class ExtensionManager {
-
- public Map<Class<?>, Object> getExtensions() {
- return _extensions;
- }
-
- protected void addExtension(
- Map<String, Object> properties, Object extension) {
-
- Class<?> extensionClass = (Class<?>)properties.get(
- "soap.extension.class");
-
- _extensions.put(extensionClass, extension);
- }
-
- protected void removeExtension(Object extension) {
- }
-
- private final Map<Class<?>, Object> _extensions = new HashMap<>();
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java b/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
index d788694..68d79f6 100644
--- a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
+++ b/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
@@ -155,7 +155,7 @@ public class ServicesRegistrator {
}
private static final Logger _logger = LoggerFactory.getLogger(
- CXFEndpointPublisher.class);
+ ServicesRegistrator.class);
private final BundleContext _bundleContext;
private ServiceRegistration<Bus> _busServiceRegistration;
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/configuration/CXFEndpointPublisherConfiguration.java
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/configuration/CXFEndpointPublisherConfiguration.java b/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/configuration/CXFEndpointPublisherConfiguration.java
deleted file mode 100644
index e59b2c0..0000000
--- a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/configuration/CXFEndpointPublisherConfiguration.java
+++ /dev/null
@@ -1,41 +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.cxf.common.configuration;
-
-import aQute.bnd.annotation.metatype.Meta;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-@Meta.OCD(
- factory = true,
- id = "com.liferay.portal.remote.cxf.common.configuration.CXFEndpointPublisherConfiguration",
- localization = "content/Language", name = "cxf.endpoint.configuration.name"
-)
-public interface CXFEndpointPublisherConfiguration {
-
- @Meta.AD(required = true)
- public String contextPath();
-
- @Meta.AD(
- deflt = "auth.verifier.PortalSessionAuthVerifier.urls.includes=*",
- name = "auth-verifier-properties", required = false
- )
- public String[] authVerifierProperties();
-
- @Meta.AD(name = "%required-extensions", required = false)
- public String[] extensions();
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-dependency-manager-tccl/.lfrbuild-portal
----------------------------------------------------------------------
diff --git a/portal-remote-dependency-manager-tccl/.lfrbuild-portal b/portal-remote-dependency-manager-tccl/.lfrbuild-portal
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-dependency-manager-tccl/.lfrbuild-static
----------------------------------------------------------------------
diff --git a/portal-remote-dependency-manager-tccl/.lfrbuild-static b/portal-remote-dependency-manager-tccl/.lfrbuild-static
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-dependency-manager-tccl/bnd.bnd
----------------------------------------------------------------------
diff --git a/portal-remote-dependency-manager-tccl/bnd.bnd b/portal-remote-dependency-manager-tccl/bnd.bnd
deleted file mode 100644
index f18acd6..0000000
--- a/portal-remote-dependency-manager-tccl/bnd.bnd
+++ /dev/null
@@ -1,8 +0,0 @@
-Bundle-Name: Liferay Portal Remote Dependency Manager TCCL
-Bundle-SymbolicName: com.liferay.portal.remote.dependency.manager.tccl
-Bundle-Version: 2.0.2
-Export-Package: com.liferay.portal.remote.dependency.manager.tccl
-Fragment-Host: org.apache.felix.dependencymanager
-Import-Package: org.osgi.framework.*
-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/871ac16e/portal-remote-dependency-manager-tccl/build.gradle
----------------------------------------------------------------------
diff --git a/portal-remote-dependency-manager-tccl/build.gradle b/portal-remote-dependency-manager-tccl/build.gradle
deleted file mode 100644
index f0a5711..0000000
--- a/portal-remote-dependency-manager-tccl/build.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-dependencies {
- compile group: "org.apache.felix", name: "org.apache.felix.dependencymanager", version: "3.2.0"
- compile group: "org.osgi", name: "org.osgi.core", version: "5.0.0"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-dependency-manager-tccl/portal-remote-dependency-manager-tccl.iml
----------------------------------------------------------------------
diff --git a/portal-remote-dependency-manager-tccl/portal-remote-dependency-manager-tccl.iml b/portal-remote-dependency-manager-tccl/portal-remote-dependency-manager-tccl.iml
deleted file mode 100644
index 0a59f4b..0000000
--- a/portal-remote-dependency-manager-tccl/portal-remote-dependency-manager-tccl.iml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":portal-remote-dependency-manager-tccl" 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: org.apache.felix:org.apache.felix.dependencymanager:3.2.0" 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.compendium:4.2.0" level="project" />
- </component>
-</module>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-dependency-manager-tccl/src/main/java/com/liferay/portal/remote/dependency/manager/tccl/ServiceReferenceTCCLServiceDependency.java
----------------------------------------------------------------------
diff --git a/portal-remote-dependency-manager-tccl/src/main/java/com/liferay/portal/remote/dependency/manager/tccl/ServiceReferenceTCCLServiceDependency.java b/portal-remote-dependency-manager-tccl/src/main/java/com/liferay/portal/remote/dependency/manager/tccl/ServiceReferenceTCCLServiceDependency.java
deleted file mode 100644
index c166fb5..0000000
--- a/portal-remote-dependency-manager-tccl/src/main/java/com/liferay/portal/remote/dependency/manager/tccl/ServiceReferenceTCCLServiceDependency.java
+++ /dev/null
@@ -1,93 +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.dependency.manager.tccl;
-
-import org.apache.felix.dm.DependencyService;
-import org.apache.felix.dm.impl.Logger;
-import org.apache.felix.dm.impl.dependencies.ServiceDependencyImpl;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.wiring.BundleWiring;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class ServiceReferenceTCCLServiceDependency
- extends ServiceDependencyImpl {
-
- public ServiceReferenceTCCLServiceDependency(
- BundleContext bundleContext, Logger logger) {
-
- super(bundleContext, logger);
- }
-
- @Override
- @SuppressWarnings("rawtypes")
- public void invoke(
- Object[] callbackInstances, DependencyService dependencyService,
- ServiceReference serviceReference, Object service, String name) {
-
- Thread currentThread = Thread.currentThread();
-
- ClassLoader contextClassLoader = currentThread.getContextClassLoader();
-
- Bundle bundle = serviceReference.getBundle();
-
- BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
-
- currentThread.setContextClassLoader(bundleWiring.getClassLoader());
-
- try {
- super.invoke(
- callbackInstances, dependencyService, serviceReference, service,
- name);
- }
- finally {
- currentThread.setContextClassLoader(contextClassLoader);
- }
- }
-
- @Override
- @SuppressWarnings("rawtypes")
- public void invokeSwappedCallback(
- Object[] callbackInstances, DependencyService component,
- ServiceReference previousServiceReference, Object previousService,
- ServiceReference currentServiceReference, Object currentService,
- String swapCallback) {
-
- Thread currentThread = Thread.currentThread();
-
- ClassLoader contextClassLoader = currentThread.getContextClassLoader();
-
- Bundle bundle = currentServiceReference.getBundle();
-
- BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
-
- currentThread.setContextClassLoader(bundleWiring.getClassLoader());
-
- try {
- super.invokeSwappedCallback(
- callbackInstances, component, previousServiceReference,
- previousService, currentServiceReference, currentService,
- swapCallback);
- }
- finally {
- currentThread.setContextClassLoader(contextClassLoader);
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-dependency-manager-tccl/src/main/java/com/liferay/portal/remote/dependency/manager/tccl/TCCLDependencyManager.java
----------------------------------------------------------------------
diff --git a/portal-remote-dependency-manager-tccl/src/main/java/com/liferay/portal/remote/dependency/manager/tccl/TCCLDependencyManager.java b/portal-remote-dependency-manager-tccl/src/main/java/com/liferay/portal/remote/dependency/manager/tccl/TCCLDependencyManager.java
deleted file mode 100644
index 9aa9264..0000000
--- a/portal-remote-dependency-manager-tccl/src/main/java/com/liferay/portal/remote/dependency/manager/tccl/TCCLDependencyManager.java
+++ /dev/null
@@ -1,39 +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.dependency.manager.tccl;
-
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.ServiceDependency;
-import org.apache.felix.dm.impl.Logger;
-
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class TCCLDependencyManager extends DependencyManager {
-
- public TCCLDependencyManager(BundleContext bundleContext) {
- super(bundleContext);
- }
-
- public ServiceDependency createTCCLServiceDependency() {
- return new ServiceReferenceTCCLServiceDependency(
- getBundleContext(), _logger);
- }
-
- private final Logger _logger = new Logger(getBundleContext());
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-dependency-manager-tccl/src/main/resources/com/liferay/portal/remote/dependency/manager/tccl/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-dependency-manager-tccl/src/main/resources/com/liferay/portal/remote/dependency/manager/tccl/packageinfo b/portal-remote-dependency-manager-tccl/src/main/resources/com/liferay/portal/remote/dependency/manager/tccl/packageinfo
deleted file mode 100644
index 5897e96..0000000
--- a/portal-remote-dependency-manager-tccl/src/main/resources/com/liferay/portal/remote/dependency/manager/tccl/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0.2
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-rest-extender/build.gradle
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/build.gradle b/portal-remote-rest-extender/build.gradle
index 1a59902..2f601fa 100644
--- a/portal-remote-rest-extender/build.gradle
+++ b/portal-remote-rest-extender/build.gradle
@@ -1,7 +1,6 @@
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: "com.liferay", name: "com.liferay.portal.remote.dependency.manager.tccl", 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"
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/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
index d376453..16c78d3 100644
--- a/portal-remote-rest-extender/portal-remote-rest-extender.iml
+++ b/portal-remote-rest-extender/portal-remote-rest-extender.iml
@@ -17,7 +17,6 @@
<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: com.liferay:com.liferay.portal.remote.dependency.manager.tccl: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" />
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/AddonsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/AddonsServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/AddonsServiceTrackerCustomizer.java
deleted file mode 100644
index c255313..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/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.activator;
-
-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/871ac16e/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ApplicationServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ApplicationServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ApplicationServiceTrackerCustomizer.java
deleted file mode 100644
index b554cf5..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ApplicationServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,151 +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.activator;
-
-import com.liferay.portal.remote.rest.extender.internal.CXFJaxRsServiceRegistrator;
-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.ServiceTracker;
-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(properties);
-
- cxfJaxRsServiceRegistrator.addBus(_bus);
- cxfJaxRsServiceRegistrator.addApplication(application);
-
- 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);
-
- Application application = tracked.getApplication();
-
- CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator =
- tracked.getCxfJaxRsServiceRegistrator();
-
- cxfJaxRsServiceRegistrator.removeApplication(application);
-
- cxfJaxRsServiceRegistrator.removeBus(_bus);
-
- 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/871ac16e/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/BusServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/BusServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/BusServiceTrackerCustomizer.java
deleted file mode 100644
index 6832b18..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/BusServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,105 +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.activator;
-
-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();
-
- return Arrays.asList(applicationTracker, singletonsServiceTracker);
- }
- catch (InvalidSyntaxException ise) {
- throw new RuntimeException(ise);
- }
- catch (Exception e) {
- _bundleContext.ungetService(serviceReference);
-
- throw e;
- }
- }
-
- 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/871ac16e/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
index 6950277..04017d6 100644
--- 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
@@ -16,6 +16,8 @@ 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;
@@ -27,8 +29,8 @@ import org.osgi.util.tracker.ServiceTracker;
*/
public class CXFJaxRsBundleActivator implements BundleActivator {
- private ServiceTracker<?, ?> _singletonsTracker;
private ServiceTracker<?, ?> _busServiceTracker;
+ private ServiceTracker<?, ?> _singletonsTracker;
@Override
public void start(BundleContext bundleContext) throws Exception {
@@ -68,9 +70,9 @@ public class CXFJaxRsBundleActivator implements BundleActivator {
@Override
public void stop(BundleContext context) throws Exception {
- _singletonsTracker.close();
-
_busServiceTracker.close();
+
+ _singletonsTracker.close();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesServiceTrackerCustomizer.java
deleted file mode 100644
index df57cc6..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,105 +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.activator;
-
-import com.liferay.portal.remote.rest.extender.internal.CXFJaxRsServiceRegistrator;
-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
- */
-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/871ac16e/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/SingletonServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/SingletonServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/SingletonServiceTrackerCustomizer.java
deleted file mode 100644
index e65f3a2..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/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.activator;
-
-import com.liferay.portal.remote.rest.extender.internal.CXFJaxRsServiceRegistrator;
-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) {
- properties.put(
- propertyKey, serviceReference.getProperty(propertyKey));
- }
-
- properties.put(
- "CXF_ENDPOINT_ADDRESS",
- serviceReference.getProperty("osgi.jaxrs.resource.base").
- toString());
-
- CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator =
- new CXFJaxRsServiceRegistrator(properties);
-
- cxfJaxRsServiceRegistrator.addBus(_bus);
- cxfJaxRsServiceRegistrator.addApplication(new Application() {
- @Override
- public Set<Object> getSingletons() {
- return Collections.singleton(service);
- }
- });
-
- 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.removeService(service);
-
- cxfJaxRsServiceRegistrator.removeBus(_bus);
-
- 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/871ac16e/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/configuration/RestExtenderConfiguration.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/configuration/RestExtenderConfiguration.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/configuration/RestExtenderConfiguration.java
deleted file mode 100644
index fbd08ce..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/configuration/RestExtenderConfiguration.java
+++ /dev/null
@@ -1,41 +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.configuration;
-
-import aQute.bnd.annotation.metatype.Meta;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-@Meta.OCD(
- factory = true,
- id = "com.liferay.portal.remote.rest.extender.configuration.RestExtenderConfiguration",
- localization = "content/Language", name = "rest.extender.configuration.name"
-)
-public interface RestExtenderConfiguration {
-
- @Meta.AD(required = false)
- public String[] contextPaths();
-
- @Meta.AD(name = "jaxrs.applications.filters", required = false)
- public String[] jaxRsApplicationFilterStrings();
-
- @Meta.AD(name = "jax.rs.provider.filters", required = false)
- public String[] jaxRsProviderFilterStrings();
-
- @Meta.AD(name = "jax.rs.service.filters", required = false)
- public String[] jaxRsServiceFilterStrings();
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/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
new file mode 100644
index 0000000..8900ded
--- /dev/null
+++ b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
@@ -0,0 +1,102 @@
+/**
+ * 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/871ac16e/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
new file mode 100644
index 0000000..2594ac3
--- /dev/null
+++ b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
@@ -0,0 +1,140 @@
+/**
+ * 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/871ac16e/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
new file mode 100644
index 0000000..0281efe
--- /dev/null
+++ b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
@@ -0,0 +1,105 @@
+/**
+ * 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();
+
+ return Arrays.asList(applicationTracker, singletonsServiceTracker);
+ }
+ catch (InvalidSyntaxException ise) {
+ throw new RuntimeException(ise);
+ }
+ catch (Exception e) {
+ _bundleContext.ungetService(serviceReference);
+
+ throw e;
+ }
+ }
+
+ 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/871ac16e/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
index 1e9635c..7449ec8 100644
--- 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
@@ -16,8 +16,6 @@ package com.liferay.portal.remote.rest.extender.internal;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
import java.util.Map;
import javax.ws.rs.core.Application;
@@ -34,76 +32,80 @@ import org.apache.cxf.jaxrs.provider.json.JSONProvider;
*/
public class CXFJaxRsServiceRegistrator {
- public CXFJaxRsServiceRegistrator(Map<String, Object> properties) {
- _properties = properties;
- }
+ public CXFJaxRsServiceRegistrator(
+ Bus bus, Application application, Map<String, Object> properties) {
- public synchronized void addApplication(Application application) {
- _applications.add(application);
+ _bus = bus;
+ _application = application;
+ _properties = properties;
rewire();
}
- public synchronized void addBus(Bus bus) {
- _buses.add(bus);
+ public void close() {
+ if (_closed) {
+ return;
+ }
- for (Application application : _applications) {
- registerApplication(bus, application);
+ if (_server != null) {
+ _server.destroy();
}
+
+ _closed = true;
}
- public synchronized void addProvider(Object provider) {
+ public void addProvider(Object provider) {
+ if (_closed) {
+ return;
+ }
+
_providers.add(provider);
rewire();
}
- public synchronized void addService(Object service) {
+ public void addService(Object service) {
+ if (_closed) {
+ return;
+ }
+
_services.add(service);
rewire();
}
- public synchronized void removeApplication(Application application) {
- _applications.remove(application);
-
- remove(application);
- }
-
- public synchronized void removeBus(Bus bus) {
- _buses.remove(bus);
-
- Map<Object, Server> servers = _busServers.remove(bus);
-
- if (servers == null) {
+ public void removeProvider(Object provider) {
+ if (_closed) {
return;
}
- for (Server server : servers.values()) {
- server.destroy();
- }
- }
-
- public synchronized void removeProvider(Object provider) {
_providers.remove(provider);
rewire();
}
- public synchronized void removeService(Object service) {
+ public void removeService(Object service) {
+ if (_closed) {
+ return;
+ }
+
_services.remove(service);
rewire();
}
- protected void registerApplication(Bus bus, Application application) {
+ protected synchronized void rewire() {
+ if (_server != null) {
+ _server.destroy();
+ }
+
RuntimeDelegate runtimeDelegate = RuntimeDelegate.getInstance();
JAXRSServerFactoryBean jaxRsServerFactoryBean =
runtimeDelegate.createEndpoint(
- application, JAXRSServerFactoryBean.class);
+ _application, JAXRSServerFactoryBean.class);
- jaxRsServerFactoryBean.setBus(bus);
+ jaxRsServerFactoryBean.setBus(_bus);
jaxRsServerFactoryBean.setProperties(_properties);
JSONProvider<Object> jsonProvider = new JSONProvider<>();
@@ -130,57 +132,17 @@ public class CXFJaxRsServiceRegistrator {
jaxRsServerFactoryBean.setAddress(address);
}
- Server server = jaxRsServerFactoryBean.create();
-
- server.start();
-
- store(bus, application, server);
- }
-
- protected void registerApplications() {
- for (Bus bus : _buses) {
- for (Application application : _applications) {
- registerApplication(bus, application);
- }
- }
- }
-
- protected void remove(Object application) {
- for (Map<Object, Server> servers : _busServers.values()) {
- Server server = servers.remove(application);
-
- if (server != null) {
- server.destroy();
- }
- }
- }
-
- protected void rewire() {
- for (Application application : _applications) {
- remove(application);
- }
-
- registerApplications();
- }
-
- protected void store(Bus bus, Object object, Server server) {
- Map<Object, Server> servers = _busServers.get(bus);
-
- if (servers == null) {
- servers = new HashMap<>();
-
- _busServers.put(bus, servers);
- }
+ _server = jaxRsServerFactoryBean.create();
- servers.put(object, server);
+ _server.start();
}
- private final Collection<Application> _applications = new ArrayList<>();
- private final Collection<Bus> _buses = new ArrayList<>();
- private final Map<Bus, Map<Object, Server>> _busServers =
- new IdentityHashMap<>();
+ 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/871ac16e/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/RestExtender.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/RestExtender.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/RestExtender.java
deleted file mode 100644
index b37b8ce..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/RestExtender.java
+++ /dev/null
@@ -1,202 +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 aQute.bnd.annotation.metatype.Configurable;
-import com.liferay.portal.remote.dependency.manager.tccl.TCCLDependencyManager;
-import com.liferay.portal.remote.rest.extender.configuration.RestExtenderConfiguration;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import javax.ws.rs.core.Application;
-
-import org.apache.cxf.Bus;
-import org.apache.felix.dm.Component;
-import org.apache.felix.dm.ServiceDependency;
-
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class RestExtender {
-
- public RestExtenderConfiguration getRestExtenderConfiguration() {
- return _restExtenderConfiguration;
- }
-
- public RestExtender() {
- System.out.println("Constructor");
- }
-
- protected void update(Dictionary<String, Object> properties) {
- _dependencyManager =
- (TCCLDependencyManager)_component.getDependencyManager();
-
- if (_registratorComponent != null) {
- _registratorComponent.stop();
-
- _dependencyManager.remove(_registratorComponent);
- }
-
- _restExtenderConfiguration = Configurable.createConfigurable(
- RestExtenderConfiguration.class, properties);
-
- _registratorComponent = _dependencyManager.createComponent();
-
- CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator =
- new CXFJaxRsServiceRegistrator((Hashtable)properties);
-
- _registratorComponent.setImplementation(cxfJaxRsServiceRegistrator);
-
- addBusDependencies();
- addJaxRsApplicationDependencies();
- addJaxRsProviderServiceDependencies();
- addJaxRsServiceDependencies();
-
- _dependencyManager.add(_registratorComponent);
-
- _registratorComponent.start();
- }
-
- protected void addBusDependencies() {
- RestExtenderConfiguration restExtenderConfiguration =
- getRestExtenderConfiguration();
-
- String[] contextPaths = restExtenderConfiguration.contextPaths();
-
- if (contextPaths == null) {
- return;
- }
-
- for (String contextPath : contextPaths) {
- if (contextPath == null || contextPath.isEmpty()) {
- continue;
- }
-
- addTCCLServiceDependency(
- true, Bus.class,
- "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH +
- "=" + contextPath + ")",
- "addBus", "removeBus");
- }
- }
-
- protected void addJaxRsApplicationDependencies() {
- RestExtenderConfiguration restExtenderConfiguration =
- getRestExtenderConfiguration();
-
- String[] jaxRsApplicationFilterStrings =
- restExtenderConfiguration.jaxRsApplicationFilterStrings();
-
- if (jaxRsApplicationFilterStrings == null) {
- addTCCLServiceDependency(
- false, Application.class, null, "addApplication",
- "removeApplication");
-
- return;
- }
-
- for (String jaxRsApplicationFilterString :
- jaxRsApplicationFilterStrings) {
-
- addTCCLServiceDependency(
- false, Application.class, jaxRsApplicationFilterString,
- "addApplication", "removeApplication");
- }
- }
-
- protected void addJaxRsProviderServiceDependencies() {
- RestExtenderConfiguration soapExtenderConfiguration =
- getRestExtenderConfiguration();
-
- String[] jaxRsProviderFilterStrings =
- soapExtenderConfiguration.jaxRsProviderFilterStrings();
-
- if (jaxRsProviderFilterStrings == null) {
- return;
- }
-
- for (String jaxRsProviderFilterString : jaxRsProviderFilterStrings) {
- if (jaxRsProviderFilterString == null ||
- jaxRsProviderFilterString.isEmpty()) {
-
- continue;
- }
-
- addTCCLServiceDependency(
- false, null, jaxRsProviderFilterString, "addProvider",
- "removeProvider");
- }
- }
-
- protected void addJaxRsServiceDependencies() {
- RestExtenderConfiguration soapExtenderConfiguration =
- getRestExtenderConfiguration();
-
- String[] jaxRsServiceFilterStrings =
- soapExtenderConfiguration.jaxRsServiceFilterStrings();
-
- if (jaxRsServiceFilterStrings == null) {
- return;
- }
-
- for (String jaxRsServiceFilterString : jaxRsServiceFilterStrings) {
- if (jaxRsServiceFilterString == null ||
- jaxRsServiceFilterString.isEmpty()) {
-
- continue;
- }
-
- addTCCLServiceDependency(
- false, null, jaxRsServiceFilterString, "addService",
- "removeService");
- }
- }
-
- protected ServiceDependency addTCCLServiceDependency(
- boolean required, Class<?> clazz, String filter, String addName,
- String removeName) {
-
- ServiceDependency serviceDependency =
- _dependencyManager.createTCCLServiceDependency();
-
- serviceDependency.setCallbacks(addName, removeName);
- serviceDependency.setRequired(required);
-
- if (clazz == null) {
- serviceDependency.setService(filter);
- }
- else {
- if (filter == null) {
- serviceDependency.setService(clazz);
- }
- else {
- serviceDependency.setService(clazz, filter);
- }
- }
-
- _component.add(serviceDependency);
-
- return serviceDependency;
- }
-
- private Component _component;
- private Component _registratorComponent;
- private TCCLDependencyManager _dependencyManager;
- private RestExtenderConfiguration _restExtenderConfiguration;
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/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
new file mode 100644
index 0000000..433f70c
--- /dev/null
+++ b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
@@ -0,0 +1,104 @@
+/**
+ * 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/871ac16e/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
new file mode 100644
index 0000000..8645504
--- /dev/null
+++ b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
@@ -0,0 +1,159 @@
+/**
+ * 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/871ac16e/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index 18c8d34..cfc5db4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,7 +2,6 @@ include(
'example-jaxrs-application',
'portal-remote-cxf-common',
'portal-remote-cxf-jaxrs-common',
- 'portal-remote-dependency-manager-tccl',
'portal-remote-rest-extender',
'test-cxf'
)
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/871ac16e/test-cxf/build.gradle
----------------------------------------------------------------------
diff --git a/test-cxf/build.gradle b/test-cxf/build.gradle
index 0c0d5f4..82d4055 100644
--- a/test-cxf/build.gradle
+++ b/test-cxf/build.gradle
@@ -22,7 +22,6 @@ dependencies {
compile project(path: ':example-jaxrs-application', transitive: false)
compile project(path: ':portal-remote-cxf-common', transitive: false)
compile project(path: ':portal-remote-cxf-jaxrs-common', transitive: false)
- compile project(path: ':portal-remote-dependency-manager-tccl', transitive: false)
compile project(path: ':portal-remote-rest-extender', transitive: false)
compile group: "biz.aQute.bnd", name: "biz.aQute.bndlib", transitive: false, version: "3.1.0"
compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.2'
[23/50] [abbrv] aries-jax-rs-whiteboard git commit: Fix dependencies
Posted by cs...@apache.org.
Fix dependencies
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/b9f42017
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/b9f42017
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/b9f42017
Branch: refs/heads/master
Commit: b9f42017329b247ff729e4aa6ad8b40203140439
Parents: 2cd1894
Author: Carlos Sierra <ca...@liferay.com>
Authored: Tue Oct 25 18:50:28 2016 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Oct 25 18:50:28 2016 +0200
----------------------------------------------------------------------
org.apache.aries.jax-rs.cxf-common/pom.xml | 12 +++++++++++-
pom.xml | 7 +------
2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/b9f42017/org.apache.aries.jax-rs.cxf-common/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/pom.xml b/org.apache.aries.jax-rs.cxf-common/pom.xml
index 0786f41..747c0a8 100644
--- a/org.apache.aries.jax-rs.cxf-common/pom.xml
+++ b/org.apache.aries.jax-rs.cxf-common/pom.xml
@@ -98,10 +98,20 @@
<artifactId>org.osgi.core</artifactId>
<version>6.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http.whiteboard</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.2</version>
+ </dependency>
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>1.6.3</version>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/b9f42017/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3da7abe..4334170 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,11 +54,6 @@
</modules>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.base.api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
@@ -83,4 +78,4 @@
<layout>default</layout>
</pluginRepository>
</pluginRepositories>
-</project>
+</project>
\ No newline at end of file
[30/50] [abbrv] aries-jax-rs-whiteboard git commit: bndrun config
Posted by cs...@apache.org.
bndrun config
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/f1252f85
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f1252f85
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f1252f85
Branch: refs/heads/master
Commit: f1252f85d8e2a80dd64edf47ee27c518fa992e28
Parents: 854ba8f
Author: Raymond Auge <ra...@liferay.com>
Authored: Fri Oct 28 06:24:13 2016 +0200
Committer: Raymond Auge <ra...@liferay.com>
Committed: Fri Oct 28 06:24:13 2016 +0200
----------------------------------------------------------------------
bndrun/org.apache.aries.jax-rs.example.bndrun | 50 ++++++++++------------
bndrun/pom.xml | 16 +++++++
2 files changed, 38 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f1252f85/bndrun/org.apache.aries.jax-rs.example.bndrun
----------------------------------------------------------------------
diff --git a/bndrun/org.apache.aries.jax-rs.example.bndrun b/bndrun/org.apache.aries.jax-rs.example.bndrun
index 27ef6ab..e3ee47a 100644
--- a/bndrun/org.apache.aries.jax-rs.example.bndrun
+++ b/bndrun/org.apache.aries.jax-rs.example.bndrun
@@ -1,7 +1,7 @@
-standalone:
-include: ${.}/augments.bnd
--plugin.pom.repo = \
+-plugin.A.pom.repo = \
aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \
releaseUrls=https://repo1.maven.org/maven2/; \
@@ -9,35 +9,29 @@
name=pom.repo; \
location=${.}/target/cached.xml
--runrequires: osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.example)'
+-runrequires: \
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.cxf-common)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.example)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.rest.extender)'
+
-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
-runbundles: \
- log4j;version='[1.2.17,1.2.18)',\
- org.apache.aries.jax-rs.example;version=snapshot,\
- org.apache.aries.jax-rs.cxf-common;version='[1.0.0,1.0.1)',\
- org.apache.aries.rest.extender;version='[1.0.0,1.0.1)',\
- org.apache.commons.fileupload;version='[1.2.2,1.2.3)',\
- org.apache.commons.io;version='[2.4.0,2.4.1)',\
- org.apache.felix.configadmin;version='[1.8.6,1.8.7)',\
- org.apache.felix.http.api;version='[3.0.0,3.0.1)',\
- org.apache.felix.scr;version='[2.0.6,2.0.7)',\
- org.eclipse.equinox.http.jetty;version='[3.4.0,3.4.1)',\
- org.eclipse.equinox.http.servlet;version='[1.4.0,1.4.1)',\
- org.eclipse.equinox.metatype;version='[1.4.200,1.4.201)',\
- org.eclipse.jetty.http;version='[9.3.9,9.3.10)',\
- org.eclipse.jetty.io;version='[9.3.9,9.3.10)',\
- org.eclipse.jetty.security;version='[9.3.9,9.3.10)',\
- org.eclipse.jetty.server;version='[9.3.9,9.3.10)',\
- org.eclipse.jetty.servlet;version='[9.3.9,9.3.10)',\
- org.eclipse.jetty.util;version='[9.3.9,9.3.10)',\
- org.objectweb.asm.all.debug;version='[5.0.3,5.0.4)',\
- org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
- org.slf4j.api;version='[1.7.2,1.7.3)',\
- org.apache.felix.bundlerepository;version='[2.0.8,2.0.9)',\
- org.apache.felix.gogo.command;version='[1.0.0,1.0.1)',\
- org.apache.felix.gogo.runtime;version='[1.0.0,1.0.1)',\
- org.apache.felix.gogo.shell;version='[1.0.0,1.0.1)',\
- javax.servlet-api;version='[3.1.0,3.1.1)'
+ log4j; version='[1.2.17,1.2.18)',\
+ org.apache.aries.jax-rs.cxf-common; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax-rs.example; version='[1.0.0,1.0.1)',\
+ org.apache.aries.rest.extender; version='[1.0.0,1.0.1)',\
+ org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
+ org.apache.felix.http.jetty; version='[3.2.0,3.2.1)',\
+ org.apache.felix.http.servlet-api; version='[1.1.2,1.1.3)',\
+ org.apache.felix.scr; version='[2.0.2,2.0.3)',\
+ org.eclipse.equinox.event; version='[1.3.100,1.3.101)',\
+ org.eclipse.equinox.metatype; version='[1.4.100,1.4.101)',\
+ org.objectweb.asm; version='[5.0.4,5.0.5)',\
+ org.osgi.service.event; version='[1.3.1,1.3.2)',\
+ org.osgi.service.http.whiteboard; version='[1.0.0,1.0.1)',\
+ org.osgi.service.metatype; version='[1.3.0,1.3.1)',\
+ slf4j.api; version='[1.7.21,1.7.22)',\
+ slf4j.log4j12; version='[1.6.1,1.6.2)'
-runee: JavaSE-1.8
-resolve.effective: resolve, active
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f1252f85/bndrun/pom.xml
----------------------------------------------------------------------
diff --git a/bndrun/pom.xml b/bndrun/pom.xml
index 444e74d..01ed697 100644
--- a/bndrun/pom.xml
+++ b/bndrun/pom.xml
@@ -19,6 +19,7 @@
<artifactId>bnd-export-maven-plugin</artifactId>
<version>3.4.0-SNAPSHOT</version>
<configuration>
+ <failOnChanges>false</failOnChanges>
<resolve>true</resolve>
<bndruns>
<bndrun>org.apache.aries.jax-rs.example.bndrun</bndrun>
@@ -38,10 +39,25 @@
<dependencies>
<dependency>
<groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs.cxf-common</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax-rs.example</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.rest.extender</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.enroute.pom.distro</artifactId>
<version>2.0.0</version>
[37/50] [abbrv] aries-jax-rs-whiteboard git commit: restructure the
entire build
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/bndrun/cnf/cache/pom-OSGi-MC.xml
----------------------------------------------------------------------
diff --git a/bndrun/cnf/cache/pom-OSGi-MC.xml b/bndrun/cnf/cache/pom-OSGi-MC.xml
deleted file mode 100644
index f09e54b..0000000
--- a/bndrun/cnf/cache/pom-OSGi-MC.xml
+++ /dev/null
@@ -1,2838 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
- <repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="q=g:org.osgi+AND+a:org.osgi.*&rows=10000" increment="1477433605316">
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.application"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.application Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.application"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.application"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.application"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="19729" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.application/1.0.0/org.osgi.application-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="6D4DBD9245BDF709230772EDD817497F9A2624F16CB6D82FA70A7BC17D735455"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.application:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.application:1.0.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.3.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.jdbc"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.jdbc Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.jdbc"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.jdbc"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="javax.sql"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.jdbc"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="12448" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.jdbc/1.0.0/org.osgi.service.jdbc-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="4226882A4047FA0318AFB46FC6C4A18F251C0EEA7332D7692DCCA4A7C6722861"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.jdbc:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.jdbc:1.0.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.sql))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.serial"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.serial Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.serial"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.serial"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.serial"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="19832" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.serial/1.0.0/org.osgi.service.serial-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="DBAC409A31E1A7720B805A5085077442BB5EC5339FF72EA052B87245FDAFD300"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.serial:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.serial:1.0.0"/>
- </capability>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.blueprint"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.blueprint Version 1.0.2."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.2.201505202024" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.2.201505202024" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.blueprint"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.2.201505202024" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.blueprint"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework,org.osgi.service.blueprint.reflect"/>
- <attribute name="version" value="1.0.2" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.blueprint.container"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.blueprint.reflect"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="67534" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.blueprint/1.0.2/org.osgi.service.blueprint-1.0.2.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="203083734A9F106E461A833B8893AAFFC2A87B9C97CA349331E7F83E6C5CAF29"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.blueprint:1.0.2"/>
- <attribute name="from" value="org.osgi:org.osgi.service.blueprint:1.0.2"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.5.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.tr069todmt"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.tr069todmt Version 1.0.1."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.1.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.1.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.tr069todmt"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.1.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.tr069todmt"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.service.dmt"/>
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.tr069todmt"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="22502" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.tr069todmt/1.0.1/org.osgi.service.tr069todmt-1.0.1.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="7066E8E617839A1002C218743511AD8AC07EDC690D8BE53AC679F0D49E4451C9"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.tr069todmt:1.0.1"/>
- <attribute name="from" value="org.osgi:org.osgi.service.tr069todmt:1.0.1"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.service.dmt)(&(version>=2.0.0)(!(version>=3.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.enocean"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.enocean Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.enocean"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.enocean"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.enocean"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.service.enocean"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.enocean.descriptions"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="37762" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.enocean/1.0.0/org.osgi.service.enocean-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="19FCDC041CDAFAB778692F5A9472CD740515817D8FEB9373F0C7A1B88948097B"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.enocean:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.enocean:1.0.0"/>
- </capability>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.dal"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.dal Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.dal"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.dal"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.service.event"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.dal"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="49447" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.dal/1.0.0/org.osgi.service.dal-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="C4E51708CDACA23F7F5A6DBE6C0BEB1B652D10879EF777EFB7166EDED5A948F8"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.dal:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.dal:1.0.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.6.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.service.event)(&(version>=1.3.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.util.measurement"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.util.measurement Version 1.0.1."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.1.201505202026" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.1.201505202026" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.util.measurement"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.1.201505202026" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.util.measurement"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.util.measurement"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="25625" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.util.measurement/1.0.1/org.osgi.util.measurement-1.0.1.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="F180D3C99A1A7257679A96BBB15D463B1FED76091CAC3709A0156F1A2DB97D9F"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.util.measurement:1.0.1"/>
- <attribute name="from" value="org.osgi:org.osgi.util.measurement:1.0.1"/>
- </capability>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="osgi.core"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2014). All Rights Reserved."/>
- <attribute name="description" value="OSGi Core Release 6, Interfaces and Classes for use in compiling bundles."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="6.0.0.201403061837" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="6.0.0.201403061837" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="osgi.core"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="6.0.0.201403061837" type="Version"/>
- <attribute name="osgi.wiring.host" value="osgi.core"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.dto"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.resource"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.dto"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.resource.dto"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.8.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.dto"/>
- <attribute name="version" value="1.8.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework.dto"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.1.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.bundle"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework.wiring"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.resolver"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.1.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.service"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework.wiring"/>
- <attribute name="version" value="1.1.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.weaving"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.2.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework.launch"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.resource"/>
- <attribute name="version" value="1.1.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework.namespace"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework.startlevel"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.dto"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework.startlevel.dto"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework,org.osgi.resource"/>
- <attribute name="version" value="1.2.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework.wiring"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.dto,org.osgi.resource.dto"/>
- <attribute name="version" value="1.2.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.framework.wiring.dto"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework,org.osgi.service.permissionadmin"/>
- <attribute name="version" value="1.1.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.condpermadmin"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.2.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.packageadmin"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.2.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.permissionadmin"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.1.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.startlevel"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.url"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.5.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.util.tracker"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="475256" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.core/6.0.0/org.osgi.core-6.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="1C1BB435EB34CBF1F743653DA38F604D45D53FBC95979053768CD3FC293CB931"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.core:6.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.core:6.0.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.security.auth.x500))"/>
- <directive name="resolution" value="optional"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.http.whiteboard"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.http.whiteboard Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202024" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.http.whiteboard"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.http.whiteboard"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="javax.servlet.http,org.osgi.framework"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.http.context"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.service.http.runtime.dto"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.http.runtime"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.dto,org.osgi.framework.dto"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.http.runtime.dto"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.http.whiteboard"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="56979" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.http.whiteboard/1.0.0/org.osgi.service.http.whiteboard-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="5CBD9A089B01766A91F17B0EF4C71E3BAF08A3B23DB6AC8F320FB6B7CBC98338"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.http.whiteboard:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.http.whiteboard:1.0.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.servlet.http)(&(version>=3.0.0)(!(version>=4.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.dto)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.8.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework.dto)(&(version>=1.8.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.dmt"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.dmt Version 2.0.1."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="2.0.1.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="2.0.1.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.dmt"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="2.0.1.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.dmt"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="2.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.dmt"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.service.dmt"/>
- <attribute name="version" value="2.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.notification"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.service.dmt.notification"/>
- <attribute name="version" value="2.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.notification.spi"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="2.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.security"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.service.dmt"/>
- <attribute name="version" value="2.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.spi"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="134297" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.dmt/2.0.1/org.osgi.service.dmt-2.0.1.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="8FA657409860B39D462C0A14831FA1B04171DD35073C3483A0D964A83A4F408E"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.dmt:2.0.1"/>
- <attribute name="from" value="org.osgi:org.osgi.service.dmt:2.0.1"/>
- </capability>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="osgi.cmpn"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2013). All Rights Reserved."/>
- <attribute name="description" value="OSGi Compendium Release 5, Interfaces and Classes for use in compiling bundles."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="5.0.0.201305092017" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="5.0.0.201305092017" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="osgi.cmpn"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="5.0.0.201305092017" type="Version"/>
- <attribute name="osgi.wiring.host" value="osgi.cmpn"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.application"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.resource"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.namespace.contract"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.resource"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.namespace.extender"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.resource"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.namespace.service"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.1.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.application"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework,org.osgi.service.blueprint.reflect"/>
- <attribute name="version" value="1.0.2" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.blueprint.container"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.blueprint.reflect"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.5.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.cm"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.2.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.component"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.2.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.component.annotations"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.coordinator"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.1.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.deploymentadmin"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework,org.osgi.service.deploymentadmin"/>
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.deploymentadmin.spi"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.1.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.device"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="2.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.dmt"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.service.dmt"/>
- <attribute name="version" value="2.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.notification"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.service.dmt.notification"/>
- <attribute name="version" value="2.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.notification.spi"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="2.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.security"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.service.dmt"/>
- <attribute name="version" value="2.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.spi"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.3.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.event"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="javax.servlet,javax.servlet.http"/>
- <attribute name="version" value="1.2.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.http"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="javax.microedition.io"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.io"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="javax.sql"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.jdbc"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="javax.naming,javax.naming.directory"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.jndi"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="javax.persistence"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.jpa"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.3.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.log"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.2.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.metatype"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.monitor"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.1.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.prefs"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.2.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.provisioning"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.remoteserviceadmin"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.resource"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.repository"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.resource"/>
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.resolver"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.resource"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.serviceloader"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework,org.osgi.resource"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.subsystem"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.2.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.upnp"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.1.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.useradmin"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.wireadmin"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.util.measurement"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.util.measurement"/>
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.util.position"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="javax.xml.parsers,org.osgi.framework"/>
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.util.xml"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="771157" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.compendium/5.0.0/org.osgi.compendium-5.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="F1EF32CC1530F4E66AAC606C24363B627ACE4780A7737B045BFB3B908D801BCD"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.compendium:5.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.compendium:5.0.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.microedition.io))"/>
- <directive name="resolution" value="optional"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.naming))"/>
- <directive name="resolution" value="optional"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.naming.directory))"/>
- <directive name="resolution" value="optional"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.persistence))"/>
- <directive name="resolution" value="optional"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.servlet))"/>
- <directive name="resolution" value="optional"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.servlet.http))"/>
- <directive name="resolution" value="optional"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.sql))"/>
- <directive name="resolution" value="optional"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.xml.parsers))"/>
- <directive name="resolution" value="optional"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework))"/>
- <directive name="resolution" value="optional"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.resource))"/>
- <directive name="resolution" value="optional"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.component.annotations"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.component.annotations Version 1.3.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.3.0.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.3.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.component.annotations"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.3.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.component.annotations"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.3.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.component.annotations"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="35919" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.component.annotations/1.3.0/org.osgi.service.component.annotations-1.3.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="B909DE891C99CA8E96FC024E9EF5CCAF2CAFAFC4A02500F1CD3293625E79AD6F"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.component.annotations:1.3.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.component.annotations:1.3.0"/>
- </capability>
- <requirement namespace="osgi.compile.time.only">
- <directive name="filter" value="(&(must.not.resolve=*)(!(must.not.resolve=*)))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.util.tracker"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.util.tracker Version 1.5.1."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.5.1.201505202027" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.5.1.201505202027" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.util.tracker"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.5.1.201505202027" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.util.tracker"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.5.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.util.tracker"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="42705" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.util.tracker/1.5.1/org.osgi.util.tracker-1.5.1.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="5EFAD34AB9A7753DCDE1415B62E6E21E4DEC83DFAD5A570DF485C1B931C1EBED"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.util.tracker:1.5.1"/>
- <attribute name="from" value="org.osgi:org.osgi.util.tracker:1.5.1"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.8.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.prefs"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.prefs Version 1.1.1."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.1.1.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.1.1.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.prefs"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.1.1.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.prefs"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.1.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.prefs"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="19739" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.prefs/1.1.1/org.osgi.service.prefs-1.1.1.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="7B9ABB61457AB98334C7FDC54C6528B7CF9364B952109B664554FC6E38442986"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.prefs:1.1.1"/>
- <attribute name="from" value="org.osgi:org.osgi.service.prefs:1.1.1"/>
- </capability>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.namespace.implementation"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.namespace.implementation Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202024" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.namespace.implementation"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.namespace.implementation"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.resource"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.namespace.implementation"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="11912" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.namespace.implementation/1.0.0/org.osgi.namespace.implementation-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="B858305E5E5AA683B8366297DDBB2E11F88FC2AF4A00C96FA722CDA525BB8B34"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.namespace.implementation:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.namespace.implementation:1.0.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.resource)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.application"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.application Version 1.1.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.1.0.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.1.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.application"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.1.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.application"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.1.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.application"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="43686" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.application/1.1.0/org.osgi.service.application-1.1.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="CAE33E59CE31CB5999A24628CD08233E1FAB7F599C4393F6CAE3F7D3A733707B"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.application:1.1.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.application:1.1.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.3.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.jpa"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.jpa Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202024" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.jpa"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.jpa"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="javax.persistence"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.jpa"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="11760" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.jpa/1.0.0/org.osgi.service.jpa-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="43BE763ECE36294974B4E56B8C2CD1991C556939703E7CA1C90C7909F58DC0AD"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.jpa:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.jpa:1.0.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.persistence)(&(version>=1.1.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.namespace.service"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.namespace.service Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202024" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.namespace.service"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.namespace.service"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.resource"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.namespace.service"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="11731" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.namespace.service/1.0.0/org.osgi.namespace.service-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="E622849DD93AA3C03085DEEDD1D4E36E29723505F9525D36F20CFEF3D5E3244A"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.namespace.service:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.namespace.service:1.0.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.resource)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.namespace.contract"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.namespace.contract Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202024" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.namespace.contract"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.namespace.contract"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.resource"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.namespace.contract"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="11625" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.namespace.contract/1.0.0/org.osgi.namespace.contract-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="36C19E73BB55ACCFF36361527EBB7363564BED00FEE257A0D93E5194A3552A94"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.namespace.contract:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.namespace.contract:1.0.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.resource)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.monitor"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.monitor Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.monitor"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.monitor"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.monitor"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="35669" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.monitor/1.0.0/org.osgi.service.monitor-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="1B94741FD97EE1C6B1CED6205E03CEC2A9D76B71B24FE59889113098A8775137"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.monitor:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.monitor:1.0.0"/>
- </capability>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.io"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.io Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.io"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.io"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="javax.microedition.io"/>
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.io"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="13374" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.io/1.0.0/org.osgi.service.io-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="227C5C13F91A41D9F9D422999A3312988F2ACC42CAB7475AE6D1B2FAA79989DF"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.io:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.io:1.0.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=javax.microedition.io))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.component"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.component Version 1.3.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.3.0.201505202024" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.3.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.component"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.3.0.201505202024" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.component"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.3.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.component"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework,org.osgi.service.component.runtime.dto,org.osgi.util.promise"/>
- <attribute name="version" value="1.3.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.component.runtime"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.dto,org.osgi.framework.dto"/>
- <attribute name="version" value="1.3.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.component.runtime.dto"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="38781" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.component/1.3.0/org.osgi.service.component-1.3.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="FD58447592CE3A257337506E401E66060DB8B31557052BBE1C815AC82817EC6A"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.component:1.3.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.component:1.3.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.dto)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.8.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework.dto)(&(version>=1.8.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.util.promise)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.log"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.log Version 1.3.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.3.0.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.3.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.log"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.3.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.log"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.framework"/>
- <attribute name="version" value="1.3.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.log"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="16697" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.log/1.3.0/org.osgi.service.log-1.3.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="FF6710C4856D32684CF3EBDC45248F41036FF734F2B03BBC08C4609A61FECFA0"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.log:1.3.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.log:1.3.0"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.3.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.util.position"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.util.position Version 1.0.1."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.1.201505202026" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.1.201505202026" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.util.position"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.1.201505202026" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.util.position"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <directive name="uses" value="org.osgi.util.measurement"/>
- <attribute name="version" value="1.0.1" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.util.position"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="14057" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.util.position/1.0.1/org.osgi.util.position-1.0.1.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="02B7F6900EFD470B612ECD755971164E1E6C5CF98F587C201D0DA3BBC9CB5F3A"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.util.position:1.0.1"/>
- <attribute name="from" value="org.osgi:org.osgi.util.position:1.0.1"/>
- </capability>
- <requirement namespace="osgi.wiring.package">
- <directive name="filter" value="(&(osgi.wiring.package=org.osgi.util.measurement)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
- </requirement>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.networkadapter"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.networkadapter Version 1.0.0."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.0.0.201505202023" type="Version"/>
- </capability>
- <capability namespace="osgi.wiring.bundle">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.bundle" value="org.osgi.service.networkadapter"/>
- </capability>
- <capability namespace="osgi.wiring.host">
- <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
- <attribute name="osgi.wiring.host" value="org.osgi.service.networkadapter"/>
- </capability>
- <capability namespace="osgi.wiring.package">
- <attribute name="version" value="1.0.0" type="Version"/>
- <attribute name="osgi.wiring.package" value="org.osgi.service.networkadapter"/>
- </capability>
- <capability namespace="osgi.content">
- <attribute name="size" value="16469" type="Long"/>
- <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.networkadapter/1.0.0/org.osgi.service.networkadapter-1.0.0.jar"/>
- <attribute name="mime" value="vnd.osgi.bundle"/>
- <attribute name="osgi.content" value="E0655560831A4754F38CA292B0D5F0FC4B5F6AE478F816F5DF54CE08BBE74667"/>
- </capability>
- <capability namespace="bnd.info">
- <attribute name="name" value="org.osgi:org.osgi.service.networkadapter:1.0.0"/>
- <attribute name="from" value="org.osgi:org.osgi.service.networkadapter:1.0.0"/>
- </capability>
- <requirement namespace="osgi.ee">
- <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
- </requirement>
- </resource>
- <resource>
- <capability namespace="osgi.identity">
- <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
- <attribute name="osgi.identity" value="org.osgi.service.http"/>
- <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
- <attribute name="documentation" value="http://www.osgi.org/"/>
- <attribute name="description" value="OSGi Companion Code for org.osgi.service.http Version 1.2.1."/>
- <attribute name="type" value="osgi.bundle"/>
- <attribute name="version" value="1.2.1.201505202024" type="Version"/>
- </capability>
- <ca
<TRUNCATED>
[48/50] [abbrv] aries-jax-rs-whiteboard git commit: tune versions and
poms
Posted by cs...@apache.org.
tune versions and poms
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/253fc768
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/253fc768
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/253fc768
Branch: refs/heads/master
Commit: 253fc768bc05022a8f105b506628b99c50566643
Parents: 1cab2b1
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Nov 8 14:45:22 2016 -0500
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Nov 8 14:45:22 2016 -0500
----------------------------------------------------------------------
jax-rs.example-run/example.bndrun | 6 +++---
jax-rs.example-run/pom.xml | 6 ++++--
jax-rs.example/pom.xml | 5 ++++-
jax-rs.itests-run/itest.bndrun | 6 +++---
jax-rs.itests-run/pom.xml | 6 ++++--
jax-rs.itests/pom.xml | 3 +++
jax-rs.log4j-configuration/pom.xml | 6 ++++--
jax-rs.whiteboard/pom.xml | 5 ++++-
8 files changed, 29 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/253fc768/jax-rs.example-run/example.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/example.bndrun b/jax-rs.example-run/example.bndrun
index 2f2c96a..376ea3f 100644
--- a/jax-rs.example-run/example.bndrun
+++ b/jax-rs.example-run/example.bndrun
@@ -24,9 +24,9 @@
javax.json-api; version='[1.0.0,1.0.1)',\
javax.ws.rs-api; version='[2.0.1,2.0.2)',\
log4j; version='[1.2.17,1.2.18)',\
- org.apache.aries.jax.rs.example; version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.log4j-configuration; version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.whiteboard; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.example; version='[0.0.1,0.0.2)',\
+ org.apache.aries.jax.rs.log4j-configuration; version='[0.0.1,0.0.2)',\
+ org.apache.aries.jax.rs.whiteboard; version='[0.0.1,0.0.2)',\
org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\
org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
org.apache.felix.gogo.command; version='[1.0.0,1.0.1)',\
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/253fc768/jax-rs.example-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/pom.xml b/jax-rs.example-run/pom.xml
index a22ecbf..97559da 100644
--- a/jax-rs.example-run/pom.xml
+++ b/jax-rs.example-run/pom.xml
@@ -9,8 +9,10 @@
</parent>
<artifactId>org.apache.aries.jax.rs.example-run</artifactId>
-
+ <description>Apache Aries JAX-RS Example Run Configuration</description>
+ <name>Apache Aries JAX-RS Example Run Configuration</name>
<packaging>pom</packaging>
+ <version>0.0.1-SNAPSHOT</version>
<build>
<plugins>
@@ -45,7 +47,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/253fc768/jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index 5f36245..7d0b8b2 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -9,9 +9,12 @@
<artifactId>org.apache.aries.jax.rs</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
+
<artifactId>org.apache.aries.jax.rs.example</artifactId>
- <packaging>jar</packaging>
<description>Apache Aries JAX-RS Example</description>
+ <name>Apache Aries JAX-RS Example</name>
+ <version>0.0.1-SNAPSHOT</version>
+
<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/253fc768/jax-rs.itests-run/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/itest.bndrun b/jax-rs.itests-run/itest.bndrun
index 847b2ae..12355f5 100644
--- a/jax-rs.itests-run/itest.bndrun
+++ b/jax-rs.itests-run/itest.bndrun
@@ -30,9 +30,9 @@
javax.json-api; version='[1.0.0,1.0.1)',\
javax.ws.rs-api; version='[2.0.1,2.0.2)',\
log4j; version='[1.2.17,1.2.18)',\
- org.apache.aries.jax.rs.itests; version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.log4j-configuration; version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.whiteboard; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.itests; version='[0.0.1,0.0.2)',\
+ org.apache.aries.jax.rs.log4j-configuration; version='[0.0.1,0.0.2)',\
+ org.apache.aries.jax.rs.whiteboard; version='[0.0.1,0.0.2)',\
org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\
org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
org.apache.felix.http.api; version='[3.0.0,3.0.1)',\
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/253fc768/jax-rs.itests-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/pom.xml b/jax-rs.itests-run/pom.xml
index 81c4ab1..2796be4 100644
--- a/jax-rs.itests-run/pom.xml
+++ b/jax-rs.itests-run/pom.xml
@@ -12,7 +12,9 @@
</parent>
<artifactId>org.apache.aries.jax.rs.itests-run</artifactId>
-
+ <description>Apache Aries JAX-RS Integration Test Plan</description>
+ <name>Apache Aries JAX-RS Integration Test Plan</name>
+ <version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
@@ -48,7 +50,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/253fc768/jax-rs.itests/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index c1a6880..e70444b 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -12,6 +12,9 @@
</parent>
<artifactId>org.apache.aries.jax.rs.itests</artifactId>
+ <description>Apache Aries JAX-RS Integration Tests</description>
+ <name>Apache Aries JAX-RS Integration Tests</name>
+ <version>0.0.1-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/253fc768/jax-rs.log4j-configuration/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.log4j-configuration/pom.xml b/jax-rs.log4j-configuration/pom.xml
index 25c5358..bfcf417 100644
--- a/jax-rs.log4j-configuration/pom.xml
+++ b/jax-rs.log4j-configuration/pom.xml
@@ -7,9 +7,11 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
+
<artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
- <packaging>jar</packaging>
<description>Apache Aries JAX-RS Log4J Configuration Fragment</description>
+ <name>Apache Aries JAX-RS Log4J Configuration Fragment</name>
+ <version>0.0.1-SNAPSHOT</version>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/253fc768/jax-rs.whiteboard/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index 16d787d..63308ae 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -9,9 +9,12 @@
<artifactId>org.apache.aries.jax.rs</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
+
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <packaging>jar</packaging>
<description>Apache Aries JAX-RS Whiteboard</description>
+ <name>Apache Aries JAX-RS Whiteboard</name>
+ <version>0.0.1-SNAPSHOT</version>
+
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
[26/50] [abbrv] aries-jax-rs-whiteboard git commit: run -- notworking
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/890a5b8a/bndrun/cnf/cache/pom-OSGi-MC.xml
----------------------------------------------------------------------
diff --git a/bndrun/cnf/cache/pom-OSGi-MC.xml b/bndrun/cnf/cache/pom-OSGi-MC.xml
new file mode 100644
index 0000000..f09e54b
--- /dev/null
+++ b/bndrun/cnf/cache/pom-OSGi-MC.xml
@@ -0,0 +1,2838 @@
+<?xml version='1.0' encoding='UTF-8'?>
+ <repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="q=g:org.osgi+AND+a:org.osgi.*&rows=10000" increment="1477433605316">
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.application"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.application Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.application"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.application"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.application"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="19729" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.application/1.0.0/org.osgi.application-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="6D4DBD9245BDF709230772EDD817497F9A2624F16CB6D82FA70A7BC17D735455"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.application:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.application:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.3.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.jdbc"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.jdbc Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.jdbc"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.jdbc"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="javax.sql"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.jdbc"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="12448" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.jdbc/1.0.0/org.osgi.service.jdbc-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="4226882A4047FA0318AFB46FC6C4A18F251C0EEA7332D7692DCCA4A7C6722861"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.jdbc:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.jdbc:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.sql))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.serial"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.serial Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.serial"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.serial"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.serial"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="19832" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.serial/1.0.0/org.osgi.service.serial-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="DBAC409A31E1A7720B805A5085077442BB5EC5339FF72EA052B87245FDAFD300"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.serial:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.serial:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.blueprint"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.blueprint Version 1.0.2."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.2.201505202024" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.2.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.blueprint"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.2.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.blueprint"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework,org.osgi.service.blueprint.reflect"/>
+ <attribute name="version" value="1.0.2" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.blueprint.container"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.blueprint.reflect"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="67534" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.blueprint/1.0.2/org.osgi.service.blueprint-1.0.2.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="203083734A9F106E461A833B8893AAFFC2A87B9C97CA349331E7F83E6C5CAF29"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.blueprint:1.0.2"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.blueprint:1.0.2"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.5.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.tr069todmt"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.tr069todmt Version 1.0.1."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.1.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.1.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.tr069todmt"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.1.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.tr069todmt"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.service.dmt"/>
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.tr069todmt"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="22502" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.tr069todmt/1.0.1/org.osgi.service.tr069todmt-1.0.1.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="7066E8E617839A1002C218743511AD8AC07EDC690D8BE53AC679F0D49E4451C9"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.tr069todmt:1.0.1"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.tr069todmt:1.0.1"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.service.dmt)(&(version>=2.0.0)(!(version>=3.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.enocean"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.enocean Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.enocean"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.enocean"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.enocean"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.service.enocean"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.enocean.descriptions"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="37762" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.enocean/1.0.0/org.osgi.service.enocean-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="19FCDC041CDAFAB778692F5A9472CD740515817D8FEB9373F0C7A1B88948097B"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.enocean:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.enocean:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.dal"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.dal Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.dal"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.dal"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.service.event"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.dal"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="49447" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.dal/1.0.0/org.osgi.service.dal-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="C4E51708CDACA23F7F5A6DBE6C0BEB1B652D10879EF777EFB7166EDED5A948F8"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.dal:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.dal:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.6.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.service.event)(&(version>=1.3.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.util.measurement"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.util.measurement Version 1.0.1."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.1.201505202026" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.1.201505202026" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.util.measurement"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.1.201505202026" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.util.measurement"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.util.measurement"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="25625" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.util.measurement/1.0.1/org.osgi.util.measurement-1.0.1.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="F180D3C99A1A7257679A96BBB15D463B1FED76091CAC3709A0156F1A2DB97D9F"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.util.measurement:1.0.1"/>
+ <attribute name="from" value="org.osgi:org.osgi.util.measurement:1.0.1"/>
+ </capability>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="osgi.core"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2014). All Rights Reserved."/>
+ <attribute name="description" value="OSGi Core Release 6, Interfaces and Classes for use in compiling bundles."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="6.0.0.201403061837" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="6.0.0.201403061837" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="osgi.core"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="6.0.0.201403061837" type="Version"/>
+ <attribute name="osgi.wiring.host" value="osgi.core"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.dto"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.resource"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.dto"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.resource.dto"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.8.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.dto"/>
+ <attribute name="version" value="1.8.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.dto"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.1.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.bundle"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework.wiring"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.resolver"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.1.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.service"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework.wiring"/>
+ <attribute name="version" value="1.1.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.weaving"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.2.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.launch"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.resource"/>
+ <attribute name="version" value="1.1.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.namespace"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.startlevel"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.dto"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.startlevel.dto"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework,org.osgi.resource"/>
+ <attribute name="version" value="1.2.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.wiring"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.dto,org.osgi.resource.dto"/>
+ <attribute name="version" value="1.2.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.wiring.dto"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework,org.osgi.service.permissionadmin"/>
+ <attribute name="version" value="1.1.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.condpermadmin"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.2.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.packageadmin"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.2.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.permissionadmin"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.1.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.startlevel"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.url"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.5.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.util.tracker"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="475256" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.core/6.0.0/org.osgi.core-6.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="1C1BB435EB34CBF1F743653DA38F604D45D53FBC95979053768CD3FC293CB931"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.core:6.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.core:6.0.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.security.auth.x500))"/>
+ <directive name="resolution" value="optional"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.http.whiteboard"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.http.whiteboard Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202024" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.http.whiteboard"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.http.whiteboard"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="javax.servlet.http,org.osgi.framework"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.http.context"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.service.http.runtime.dto"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.http.runtime"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.dto,org.osgi.framework.dto"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.http.runtime.dto"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.http.whiteboard"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="56979" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.http.whiteboard/1.0.0/org.osgi.service.http.whiteboard-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="5CBD9A089B01766A91F17B0EF4C71E3BAF08A3B23DB6AC8F320FB6B7CBC98338"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.http.whiteboard:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.http.whiteboard:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.servlet.http)(&(version>=3.0.0)(!(version>=4.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.dto)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.8.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework.dto)(&(version>=1.8.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.dmt"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.dmt Version 2.0.1."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="2.0.1.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="2.0.1.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.dmt"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="2.0.1.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.dmt"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="2.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.dmt"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.service.dmt"/>
+ <attribute name="version" value="2.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.notification"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.service.dmt.notification"/>
+ <attribute name="version" value="2.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.notification.spi"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="2.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.security"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.service.dmt"/>
+ <attribute name="version" value="2.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.spi"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="134297" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.dmt/2.0.1/org.osgi.service.dmt-2.0.1.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="8FA657409860B39D462C0A14831FA1B04171DD35073C3483A0D964A83A4F408E"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.dmt:2.0.1"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.dmt:2.0.1"/>
+ </capability>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="osgi.cmpn"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2013). All Rights Reserved."/>
+ <attribute name="description" value="OSGi Compendium Release 5, Interfaces and Classes for use in compiling bundles."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="5.0.0.201305092017" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="5.0.0.201305092017" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="osgi.cmpn"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="5.0.0.201305092017" type="Version"/>
+ <attribute name="osgi.wiring.host" value="osgi.cmpn"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.application"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.resource"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.namespace.contract"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.resource"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.namespace.extender"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.resource"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.namespace.service"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.1.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.application"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework,org.osgi.service.blueprint.reflect"/>
+ <attribute name="version" value="1.0.2" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.blueprint.container"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.blueprint.reflect"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.5.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.cm"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.2.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.component"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.2.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.component.annotations"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.coordinator"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.1.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.deploymentadmin"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework,org.osgi.service.deploymentadmin"/>
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.deploymentadmin.spi"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.1.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.device"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="2.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.dmt"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.service.dmt"/>
+ <attribute name="version" value="2.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.notification"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.service.dmt.notification"/>
+ <attribute name="version" value="2.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.notification.spi"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="2.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.security"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.service.dmt"/>
+ <attribute name="version" value="2.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.dmt.spi"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.3.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.event"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="javax.servlet,javax.servlet.http"/>
+ <attribute name="version" value="1.2.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.http"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="javax.microedition.io"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.io"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="javax.sql"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.jdbc"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="javax.naming,javax.naming.directory"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.jndi"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="javax.persistence"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.jpa"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.3.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.log"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.2.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.metatype"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.monitor"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.1.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.prefs"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.2.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.provisioning"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.remoteserviceadmin"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.resource"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.repository"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.resource"/>
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.resolver"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.resource"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.serviceloader"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework,org.osgi.resource"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.subsystem"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.2.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.upnp"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.1.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.useradmin"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.wireadmin"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.util.measurement"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.util.measurement"/>
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.util.position"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="javax.xml.parsers,org.osgi.framework"/>
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.util.xml"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="771157" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.compendium/5.0.0/org.osgi.compendium-5.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="F1EF32CC1530F4E66AAC606C24363B627ACE4780A7737B045BFB3B908D801BCD"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.compendium:5.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.compendium:5.0.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.microedition.io))"/>
+ <directive name="resolution" value="optional"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.naming))"/>
+ <directive name="resolution" value="optional"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.naming.directory))"/>
+ <directive name="resolution" value="optional"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.persistence))"/>
+ <directive name="resolution" value="optional"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.servlet))"/>
+ <directive name="resolution" value="optional"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.servlet.http))"/>
+ <directive name="resolution" value="optional"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.sql))"/>
+ <directive name="resolution" value="optional"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.xml.parsers))"/>
+ <directive name="resolution" value="optional"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework))"/>
+ <directive name="resolution" value="optional"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.resource))"/>
+ <directive name="resolution" value="optional"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.component.annotations"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.component.annotations Version 1.3.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.3.0.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.3.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.component.annotations"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.3.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.component.annotations"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.3.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.component.annotations"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="35919" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.component.annotations/1.3.0/org.osgi.service.component.annotations-1.3.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="B909DE891C99CA8E96FC024E9EF5CCAF2CAFAFC4A02500F1CD3293625E79AD6F"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.component.annotations:1.3.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.component.annotations:1.3.0"/>
+ </capability>
+ <requirement namespace="osgi.compile.time.only">
+ <directive name="filter" value="(&(must.not.resolve=*)(!(must.not.resolve=*)))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.util.tracker"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.util.tracker Version 1.5.1."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.5.1.201505202027" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.5.1.201505202027" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.util.tracker"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.5.1.201505202027" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.util.tracker"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.5.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.util.tracker"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="42705" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.util.tracker/1.5.1/org.osgi.util.tracker-1.5.1.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="5EFAD34AB9A7753DCDE1415B62E6E21E4DEC83DFAD5A570DF485C1B931C1EBED"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.util.tracker:1.5.1"/>
+ <attribute name="from" value="org.osgi:org.osgi.util.tracker:1.5.1"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.8.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.prefs"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.prefs Version 1.1.1."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.1.1.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.1.1.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.prefs"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.1.1.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.prefs"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.1.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.prefs"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="19739" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.prefs/1.1.1/org.osgi.service.prefs-1.1.1.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="7B9ABB61457AB98334C7FDC54C6528B7CF9364B952109B664554FC6E38442986"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.prefs:1.1.1"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.prefs:1.1.1"/>
+ </capability>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.namespace.implementation"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.namespace.implementation Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202024" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.namespace.implementation"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.namespace.implementation"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.resource"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.namespace.implementation"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="11912" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.namespace.implementation/1.0.0/org.osgi.namespace.implementation-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="B858305E5E5AA683B8366297DDBB2E11F88FC2AF4A00C96FA722CDA525BB8B34"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.namespace.implementation:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.namespace.implementation:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.resource)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.application"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.application Version 1.1.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.1.0.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.1.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.application"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.1.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.application"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.1.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.application"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="43686" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.application/1.1.0/org.osgi.service.application-1.1.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="CAE33E59CE31CB5999A24628CD08233E1FAB7F599C4393F6CAE3F7D3A733707B"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.application:1.1.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.application:1.1.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.3.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.jpa"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.jpa Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202024" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.jpa"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.jpa"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="javax.persistence"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.jpa"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="11760" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.jpa/1.0.0/org.osgi.service.jpa-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="43BE763ECE36294974B4E56B8C2CD1991C556939703E7CA1C90C7909F58DC0AD"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.jpa:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.jpa:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.persistence)(&(version>=1.1.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.namespace.service"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.namespace.service Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202024" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.namespace.service"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.namespace.service"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.resource"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.namespace.service"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="11731" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.namespace.service/1.0.0/org.osgi.namespace.service-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="E622849DD93AA3C03085DEEDD1D4E36E29723505F9525D36F20CFEF3D5E3244A"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.namespace.service:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.namespace.service:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.resource)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.namespace.contract"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.namespace.contract Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202024" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.namespace.contract"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.namespace.contract"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.resource"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.namespace.contract"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="11625" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.namespace.contract/1.0.0/org.osgi.namespace.contract-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="36C19E73BB55ACCFF36361527EBB7363564BED00FEE257A0D93E5194A3552A94"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.namespace.contract:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.namespace.contract:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.resource)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.monitor"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.monitor Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.monitor"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.monitor"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.monitor"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="35669" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.monitor/1.0.0/org.osgi.service.monitor-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="1B94741FD97EE1C6B1CED6205E03CEC2A9D76B71B24FE59889113098A8775137"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.monitor:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.monitor:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.io"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.io Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.io"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.io"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="javax.microedition.io"/>
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.io"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="13374" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.io/1.0.0/org.osgi.service.io-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="227C5C13F91A41D9F9D422999A3312988F2ACC42CAB7475AE6D1B2FAA79989DF"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.io:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.io:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=javax.microedition.io))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.component"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.component Version 1.3.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.3.0.201505202024" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.3.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.component"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.3.0.201505202024" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.component"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.3.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.component"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework,org.osgi.service.component.runtime.dto,org.osgi.util.promise"/>
+ <attribute name="version" value="1.3.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.component.runtime"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.dto,org.osgi.framework.dto"/>
+ <attribute name="version" value="1.3.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.component.runtime.dto"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="38781" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.component/1.3.0/org.osgi.service.component-1.3.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="FD58447592CE3A257337506E401E66060DB8B31557052BBE1C815AC82817EC6A"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.component:1.3.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.component:1.3.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.dto)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.8.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework.dto)(&(version>=1.8.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.util.promise)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.5))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.log"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.log Version 1.3.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.3.0.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.3.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.log"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.3.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.log"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.framework"/>
+ <attribute name="version" value="1.3.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.log"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="16697" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.log/1.3.0/org.osgi.service.log-1.3.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="FF6710C4856D32684CF3EBDC45248F41036FF734F2B03BBC08C4609A61FECFA0"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.log:1.3.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.log:1.3.0"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.framework)(&(version>=1.3.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.util.position"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.util.position Version 1.0.1."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.1.201505202026" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.1.201505202026" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.util.position"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.1.201505202026" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.util.position"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <directive name="uses" value="org.osgi.util.measurement"/>
+ <attribute name="version" value="1.0.1" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.util.position"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="14057" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.util.position/1.0.1/org.osgi.util.position-1.0.1.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="02B7F6900EFD470B612ECD755971164E1E6C5CF98F587C201D0DA3BBC9CB5F3A"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.util.position:1.0.1"/>
+ <attribute name="from" value="org.osgi:org.osgi.util.position:1.0.1"/>
+ </capability>
+ <requirement namespace="osgi.wiring.package">
+ <directive name="filter" value="(&(osgi.wiring.package=org.osgi.util.measurement)(&(version>=1.0.0)(!(version>=2.0.0))))"/>
+ </requirement>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.networkadapter"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.networkadapter Version 1.0.0."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.0.0.201505202023" type="Version"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.bundle" value="org.osgi.service.networkadapter"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="bundle-version" value="1.0.0.201505202023" type="Version"/>
+ <attribute name="osgi.wiring.host" value="org.osgi.service.networkadapter"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="version" value="1.0.0" type="Version"/>
+ <attribute name="osgi.wiring.package" value="org.osgi.service.networkadapter"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="size" value="16469" type="Long"/>
+ <attribute name="url" value="file:/home/rotty/.m2/repository/org/osgi/org.osgi.service.networkadapter/1.0.0/org.osgi.service.networkadapter-1.0.0.jar"/>
+ <attribute name="mime" value="vnd.osgi.bundle"/>
+ <attribute name="osgi.content" value="E0655560831A4754F38CA292B0D5F0FC4B5F6AE478F816F5DF54CE08BBE74667"/>
+ </capability>
+ <capability namespace="bnd.info">
+ <attribute name="name" value="org.osgi:org.osgi.service.networkadapter:1.0.0"/>
+ <attribute name="from" value="org.osgi:org.osgi.service.networkadapter:1.0.0"/>
+ </capability>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.2))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
+ <attribute name="license" value="http://opensource.org/licenses/apache2.0.php; link="http://www.apache.org/licenses/LICENSE-2.0"; description="Apache License, Version 2.0""/>
+ <attribute name="osgi.identity" value="org.osgi.service.http"/>
+ <attribute name="copyright" value="Copyright (c) OSGi Alliance (2000, 2015). All Rights Reserved."/>
+ <attribute name="documentation" value="http://www.osgi.org/"/>
+ <attribute name="description" value="OSGi Companion Code for org.osgi.service.http Version 1.2.1."/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" value="1.2.1.201505202024" type="Version"/>
+ </capability>
+ <capabi
<TRUNCATED>
[16/50] [abbrv] aries-jax-rs-whiteboard git commit: [maven] convert
to maven build using bnd-maven-plugin
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/test-cxf.iml
----------------------------------------------------------------------
diff --git a/test-cxf/test-cxf.iml b/test-cxf/test-cxf.iml
deleted file mode 100644
index d676d78..0000000
--- a/test-cxf/test-cxf.iml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":test-cxf" 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="FacetManager">
- <facet type="Osmorc" name="OSGi">
- <configuration manifestGenerationMode="OsmorcControlled" manifestLocation="" jarfileLocation="test-cxf.jar" outputPathType="CompilerOutputPath" bndFileLocation="" bundlorFileLocation="" bundleActivator="" bundleSymbolicName="" bundleVersion="1.0.0" ignoreFilePattern="" useProjectDefaultManifestFileLocation="true" alwaysRebuildBundleJAR="false" doNotSynchronizeWithMaven="false">
- <additionalProperties />
- <additionalJARContents />
- </configuration>
- </facet>
- <facet type="java-gradle" name="Java-Gradle">
- <configuration>
- <option name="BUILD_FOLDER_PATH" />
- <option name="BUILDABLE" value="false" />
- </configuration>
- </facet>
- </component>
- <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="module" module-name="portal-remote-cxf-common" />
- <orderEntry type="module" module-name="portal-remote-cxf-jaxrs-common" />
- <orderEntry type="module" module-name="portal-remote-dependency-manager-tccl" />
- <orderEntry type="module" module-name="portal-remote-rest-extender" />
- <orderEntry type="library" name="Gradle: biz.aQute.bnd:biz.aQute.bndlib:3.1.0" level="project" />
- <orderEntry type="library" name="Gradle: commons-fileupload:commons-fileupload:1.3.2" 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.json:json:20160212" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.configadmin:1.8.8" 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.apache.felix:org.apache.felix.eventadmin:1.4.6" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.fileinstall:3.5.4" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.gogo.command:0.12.0" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.gogo.runtime:0.10.0" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.gogo.shell:0.10.0" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.http.jetty:3.2.0" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.http.servlet-api:1.1.2" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.inventory:1.0.4" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.metatype:1.1.2" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.scr:2.0.2" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.webconsole:4.2.16" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.felix:org.apache.felix.webconsole.plugins.ds:2.0.2" level="project" />
- <orderEntry type="library" name="Gradle: log4j:log4j:1.2.17" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.6.1" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.6.1" level="project" />
- <orderEntry type="library" name="Gradle: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
- <orderEntry type="library" name="Gradle: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
- <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
- <orderEntry type="library" name="Gradle: commons-io:commons-io:2.2" level="project" />
- </component>
-</module>
\ No newline at end of file
[50/50] [abbrv] aries-jax-rs-whiteboard git commit: update the readme
Posted by cs...@apache.org.
update the readme
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/837e00b6
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/837e00b6
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/837e00b6
Branch: refs/heads/master
Commit: 837e00b66327b3dfbfba466c8cc3493bcd673075
Parents: 94e21e8
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Nov 8 14:57:28 2016 -0500
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Nov 8 14:57:28 2016 -0500
----------------------------------------------------------------------
README.md | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/837e00b6/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 6a7519a..154fb6a 100644
--- a/README.md
+++ b/README.md
@@ -4,24 +4,14 @@ This is an implementation of a JAX-RS Services whiteboard [OSGi RFC-217](https:/
## Building
-Execute the usual maven task `mvn package`.
+Execute the maven tasks `mvn clean install`.
## Running the Example
-This is a two step process.
+The file `jax-rs.example-run/example.jar` should have been created.
-### Create the executable jar
-
-In the bndrun subdirectory, execute the task `mvn bnd-export:export`
-
-**Note:** There's an occasional NPE occuring during the resolve operation. If you should encounter this, please try again.
-
-### Run the exported jar
-
-Once exported, the bndrun directory should contain a file `org.apache.aries.jax-rs.example.jar`.
-
-Execute the following command
+Execute the following command:
```
-java -jar org.apache.aries.jax-rs.example.jar
+java -jar jax-rs.example-run/example.jar
```
\ No newline at end of file
[11/50] [abbrv] aries-jax-rs-whiteboard git commit: fix ignores
Posted by cs...@apache.org.
fix ignores
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/af18d7dd
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/af18d7dd
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/af18d7dd
Branch: refs/heads/master
Commit: af18d7ddbbec7efd2e6b0918858d695dfb7c1b2e
Parents: d086f10
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Aug 2 15:06:22 2016 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Oct 11 13:21:20 2016 -0400
----------------------------------------------------------------------
.gitignore | 14 ++++++++++----
example-jaxrs-application/.gitignore | 2 ++
portal-remote-cxf-common/.gitignore | 2 ++
portal-remote-cxf-jaxrs-common/.gitignore | 2 ++
portal-remote-dependency-manager-tccl/.gitignore | 2 ++
portal-remote-rest-extender/.gitignore | 2 ++
test-cxf/.gitignore | 2 ++
test-cxf/bin/--help/cache.lock | 0
test-cxf/bin/felix.jar | Bin 690862 -> 0 bytes
9 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/af18d7dd/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 95cd470..0bb5a07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,11 @@
-**/build
+.project
+.settings
*.iml
-.gradle
-test-cxf/bundle
-test-cxf/felix-cache
\ No newline at end of file
+*/.classpath
+*/.project
+*/.settings/
+*/bin/
+*/build/
+/.gradle/
+/test-cxf/felix-cache/
+/test-cxf/bundle/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/af18d7dd/example-jaxrs-application/.gitignore
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/.gitignore b/example-jaxrs-application/.gitignore
new file mode 100644
index 0000000..83ccc54
--- /dev/null
+++ b/example-jaxrs-application/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/af18d7dd/portal-remote-cxf-common/.gitignore
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/.gitignore b/portal-remote-cxf-common/.gitignore
new file mode 100644
index 0000000..83ccc54
--- /dev/null
+++ b/portal-remote-cxf-common/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/af18d7dd/portal-remote-cxf-jaxrs-common/.gitignore
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-jaxrs-common/.gitignore b/portal-remote-cxf-jaxrs-common/.gitignore
new file mode 100644
index 0000000..83ccc54
--- /dev/null
+++ b/portal-remote-cxf-jaxrs-common/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/af18d7dd/portal-remote-dependency-manager-tccl/.gitignore
----------------------------------------------------------------------
diff --git a/portal-remote-dependency-manager-tccl/.gitignore b/portal-remote-dependency-manager-tccl/.gitignore
new file mode 100644
index 0000000..83ccc54
--- /dev/null
+++ b/portal-remote-dependency-manager-tccl/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/af18d7dd/portal-remote-rest-extender/.gitignore
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/.gitignore b/portal-remote-rest-extender/.gitignore
new file mode 100644
index 0000000..83ccc54
--- /dev/null
+++ b/portal-remote-rest-extender/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/af18d7dd/test-cxf/.gitignore
----------------------------------------------------------------------
diff --git a/test-cxf/.gitignore b/test-cxf/.gitignore
new file mode 100644
index 0000000..abc78ba
--- /dev/null
+++ b/test-cxf/.gitignore
@@ -0,0 +1,2 @@
+/.gradle/
+/build/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/af18d7dd/test-cxf/bin/--help/cache.lock
----------------------------------------------------------------------
diff --git a/test-cxf/bin/--help/cache.lock b/test-cxf/bin/--help/cache.lock
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/af18d7dd/test-cxf/bin/felix.jar
----------------------------------------------------------------------
diff --git a/test-cxf/bin/felix.jar b/test-cxf/bin/felix.jar
deleted file mode 100644
index c91e86b..0000000
Binary files a/test-cxf/bin/felix.jar and /dev/null differ
[33/50] [abbrv] aries-jax-rs-whiteboard git commit: add readme
Posted by cs...@apache.org.
add readme
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/4b36003c
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/4b36003c
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/4b36003c
Branch: refs/heads/master
Commit: 4b36003c1e65e355de9d55f96556280caa81d8f1
Parents: 3af0157
Author: Raymond Auge <ra...@liferay.com>
Authored: Fri Oct 28 11:49:41 2016 +0200
Committer: Raymond Auge <ra...@liferay.com>
Committed: Fri Oct 28 11:49:41 2016 +0200
----------------------------------------------------------------------
README.md | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/4b36003c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6a7519a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,27 @@
+## JAX-RS Whiteboard
+
+This is an implementation of a JAX-RS Services whiteboard [OSGi RFC-217](https://github.com/osgi/design/tree/master/rfcs/rfc0217).
+
+## Building
+
+Execute the usual maven task `mvn package`.
+
+## Running the Example
+
+This is a two step process.
+
+### Create the executable jar
+
+In the bndrun subdirectory, execute the task `mvn bnd-export:export`
+
+**Note:** There's an occasional NPE occuring during the resolve operation. If you should encounter this, please try again.
+
+### Run the exported jar
+
+Once exported, the bndrun directory should contain a file `org.apache.aries.jax-rs.example.jar`.
+
+Execute the following command
+
+```
+java -jar org.apache.aries.jax-rs.example.jar
+```
\ No newline at end of file
[35/50] [abbrv] aries-jax-rs-whiteboard git commit: restructure the
entire build
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
new file mode 100644
index 0000000..7449ec8
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
@@ -0,0 +1,148 @@
+/**
+ * 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/17c51be0/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
new file mode 100644
index 0000000..07e8c7a
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
@@ -0,0 +1,123 @@
+/**
+ * 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/17c51be0/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
new file mode 100644
index 0000000..433f70c
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
@@ -0,0 +1,104 @@
+/**
+ * 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/17c51be0/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
new file mode 100644
index 0000000..8645504
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
@@ -0,0 +1,159 @@
+/**
+ * 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/17c51be0/org.apache.aries.jax-rs.integration-test/integration-test.bndrun
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.integration-test/integration-test.bndrun b/org.apache.aries.jax-rs.integration-test/integration-test.bndrun
new file mode 100644
index 0000000..435ad96
--- /dev/null
+++ b/org.apache.aries.jax-rs.integration-test/integration-test.bndrun
@@ -0,0 +1,50 @@
+-standalone:
+
+-plugin.integration.test = \
+ aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
+ snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \
+ releaseUrls=https://repo1.maven.org/maven2/; \
+ pom=${.}/pom.xml; \
+ name=integration.test; \
+ location=${.}/target/cached.xml
+
+-runrequires: \
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.tests)'
+
+-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
+
+#-runtrace: true
+
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+
+-runsystempackages.eqnx: javax.script
+-runsystemcapabilities.dflt: ${native_capability}
+-runproperties.eqnx: \
+ osgi.console.enable.builtin=false, \
+ osgi.console=, \
+ org.osgi.service.http.port=8080
+-runbundles: \
+ javax.annotation-api; version='[1.2.0,1.2.1)',\
+ javax.json-api; version='[1.0.0,1.0.1)',\
+ javax.ws.rs-api; version='[2.0.1,2.0.2)',\
+ log4j; version='[1.2.17,1.2.18)',\
+ org.apache.aries.jax-rs.extender; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax-rs.tests; version='[1.0.0,1.0.1)',\
+ org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\
+ org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
+ org.apache.felix.http.api; version='[3.0.0,3.0.1)',\
+ org.apache.felix.http.jetty; version='[3.4.0,3.4.1)',\
+ org.apache.felix.http.servlet-api; version='[1.1.2,1.1.3)',\
+ org.apache.felix.scr; version='[2.0.2,2.0.3)',\
+ org.apache.ws.xmlschema.core; version='[2.2.1,2.2.2)',\
+ org.eclipse.equinox.event; version='[1.3.100,1.3.101)',\
+ org.eclipse.equinox.metatype; version='[1.4.100,1.4.101)',\
+ org.objectweb.asm; version='[5.0.4,5.0.5)',\
+ org.osgi.compendium; version='[4.1.0,4.1.1)',\
+ org.osgi.service.event; version='[1.3.1,1.3.2)',\
+ org.osgi.service.metatype; version='[1.3.0,1.3.1)',\
+ osgi.enroute.hamcrest.wrapper; version='[1.3.0,1.3.1)',\
+ osgi.enroute.junit.wrapper; version='[4.12.0,4.12.1)',\
+ slf4j.api; version='[1.7.21,1.7.22)',\
+ slf4j.log4j12; version='[1.6.1,1.6.2)'
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.integration-test/pom.xml b/org.apache.aries.jax-rs.integration-test/pom.xml
new file mode 100644
index 0000000..2650fc2
--- /dev/null
+++ b/org.apache.aries.jax-rs.integration-test/pom.xml
@@ -0,0 +1,64 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>org.apache.aries.jax-rs.integration-test</artifactId>
+
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-testing-maven-plugin</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <resolve>false</resolve>
+ <bndruns>
+ <bndrun>integration-test.bndrun</bndrun>
+ </bndruns>
+ <targetDir>.</targetDir>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testing</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs.extender</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs.tests</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.pom.distro</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.tests/bnd.bnd
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/bnd.bnd b/org.apache.aries.jax-rs.tests/bnd.bnd
new file mode 100644
index 0000000..264db93
--- /dev/null
+++ b/org.apache.aries.jax-rs.tests/bnd.bnd
@@ -0,0 +1,5 @@
+Bundle-Description: Integration Test bundle for the JAX-RS extender
+
+Test-Cases: \
+ ${classes;CONCRETE;EXTENDS;junit.framework.TestCase},\
+ ${classes;CONCRETE;ANNOTATED;org.junit.Test}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.tests/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/pom.xml b/org.apache.aries.jax-rs.tests/pom.xml
new file mode 100644
index 0000000..0a4a453
--- /dev/null
+++ b/org.apache.aries.jax-rs.tests/pom.xml
@@ -0,0 +1,33 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.aries.jax-rs.tests</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.junit.wrapper</artifactId>
+ <version>4.12.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.tests/src/main/java/test/JaxrsTest.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/src/main/java/test/JaxrsTest.java b/org.apache.aries.jax-rs.tests/src/main/java/test/JaxrsTest.java
new file mode 100644
index 0000000..38b03c2
--- /dev/null
+++ b/org.apache.aries.jax-rs.tests/src/main/java/test/JaxrsTest.java
@@ -0,0 +1,55 @@
+package test;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.util.tracker.ServiceTracker;
+
+import junit.framework.TestCase;
+import test.types.TestAddon;
+
+public class JaxrsTest extends TestCase {
+
+ static BundleContext bundleContext = FrameworkUtil.getBundle(
+ JaxrsTest.class).getBundleContext();
+
+ public void testEndPoint() throws Exception {
+ ServiceRegistration<?> serviceRegistration = null;
+
+ try {
+ TestAddon testAddon = new TestAddon();
+
+ Dictionary<String, Object> properties = new Hashtable<>();
+ properties.put("osgi.jaxrs.resource.base", "/test-addon");
+
+ serviceRegistration = bundleContext.registerService(
+ Object.class, testAddon, properties);
+
+ // TODO this availability should be checked through a jaxrs runtime service of some kind
+
+ Filter filter = bundleContext.createFilter(
+ "(&(objectClass=com.liferay.portal.remote.rest.extender.internal.CXFJaxRsServiceRegistrator)" +
+ "(CXF_ENDPOINT_ADDRESS=/test-addon))");
+
+ ServiceTracker<?, ?> st = new ServiceTracker<>(bundleContext, filter, null);
+
+ st.open();
+
+ if (st.waitForService(5000) == null) {
+ fail();
+ }
+
+ // TODO add http client to connect to the endpoint
+ }
+ finally {
+ if (serviceRegistration != null) {
+ serviceRegistration.unregister();
+ }
+ }
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestAddon.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestAddon.java b/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestAddon.java
new file mode 100644
index 0000000..849d582
--- /dev/null
+++ b/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestAddon.java
@@ -0,0 +1,41 @@
+/**
+ * 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 test.types;
+
+import javax.annotation.PostConstruct;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+//property = "osgi.jaxrs.resource.base=/test-addon",
+public class TestAddon {
+
+ @GET
+ @Path("/{name}")
+ public String sayHello(@PathParam("name") String name) {
+ return "Hello " + name;
+ }
+
+ @PostConstruct
+ public void init() {
+ System.out.println("URIINFO: " + _uriInfo);
+ }
+
+ @Context
+ UriInfo _uriInfo;
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestApplication.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestApplication.java b/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestApplication.java
new file mode 100644
index 0000000..c7e65f3
--- /dev/null
+++ b/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestApplication.java
@@ -0,0 +1,38 @@
+/**
+ * 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 test.types;
+
+import java.util.Collections;
+import java.util.Set;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Application;
+
+// property = "osgi.jaxrs.application.base=/example-application",
+public class TestApplication extends Application {
+
+ @Override
+ public Set<Object> getSingletons() {
+ return Collections.<Object>singleton(this);
+ }
+
+ @GET
+ @Produces("text/plain")
+ public String sayHello() {
+ return "Hello world";
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestFilter.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestFilter.java b/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestFilter.java
new file mode 100644
index 0000000..928221a
--- /dev/null
+++ b/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestFilter.java
@@ -0,0 +1,37 @@
+/**
+ * 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 test.types;
+
+import java.io.IOException;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+// property = {
+// "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)",
+// "osgi.jaxrs.filter.base=/examples"
+// }
+@Provider
+public class TestFilter implements ContainerRequestFilter {
+
+ @Override
+ public void filter(ContainerRequestContext requestContext)
+ throws IOException {
+
+ System.out.println("FILTERED!");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.rest.extender/.gitignore
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/.gitignore b/org.apache.aries.rest.extender/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/org.apache.aries.rest.extender/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build/
-/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.rest.extender/bnd.bnd
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/bnd.bnd b/org.apache.aries.rest.extender/bnd.bnd
deleted file mode 100644
index d03d478..0000000
--- a/org.apache.aries.rest.extender/bnd.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-Activator: com.liferay.portal.remote.rest.extender.activator.CXFJaxRsBundleActivator
-Provide-Capability: \
- osgi.extender; \
- osgi.extender='aries.jax-rs'; \
- version:Version='1.0.0'
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.rest.extender/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/pom.xml b/org.apache.aries.rest.extender/pom.xml
deleted file mode 100644
index 5952b5a..0000000
--- a/org.apache.aries.rest.extender/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.aries.rest.extender</artifactId>
- <packaging>jar</packaging>
- <description>Aries JAX-RS Extender</description>
- <dependencies>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>com.liferay</groupId>
- <artifactId>com.liferay.portal.remote.cxf.jaxrs.common</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>6.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.http.whiteboard</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>3.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3.8</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
deleted file mode 100644
index 04017d6..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
deleted file mode 100644
index 8900ded..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
deleted file mode 100644
index 2594ac3..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
deleted file mode 100644
index 8440196..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
deleted file mode 100644
index 7449ec8..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
deleted file mode 100644
index 07e8c7a..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
deleted file mode 100644
index 433f70c..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
deleted file mode 100644
index 8645504..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language.properties
deleted file mode 100644
index ff2b883..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_ar.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ar.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ar.properties
deleted file mode 100644
index f7ddde5..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_bg.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_bg.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_bg.properties
deleted file mode 100644
index 93f99d3..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_ca.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ca.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ca.properties
deleted file mode 100644
index 9476a3e..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_cs.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_cs.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_cs.properties
deleted file mode 100644
index 76bc497..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_da.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_da.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_da.properties
deleted file mode 100644
index 9b885db..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_de.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_de.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_de.properties
deleted file mode 100644
index ff2b883..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_el.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_el.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_el.properties
deleted file mode 100644
index 1fd60a7..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_en.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_en.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_en.properties
deleted file mode 100644
index ff2b883..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_es.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_es.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_es.properties
deleted file mode 100644
index cc489da..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_et.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_et.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_et.properties
deleted file mode 100644
index 824e6e1..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_eu.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_eu.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_eu.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_fa.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_fa.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_fa.properties
deleted file mode 100644
index 64e00d0..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_fi.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_fi.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_fi.properties
deleted file mode 100644
index d0e0a1d..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_fr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_fr.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_fr.properties
deleted file mode 100644
index 52e43d9..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_gl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_gl.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_gl.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_hi_IN.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_hi_IN.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_hi_IN.properties
deleted file mode 100644
index 340d552..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_hr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_hr.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_hr.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_hu.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_hu.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_hu.properties
deleted file mode 100644
index cdc65c6..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_in.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_in.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_in.properties
deleted file mode 100644
index b60839d..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_it.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_it.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_it.properties
deleted file mode 100644
index ff2b883..0000000
--- a/org.apache.aries.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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_iw.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_iw.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_iw.properties
deleted file mode 100644
index 667e11d..0000000
--- a/org.apache.aries.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
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_ja.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ja.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ja.properties
deleted file mode 100644
index ff2b883..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_ko.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ko.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ko.properties
deleted file mode 100644
index 3b3ecce..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_lo.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_lo.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_lo.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_lt.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_lt.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_lt.properties
deleted file mode 100644
index 4f37958..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_nb.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_nb.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_nb.properties
deleted file mode 100644
index 9b885db..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_nl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_nl.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_nl.properties
deleted file mode 100644
index b62adc9..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_nl_BE.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_nl_BE.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_nl_BE.properties
deleted file mode 100644
index d137e77..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_pl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_pl.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_pl.properties
deleted file mode 100644
index 0055a27..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/content/Language_pl.properties
+++ /dev/null
@@ -1 +0,0 @@
-rest.extender.configuration.name=RESZTA Extender (Automatic Translation)
\ No newline at end of file
[21/50] [abbrv] aries-jax-rs-whiteboard git commit: [maven] convert
to maven build using bnd-maven-plugin
Posted by cs...@apache.org.
[maven] convert to maven build using bnd-maven-plugin
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/c7de7755
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/c7de7755
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/c7de7755
Branch: refs/heads/master
Commit: c7de7755233792bbf7a9b61fbc402bbee75c7c69
Parents: f9c4f9f
Author: Raymond Auge <ra...@liferay.com>
Authored: Mon Oct 24 17:44:25 2016 +0200
Committer: Raymond Auge <ra...@liferay.com>
Committed: Mon Oct 24 17:44:25 2016 +0200
----------------------------------------------------------------------
.gitignore | 2 +-
.gradle-wrapper/gradle-wrapper.jar | Bin 53639 -> 0 bytes
.gradle-wrapper/gradle-wrapper.properties | 6 -
Readme.md | 3 -
build.gradle | 41 -
example-jaxrs-application/.gitignore | 2 -
example-jaxrs-application/bnd.bnd | 3 -
example-jaxrs-application/build.gradle | 4 -
.../example-jaxrs-application.iml | 20 -
.../portal/rest/example/ExampleAddon.java | 50 --
.../portal/rest/example/ExampleApplication.java | 46 -
.../portal/rest/example/ExampleFilter.java | 44 -
gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 0 bytes
gradle/wrapper/gradle-wrapper.properties | 6 -
gradlew | 160 ----
gradlew.bat | 90 --
org.apache.aries.jax-rs.cxf-common/.gitignore | 2 +
org.apache.aries.jax-rs.cxf-common/bnd.bnd | 55 ++
org.apache.aries.jax-rs.cxf-common/pom.xml | 107 +++
.../remote/cxf/common/ServicesRegistrator.java | 168 ++++
.../CXFEndpointPublisherActivator.java | 47 +
.../main/resources/content/Language.properties | 1 +
.../resources/content/Language_ar.properties | 1 +
.../resources/content/Language_bg.properties | 1 +
.../resources/content/Language_ca.properties | 1 +
.../resources/content/Language_cs.properties | 1 +
.../resources/content/Language_da.properties | 1 +
.../resources/content/Language_de.properties | 1 +
.../resources/content/Language_el.properties | 1 +
.../resources/content/Language_en.properties | 1 +
.../resources/content/Language_es.properties | 1 +
.../resources/content/Language_et.properties | 1 +
.../resources/content/Language_eu.properties | 1 +
.../resources/content/Language_fa.properties | 1 +
.../resources/content/Language_fi.properties | 1 +
.../resources/content/Language_fr.properties | 1 +
.../resources/content/Language_gl.properties | 1 +
.../resources/content/Language_hi_IN.properties | 1 +
.../resources/content/Language_hr.properties | 1 +
.../resources/content/Language_hu.properties | 1 +
.../resources/content/Language_in.properties | 1 +
.../resources/content/Language_it.properties | 1 +
.../resources/content/Language_iw.properties | 1 +
.../resources/content/Language_ja.properties | 1 +
.../resources/content/Language_ko.properties | 1 +
.../resources/content/Language_lo.properties | 1 +
.../resources/content/Language_lt.properties | 1 +
.../resources/content/Language_nb.properties | 1 +
.../resources/content/Language_nl.properties | 1 +
.../resources/content/Language_nl_BE.properties | 1 +
.../resources/content/Language_pl.properties | 1 +
.../resources/content/Language_pt_BR.properties | 1 +
.../resources/content/Language_pt_PT.properties | 1 +
.../resources/content/Language_ro.properties | 1 +
.../resources/content/Language_ru.properties | 1 +
.../resources/content/Language_sk.properties | 1 +
.../resources/content/Language_sl.properties | 1 +
.../resources/content/Language_sr_RS.properties | 1 +
.../content/Language_sr_RS_latin.properties | 1 +
.../resources/content/Language_sv.properties | 1 +
.../resources/content/Language_tr.properties | 1 +
.../resources/content/Language_uk.properties | 1 +
.../resources/content/Language_vi.properties | 1 +
.../resources/content/Language_zh_CN.properties | 1 +
.../resources/content/Language_zh_TW.properties | 1 +
org.apache.aries.jax-rs.example/.gitignore | 2 +
org.apache.aries.jax-rs.example/pom.xml | 27 +
.../portal/rest/example/ExampleAddon.java | 50 ++
.../portal/rest/example/ExampleApplication.java | 46 +
.../portal/rest/example/ExampleFilter.java | 44 +
org.apache.aries.rest.extender/.gitignore | 2 +
org.apache.aries.rest.extender/bnd.bnd | 5 +
org.apache.aries.rest.extender/pom.xml | 67 ++
.../activator/CXFJaxRsBundleActivator.java | 78 ++
.../AddonsServiceTrackerCustomizer.java | 102 +++
.../ApplicationServiceTrackerCustomizer.java | 140 +++
.../internal/BusServiceTrackerCustomizer.java | 116 +++
.../internal/CXFJaxRsServiceRegistrator.java | 148 +++
...AndInterceptorsServiceTrackerCustomizer.java | 123 +++
.../ServicesServiceTrackerCustomizer.java | 104 +++
.../SingletonServiceTrackerCustomizer.java | 159 ++++
.../main/resources/content/Language.properties | 1 +
.../resources/content/Language_ar.properties | 1 +
.../resources/content/Language_bg.properties | 1 +
.../resources/content/Language_ca.properties | 1 +
.../resources/content/Language_cs.properties | 1 +
.../resources/content/Language_da.properties | 1 +
.../resources/content/Language_de.properties | 1 +
.../resources/content/Language_el.properties | 1 +
.../resources/content/Language_en.properties | 1 +
.../resources/content/Language_es.properties | 1 +
.../resources/content/Language_et.properties | 1 +
.../resources/content/Language_eu.properties | 1 +
.../resources/content/Language_fa.properties | 1 +
.../resources/content/Language_fi.properties | 1 +
.../resources/content/Language_fr.properties | 1 +
.../resources/content/Language_gl.properties | 1 +
.../resources/content/Language_hi_IN.properties | 1 +
.../resources/content/Language_hr.properties | 1 +
.../resources/content/Language_hu.properties | 1 +
.../resources/content/Language_in.properties | 1 +
.../resources/content/Language_it.properties | 1 +
.../resources/content/Language_iw.properties | 1 +
.../resources/content/Language_ja.properties | 1 +
.../resources/content/Language_ko.properties | 1 +
.../resources/content/Language_lo.properties | 1 +
.../resources/content/Language_lt.properties | 1 +
.../resources/content/Language_nb.properties | 1 +
.../resources/content/Language_nl.properties | 1 +
.../resources/content/Language_nl_BE.properties | 1 +
.../resources/content/Language_pl.properties | 1 +
.../resources/content/Language_pt_BR.properties | 1 +
.../resources/content/Language_pt_PT.properties | 1 +
.../resources/content/Language_ro.properties | 1 +
.../resources/content/Language_ru.properties | 1 +
.../resources/content/Language_sk.properties | 1 +
.../resources/content/Language_sl.properties | 1 +
.../resources/content/Language_sr_RS.properties | 1 +
.../content/Language_sr_RS_latin.properties | 1 +
.../resources/content/Language_sv.properties | 1 +
.../resources/content/Language_tr.properties | 1 +
.../resources/content/Language_uk.properties | 1 +
.../resources/content/Language_vi.properties | 1 +
.../resources/content/Language_zh_CN.properties | 1 +
.../resources/content/Language_zh_TW.properties | 1 +
osgi-rest.iml | 14 -
pom.xml | 16 +-
portal-remote-cxf-common/.gitignore | 2 -
portal-remote-cxf-common/.lfrbuild-portal | 0
portal-remote-cxf-common/bnd.bnd | 63 --
portal-remote-cxf-common/build.gradle | 48 -
.../cxf/common/CXFEndpointPublisher$1.class | Bin 282 -> 0 bytes
...ndpointPublisher$ServicesRegistrator$1.class | Bin 1000 -> 0 bytes
...ServicesRegistrator$RemoteAccessFilter.class | Bin 2256 -> 0 bytes
...FEndpointPublisher$ServicesRegistrator.class | Bin 7314 -> 0 bytes
.../cxf/common/CXFEndpointPublisher.class | Bin 3813 -> 0 bytes
.../remote/cxf/common/ExtensionManager.class | Bin 1463 -> 0 bytes
.../CXFEndpointPublisherConfiguration.class | Bin 1181 -> 0 bytes
.../classes/content/Language.properties | 1 -
.../classes/content/Language_ar.properties | 1 -
.../classes/content/Language_bg.properties | 1 -
.../classes/content/Language_ca.properties | 1 -
.../classes/content/Language_cs.properties | 1 -
.../classes/content/Language_da.properties | 1 -
.../classes/content/Language_de.properties | 1 -
.../classes/content/Language_el.properties | 1 -
.../classes/content/Language_en.properties | 1 -
.../classes/content/Language_es.properties | 1 -
.../classes/content/Language_et.properties | 1 -
.../classes/content/Language_eu.properties | 1 -
.../classes/content/Language_fa.properties | 1 -
.../classes/content/Language_fi.properties | 1 -
.../classes/content/Language_fr.properties | 1 -
.../classes/content/Language_gl.properties | 1 -
.../classes/content/Language_hi_IN.properties | 1 -
.../classes/content/Language_hr.properties | 1 -
.../classes/content/Language_hu.properties | 1 -
.../classes/content/Language_in.properties | 1 -
.../classes/content/Language_it.properties | 1 -
.../classes/content/Language_iw.properties | 1 -
.../classes/content/Language_ja.properties | 1 -
.../classes/content/Language_ko.properties | 1 -
.../classes/content/Language_lo.properties | 1 -
.../classes/content/Language_lt.properties | 1 -
.../classes/content/Language_nb.properties | 1 -
.../classes/content/Language_nl.properties | 1 -
.../classes/content/Language_nl_BE.properties | 1 -
.../classes/content/Language_pl.properties | 1 -
.../classes/content/Language_pt_BR.properties | 1 -
.../classes/content/Language_pt_PT.properties | 1 -
.../classes/content/Language_ro.properties | 1 -
.../classes/content/Language_ru.properties | 1 -
.../classes/content/Language_sk.properties | 1 -
.../classes/content/Language_sl.properties | 1 -
.../classes/content/Language_sr_RS.properties | 1 -
.../content/Language_sr_RS_latin.properties | 1 -
.../classes/content/Language_sv.properties | 1 -
.../classes/content/Language_tr.properties | 1 -
.../classes/content/Language_uk.properties | 1 -
.../classes/content/Language_vi.properties | 1 -
.../classes/content/Language_zh_CN.properties | 1 -
.../classes/content/Language_zh_TW.properties | 1 -
.../javax/wsdl/extensions/http/packageinfo | 1 -
.../javax/wsdl/extensions/mime/packageinfo | 1 -
.../classes/javax/wsdl/extensions/packageinfo | 1 -
.../javax/wsdl/extensions/schema/packageinfo | 1 -
.../javax/wsdl/extensions/soap/packageinfo | 1 -
.../javax/wsdl/extensions/soap12/packageinfo | 1 -
.../classes/javax/wsdl/factory/packageinfo | 1 -
.../classes/javax/wsdl/packageinfo | 1 -
.../classes/javax/wsdl/xml/packageinfo | 1 -
.../binding/soap/wsdl/extensions/packageinfo | 1 -
.../cxf/databinding/source/mime/packageinfo | 1 -
.../ws/commons/schema/constants/packageinfo | 1 -
.../ws/commons/schema/extensions/packageinfo | 1 -
.../ws/commons/schema/internal/packageinfo | 1 -
.../org/apache/ws/commons/schema/packageinfo | 1 -
.../ws/commons/schema/resolver/packageinfo | 1 -
.../apache/ws/commons/schema/utils/packageinfo | 1 -
.../portal-remote-cxf-common.iml | 46 -
.../remote/cxf/common/ServicesRegistrator.java | 168 ----
.../CXFEndpointPublisherActivator.java | 47 -
.../main/resources/content/Language.properties | 1 -
.../resources/content/Language_ar.properties | 1 -
.../resources/content/Language_bg.properties | 1 -
.../resources/content/Language_ca.properties | 1 -
.../resources/content/Language_cs.properties | 1 -
.../resources/content/Language_da.properties | 1 -
.../resources/content/Language_de.properties | 1 -
.../resources/content/Language_el.properties | 1 -
.../resources/content/Language_en.properties | 1 -
.../resources/content/Language_es.properties | 1 -
.../resources/content/Language_et.properties | 1 -
.../resources/content/Language_eu.properties | 1 -
.../resources/content/Language_fa.properties | 1 -
.../resources/content/Language_fi.properties | 1 -
.../resources/content/Language_fr.properties | 1 -
.../resources/content/Language_gl.properties | 1 -
.../resources/content/Language_hi_IN.properties | 1 -
.../resources/content/Language_hr.properties | 1 -
.../resources/content/Language_hu.properties | 1 -
.../resources/content/Language_in.properties | 1 -
.../resources/content/Language_it.properties | 1 -
.../resources/content/Language_iw.properties | 1 -
.../resources/content/Language_ja.properties | 1 -
.../resources/content/Language_ko.properties | 1 -
.../resources/content/Language_lo.properties | 1 -
.../resources/content/Language_lt.properties | 1 -
.../resources/content/Language_nb.properties | 1 -
.../resources/content/Language_nl.properties | 1 -
.../resources/content/Language_nl_BE.properties | 1 -
.../resources/content/Language_pl.properties | 1 -
.../resources/content/Language_pt_BR.properties | 1 -
.../resources/content/Language_pt_PT.properties | 1 -
.../resources/content/Language_ro.properties | 1 -
.../resources/content/Language_ru.properties | 1 -
.../resources/content/Language_sk.properties | 1 -
.../resources/content/Language_sl.properties | 1 -
.../resources/content/Language_sr_RS.properties | 1 -
.../content/Language_sr_RS_latin.properties | 1 -
.../resources/content/Language_sv.properties | 1 -
.../resources/content/Language_tr.properties | 1 -
.../resources/content/Language_uk.properties | 1 -
.../resources/content/Language_vi.properties | 1 -
.../resources/content/Language_zh_CN.properties | 1 -
.../resources/content/Language_zh_TW.properties | 1 -
.../javax/wsdl/extensions/http/packageinfo | 1 -
.../javax/wsdl/extensions/mime/packageinfo | 1 -
.../resources/javax/wsdl/extensions/packageinfo | 1 -
.../javax/wsdl/extensions/schema/packageinfo | 1 -
.../javax/wsdl/extensions/soap/packageinfo | 1 -
.../javax/wsdl/extensions/soap12/packageinfo | 1 -
.../resources/javax/wsdl/factory/packageinfo | 1 -
.../src/main/resources/javax/wsdl/packageinfo | 1 -
.../main/resources/javax/wsdl/xml/packageinfo | 1 -
.../binding/soap/wsdl/extensions/packageinfo | 1 -
.../cxf/databinding/source/mime/packageinfo | 1 -
.../ws/commons/schema/constants/packageinfo | 1 -
.../ws/commons/schema/extensions/packageinfo | 1 -
.../ws/commons/schema/internal/packageinfo | 1 -
.../org/apache/ws/commons/schema/packageinfo | 1 -
.../ws/commons/schema/resolver/packageinfo | 1 -
.../apache/ws/commons/schema/utils/packageinfo | 1 -
portal-remote-cxf-jaxrs-common/.gitignore | 2 -
portal-remote-cxf-jaxrs-common/.lfrbuild-portal | 0
portal-remote-cxf-jaxrs-common/bnd.bnd | 64 --
portal-remote-cxf-jaxrs-common/build.gradle | 13 -
.../portal-remote-cxf-jaxrs-common.iml | 35 -
.../.gitignore | 2 -
portal-remote-rest-extender/.gitignore | 2 -
portal-remote-rest-extender/.lfrbuild-portal | 0
portal-remote-rest-extender/bnd.bnd | 6 -
portal-remote-rest-extender/build.gradle | 12 -
.../activator/CXFJaxRsBundleActivator.class | Bin 1438 -> 0 bytes
.../RestExtenderConfiguration.class | Bin 1463 -> 0 bytes
.../internal/CXFJaxRsServiceRegistrator.class | Bin 5632 -> 0 bytes
.../rest/extender/internal/RestExtender.class | Bin 6460 -> 0 bytes
.../classes/content/Language.properties | 1 -
.../classes/content/Language_ar.properties | 1 -
.../classes/content/Language_bg.properties | 1 -
.../classes/content/Language_ca.properties | 1 -
.../classes/content/Language_cs.properties | 1 -
.../classes/content/Language_da.properties | 1 -
.../classes/content/Language_de.properties | 1 -
.../classes/content/Language_el.properties | 1 -
.../classes/content/Language_en.properties | 1 -
.../classes/content/Language_es.properties | 1 -
.../classes/content/Language_et.properties | 1 -
.../classes/content/Language_eu.properties | 1 -
.../classes/content/Language_fa.properties | 1 -
.../classes/content/Language_fi.properties | 1 -
.../classes/content/Language_fr.properties | 1 -
.../classes/content/Language_gl.properties | 1 -
.../classes/content/Language_hi_IN.properties | 1 -
.../classes/content/Language_hr.properties | 1 -
.../classes/content/Language_hu.properties | 1 -
.../classes/content/Language_in.properties | 1 -
.../classes/content/Language_it.properties | 1 -
.../classes/content/Language_iw.properties | 1 -
.../classes/content/Language_ja.properties | 1 -
.../classes/content/Language_ko.properties | 1 -
.../classes/content/Language_lo.properties | 1 -
.../classes/content/Language_lt.properties | 1 -
.../classes/content/Language_nb.properties | 1 -
.../classes/content/Language_nl.properties | 1 -
.../classes/content/Language_nl_BE.properties | 1 -
.../classes/content/Language_pl.properties | 1 -
.../classes/content/Language_pt_BR.properties | 1 -
.../classes/content/Language_pt_PT.properties | 1 -
.../classes/content/Language_ro.properties | 1 -
.../classes/content/Language_ru.properties | 1 -
.../classes/content/Language_sk.properties | 1 -
.../classes/content/Language_sl.properties | 1 -
.../classes/content/Language_sr_RS.properties | 1 -
.../content/Language_sr_RS_latin.properties | 1 -
.../classes/content/Language_sv.properties | 1 -
.../classes/content/Language_tr.properties | 1 -
.../classes/content/Language_uk.properties | 1 -
.../classes/content/Language_vi.properties | 1 -
.../classes/content/Language_zh_CN.properties | 1 -
.../classes/content/Language_zh_TW.properties | 1 -
.../portal-remote-rest-extender.iml | 36 -
.../activator/CXFJaxRsBundleActivator.java | 78 --
.../AddonsServiceTrackerCustomizer.java | 102 ---
.../ApplicationServiceTrackerCustomizer.java | 140 ---
.../internal/BusServiceTrackerCustomizer.java | 116 ---
.../internal/CXFJaxRsServiceRegistrator.java | 148 ---
...AndInterceptorsServiceTrackerCustomizer.java | 123 ---
.../ServicesServiceTrackerCustomizer.java | 104 ---
.../SingletonServiceTrackerCustomizer.java | 159 ----
.../main/resources/content/Language.properties | 1 -
.../resources/content/Language_ar.properties | 1 -
.../resources/content/Language_bg.properties | 1 -
.../resources/content/Language_ca.properties | 1 -
.../resources/content/Language_cs.properties | 1 -
.../resources/content/Language_da.properties | 1 -
.../resources/content/Language_de.properties | 1 -
.../resources/content/Language_el.properties | 1 -
.../resources/content/Language_en.properties | 1 -
.../resources/content/Language_es.properties | 1 -
.../resources/content/Language_et.properties | 1 -
.../resources/content/Language_eu.properties | 1 -
.../resources/content/Language_fa.properties | 1 -
.../resources/content/Language_fi.properties | 1 -
.../resources/content/Language_fr.properties | 1 -
.../resources/content/Language_gl.properties | 1 -
.../resources/content/Language_hi_IN.properties | 1 -
.../resources/content/Language_hr.properties | 1 -
.../resources/content/Language_hu.properties | 1 -
.../resources/content/Language_in.properties | 1 -
.../resources/content/Language_it.properties | 1 -
.../resources/content/Language_iw.properties | 1 -
.../resources/content/Language_ja.properties | 1 -
.../resources/content/Language_ko.properties | 1 -
.../resources/content/Language_lo.properties | 1 -
.../resources/content/Language_lt.properties | 1 -
.../resources/content/Language_nb.properties | 1 -
.../resources/content/Language_nl.properties | 1 -
.../resources/content/Language_nl_BE.properties | 1 -
.../resources/content/Language_pl.properties | 1 -
.../resources/content/Language_pt_BR.properties | 1 -
.../resources/content/Language_pt_PT.properties | 1 -
.../resources/content/Language_ro.properties | 1 -
.../resources/content/Language_ru.properties | 1 -
.../resources/content/Language_sk.properties | 1 -
.../resources/content/Language_sl.properties | 1 -
.../resources/content/Language_sr_RS.properties | 1 -
.../content/Language_sr_RS_latin.properties | 1 -
.../resources/content/Language_sv.properties | 1 -
.../resources/content/Language_tr.properties | 1 -
.../resources/content/Language_uk.properties | 1 -
.../resources/content/Language_vi.properties | 1 -
.../resources/content/Language_zh_CN.properties | 1 -
.../resources/content/Language_zh_TW.properties | 1 -
run.sh | 2 -
settings.gradle | 7 -
test-cxf/.gitignore | 2 -
test-cxf/.idea/.name | 1 -
test-cxf/.idea/compiler.xml | 22 -
test-cxf/.idea/copyright/profiles_settings.xml | 3 -
test-cxf/.idea/encodings.xml | 6 -
.../.idea/libraries/org_osgi_core_6_0_0.xml | 12 -
test-cxf/.idea/misc.xml | 19 -
test-cxf/.idea/modules.xml | 8 -
test-cxf/.idea/uiDesigner.xml | 124 ---
test-cxf/.idea/workspace.xml | 893 -------------------
test-cxf/bnd.bnd | 3 -
test-cxf/build.gradle | 57 --
test-cxf/conf/config.properties | 105 ---
...on.CXFEndpointPublisherConfiguration-one.cfg | 1 -
...figuration.RestExtenderConfiguration-one.cfg | 1 -
.../java/com/liferay/cxf/TestApplication.java | 22 -
test-cxf/test-cxf.iml | 61 --
393 files changed, 1695 insertions(+), 3567 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 2920297..7cfaff5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,6 @@
*/.settings/
*/bin/
**/build/
-/.gradle/
+**/target/
/test-cxf/felix-cache/
/test-cxf/bundle/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/.gradle-wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/.gradle-wrapper/gradle-wrapper.jar b/.gradle-wrapper/gradle-wrapper.jar
deleted file mode 100644
index 2c6137b..0000000
Binary files a/.gradle-wrapper/gradle-wrapper.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/.gradle-wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/.gradle-wrapper/gradle-wrapper.properties b/.gradle-wrapper/gradle-wrapper.properties
deleted file mode 100644
index 49e6283..0000000
--- a/.gradle-wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Mar 15 10:18:27 CDT 2016
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/Readme.md
----------------------------------------------------------------------
diff --git a/Readme.md b/Readme.md
deleted file mode 100644
index 25cd09e..0000000
--- a/Readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-To run the examples issue `./gradlew -q test-cxf:run`
-
-you should be able to access `example-jaxrs-application` in `http://localhost:8080/cxf/example`
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 989ec63..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,41 +0,0 @@
-buildscript {
- repositories {
- maven {
- url "http://cdn.repository.liferay.com/nexus/content/groups/public/"
- }
- }
- dependencies {
- classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:3.3.0'
- classpath 'com.liferay:com.liferay.ant.bnd:2.0.21'
- }
-}
-
-defaultTasks 'build'
-
-subprojects {
- buildscript {
- repositories {
- maven {
- url "http://cdn.repository.liferay.com/nexus/content/groups/public/"
- }
- }
- }
-
- if (file('bnd.bnd').exists()) {
- apply plugin: 'biz.aQute.bnd.builder'
- sourceCompatibility = 1.7
- }
- else {
- apply plugin: 'java'
- }
-
- repositories {
- maven {
- url "http://cdn.repository.liferay.com/nexus/content/groups/public/"
- }
- }
-}
-
-task wrapper(type:Wrapper){
- gradleVersion = '3.1'
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/example-jaxrs-application/.gitignore
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/.gitignore b/example-jaxrs-application/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/example-jaxrs-application/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build/
-/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/example-jaxrs-application/bnd.bnd
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/bnd.bnd b/example-jaxrs-application/bnd.bnd
deleted file mode 100644
index b9afa09..0000000
--- a/example-jaxrs-application/bnd.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-Name: Example OSGi Rest Application
-Bundle-SymbolicName: com.liferay.portal.rest.example
-Bundle-Version: 1.0.0
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/example-jaxrs-application/build.gradle
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/build.gradle b/example-jaxrs-application/build.gradle
deleted file mode 100644
index 4e48a50..0000000
--- a/example-jaxrs-application/build.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-dependencies {
- compile group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.0.1"
- compile group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/example-jaxrs-application/example-jaxrs-application.iml
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/example-jaxrs-application.iml b/example-jaxrs-application/example-jaxrs-application.iml
deleted file mode 100644
index 491aed7..0000000
--- a/example-jaxrs-application/example-jaxrs-application.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":example-jaxrs-application" 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.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
- <orderEntry type="library" name="Gradle: org.osgi:org.osgi.service.component.annotations:1.3.0" level="project" />
- </component>
-</module>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
deleted file mode 100644
index 5431e76..0000000
--- a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
+++ /dev/null
@@ -1,50 +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.rest.example;
-
-import org.osgi.service.component.annotations.Component;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-@Component(
- immediate = true,
- property = "osgi.jaxrs.resource.base=/examples/example-addon",
- service = ExampleAddon.class
-)
-public class ExampleAddon {
-
- @GET
- @Path("/{name}")
- public String sayHello(@PathParam("name") String name) {
- return "Hello " + name;
- }
-
- @PostConstruct
- public void init() {
- System.out.println("URIINFO: " + _uriInfo);
- }
-
- @Context
- UriInfo _uriInfo;
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
deleted file mode 100644
index 25234b2..0000000
--- a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
+++ /dev/null
@@ -1,46 +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.rest.example;
-
-import org.osgi.service.component.annotations.Component;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Application;
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-@Component(
- immediate = true,
- property = "osgi.jaxrs.application.base=/example-application",
- service = Application.class
-)
-public class ExampleApplication extends Application {
-
- @Override
- public Set<Object> getSingletons() {
- return Collections.<Object>singleton(this);
- }
-
- @GET
- @Produces("text/plain")
- public String sayHello() {
- return "Hello world";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
deleted file mode 100644
index c2e89ac..0000000
--- a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
+++ /dev/null
@@ -1,44 +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.rest.example;
-
-import org.osgi.service.component.annotations.Component;
-
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.ext.Provider;
-import java.io.IOException;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-@Component(
- immediate = true,
- property = {
- "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)",
- "osgi.jaxrs.filter.base=/examples"
- }
-)
-@Provider
-public class ExampleFilter implements ContainerRequestFilter {
-
- @Override
- public void filter(ContainerRequestContext requestContext)
- throws IOException {
-
- System.out.println("FILTERED!");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 9411448..0000000
Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 42dcda0..0000000
--- a/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Thu Jun 30 11:34:11 CEST 2016
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
deleted file mode 100755
index 9d82f78..0000000
--- a/gradlew
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
- echo "$*"
-}
-
-die ( ) {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
-esac
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=$((i+1))
- done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/gradlew.bat
----------------------------------------------------------------------
diff --git a/gradlew.bat b/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/.gitignore
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/.gitignore b/org.apache.aries.jax-rs.cxf-common/.gitignore
new file mode 100644
index 0000000..83ccc54
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/bnd.bnd
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/bnd.bnd b/org.apache.aries.jax-rs.cxf-common/bnd.bnd
new file mode 100644
index 0000000..53dfced
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/bnd.bnd
@@ -0,0 +1,55 @@
+Bundle-Activator: com.liferay.portal.remote.cxf.common.activator.CXFEndpointPublisherActivator
+-exportcontents:\
+ javax.json.*,\
+ javax.ws.rs.*,\
+ javax.wsdl.*,\
+ org.apache.cxf.*,\
+ org.apache.ws.commons.schema.*
+Import-Package:\
+ !com.sun.*,\
+ !com.ctc.wstx.*,\
+ !javax.validation.*,\
+ !net.sf.cglib.proxy.*,\
+ !org.apache.abdera.*,\
+ !org.apache.aries.*,\
+ !org.apache.cxf.*,\
+ !org.apache.neethi.*,\
+ !org.apache.velocity.*,\
+ !org.apache.xerces.*,\
+ !org.apache.xml.resolver.*,\
+ !org.apache.xmlbeans.*,\
+ !org.codehaus.stax2.*,\
+ !org.dom4j.*,\
+ !org.junit.*,\
+ !org.jvnet.fastinfoset.*,\
+ !org.jvnet.staxex.*,\
+ !org.osgi.service.blueprint.*,\
+ !org.relaxng.datatype.*,\
+ !org.slf4j.spi.*,\
+ !org.springframework.*,\
+ *
+Provide-Capability:\
+ osgi.contract;\
+ osgi.contract=JavaJAXRS;\
+ uses:="javax.ws.rs,javax.ws.rs.core,javax.ws.rs.client,javax.ws.rs.container,javax.ws.rs.ext";\
+ version:Version=2,\
+ osgi.contract;\
+ osgi.contract=JavaJSONP;\
+ uses:="javax.json,javax.json.spi,javax.json.stream";\
+ version:Version=1
+-includeresource:\
+ lib/cxf-core.jar=cxf-core-*.jar;lib:=true,\
+ lib/cxf-rt-bindings-soap.jar=cxf-rt-bindings-soap-*.jar;lib:=true,\
+ lib/cxf-rt-databinding-jaxb.jar=cxf-rt-databinding-jaxb-*.jar;lib:=true,\
+ lib/cxf-rt-frontend-jaxrs.jar=cxf-rt-frontend-jaxrs-*.jar;lib:=true,\
+ lib/cxf-rt-rs-extension-providers.jar=cxf-rt-rs-extension-providers-*.jar;lib:=true,\
+ lib/cxf-rt-transports-http.jar=cxf-rt-transports-http-*.jar;lib:=true,\
+ lib/cxf-rt-wsdl.jar=cxf-rt-wsdl-*.jar;lib:=true,\
+ lib/cxf-tools-common.jar=cxf-tools-common-*.jar;lib:=true,\
+ lib/cxf-tools-validator.jar=cxf-tools-validator-*.jar;lib:=true,\
+ lib/javax.annotation-api.jar=javax.annotation-api-*.jar;lib:=true,\
+ lib/javax.json-api.jar=javax.json-api-*.jar;lib:=true,\
+ lib/javax.ws.rs-api.jar=javax.ws.rs-api-*.jar;lib:=true,\
+ lib/jettison.jar=jettison-*.jar;lib:=true,\
+ lib/wsdl4j.jar=wsdl4j-*.jar;lib:=true,\
+ lib/xmlschema-core.jar=xmlschema-core-*.jar;lib:=true
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/pom.xml b/org.apache.aries.jax-rs.cxf-common/pom.xml
new file mode 100644
index 0000000..0786f41
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/pom.xml
@@ -0,0 +1,107 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.aries.jax-rs.cxf-common</artifactId>
+ <packaging>jar</packaging>
+ <description>Aries Repackaging of CXF Common Jars</description>
+ <dependencies>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.json</groupId>
+ <artifactId>javax.json-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-jaxb</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-wsdl</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-common</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-validator</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.dependencymanager</artifactId>
+ <version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.3.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <version>3.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>4.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>6.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.6.3</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java b/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
new file mode 100644
index 0000000..68d79f6
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
@@ -0,0 +1,168 @@
+/**
+ * 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.cxf.common;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.http.context.ServletContextHelper;
+import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.Servlet;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+public class ServicesRegistrator {
+
+ public ServicesRegistrator(
+ BundleContext bundleContext, Map<String, Object> properties) {
+
+ _bundleContext = bundleContext;
+
+ _properties = properties;
+ }
+
+ @SuppressWarnings("unused")
+ protected void addExtension(
+ Map<String, Object> properties, Object extension) {
+
+ Class<?> extensionClass = (Class<?>) properties.get(
+ "cxf.extension.class");
+
+ if (extensionClass == null) {
+ extensionClass = extension.getClass();
+ }
+
+ _extensions.put(extensionClass, extension);
+ }
+
+ @SuppressWarnings("unused")
+ public void start() {
+ Dictionary<String, Object> properties = new Hashtable<>();
+
+ Object contextPathObject = _properties.get("contextPath");
+
+ String contextPath = contextPathObject.toString();
+
+ String contextName = contextPath.substring(1);
+
+ contextName = contextName.replace("/", ".");
+
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME,
+ contextName);
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
+ contextPath);
+
+ _servletContextHelperServiceRegistration =
+ _bundleContext.registerService(
+ ServletContextHelper.class,
+ new ServletContextHelper(_bundleContext.getBundle()) {
+ },
+ properties);
+
+ CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet();
+
+ CXFBusFactory cxfBusFactory =
+ (CXFBusFactory) CXFBusFactory.newInstance(
+ CXFBusFactory.class.getName());
+
+ Bus bus = cxfBusFactory.createBus(_extensions);
+
+ properties = new Hashtable<>();
+
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
+ "(osgi.http.whiteboard.context.name=" + contextName + ")");
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME,
+ CXFNonSpringServlet.class.getName());
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/*");
+
+ cxfNonSpringServlet.setBus(bus);
+
+ _servletServiceRegistration = _bundleContext.registerService(
+ Servlet.class, cxfNonSpringServlet, properties);
+
+ properties = new Hashtable<>();
+
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
+ contextPath);
+
+ _busServiceRegistration = _bundleContext.registerService(
+ Bus.class, bus, properties);
+ }
+
+ @SuppressWarnings("unused")
+ public void stop() {
+ try {
+ _busServiceRegistration.unregister();
+ }
+ catch (Exception e) {
+ if (_logger.isWarnEnabled()) {
+ _logger.warn(
+ "Unable to unregister CXF bus service registration " +
+ _busServiceRegistration);
+ }
+ }
+
+ try {
+ _servletServiceRegistration.unregister();
+ }
+ catch (Exception e) {
+ if (_logger.isWarnEnabled()) {
+ _logger.warn(
+ "Unable to unregister servlet service registration " +
+ _servletServiceRegistration);
+ }
+ }
+
+ try {
+ _servletContextHelperServiceRegistration.unregister();
+ }
+ catch (Exception e) {
+ if (_logger.isWarnEnabled()) {
+ _logger.warn(
+ "Unable to unregister servlet context helper service " +
+ "registration " +
+ _servletContextHelperServiceRegistration);
+ }
+ }
+ }
+
+ private static final Logger _logger = LoggerFactory.getLogger(
+ ServicesRegistrator.class);
+
+ private final BundleContext _bundleContext;
+ private ServiceRegistration<Bus> _busServiceRegistration;
+ private final Map<Class<?>, Object> _extensions = new HashMap<>();
+ private final Map<String, Object> _properties;
+ private ServiceRegistration<ServletContextHelper>
+ _servletContextHelperServiceRegistration;
+ private ServiceRegistration<Servlet> _servletServiceRegistration;
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java b/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java
new file mode 100644
index 0000000..df299db
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java
@@ -0,0 +1,47 @@
+/**
+ * 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.cxf.common.activator;
+
+import com.liferay.portal.remote.cxf.common.ServicesRegistrator;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+import java.util.HashMap;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+public class CXFEndpointPublisherActivator implements BundleActivator {
+
+ private ServicesRegistrator _servicesRegistrator;
+
+ @Override
+ public void start(BundleContext bundleContext) throws Exception {
+ HashMap<String, Object> properties = new HashMap<String, Object>() {{
+ put("contextPath", "/cxf");
+ }};
+
+ _servicesRegistrator = new ServicesRegistrator(
+ bundleContext, properties);
+
+ _servicesRegistrator.start();
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ _servicesRegistrator.stop();
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language.properties
new file mode 100644
index 0000000..12dd09d
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ar.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ar.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ar.properties
new file mode 100644
index 0000000..1e2a617
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ar.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=\u0646\u0642\u0627\u0637 \u0627\u0644\u0646\u0647\u0627\u064a\u0629 CXF (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_bg.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_bg.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_bg.properties
new file mode 100644
index 0000000..64113eb
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_bg.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF \u043a\u0440\u0430\u0439\u043d\u0438 \u0442\u043e\u0447\u043a\u0438 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ca.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ca.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ca.properties
new file mode 100644
index 0000000..d434f12
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ca.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=Punts finals CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_cs.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_cs.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_cs.properties
new file mode 100644
index 0000000..d6e9761
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_cs.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF koncov� body (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_da.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_da.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_da.properties
new file mode 100644
index 0000000..c97e7ad
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_da.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF slutpunkter (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_de.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_de.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_de.properties
new file mode 100644
index 0000000..12dd09d
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_de.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_el.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_el.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_el.properties
new file mode 100644
index 0000000..62c364f
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_el.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF \u03b1\u03c0\u03bf\u03bb\u03ae\u03be\u03b5\u03b9\u03c2 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_en.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_en.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_en.properties
new file mode 100644
index 0000000..12dd09d
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_en.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_es.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_es.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_es.properties
new file mode 100644
index 0000000..a7da044
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_es.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=Puntos finales CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_et.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_et.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_et.properties
new file mode 100644
index 0000000..50810e0
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_et.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF l�pp (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_eu.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_eu.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_eu.properties
new file mode 100644
index 0000000..b79f51c
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_eu.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fa.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fa.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fa.properties
new file mode 100644
index 0000000..a344c54
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fa.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=\u0646\u0642\u0637\u0647 \u067e\u0627\u06cc\u0627\u0646\u06cc CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fi.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fi.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fi.properties
new file mode 100644
index 0000000..513c688
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fi.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF-p��tepisteet
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fr.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fr.properties
new file mode 100644
index 0000000..079f60e
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fr.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=Extr�mit�s CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_gl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_gl.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_gl.properties
new file mode 100644
index 0000000..b79f51c
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_gl.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hi_IN.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hi_IN.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hi_IN.properties
new file mode 100644
index 0000000..bce7eb1
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hi_IN.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF \u0905\u0902\u0924\u093f\u092e\u092c\u093f\u0902\u0926\u0941 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hr.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hr.properties
new file mode 100644
index 0000000..b79f51c
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hr.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hu.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hu.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hu.properties
new file mode 100644
index 0000000..f529f91
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hu.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF v�gpontok
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_in.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_in.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_in.properties
new file mode 100644
index 0000000..6b2166f
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_in.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF Endpoint (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_it.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_it.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_it.properties
new file mode 100644
index 0000000..9792228
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_it.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=Endpoint CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_iw.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_iw.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_iw.properties
new file mode 100644
index 0000000..709f990
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_iw.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=\u05e0\u05e7\u05d5\u05d3\u05d5\u05ea \u05e7\u05e6\u05d4 CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ja.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ja.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ja.properties
new file mode 100644
index 0000000..6227a00
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ja.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF \u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ko.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ko.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ko.properties
new file mode 100644
index 0000000..0ec8433
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ko.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF \ub05d\uc810 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lo.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lo.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lo.properties
new file mode 100644
index 0000000..b79f51c
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lo.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lt.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lt.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lt.properties
new file mode 100644
index 0000000..c22d773
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lt.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF importas galiniai punktai (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nb.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nb.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nb.properties
new file mode 100644
index 0000000..034a23f
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nb.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF endepunkt (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl.properties
new file mode 100644
index 0000000..eef886c
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF-endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl_BE.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl_BE.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl_BE.properties
new file mode 100644
index 0000000..f517012
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl_BE.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF eindpunten (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pl.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pl.properties
new file mode 100644
index 0000000..f755610
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pl.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF'A ko\u0144cowe (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_BR.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_BR.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_BR.properties
new file mode 100644
index 0000000..bd24788
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_BR.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=Terminais CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_PT.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_PT.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_PT.properties
new file mode 100644
index 0000000..bd24788
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_PT.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=Terminais CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ro.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ro.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ro.properties
new file mode 100644
index 0000000..ae28733
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ro.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF obiective (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ru.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ru.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ru.properties
new file mode 100644
index 0000000..6e3bb27
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ru.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF \u043a\u043e\u043d\u0435\u0447\u043d\u044b\u0435 \u0442\u043e\u0447\u043a\u0438 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sk.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sk.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sk.properties
new file mode 100644
index 0000000..d6e9761
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sk.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF koncov� body (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sl.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sl.properties
new file mode 100644
index 0000000..2706ade
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sl.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=Kon\u010dne to\u010dke CXF (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS.properties
new file mode 100644
index 0000000..b79f51c
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS_latin.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS_latin.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS_latin.properties
new file mode 100644
index 0000000..b79f51c
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS_latin.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sv.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sv.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sv.properties
new file mode 100644
index 0000000..ccbfe3c
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sv.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF �ndpunkter (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_tr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_tr.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_tr.properties
new file mode 100644
index 0000000..ecc09cc
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_tr.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF biti\u015f noktalar\u0131 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_uk.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_uk.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_uk.properties
new file mode 100644
index 0000000..8de2199
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_uk.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=\u0426\u044c\u043e\u0433\u043e \u041e\u041f\u0418\u0421\u0423 \u043a\u0456\u043d\u0446\u0435\u0432\u0438\u0445 \u0442\u043e\u0447\u043e\u043a (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_vi.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_vi.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_vi.properties
new file mode 100644
index 0000000..2bfeb99
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_vi.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=Hai \u0111i\u1ec3m cu\u1ed1i CXF (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_CN.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_CN.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_CN.properties
new file mode 100644
index 0000000..9b60693
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_CN.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF\u7ec8\u7ed3\u70b9
\ No newline at end of file
[06/50] [abbrv] aries-jax-rs-whiteboard git commit: Update example to
affect standalone service
Posted by cs...@apache.org.
Update example to affect standalone service
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/c369d16a
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/c369d16a
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/c369d16a
Branch: refs/heads/master
Commit: c369d16af0a3d7861467d972d81a06b5ea7ea8d2
Parents: ccba122
Author: Carlos Sierra <ca...@liferay.com>
Authored: Tue Oct 11 19:04:06 2016 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Oct 11 19:04:06 2016 +0200
----------------------------------------------------------------------
.../main/java/com/liferay/portal/rest/example/ExampleAddon.java | 2 +-
.../java/com/liferay/portal/rest/example/ExampleFilter.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c369d16a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
index 206aebc..5431e76 100644
--- a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
+++ b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
@@ -28,7 +28,7 @@ import javax.ws.rs.core.UriInfo;
*/
@Component(
immediate = true,
- property = "osgi.jaxrs.resource.base=/example-addon",
+ property = "osgi.jaxrs.resource.base=/examples/example-addon",
service = ExampleAddon.class
)
public class ExampleAddon {
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c369d16a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
index f5fdde3..c2e89ac 100644
--- a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
+++ b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
@@ -26,7 +26,10 @@ import java.io.IOException;
*/
@Component(
immediate = true,
- property = "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)"
+ property = {
+ "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)",
+ "osgi.jaxrs.filter.base=/examples"
+ }
)
@Provider
public class ExampleFilter implements ContainerRequestFilter {
[12/50] [abbrv] aries-jax-rs-whiteboard git commit: remove
erroneously committed files
Posted by cs...@apache.org.
remove erroneously committed files
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/e399753e
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/e399753e
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/e399753e
Branch: refs/heads/master
Commit: e399753e2a5d190b7ea1310fc0fe0bd33bac0581
Parents: af18d7d
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Aug 2 15:51:56 2016 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Oct 11 13:21:20 2016 -0400
----------------------------------------------------------------------
.../.gradle/1.10/taskArtifacts/cache.properties | 1 -
.../1.10/taskArtifacts/cache.properties.lock | Bin 17 -> 0 bytes
test-cxf/.gradle/1.10/taskArtifacts/fileHashes.bin | Bin 24419 -> 0 bytes
.../.gradle/1.10/taskArtifacts/fileSnapshots.bin | Bin 58073 -> 0 bytes
.../1.10/taskArtifacts/outputFileStates.bin | Bin 18572 -> 0 bytes
.../.gradle/1.10/taskArtifacts/taskArtifacts.bin | Bin 19860 -> 0 bytes
6 files changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/e399753e/test-cxf/.gradle/1.10/taskArtifacts/cache.properties
----------------------------------------------------------------------
diff --git a/test-cxf/.gradle/1.10/taskArtifacts/cache.properties b/test-cxf/.gradle/1.10/taskArtifacts/cache.properties
deleted file mode 100644
index 58b64c1..0000000
--- a/test-cxf/.gradle/1.10/taskArtifacts/cache.properties
+++ /dev/null
@@ -1 +0,0 @@
-#Fri Jun 17 14:37:34 CEST 2016
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/e399753e/test-cxf/.gradle/1.10/taskArtifacts/cache.properties.lock
----------------------------------------------------------------------
diff --git a/test-cxf/.gradle/1.10/taskArtifacts/cache.properties.lock b/test-cxf/.gradle/1.10/taskArtifacts/cache.properties.lock
deleted file mode 100644
index f818c3b..0000000
Binary files a/test-cxf/.gradle/1.10/taskArtifacts/cache.properties.lock and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/e399753e/test-cxf/.gradle/1.10/taskArtifacts/fileHashes.bin
----------------------------------------------------------------------
diff --git a/test-cxf/.gradle/1.10/taskArtifacts/fileHashes.bin b/test-cxf/.gradle/1.10/taskArtifacts/fileHashes.bin
deleted file mode 100644
index 6607d4f..0000000
Binary files a/test-cxf/.gradle/1.10/taskArtifacts/fileHashes.bin and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/e399753e/test-cxf/.gradle/1.10/taskArtifacts/fileSnapshots.bin
----------------------------------------------------------------------
diff --git a/test-cxf/.gradle/1.10/taskArtifacts/fileSnapshots.bin b/test-cxf/.gradle/1.10/taskArtifacts/fileSnapshots.bin
deleted file mode 100644
index e064f49..0000000
Binary files a/test-cxf/.gradle/1.10/taskArtifacts/fileSnapshots.bin and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/e399753e/test-cxf/.gradle/1.10/taskArtifacts/outputFileStates.bin
----------------------------------------------------------------------
diff --git a/test-cxf/.gradle/1.10/taskArtifacts/outputFileStates.bin b/test-cxf/.gradle/1.10/taskArtifacts/outputFileStates.bin
deleted file mode 100644
index 16d3852..0000000
Binary files a/test-cxf/.gradle/1.10/taskArtifacts/outputFileStates.bin and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/e399753e/test-cxf/.gradle/1.10/taskArtifacts/taskArtifacts.bin
----------------------------------------------------------------------
diff --git a/test-cxf/.gradle/1.10/taskArtifacts/taskArtifacts.bin b/test-cxf/.gradle/1.10/taskArtifacts/taskArtifacts.bin
deleted file mode 100644
index 5fbe76b..0000000
Binary files a/test-cxf/.gradle/1.10/taskArtifacts/taskArtifacts.bin and /dev/null differ
[09/50] [abbrv] aries-jax-rs-whiteboard git commit: remove old file
Posted by cs...@apache.org.
remove old file
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/f16ef4a5
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f16ef4a5
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f16ef4a5
Branch: refs/heads/master
Commit: f16ef4a54dc35eddc24105b1a3f951ecb941fdbb
Parents: c567e39
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Aug 2 15:54:36 2016 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Oct 11 13:21:20 2016 -0400
----------------------------------------------------------------------
test-cxf/bin/felix-cache/cache.lock | 0
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f16ef4a5/test-cxf/bin/felix-cache/cache.lock
----------------------------------------------------------------------
diff --git a/test-cxf/bin/felix-cache/cache.lock b/test-cxf/bin/felix-cache/cache.lock
deleted file mode 100644
index e69de29..0000000
[38/50] [abbrv] aries-jax-rs-whiteboard git commit: restructure the
entire build
Posted by cs...@apache.org.
restructure the entire build
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/17c51be0
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/17c51be0
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/17c51be0
Branch: refs/heads/master
Commit: 17c51be07ceae5d93af3c744df27bc1c4dea7801
Parents: 4b36003
Author: Raymond Auge <ra...@liferay.com>
Authored: Mon Oct 31 15:49:01 2016 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Mon Oct 31 15:49:01 2016 -0400
----------------------------------------------------------------------
.gitignore | 5 +-
bndrun/augments.bnd | 82 -
bndrun/cnf/cache/pom-OSGi-MC.query | 1 -
bndrun/cnf/cache/pom-OSGi-MC.query.json | 1 -
bndrun/cnf/cache/pom-OSGi-MC.xml | 2838 ------------------
bndrun/org.apache.aries.jax-rs.example.bndrun | 49 -
bndrun/pom.xml | 81 -
org.apache.aries.jax-rs.bndrun/augments.bnd | 82 +
org.apache.aries.jax-rs.bndrun/pom.xml | 69 +
org.apache.aries.jax-rs.bndrun/run.bndrun | 52 +
org.apache.aries.jax-rs.cxf-common/.gitignore | 2 -
org.apache.aries.jax-rs.cxf-common/bnd.bnd | 55 -
org.apache.aries.jax-rs.cxf-common/pom.xml | 117 -
.../remote/cxf/common/ServicesRegistrator.java | 151 -
.../CXFEndpointPublisherActivator.java | 47 -
.../main/resources/content/Language.properties | 1 -
.../resources/content/Language_ar.properties | 1 -
.../resources/content/Language_bg.properties | 1 -
.../resources/content/Language_ca.properties | 1 -
.../resources/content/Language_cs.properties | 1 -
.../resources/content/Language_da.properties | 1 -
.../resources/content/Language_de.properties | 1 -
.../resources/content/Language_el.properties | 1 -
.../resources/content/Language_en.properties | 1 -
.../resources/content/Language_es.properties | 1 -
.../resources/content/Language_et.properties | 1 -
.../resources/content/Language_eu.properties | 1 -
.../resources/content/Language_fa.properties | 1 -
.../resources/content/Language_fi.properties | 1 -
.../resources/content/Language_fr.properties | 1 -
.../resources/content/Language_gl.properties | 1 -
.../resources/content/Language_hi_IN.properties | 1 -
.../resources/content/Language_hr.properties | 1 -
.../resources/content/Language_hu.properties | 1 -
.../resources/content/Language_in.properties | 1 -
.../resources/content/Language_it.properties | 1 -
.../resources/content/Language_iw.properties | 1 -
.../resources/content/Language_ja.properties | 1 -
.../resources/content/Language_ko.properties | 1 -
.../resources/content/Language_lo.properties | 1 -
.../resources/content/Language_lt.properties | 1 -
.../resources/content/Language_nb.properties | 1 -
.../resources/content/Language_nl.properties | 1 -
.../resources/content/Language_nl_BE.properties | 1 -
.../resources/content/Language_pl.properties | 1 -
.../resources/content/Language_pt_BR.properties | 1 -
.../resources/content/Language_pt_PT.properties | 1 -
.../resources/content/Language_ro.properties | 1 -
.../resources/content/Language_ru.properties | 1 -
.../resources/content/Language_sk.properties | 1 -
.../resources/content/Language_sl.properties | 1 -
.../resources/content/Language_sr_RS.properties | 1 -
.../content/Language_sr_RS_latin.properties | 1 -
.../resources/content/Language_sv.properties | 1 -
.../resources/content/Language_tr.properties | 1 -
.../resources/content/Language_uk.properties | 1 -
.../resources/content/Language_vi.properties | 1 -
.../resources/content/Language_zh_CN.properties | 1 -
.../resources/content/Language_zh_TW.properties | 1 -
org.apache.aries.jax-rs.extender/.gitignore | 2 +
org.apache.aries.jax-rs.extender/bnd.bnd | 58 +
org.apache.aries.jax-rs.extender/pom.xml | 82 +
.../activator/CXFJaxRsBundleActivator.java | 102 +
.../extender/activator/ServicesRegistrator.java | 151 +
.../AddonsServiceTrackerCustomizer.java | 102 +
.../ApplicationServiceTrackerCustomizer.java | 141 +
.../internal/BusServiceTrackerCustomizer.java | 117 +
.../internal/CXFJaxRsServiceRegistrator.java | 148 +
...AndInterceptorsServiceTrackerCustomizer.java | 123 +
.../ServicesServiceTrackerCustomizer.java | 104 +
.../SingletonServiceTrackerCustomizer.java | 159 +
.../integration-test.bndrun | 50 +
.../pom.xml | 64 +
org.apache.aries.jax-rs.tests/bnd.bnd | 5 +
org.apache.aries.jax-rs.tests/pom.xml | 33 +
.../src/main/java/test/JaxrsTest.java | 55 +
.../src/main/java/test/types/TestAddon.java | 41 +
.../main/java/test/types/TestApplication.java | 38 +
.../src/main/java/test/types/TestFilter.java | 37 +
org.apache.aries.rest.extender/.gitignore | 2 -
org.apache.aries.rest.extender/bnd.bnd | 5 -
org.apache.aries.rest.extender/pom.xml | 67 -
.../activator/CXFJaxRsBundleActivator.java | 78 -
.../AddonsServiceTrackerCustomizer.java | 102 -
.../ApplicationServiceTrackerCustomizer.java | 140 -
.../internal/BusServiceTrackerCustomizer.java | 116 -
.../internal/CXFJaxRsServiceRegistrator.java | 148 -
...AndInterceptorsServiceTrackerCustomizer.java | 123 -
.../ServicesServiceTrackerCustomizer.java | 104 -
.../SingletonServiceTrackerCustomizer.java | 159 -
.../main/resources/content/Language.properties | 1 -
.../resources/content/Language_ar.properties | 1 -
.../resources/content/Language_bg.properties | 1 -
.../resources/content/Language_ca.properties | 1 -
.../resources/content/Language_cs.properties | 1 -
.../resources/content/Language_da.properties | 1 -
.../resources/content/Language_de.properties | 1 -
.../resources/content/Language_el.properties | 1 -
.../resources/content/Language_en.properties | 1 -
.../resources/content/Language_es.properties | 1 -
.../resources/content/Language_et.properties | 1 -
.../resources/content/Language_eu.properties | 1 -
.../resources/content/Language_fa.properties | 1 -
.../resources/content/Language_fi.properties | 1 -
.../resources/content/Language_fr.properties | 1 -
.../resources/content/Language_gl.properties | 1 -
.../resources/content/Language_hi_IN.properties | 1 -
.../resources/content/Language_hr.properties | 1 -
.../resources/content/Language_hu.properties | 1 -
.../resources/content/Language_in.properties | 1 -
.../resources/content/Language_it.properties | 1 -
.../resources/content/Language_iw.properties | 1 -
.../resources/content/Language_ja.properties | 1 -
.../resources/content/Language_ko.properties | 1 -
.../resources/content/Language_lo.properties | 1 -
.../resources/content/Language_lt.properties | 1 -
.../resources/content/Language_nb.properties | 1 -
.../resources/content/Language_nl.properties | 1 -
.../resources/content/Language_nl_BE.properties | 1 -
.../resources/content/Language_pl.properties | 1 -
.../resources/content/Language_pt_BR.properties | 1 -
.../resources/content/Language_pt_PT.properties | 1 -
.../resources/content/Language_ro.properties | 1 -
.../resources/content/Language_ru.properties | 1 -
.../resources/content/Language_sk.properties | 1 -
.../resources/content/Language_sl.properties | 1 -
.../resources/content/Language_sr_RS.properties | 1 -
.../content/Language_sr_RS_latin.properties | 1 -
.../resources/content/Language_sv.properties | 1 -
.../resources/content/Language_tr.properties | 1 -
.../resources/content/Language_uk.properties | 1 -
.../resources/content/Language_vi.properties | 1 -
.../resources/content/Language_zh_CN.properties | 1 -
.../resources/content/Language_zh_TW.properties | 1 -
pom.xml | 6 +-
135 files changed, 1822 insertions(+), 4560 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ddda196..99b9097 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,6 @@
**/build/
**/generated/
**/target/
-/bndrun/*.jar
-/bndrun/cnf/
+*/*.jar
+*/cnf/
+*/TEST-*.xml
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/bndrun/augments.bnd
----------------------------------------------------------------------
diff --git a/bndrun/augments.bnd b/bndrun/augments.bnd
deleted file mode 100644
index 4a16ea5..0000000
--- a/bndrun/augments.bnd
+++ /dev/null
@@ -1,82 +0,0 @@
--augment.javax.servlet-api: \
- javax.servlet-api; \
- requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
-
--augment.javax.ws.rs-api: \
- javax.ws.rs-api; \
- requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
-
--augment.org.apache.aries.jax-rs.cxf-common: \
- org.apache.aries.jax-rs.cxf-common; \
- requirement:="osgi.extender;filter:='(&(osgi.extender=aries.jax-rs)(version>=1.0.0)(!(version>=2.0.0)))', \
- osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
-
--augment.org.apache.commons.fileupload: \
- org.apache.commons.fileupload; \
- capability:=" generic.dependency;generic.dependency='commons.fileupload'"
-
--augment.org.apache.felix.gogo.command: \
- org.apache.felix.gogo.command; \
- capability:=" generic.dependency;generic.dependency='gogo.shell.command';version:Version='1.0.0'"; \
- version='1.0.0'
-
--augment.org.apache.felix.gogo.shell: \
- org.apache.felix.gogo.shell; \
- capability:=" osgi.implementation;osgi.implementation='gogo.shell';version:Version='1.0.0'"; \
- requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \
- version='1.0.0'
-
--augment.org.apache.felix.gogo.jline: \
- org.apache.felix.gogo.jline; \
- capability:=" osgi.implementation;osgi.implementation='gogo.jline';version:Version='1.0.0'"; \
- requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \
- version='1.0.0'
-
--augment.org.apache.felix.log: \
- org.apache.felix.log; \
- capability:=" osgi.implementation;osgi.implementation=osgi.log"
-
--augment.org.apache.felix.scr: \
- org.apache.felix.scr; \
- requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
-
--augment.org.eclipse.equinox.coordinator: \
- org.eclipse.equinox.coordinator; \
- capability:=" osgi.service;objectClass=org.osgi.service.coordinator.Coordinator;effective:=active, \
- osgi.implementation;osgi.implementation=osgi.coordinator"
-
--augment.org.eclipse.equinox.event: \
- org.eclipse.equinox.event; \
- capability:=" osgi.service;objectClass=org.osgi.service.event.EventAdmin;effective:=active, \
- osgi.implementation;osgi.implementation=osgi.event"; \
- requirement:="osgi.extender;filter:='(osgi.extender=osgi.component)'"
-
--augment.org.eclipse.equinox.http.jetty: \
- org.eclipse.equinox.http.jetty; \
- capability:=" equinox.module.data;activation.policy=eager, \
- generic.dependency;generic.dependency='osgi.servlet.container';version:Version='1.0.0'"
-
--augment.org.eclipse.equinox.http.servlet: \
- org.eclipse.equinox.http.servlet; \
- capability:=" equinox.module.data;activation.policy=eager"; \
- requirement:="generic.dependency;filter:='(generic.dependency=commons.fileupload)';effective:=active,\
- generic.dependency;filter:='(generic.dependency=osgi.servlet.container)';effective:=active"
-
--augment.org.knopflerfish.bundle.useradmin: \
- org.knopflerfish.bundle.useradmin; \
- capability:=" osgi.service;objectClass:List<String>=org.osgi.service.useradmin.UserAdmin;effective:=active, \
- osgi.implementation;osgi.implementation=osgi.useradmin"
-
--augment.org.osgi.service.event: \
- org.osgi.service.event; \
- requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.event)'"
-
--augment.org.osgi.service.metatype: \
- org.osgi.service.metatype; \
- requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
-
--augment.org.osgi.service.remoteserviceadmin: \
- org.osgi.service.remoteserviceadmin; \
- requirement:="osgi.remoteserviceadmin.distribution;filter:='(configs=*)', \
- osgi.remoteserviceadmin.topology;filter:='(policy=*)', \
- osgi.remoteserviceadmin.discovery;filter:='(protocols=*)'"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/bndrun/cnf/cache/pom-OSGi-MC.query
----------------------------------------------------------------------
diff --git a/bndrun/cnf/cache/pom-OSGi-MC.query b/bndrun/cnf/cache/pom-OSGi-MC.query
deleted file mode 100644
index cea5693..0000000
--- a/bndrun/cnf/cache/pom-OSGi-MC.query
+++ /dev/null
@@ -1 +0,0 @@
-{"responseHeader":{"status":0,"QTime":1,"params":{"spellcheck":"true","fl":"id,g,a,latestVersion,p,ec,repositoryId,text,timestamp,versionCount","sort":"score desc,timestamp desc,g asc,a asc","indent":"off","q":"g:org.osgi AND a:org.osgi.*","spellcheck.count":"5","wt":"json","rows":"10000","version":"2.2"}},"response":{"numFound":56,"start":0,"docs":[{"id":"org.osgi:org.osgi.service.metatype","g":"org.osgi","a":"org.osgi.service.metatype","latestVersion":"1.3.0","repositoryId":"central","p":"jar","timestamp":1439920690000,"versionCount":1,"text":["org.osgi","org.osgi.service.metatype","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.util.position","g":"org.osgi","a":"org.osgi.util.position","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439920658000,"versionCount":1,"text":["org.osgi","org.osgi.util.position","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar
",".jar",".pom"]},{"id":"org.osgi:org.osgi.util.xml","g":"org.osgi","a":"org.osgi.util.xml","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439906999000,"versionCount":1,"text":["org.osgi","org.osgi.util.xml","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.util.tracker","g":"org.osgi","a":"org.osgi.util.tracker","latestVersion":"1.5.1","repositoryId":"central","p":"jar","timestamp":1439906887000,"versionCount":1,"text":["org.osgi","org.osgi.util.tracker","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.util.promise","g":"org.osgi","a":"org.osgi.util.promise","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906825000,"versionCount":1,"text":["org.osgi","org.osgi.util.promise","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org
.osgi.util.measurement","g":"org.osgi","a":"org.osgi.util.measurement","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439906706000,"versionCount":1,"text":["org.osgi","org.osgi.util.measurement","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.util.function","g":"org.osgi","a":"org.osgi.util.function","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906642000,"versionCount":1,"text":["org.osgi","org.osgi.util.function","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.wireadmin","g":"org.osgi","a":"org.osgi.service.wireadmin","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439906593000,"versionCount":1,"text":["org.osgi","org.osgi.service.wireadmin","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osg
i:org.osgi.service.useradmin","g":"org.osgi","a":"org.osgi.service.useradmin","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439906543000,"versionCount":1,"text":["org.osgi","org.osgi.service.useradmin","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.usbinfo","g":"org.osgi","a":"org.osgi.service.usbinfo","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906485000,"versionCount":1,"text":["org.osgi","org.osgi.service.usbinfo","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.upnp","g":"org.osgi","a":"org.osgi.service.upnp","latestVersion":"1.2.0","repositoryId":"central","p":"jar","timestamp":1439906401000,"versionCount":1,"text":["org.osgi","org.osgi.service.upnp","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi
:org.osgi.service.tr069todmt","g":"org.osgi","a":"org.osgi.service.tr069todmt","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439906348000,"versionCount":1,"text":["org.osgi","org.osgi.service.tr069todmt","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.subsystem","g":"org.osgi","a":"org.osgi.service.subsystem","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439906303000,"versionCount":1,"text":["org.osgi","org.osgi.service.subsystem","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.serviceloader","g":"org.osgi","a":"org.osgi.service.serviceloader","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906217000,"versionCount":1,"text":["org.osgi","org.osgi.service.serviceloader","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.j
ar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.serial","g":"org.osgi","a":"org.osgi.service.serial","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906094000,"versionCount":1,"text":["org.osgi","org.osgi.service.serial","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.rest","g":"org.osgi","a":"org.osgi.service.rest","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906029000,"versionCount":1,"text":["org.osgi","org.osgi.service.rest","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.resourcemonitoring","g":"org.osgi","a":"org.osgi.service.resourcemonitoring","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905962000,"versionCount":1,"text":["org.osgi","org.osgi.service.resourcemonitoring","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-j
avadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.resolver","g":"org.osgi","a":"org.osgi.service.resolver","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439905840000,"versionCount":1,"text":["org.osgi","org.osgi.service.resolver","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.repository","g":"org.osgi","a":"org.osgi.service.repository","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439905786000,"versionCount":1,"text":["org.osgi","org.osgi.service.repository","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.remoteserviceadmin","g":"org.osgi","a":"org.osgi.service.remoteserviceadmin","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439905726000,"versionCount":1,"text":["org.osgi","org.osgi.service.remoteserviceadmin","-sourc
es.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.provisioning","g":"org.osgi","a":"org.osgi.service.provisioning","latestVersion":"1.2.0","repositoryId":"central","p":"jar","timestamp":1439905672000,"versionCount":1,"text":["org.osgi","org.osgi.service.provisioning","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.prefs","g":"org.osgi","a":"org.osgi.service.prefs","latestVersion":"1.1.1","repositoryId":"central","p":"jar","timestamp":1439905619000,"versionCount":1,"text":["org.osgi","org.osgi.service.prefs","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.networkadapter","g":"org.osgi","a":"org.osgi.service.networkadapter","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905562000,"versionCount":1,"text":["org.osgi","org.osgi
.service.networkadapter","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.monitor","g":"org.osgi","a":"org.osgi.service.monitor","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905497000,"versionCount":1,"text":["org.osgi","org.osgi.service.monitor","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.metatype.annotations","g":"org.osgi","a":"org.osgi.service.metatype.annotations","latestVersion":"1.3.0","repositoryId":"central","p":"jar","timestamp":1439905442000,"versionCount":1,"text":["org.osgi","org.osgi.service.metatype.annotations","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.log","g":"org.osgi","a":"org.osgi.service.log","latestVersion":"1.3.0","repositoryId":"central","p":"jar","timestamp":1439905251000,"vers
ionCount":1,"text":["org.osgi","org.osgi.service.log","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.jpa","g":"org.osgi","a":"org.osgi.service.jpa","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905187000,"versionCount":1,"text":["org.osgi","org.osgi.service.jpa","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.jndi","g":"org.osgi","a":"org.osgi.service.jndi","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905149000,"versionCount":1,"text":["org.osgi","org.osgi.service.jndi","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.jdbc","g":"org.osgi","a":"org.osgi.service.jdbc","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905081000,"versionCount":1,"text":["org.osgi
","org.osgi.service.jdbc","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.io","g":"org.osgi","a":"org.osgi.service.io","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905026000,"versionCount":1,"text":["org.osgi","org.osgi.service.io","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.http.whiteboard","g":"org.osgi","a":"org.osgi.service.http.whiteboard","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439904950000,"versionCount":1,"text":["org.osgi","org.osgi.service.http.whiteboard","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.http","g":"org.osgi","a":"org.osgi.service.http","latestVersion":"1.2.1","repositoryId":"central","p":"jar","timestamp":1439904873000,"versionCount":1,"text":["org.os
gi","org.osgi.service.http","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.event","g":"org.osgi","a":"org.osgi.service.event","latestVersion":"1.3.1","repositoryId":"central","p":"jar","timestamp":1439904828000,"versionCount":1,"text":["org.osgi","org.osgi.service.event","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.enocean","g":"org.osgi","a":"org.osgi.service.enocean","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439904772000,"versionCount":1,"text":["org.osgi","org.osgi.service.enocean","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.dmt","g":"org.osgi","a":"org.osgi.service.dmt","latestVersion":"2.0.1","repositoryId":"central","p":"jar","timestamp":1439904722000,"versionCount":1,"text":["org.osgi","org.osgi.s
ervice.dmt","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.device","g":"org.osgi","a":"org.osgi.service.device","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439904682000,"versionCount":1,"text":["org.osgi","org.osgi.service.device","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.deploymentadmin","g":"org.osgi","a":"org.osgi.service.deploymentadmin","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439904607000,"versionCount":1,"text":["org.osgi","org.osgi.service.deploymentadmin","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.dal.functions","g":"org.osgi","a":"org.osgi.service.dal.functions","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439904560000,"versionCount":1
,"text":["org.osgi","org.osgi.service.dal.functions","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.dal","g":"org.osgi","a":"org.osgi.service.dal","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439904518000,"versionCount":1,"text":["org.osgi","org.osgi.service.dal","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.coordinator","g":"org.osgi","a":"org.osgi.service.coordinator","latestVersion":"1.0.2","repositoryId":"central","p":"jar","timestamp":1439904439000,"versionCount":1,"text":["org.osgi","org.osgi.service.coordinator","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.component.annotations","g":"org.osgi","a":"org.osgi.service.component.annotations","latestVersion":"1.3.0","repositoryId":"central","p":"jar","times
tamp":1439904362000,"versionCount":1,"text":["org.osgi","org.osgi.service.component.annotations","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.component","g":"org.osgi","a":"org.osgi.service.component","latestVersion":"1.3.0","repositoryId":"central","p":"jar","timestamp":1439904241000,"versionCount":1,"text":["org.osgi","org.osgi.service.component","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.cm","g":"org.osgi","a":"org.osgi.service.cm","latestVersion":"1.5.0","repositoryId":"central","p":"jar","timestamp":1439904190000,"versionCount":1,"text":["org.osgi","org.osgi.service.cm","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.blueprint","g":"org.osgi","a":"org.osgi.service.blueprint","latestVersion":"1.0.2","repositoryId":"central","p":"
jar","timestamp":1439904150000,"versionCount":1,"text":["org.osgi","org.osgi.service.blueprint","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.async","g":"org.osgi","a":"org.osgi.service.async","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439904092000,"versionCount":1,"text":["org.osgi","org.osgi.service.async","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.application","g":"org.osgi","a":"org.osgi.service.application","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439904057000,"versionCount":1,"text":["org.osgi","org.osgi.service.application","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.namespace.service","g":"org.osgi","a":"org.osgi.namespace.service","latestVersion":"1.0.0","repositoryId":"
central","p":"jar","timestamp":1439904004000,"versionCount":1,"text":["org.osgi","org.osgi.namespace.service","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.namespace.implementation","g":"org.osgi","a":"org.osgi.namespace.implementation","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439903963000,"versionCount":1,"text":["org.osgi","org.osgi.namespace.implementation","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.namespace.extender","g":"org.osgi","a":"org.osgi.namespace.extender","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439903903000,"versionCount":1,"text":["org.osgi","org.osgi.namespace.extender","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.namespace.contract","g":"org.osgi","a":"org.osgi.namespace.cont
ract","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439903860000,"versionCount":1,"text":["org.osgi","org.osgi.namespace.contract","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.jmx","g":"org.osgi","a":"org.osgi.jmx","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439903815000,"versionCount":1,"text":["org.osgi","org.osgi.jmx","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.application","g":"org.osgi","a":"org.osgi.application","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439903772000,"versionCount":1,"text":["org.osgi","org.osgi.application","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.core","g":"org.osgi","a":"org.osgi.core","latestVersion":"6.0.0","repositoryId":"central","p":"jar",
"timestamp":1406692071000,"versionCount":8,"text":["org.osgi","org.osgi.core","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.annotation","g":"org.osgi","a":"org.osgi.annotation","latestVersion":"6.0.0","repositoryId":"central","p":"jar","timestamp":1406692049000,"versionCount":1,"text":["org.osgi","org.osgi.annotation","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.compendium","g":"org.osgi","a":"org.osgi.compendium","latestVersion":"5.0.0","repositoryId":"central","p":"jar","timestamp":1380053541000,"versionCount":7,"text":["org.osgi","org.osgi.compendium","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.enterprise","g":"org.osgi","a":"org.osgi.enterprise","latestVersion":"5.0.0","repositoryId":"central","p":"jar","timestamp":1339673704000,"versionCount":2,"text"
:["org.osgi","org.osgi.enterprise","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]}]},"spellcheck":{"suggestions":[]}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/bndrun/cnf/cache/pom-OSGi-MC.query.json
----------------------------------------------------------------------
diff --git a/bndrun/cnf/cache/pom-OSGi-MC.query.json b/bndrun/cnf/cache/pom-OSGi-MC.query.json
deleted file mode 100644
index 1a72d06..0000000
--- a/bndrun/cnf/cache/pom-OSGi-MC.query.json
+++ /dev/null
@@ -1 +0,0 @@
-{"modified":1477433605000,"sha_1":"3F59264D7D63B9C86AD23930FC89ED87734944D0","sha_256":"AE635498CFD9A54F53A725AE0F6643FF1DA116603A85EFBCE36A3E538D67805B","uri":"http://search.maven.org/solrsearch/select?q=g:org.osgi+AND+a:org.osgi.*&rows=10000"}
\ No newline at end of file
[36/50] [abbrv] aries-jax-rs-whiteboard git commit: restructure the
entire build
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/bndrun/org.apache.aries.jax-rs.example.bndrun
----------------------------------------------------------------------
diff --git a/bndrun/org.apache.aries.jax-rs.example.bndrun b/bndrun/org.apache.aries.jax-rs.example.bndrun
deleted file mode 100644
index 367dfc7..0000000
--- a/bndrun/org.apache.aries.jax-rs.example.bndrun
+++ /dev/null
@@ -1,49 +0,0 @@
--standalone:
--include: ${.}/augments.bnd
--resourceonly: true
-
--plugin.A.pom.repo = \
- aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
- snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \
- releaseUrls=https://repo1.maven.org/maven2/; \
- pom=${.}/pom.xml; \
- name=pom.repo; \
- location=${.}/target/cached.xml
-
--runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.cxf-common)',\
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.example)',\
- osgi.identity;filter:='(osgi.identity=org.apache.aries.rest.extender)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)'
-
--runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
--runbundles: \
- log4j;version='[1.2.17,1.2.18)',\
- org.apache.aries.jax-rs.cxf-common;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax-rs.example;version='[1.0.0,1.0.1)',\
- org.apache.aries.rest.extender;version='[1.0.0,1.0.1)',\
- org.apache.felix.bundlerepository;version='[1.6.0,1.6.1)',\
- org.apache.felix.gogo.command;version='[1.0.0,1.0.1)',\
- org.apache.felix.gogo.jline;version='[1.0.0,1.0.1)',\
- org.apache.felix.gogo.runtime;version='[1.0.0,1.0.1)',\
- org.apache.felix.http.jetty;version='[3.2.0,3.2.1)',\
- org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
- org.apache.felix.scr;version='[2.0.2,2.0.3)',\
- org.eclipse.equinox.event;version='[1.3.100,1.3.101)',\
- org.eclipse.equinox.metatype;version='[1.4.100,1.4.101)',\
- org.jline;version='[3.0.0,3.0.1)',\
- org.objectweb.asm;version='[5.0.4,5.0.5)',\
- org.osgi.compendium;version='[4.1.0,4.1.1)',\
- org.osgi.service.event;version='[1.3.1,1.3.2)',\
- org.osgi.service.http.whiteboard;version='[1.0.0,1.0.1)',\
- org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
- slf4j.api;version='[1.7.21,1.7.22)',\
- slf4j.log4j12;version='[1.6.1,1.6.2)'
-
--runee: JavaSE-1.8
--resolve.effective: resolve, active
--runproperties.eqnx: \
- osgi.console.enable.builtin=false, \
- osgi.console=, \
- org.osgi.service.http.port=8080
--runsystemcapabilities.dflt: ${native_capability}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/bndrun/pom.xml
----------------------------------------------------------------------
diff --git a/bndrun/pom.xml b/bndrun/pom.xml
deleted file mode 100644
index df45732..0000000
--- a/bndrun/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.apache.aries.jax-rs.example.bndrun</artifactId>
-
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-export-maven-plugin</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- <configuration>
- <failOnChanges>false</failOnChanges>
- <resolve>true</resolve>
- <bndruns>
- <bndrun>org.apache.aries.jax-rs.example.bndrun</bndrun>
- </bndruns>
- <targetDir>.</targetDir>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>export</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs.cxf-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs.example</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.rest.extender</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>3.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.command</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.jline</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.pom.distro</artifactId>
- <version>2.0.0</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.bndrun/augments.bnd
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.bndrun/augments.bnd b/org.apache.aries.jax-rs.bndrun/augments.bnd
new file mode 100644
index 0000000..4a16ea5
--- /dev/null
+++ b/org.apache.aries.jax-rs.bndrun/augments.bnd
@@ -0,0 +1,82 @@
+-augment.javax.servlet-api: \
+ javax.servlet-api; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
+
+-augment.javax.ws.rs-api: \
+ javax.ws.rs-api; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
+
+-augment.org.apache.aries.jax-rs.cxf-common: \
+ org.apache.aries.jax-rs.cxf-common; \
+ requirement:="osgi.extender;filter:='(&(osgi.extender=aries.jax-rs)(version>=1.0.0)(!(version>=2.0.0)))', \
+ osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
+
+-augment.org.apache.commons.fileupload: \
+ org.apache.commons.fileupload; \
+ capability:=" generic.dependency;generic.dependency='commons.fileupload'"
+
+-augment.org.apache.felix.gogo.command: \
+ org.apache.felix.gogo.command; \
+ capability:=" generic.dependency;generic.dependency='gogo.shell.command';version:Version='1.0.0'"; \
+ version='1.0.0'
+
+-augment.org.apache.felix.gogo.shell: \
+ org.apache.felix.gogo.shell; \
+ capability:=" osgi.implementation;osgi.implementation='gogo.shell';version:Version='1.0.0'"; \
+ requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \
+ version='1.0.0'
+
+-augment.org.apache.felix.gogo.jline: \
+ org.apache.felix.gogo.jline; \
+ capability:=" osgi.implementation;osgi.implementation='gogo.jline';version:Version='1.0.0'"; \
+ requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \
+ version='1.0.0'
+
+-augment.org.apache.felix.log: \
+ org.apache.felix.log; \
+ capability:=" osgi.implementation;osgi.implementation=osgi.log"
+
+-augment.org.apache.felix.scr: \
+ org.apache.felix.scr; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
+
+-augment.org.eclipse.equinox.coordinator: \
+ org.eclipse.equinox.coordinator; \
+ capability:=" osgi.service;objectClass=org.osgi.service.coordinator.Coordinator;effective:=active, \
+ osgi.implementation;osgi.implementation=osgi.coordinator"
+
+-augment.org.eclipse.equinox.event: \
+ org.eclipse.equinox.event; \
+ capability:=" osgi.service;objectClass=org.osgi.service.event.EventAdmin;effective:=active, \
+ osgi.implementation;osgi.implementation=osgi.event"; \
+ requirement:="osgi.extender;filter:='(osgi.extender=osgi.component)'"
+
+-augment.org.eclipse.equinox.http.jetty: \
+ org.eclipse.equinox.http.jetty; \
+ capability:=" equinox.module.data;activation.policy=eager, \
+ generic.dependency;generic.dependency='osgi.servlet.container';version:Version='1.0.0'"
+
+-augment.org.eclipse.equinox.http.servlet: \
+ org.eclipse.equinox.http.servlet; \
+ capability:=" equinox.module.data;activation.policy=eager"; \
+ requirement:="generic.dependency;filter:='(generic.dependency=commons.fileupload)';effective:=active,\
+ generic.dependency;filter:='(generic.dependency=osgi.servlet.container)';effective:=active"
+
+-augment.org.knopflerfish.bundle.useradmin: \
+ org.knopflerfish.bundle.useradmin; \
+ capability:=" osgi.service;objectClass:List<String>=org.osgi.service.useradmin.UserAdmin;effective:=active, \
+ osgi.implementation;osgi.implementation=osgi.useradmin"
+
+-augment.org.osgi.service.event: \
+ org.osgi.service.event; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.event)'"
+
+-augment.org.osgi.service.metatype: \
+ org.osgi.service.metatype; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
+
+-augment.org.osgi.service.remoteserviceadmin: \
+ org.osgi.service.remoteserviceadmin; \
+ requirement:="osgi.remoteserviceadmin.distribution;filter:='(configs=*)', \
+ osgi.remoteserviceadmin.topology;filter:='(policy=*)', \
+ osgi.remoteserviceadmin.discovery;filter:='(protocols=*)'"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.bndrun/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.bndrun/pom.xml b/org.apache.aries.jax-rs.bndrun/pom.xml
new file mode 100644
index 0000000..eecbde1
--- /dev/null
+++ b/org.apache.aries.jax-rs.bndrun/pom.xml
@@ -0,0 +1,69 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.aries.jax-rs.bndrun</artifactId>
+
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-export-maven-plugin</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <resolve>true</resolve>
+ <bndruns>
+ <bndrun>run.bndrun</bndrun>
+ </bndruns>
+ <targetDir>.</targetDir>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs.example</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs.extender</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.command</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.jline</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.pom.distro</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.bndrun/run.bndrun
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.bndrun/run.bndrun b/org.apache.aries.jax-rs.bndrun/run.bndrun
new file mode 100644
index 0000000..248a200
--- /dev/null
+++ b/org.apache.aries.jax-rs.bndrun/run.bndrun
@@ -0,0 +1,52 @@
+-standalone:
+-include: ${.}/augments.bnd
+-resourceonly: true
+
+-plugin.A.pom.repo = \
+ aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
+ snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \
+ releaseUrls=https://repo1.maven.org/maven2/; \
+ pom=${.}/pom.xml; \
+ name=pom.repo; \
+ location=${.}/target/cached.xml
+
+-runrequires: \
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.example)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.extender)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)'
+
+-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
+-runbundles: \
+ javax.annotation-api;version='[1.2.0,1.2.1)',\
+ javax.json-api;version='[1.0.0,1.0.1)',\
+ javax.ws.rs-api;version='[2.0.1,2.0.2)',\
+ log4j;version='[1.2.17,1.2.18)',\
+ org.apache.aries.jax-rs.example;version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax-rs.extender;version='[1.0.0,1.0.1)',\
+ org.apache.felix.bundlerepository;version='[1.6.0,1.6.1)',\
+ org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
+ org.apache.felix.gogo.command;version='[1.0.0,1.0.1)',\
+ org.apache.felix.gogo.jline;version='[1.0.0,1.0.1)',\
+ org.apache.felix.gogo.runtime;version='[1.0.0,1.0.1)',\
+ org.apache.felix.http.api;version='[3.0.0,3.0.1)',\
+ org.apache.felix.http.jetty;version='[3.4.0,3.4.1)',\
+ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.felix.scr;version='[2.0.2,2.0.3)',\
+ org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
+ org.eclipse.equinox.event;version='[1.3.100,1.3.101)',\
+ org.eclipse.equinox.metatype;version='[1.4.100,1.4.101)',\
+ org.jline;version='[3.0.0,3.0.1)',\
+ org.objectweb.asm;version='[5.0.4,5.0.5)',\
+ org.osgi.compendium;version='[4.1.0,4.1.1)',\
+ org.osgi.service.event;version='[1.3.1,1.3.2)',\
+ org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
+ slf4j.api;version='[1.7.21,1.7.22)',\
+ slf4j.log4j12;version='[1.6.1,1.6.2)'
+
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+-runproperties.eqnx: \
+ osgi.console.enable.builtin=false, \
+ osgi.console=, \
+ org.osgi.service.http.port=8080
+-runsystemcapabilities.dflt: ${native_capability}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/.gitignore
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/.gitignore b/org.apache.aries.jax-rs.cxf-common/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/org.apache.aries.jax-rs.cxf-common/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build/
-/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/bnd.bnd
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/bnd.bnd b/org.apache.aries.jax-rs.cxf-common/bnd.bnd
deleted file mode 100644
index 53dfced..0000000
--- a/org.apache.aries.jax-rs.cxf-common/bnd.bnd
+++ /dev/null
@@ -1,55 +0,0 @@
-Bundle-Activator: com.liferay.portal.remote.cxf.common.activator.CXFEndpointPublisherActivator
--exportcontents:\
- javax.json.*,\
- javax.ws.rs.*,\
- javax.wsdl.*,\
- org.apache.cxf.*,\
- org.apache.ws.commons.schema.*
-Import-Package:\
- !com.sun.*,\
- !com.ctc.wstx.*,\
- !javax.validation.*,\
- !net.sf.cglib.proxy.*,\
- !org.apache.abdera.*,\
- !org.apache.aries.*,\
- !org.apache.cxf.*,\
- !org.apache.neethi.*,\
- !org.apache.velocity.*,\
- !org.apache.xerces.*,\
- !org.apache.xml.resolver.*,\
- !org.apache.xmlbeans.*,\
- !org.codehaus.stax2.*,\
- !org.dom4j.*,\
- !org.junit.*,\
- !org.jvnet.fastinfoset.*,\
- !org.jvnet.staxex.*,\
- !org.osgi.service.blueprint.*,\
- !org.relaxng.datatype.*,\
- !org.slf4j.spi.*,\
- !org.springframework.*,\
- *
-Provide-Capability:\
- osgi.contract;\
- osgi.contract=JavaJAXRS;\
- uses:="javax.ws.rs,javax.ws.rs.core,javax.ws.rs.client,javax.ws.rs.container,javax.ws.rs.ext";\
- version:Version=2,\
- osgi.contract;\
- osgi.contract=JavaJSONP;\
- uses:="javax.json,javax.json.spi,javax.json.stream";\
- version:Version=1
--includeresource:\
- lib/cxf-core.jar=cxf-core-*.jar;lib:=true,\
- lib/cxf-rt-bindings-soap.jar=cxf-rt-bindings-soap-*.jar;lib:=true,\
- lib/cxf-rt-databinding-jaxb.jar=cxf-rt-databinding-jaxb-*.jar;lib:=true,\
- lib/cxf-rt-frontend-jaxrs.jar=cxf-rt-frontend-jaxrs-*.jar;lib:=true,\
- lib/cxf-rt-rs-extension-providers.jar=cxf-rt-rs-extension-providers-*.jar;lib:=true,\
- lib/cxf-rt-transports-http.jar=cxf-rt-transports-http-*.jar;lib:=true,\
- lib/cxf-rt-wsdl.jar=cxf-rt-wsdl-*.jar;lib:=true,\
- lib/cxf-tools-common.jar=cxf-tools-common-*.jar;lib:=true,\
- lib/cxf-tools-validator.jar=cxf-tools-validator-*.jar;lib:=true,\
- lib/javax.annotation-api.jar=javax.annotation-api-*.jar;lib:=true,\
- lib/javax.json-api.jar=javax.json-api-*.jar;lib:=true,\
- lib/javax.ws.rs-api.jar=javax.ws.rs-api-*.jar;lib:=true,\
- lib/jettison.jar=jettison-*.jar;lib:=true,\
- lib/wsdl4j.jar=wsdl4j-*.jar;lib:=true,\
- lib/xmlschema-core.jar=xmlschema-core-*.jar;lib:=true
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/pom.xml b/org.apache.aries.jax-rs.cxf-common/pom.xml
deleted file mode 100644
index 747c0a8..0000000
--- a/org.apache.aries.jax-rs.cxf-common/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.aries.jax-rs.cxf-common</artifactId>
- <packaging>jar</packaging>
- <description>Aries Repackaging of CXF Common Jars</description>
- <dependencies>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-wsdl</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-validator</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>3.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3.8</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <version>3.1.4</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>6.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.http.whiteboard</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.3</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java b/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
deleted file mode 100644
index 8169e78..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
+++ /dev/null
@@ -1,151 +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.cxf.common;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusFactory;
-import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.http.context.ServletContextHelper;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.Servlet;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class ServicesRegistrator {
-
- public ServicesRegistrator(
- BundleContext bundleContext, Map<String, Object> properties) {
-
- _bundleContext = bundleContext;
-
- _properties = properties;
- }
-
- public void start() {
- Dictionary<String, Object> properties = new Hashtable<>();
-
- Object contextPathObject = _properties.get("contextPath");
-
- String contextPath = contextPathObject.toString();
-
- String contextName = contextPath.substring(1);
-
- contextName = contextName.replace("/", ".");
-
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME,
- contextName);
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
- contextPath);
-
- _servletContextHelperServiceRegistration =
- _bundleContext.registerService(
- ServletContextHelper.class,
- new ServletContextHelper(_bundleContext.getBundle()) {
- },
- properties);
-
- CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet();
-
- CXFBusFactory cxfBusFactory =
- (CXFBusFactory) CXFBusFactory.newInstance(
- CXFBusFactory.class.getName());
-
- Bus bus = cxfBusFactory.createBus();
-
- properties = new Hashtable<>();
-
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
- "(osgi.http.whiteboard.context.name=" + contextName + ")");
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME,
- CXFNonSpringServlet.class.getName());
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/*");
-
- cxfNonSpringServlet.setBus(bus);
-
- _servletServiceRegistration = _bundleContext.registerService(
- Servlet.class, cxfNonSpringServlet, properties);
-
- properties = new Hashtable<>();
-
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
- contextPath);
-
- _busServiceRegistration = _bundleContext.registerService(
- Bus.class, bus, properties);
- }
-
- public void stop() {
- try {
- _busServiceRegistration.unregister();
- }
- catch (Exception e) {
- if (_logger.isWarnEnabled()) {
- _logger.warn(
- "Unable to unregister CXF bus service registration " +
- _busServiceRegistration);
- }
- }
-
- try {
- _servletServiceRegistration.unregister();
- }
- catch (Exception e) {
- if (_logger.isWarnEnabled()) {
- _logger.warn(
- "Unable to unregister servlet service registration " +
- _servletServiceRegistration);
- }
- }
-
- try {
- _servletContextHelperServiceRegistration.unregister();
- }
- catch (Exception e) {
- if (_logger.isWarnEnabled()) {
- _logger.warn(
- "Unable to unregister servlet context helper service " +
- "registration " +
- _servletContextHelperServiceRegistration);
- }
- }
- }
-
- private static final Logger _logger = LoggerFactory.getLogger(
- ServicesRegistrator.class);
-
- private final BundleContext _bundleContext;
- private ServiceRegistration<Bus> _busServiceRegistration;
- private final Map<String, Object> _properties;
- private ServiceRegistration<ServletContextHelper>
- _servletContextHelperServiceRegistration;
- private ServiceRegistration<Servlet> _servletServiceRegistration;
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java b/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java
deleted file mode 100644
index df299db..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java
+++ /dev/null
@@ -1,47 +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.cxf.common.activator;
-
-import com.liferay.portal.remote.cxf.common.ServicesRegistrator;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-import java.util.HashMap;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class CXFEndpointPublisherActivator implements BundleActivator {
-
- private ServicesRegistrator _servicesRegistrator;
-
- @Override
- public void start(BundleContext bundleContext) throws Exception {
- HashMap<String, Object> properties = new HashMap<String, Object>() {{
- put("contextPath", "/cxf");
- }};
-
- _servicesRegistrator = new ServicesRegistrator(
- bundleContext, properties);
-
- _servicesRegistrator.start();
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- _servicesRegistrator.stop();
- }
-}
-
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language.properties
deleted file mode 100644
index 12dd09d..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ar.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ar.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ar.properties
deleted file mode 100644
index 1e2a617..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ar.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u0646\u0642\u0627\u0637 \u0627\u0644\u0646\u0647\u0627\u064a\u0629 CXF (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_bg.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_bg.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_bg.properties
deleted file mode 100644
index 64113eb..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_bg.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u043a\u0440\u0430\u0439\u043d\u0438 \u0442\u043e\u0447\u043a\u0438 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ca.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ca.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ca.properties
deleted file mode 100644
index d434f12..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ca.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Punts finals CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_cs.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_cs.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_cs.properties
deleted file mode 100644
index d6e9761..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_cs.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF koncov� body (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_da.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_da.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_da.properties
deleted file mode 100644
index c97e7ad..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_da.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF slutpunkter (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_de.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_de.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_de.properties
deleted file mode 100644
index 12dd09d..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_de.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_el.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_el.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_el.properties
deleted file mode 100644
index 62c364f..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_el.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u03b1\u03c0\u03bf\u03bb\u03ae\u03be\u03b5\u03b9\u03c2 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_en.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_en.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_en.properties
deleted file mode 100644
index 12dd09d..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_en.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_es.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_es.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_es.properties
deleted file mode 100644
index a7da044..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_es.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Puntos finales CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_et.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_et.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_et.properties
deleted file mode 100644
index 50810e0..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_et.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF l�pp (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_eu.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_eu.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_eu.properties
deleted file mode 100644
index b79f51c..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_eu.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fa.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fa.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fa.properties
deleted file mode 100644
index a344c54..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fa.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u0646\u0642\u0637\u0647 \u067e\u0627\u06cc\u0627\u0646\u06cc CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fi.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fi.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fi.properties
deleted file mode 100644
index 513c688..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fi.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF-p��tepisteet
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fr.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fr.properties
deleted file mode 100644
index 079f60e..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_fr.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Extr�mit�s CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_gl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_gl.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_gl.properties
deleted file mode 100644
index b79f51c..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_gl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hi_IN.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hi_IN.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hi_IN.properties
deleted file mode 100644
index bce7eb1..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hi_IN.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u0905\u0902\u0924\u093f\u092e\u092c\u093f\u0902\u0926\u0941 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hr.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hr.properties
deleted file mode 100644
index b79f51c..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hr.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hu.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hu.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hu.properties
deleted file mode 100644
index f529f91..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_hu.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF v�gpontok
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_in.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_in.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_in.properties
deleted file mode 100644
index 6b2166f..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_in.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoint (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_it.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_it.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_it.properties
deleted file mode 100644
index 9792228..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_it.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Endpoint CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_iw.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_iw.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_iw.properties
deleted file mode 100644
index 709f990..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_iw.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u05e0\u05e7\u05d5\u05d3\u05d5\u05ea \u05e7\u05e6\u05d4 CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ja.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ja.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ja.properties
deleted file mode 100644
index 6227a00..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ja.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ko.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ko.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ko.properties
deleted file mode 100644
index 0ec8433..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ko.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \ub05d\uc810 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lo.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lo.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lo.properties
deleted file mode 100644
index b79f51c..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lo.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lt.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lt.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lt.properties
deleted file mode 100644
index c22d773..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_lt.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF importas galiniai punktai (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nb.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nb.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nb.properties
deleted file mode 100644
index 034a23f..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nb.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF endepunkt (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl.properties
deleted file mode 100644
index eef886c..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF-endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl_BE.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl_BE.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl_BE.properties
deleted file mode 100644
index f517012..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_nl_BE.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF eindpunten (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pl.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pl.properties
deleted file mode 100644
index f755610..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF'A ko\u0144cowe (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_BR.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_BR.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_BR.properties
deleted file mode 100644
index bd24788..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_BR.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Terminais CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_PT.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_PT.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_PT.properties
deleted file mode 100644
index bd24788..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_pt_PT.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Terminais CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ro.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ro.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ro.properties
deleted file mode 100644
index ae28733..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ro.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF obiective (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ru.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ru.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ru.properties
deleted file mode 100644
index 6e3bb27..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_ru.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u043a\u043e\u043d\u0435\u0447\u043d\u044b\u0435 \u0442\u043e\u0447\u043a\u0438 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sk.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sk.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sk.properties
deleted file mode 100644
index d6e9761..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sk.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF koncov� body (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sl.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sl.properties
deleted file mode 100644
index 2706ade..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Kon\u010dne to\u010dke CXF (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS.properties
deleted file mode 100644
index b79f51c..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS_latin.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS_latin.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS_latin.properties
deleted file mode 100644
index b79f51c..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sr_RS_latin.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sv.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sv.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sv.properties
deleted file mode 100644
index ccbfe3c..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_sv.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF �ndpunkter (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_tr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_tr.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_tr.properties
deleted file mode 100644
index ecc09cc..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_tr.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF biti\u015f noktalar\u0131 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_uk.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_uk.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_uk.properties
deleted file mode 100644
index 8de2199..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_uk.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u0426\u044c\u043e\u0433\u043e \u041e\u041f\u0418\u0421\u0423 \u043a\u0456\u043d\u0446\u0435\u0432\u0438\u0445 \u0442\u043e\u0447\u043e\u043a (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_vi.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_vi.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_vi.properties
deleted file mode 100644
index 2bfeb99..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_vi.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Hai \u0111i\u1ec3m cu\u1ed1i CXF (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_CN.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_CN.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_CN.properties
deleted file mode 100644
index 9b60693..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_CN.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF\u7ec8\u7ed3\u70b9
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_TW.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_TW.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_TW.properties
deleted file mode 100644
index c287f7f..0000000
--- a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_TW.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u7d42\u7d50\u9ede (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.extender/.gitignore
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/.gitignore b/org.apache.aries.jax-rs.extender/.gitignore
new file mode 100644
index 0000000..83ccc54
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.extender/bnd.bnd
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/bnd.bnd b/org.apache.aries.jax-rs.extender/bnd.bnd
new file mode 100644
index 0000000..1e44d09
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/bnd.bnd
@@ -0,0 +1,58 @@
+Bundle-Activator: com.liferay.portal.remote.rest.extender.activator.CXFJaxRsBundleActivator
+Provide-Capability: \
+ osgi.extender; \
+ osgi.extender='aries.jax-rs'; \
+ version:Version='1.0.0'
+Import-Package:\
+ !com.sun.*,\
+ !com.ctc.wstx.*,\
+ !javax.imageio.*,\
+ !javax.jws.*,\
+ !javax.net.*,\
+ !javax.security.*,\
+ !javax.tools.*,\
+ !javax.validation.*,\
+ !javax.wsdl.*,\
+ !net.sf.cglib.proxy.*,\
+ !org.apache.abdera.*,\
+ !org.apache.aries.*,\
+ !org.apache.cxf.*,\
+ !org.apache.neethi.*,\
+ !org.apache.velocity.*,\
+ !org.apache.xerces.*,\
+ !org.apache.xml.resolver.*,\
+ !org.apache.xmlbeans.*,\
+ !org.codehaus.stax2.*,\
+ !org.dom4j.*,\
+ !org.junit.*,\
+ !org.jvnet.fastinfoset.*,\
+ !org.jvnet.staxex.*,\
+ !org.ietf.jgss.*,\
+ !org.osgi.service.blueprint.*,\
+ !org.relaxng.datatype.*,\
+ !org.slf4j.spi.*,\
+ !org.springframework.*,\
+ *
+
+#Provide-Capability:\
+# osgi.contract;\
+# osgi.contract=JavaJAXRS;\
+# uses:="javax.ws.rs,javax.ws.rs.core,javax.ws.rs.client,javax.ws.rs.container,javax.ws.rs.ext";\
+# version:Version=2,\
+# osgi.contract;\
+# osgi.contract=JavaJSONP;\
+# uses:="javax.json,javax.json.spi,javax.json.stream";\
+# version:Version=1
+
+#-exportcontents:\
+# org.apache.cxf.jaxrs.ext.*
+
+-includeresource:\
+ lib/cxf-core.jar=cxf-core-*.jar;lib:=true,\
+ lib/cxf-rt-databinding-jaxb.jar=cxf-rt-databinding-jaxb-*.jar;lib:=true,\
+ lib/cxf-rt-frontend-jaxrs.jar=cxf-rt-frontend-jaxrs-*.jar;lib:=true,\
+ lib/cxf-rt-rs-extension-providers.jar=cxf-rt-rs-extension-providers-*.jar;lib:=true,\
+ lib/cxf-rt-transports-http.jar=cxf-rt-transports-http-*.jar;lib:=true,\
+ lib/cxf-tools-common.jar=cxf-tools-common-*.jar;lib:=true,\
+ lib/cxf-tools-validator.jar=cxf-tools-validator-*.jar;lib:=true,\
+ lib/jettison.jar=jettison-*.jar;lib:=true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.extender/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/pom.xml b/org.apache.aries.jax-rs.extender/pom.xml
new file mode 100644
index 0000000..2e756de
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/pom.xml
@@ -0,0 +1,82 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.aries.jax-rs.extender</artifactId>
+ <packaging>jar</packaging>
+ <description>Aries JAX-RS Extender</description>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-jaxb</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-common</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-validator</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.3.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation</artifactId>
+ <version>6.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.api</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.2</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
new file mode 100644
index 0000000..f3203b0
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
@@ -0,0 +1,102 @@
+/**
+ * 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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import javax.ws.rs.ext.RuntimeDelegate;
+
+import org.apache.cxf.Bus;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.util.tracker.ServiceTracker;
+
+import com.liferay.portal.remote.rest.extender.internal.BusServiceTrackerCustomizer;
+import com.liferay.portal.remote.rest.extender.internal.ServicesServiceTrackerCustomizer;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+public class CXFJaxRsBundleActivator implements BundleActivator {
+
+ private ServiceTracker<?, ?> _busServiceTracker;
+ private ServiceTracker<?, ?> _singletonsTracker;
+ private ServicesRegistrator _servicesRegistrator;
+
+ @Override
+ public void start(BundleContext bundleContext) throws Exception {
+ Thread thread = Thread.currentThread();
+
+ ClassLoader contextClassLoader = thread.getContextClassLoader();
+
+ Bundle bundle = bundleContext.getBundle();
+
+ BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
+
+ thread.setContextClassLoader(bundleWiring.getClassLoader());
+
+ try {
+
+ // Initialize instance so it is never looked up again
+
+ RuntimeDelegate.getInstance();
+ }
+ finally {
+ thread.setContextClassLoader(contextClassLoader);
+ }
+
+ Dictionary<String, Object> runtimeProperties = new Hashtable<>();
+
+ runtimeProperties.put("endpoints", new ArrayList<String>());
+
+ // TODO make the context path of the JAX-RS Whiteboard configurable.
+
+ _servicesRegistrator = new ServicesRegistrator(
+ bundleContext, Collections.singletonMap("contextPath", "/"));
+
+ _servicesRegistrator.start();
+
+ _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();
+
+ _servicesRegistrator.stop();
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
new file mode 100644
index 0000000..83c802a
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
@@ -0,0 +1,151 @@
+/**
+ * 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.activator;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.http.context.ServletContextHelper;
+import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.Servlet;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+public class ServicesRegistrator {
+
+ public ServicesRegistrator(
+ BundleContext bundleContext, Map<String, Object> properties) {
+
+ _bundleContext = bundleContext;
+
+ _properties = properties;
+ }
+
+ public void start() {
+ Dictionary<String, Object> properties = new Hashtable<>();
+
+ Object contextPathObject = _properties.get("contextPath");
+
+ String contextPath = contextPathObject.toString();
+
+ String contextName = contextPath.substring(1);
+
+ contextName = contextName.replace("/", ".");
+
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME,
+ contextName);
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
+ contextPath);
+
+ _servletContextHelperServiceRegistration =
+ _bundleContext.registerService(
+ ServletContextHelper.class,
+ new ServletContextHelper(_bundleContext.getBundle()) {
+ },
+ properties);
+
+ CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet();
+
+ CXFBusFactory cxfBusFactory =
+ (CXFBusFactory) CXFBusFactory.newInstance(
+ CXFBusFactory.class.getName());
+
+ Bus bus = cxfBusFactory.createBus();
+
+ properties = new Hashtable<>();
+
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
+ "(osgi.http.whiteboard.context.name=" + contextName + ")");
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME,
+ CXFNonSpringServlet.class.getName());
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/*");
+
+ cxfNonSpringServlet.setBus(bus);
+
+ _servletServiceRegistration = _bundleContext.registerService(
+ Servlet.class, cxfNonSpringServlet, properties);
+
+ properties = new Hashtable<>();
+
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
+ contextPath);
+
+ _busServiceRegistration = _bundleContext.registerService(
+ Bus.class, bus, properties);
+ }
+
+ public void stop() {
+ try {
+ _busServiceRegistration.unregister();
+ }
+ catch (Exception e) {
+ if (_logger.isWarnEnabled()) {
+ _logger.warn(
+ "Unable to unregister CXF bus service registration " +
+ _busServiceRegistration);
+ }
+ }
+
+ try {
+ _servletServiceRegistration.unregister();
+ }
+ catch (Exception e) {
+ if (_logger.isWarnEnabled()) {
+ _logger.warn(
+ "Unable to unregister servlet service registration " +
+ _servletServiceRegistration);
+ }
+ }
+
+ try {
+ _servletContextHelperServiceRegistration.unregister();
+ }
+ catch (Exception e) {
+ if (_logger.isWarnEnabled()) {
+ _logger.warn(
+ "Unable to unregister servlet context helper service " +
+ "registration " +
+ _servletContextHelperServiceRegistration);
+ }
+ }
+ }
+
+ private static final Logger _logger = LoggerFactory.getLogger(
+ ServicesRegistrator.class);
+
+ private final BundleContext _bundleContext;
+ private ServiceRegistration<Bus> _busServiceRegistration;
+ private final Map<String, Object> _properties;
+ private ServiceRegistration<ServletContextHelper>
+ _servletContextHelperServiceRegistration;
+ private ServiceRegistration<Servlet> _servletServiceRegistration;
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
new file mode 100644
index 0000000..8900ded
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
@@ -0,0 +1,102 @@
+/**
+ * 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/17c51be0/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
new file mode 100644
index 0000000..8296683
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
@@ -0,0 +1,141 @@
+/**
+ * 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 java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.ws.rs.core.Application;
+
+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;
+
+/**
+ * @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 (Throwable 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/17c51be0/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
new file mode 100644
index 0000000..ba15c1e
--- /dev/null
+++ b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
@@ -0,0 +1,117 @@
+/**
+ * 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 java.util.Arrays;
+import java.util.Collection;
+
+import javax.ws.rs.core.Application;
+
+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;
+
+/**
+ * @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, filtersAndInterceptorsServiceTracker);
+ }
+ 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();
+ }
+ }
+
+}
[32/50] [abbrv] aries-jax-rs-whiteboard git commit: fix the
dependencies
Posted by cs...@apache.org.
fix the dependencies
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/3af01578
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/3af01578
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/3af01578
Branch: refs/heads/master
Commit: 3af01578148258c3e85da62583dd92dc985021bf
Parents: 94077e7
Author: Raymond Auge <ra...@liferay.com>
Authored: Fri Oct 28 11:49:05 2016 +0200
Committer: Raymond Auge <ra...@liferay.com>
Committed: Fri Oct 28 11:49:05 2016 +0200
----------------------------------------------------------------------
bndrun/org.apache.aries.jax-rs.example.bndrun | 40 +++++++++++++---------
bndrun/pom.xml | 15 ++++++++
2 files changed, 38 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/3af01578/bndrun/org.apache.aries.jax-rs.example.bndrun
----------------------------------------------------------------------
diff --git a/bndrun/org.apache.aries.jax-rs.example.bndrun b/bndrun/org.apache.aries.jax-rs.example.bndrun
index ec046a9..367dfc7 100644
--- a/bndrun/org.apache.aries.jax-rs.example.bndrun
+++ b/bndrun/org.apache.aries.jax-rs.example.bndrun
@@ -13,26 +13,32 @@
-runrequires: \
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.cxf-common)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.example)',\
- osgi.identity;filter:='(osgi.identity=org.apache.aries.rest.extender)'
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.rest.extender)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)'
-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
-runbundles: \
- log4j; version='[1.2.17,1.2.18)',\
- org.apache.aries.jax-rs.cxf-common; version='[1.0.0,1.0.1)',\
- org.apache.aries.jax-rs.example; version='[1.0.0,1.0.1)',\
- org.apache.aries.rest.extender; version='[1.0.0,1.0.1)',\
- org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
- org.apache.felix.http.jetty; version='[3.2.0,3.2.1)',\
- org.apache.felix.http.servlet-api; version='[1.1.2,1.1.3)',\
- org.apache.felix.scr; version='[2.0.2,2.0.3)',\
- org.eclipse.equinox.event; version='[1.3.100,1.3.101)',\
- org.eclipse.equinox.metatype; version='[1.4.100,1.4.101)',\
- org.objectweb.asm; version='[5.0.4,5.0.5)',\
- org.osgi.service.event; version='[1.3.1,1.3.2)',\
- org.osgi.service.http.whiteboard; version='[1.0.0,1.0.1)',\
- org.osgi.service.metatype; version='[1.3.0,1.3.1)',\
- slf4j.api; version='[1.7.21,1.7.22)',\
- slf4j.log4j12; version='[1.6.1,1.6.2)'
+ log4j;version='[1.2.17,1.2.18)',\
+ org.apache.aries.jax-rs.cxf-common;version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax-rs.example;version='[1.0.0,1.0.1)',\
+ org.apache.aries.rest.extender;version='[1.0.0,1.0.1)',\
+ org.apache.felix.bundlerepository;version='[1.6.0,1.6.1)',\
+ org.apache.felix.gogo.command;version='[1.0.0,1.0.1)',\
+ org.apache.felix.gogo.jline;version='[1.0.0,1.0.1)',\
+ org.apache.felix.gogo.runtime;version='[1.0.0,1.0.1)',\
+ org.apache.felix.http.jetty;version='[3.2.0,3.2.1)',\
+ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.felix.scr;version='[2.0.2,2.0.3)',\
+ org.eclipse.equinox.event;version='[1.3.100,1.3.101)',\
+ org.eclipse.equinox.metatype;version='[1.4.100,1.4.101)',\
+ org.jline;version='[3.0.0,3.0.1)',\
+ org.objectweb.asm;version='[5.0.4,5.0.5)',\
+ org.osgi.compendium;version='[4.1.0,4.1.1)',\
+ org.osgi.service.event;version='[1.3.1,1.3.2)',\
+ org.osgi.service.http.whiteboard;version='[1.0.0,1.0.1)',\
+ org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
+ slf4j.api;version='[1.7.21,1.7.22)',\
+ slf4j.log4j12;version='[1.6.1,1.6.2)'
-runee: JavaSE-1.8
-resolve.effective: resolve, active
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/3af01578/bndrun/pom.xml
----------------------------------------------------------------------
diff --git a/bndrun/pom.xml b/bndrun/pom.xml
index 01ed697..df45732 100644
--- a/bndrun/pom.xml
+++ b/bndrun/pom.xml
@@ -58,6 +58,21 @@
<version>3.4.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.command</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.jline</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.enroute.pom.distro</artifactId>
<version>2.0.0</version>
[28/50] [abbrv] aries-jax-rs-whiteboard git commit: update ignores
Posted by cs...@apache.org.
update ignores
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/bbd82910
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/bbd82910
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/bbd82910
Branch: refs/heads/master
Commit: bbd8291033f420f72b1f633d9af4c6d2893e3a51
Parents: 890a5b8
Author: Raymond Auge <ra...@liferay.com>
Authored: Fri Oct 28 02:18:10 2016 +0200
Committer: Raymond Auge <ra...@liferay.com>
Committed: Fri Oct 28 02:18:10 2016 +0200
----------------------------------------------------------------------
.gitignore | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/bbd82910/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 7cfaff5..ddda196 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
*/.settings/
*/bin/
**/build/
+**/generated/
**/target/
-/test-cxf/felix-cache/
-/test-cxf/bundle/
+/bndrun/*.jar
+/bndrun/cnf/
[10/50] [abbrv] aries-jax-rs-whiteboard git commit: follow maven
source structure
Posted by cs...@apache.org.
follow maven source structure
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/c567e39c
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/c567e39c
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/c567e39c
Branch: refs/heads/master
Commit: c567e39ce27e3783e716cf324a8f4a47e797d117
Parents: e399753
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Aug 2 15:52:07 2016 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Oct 11 13:21:20 2016 -0400
----------------------------------------------------------------------
.../src/com/liferay/cxf/TestApplication.java | 22 --------------------
.../java/com/liferay/cxf/TestApplication.java | 22 ++++++++++++++++++++
2 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c567e39c/test-cxf/src/com/liferay/cxf/TestApplication.java
----------------------------------------------------------------------
diff --git a/test-cxf/src/com/liferay/cxf/TestApplication.java b/test-cxf/src/com/liferay/cxf/TestApplication.java
deleted file mode 100644
index bcae956..0000000
--- a/test-cxf/src/com/liferay/cxf/TestApplication.java
+++ /dev/null
@@ -1,22 +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.cxf;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class TestApplication extends javax.ws.rs.core.Application {
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c567e39c/test-cxf/src/main/java/com/liferay/cxf/TestApplication.java
----------------------------------------------------------------------
diff --git a/test-cxf/src/main/java/com/liferay/cxf/TestApplication.java b/test-cxf/src/main/java/com/liferay/cxf/TestApplication.java
new file mode 100644
index 0000000..bcae956
--- /dev/null
+++ b/test-cxf/src/main/java/com/liferay/cxf/TestApplication.java
@@ -0,0 +1,22 @@
+/**
+ * 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.cxf;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+public class TestApplication extends javax.ws.rs.core.Application {
+
+}
[03/50] [abbrv] aries-jax-rs-whiteboard git commit: Add .gitignore
Posted by cs...@apache.org.
Add .gitignore
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/64ea9eb3
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/64ea9eb3
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/64ea9eb3
Branch: refs/heads/master
Commit: 64ea9eb32d9bd3efa6c16b7b0588a7c254267431
Parents: d28a0cc
Author: Carlos Sierra <ca...@liferay.com>
Authored: Wed Sep 7 14:25:35 2016 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Oct 4 15:46:55 2016 +0200
----------------------------------------------------------------------
.gitignore | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/64ea9eb3/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..95cd470
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+**/build
+*.iml
+.gradle
+test-cxf/bundle
+test-cxf/felix-cache
\ No newline at end of file
[07/50] [abbrv] aries-jax-rs-whiteboard git commit: added script to
run on un*xes
Posted by cs...@apache.org.
added script to run on un*xes
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/118fb42e
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/118fb42e
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/118fb42e
Branch: refs/heads/master
Commit: 118fb42e831bd893321fb3cd77d5656f8a527bf3
Parents: c369d16
Author: Carlos Sierra <ca...@liferay.com>
Authored: Tue Oct 11 19:04:28 2016 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Oct 11 19:04:28 2016 +0200
----------------------------------------------------------------------
run.sh | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/118fb42e/run.sh
----------------------------------------------------------------------
diff --git a/run.sh b/run.sh
new file mode 100644
index 0000000..c6d6dae
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+./gradlew -q test-cxf:run
\ No newline at end of file
[43/50] [abbrv] aries-jax-rs-whiteboard git commit: Update License
and packages
Posted by cs...@apache.org.
Update License and packages
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/fe021547
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/fe021547
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/fe021547
Branch: refs/heads/master
Commit: fe02154724aea2dcd5d62c5457111dff6af9ccdc
Parents: 76e7db8
Author: Carlos Sierra <ca...@liferay.com>
Authored: Tue Nov 8 17:34:22 2016 +0100
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Nov 8 17:44:40 2016 +0100
----------------------------------------------------------------------
LICENSE | 202 +++++++++++++++++++
jax-rs.example-run/LICENSE | 202 +++++++++++++++++++
jax-rs.example/LICENSE | 202 +++++++++++++++++++
.../portal/rest/example/ExampleAddon.java | 50 -----
.../portal/rest/example/ExampleApplication.java | 46 -----
.../portal/rest/example/ExampleFilter.java | 44 ----
.../aries/jax/rs/example/ExampleAddon.java | 53 +++++
.../jax/rs/example/ExampleApplication.java | 49 +++++
.../aries/jax/rs/example/ExampleFilter.java | 47 +++++
jax-rs.itests-run/LICENSE | 202 +++++++++++++++++++
jax-rs.itests/LICENSE | 202 +++++++++++++++++++
jax-rs.itests/src/main/java/test/JaxrsTest.java | 17 ++
.../src/main/java/test/types/TestAddon.java | 27 +--
.../main/java/test/types/TestApplication.java | 27 +--
.../src/main/java/test/types/TestFilter.java | 29 +--
jax-rs.whiteboard/LICENSE | 202 +++++++++++++++++++
jax-rs.whiteboard/bnd.bnd | 2 +-
.../activator/CXFJaxRsBundleActivator.java | 101 ----------
.../extender/activator/ServicesRegistrator.java | 144 -------------
.../AddonsServiceTrackerCustomizer.java | 102 ----------
.../ApplicationServiceTrackerCustomizer.java | 141 -------------
.../internal/BusServiceTrackerCustomizer.java | 117 -----------
.../internal/CXFJaxRsServiceRegistrator.java | 148 --------------
...AndInterceptorsServiceTrackerCustomizer.java | 123 -----------
.../ServicesServiceTrackerCustomizer.java | 104 ----------
.../SingletonServiceTrackerCustomizer.java | 159 ---------------
.../activator/CXFJaxRsBundleActivator.java | 103 ++++++++++
.../activator/ServicesRegistrator.java | 147 ++++++++++++++
.../AddonsServiceTrackerCustomizer.java | 107 ++++++++++
.../ApplicationServiceTrackerCustomizer.java | 135 +++++++++++++
.../internal/BusServiceTrackerCustomizer.java | 121 +++++++++++
.../internal/CXFJaxRsServiceRegistrator.java | 151 ++++++++++++++
...AndInterceptorsServiceTrackerCustomizer.java | 126 ++++++++++++
.../ServicesServiceTrackerCustomizer.java | 102 ++++++++++
.../SingletonServiceTrackerCustomizer.java | 162 +++++++++++++++
35 files changed, 2579 insertions(+), 1317 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.example-run/LICENSE
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/LICENSE b/jax-rs.example-run/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/jax-rs.example-run/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.example/LICENSE
----------------------------------------------------------------------
diff --git a/jax-rs.example/LICENSE b/jax-rs.example/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/jax-rs.example/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java b/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
deleted file mode 100644
index 5431e76..0000000
--- a/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
+++ /dev/null
@@ -1,50 +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.rest.example;
-
-import org.osgi.service.component.annotations.Component;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-@Component(
- immediate = true,
- property = "osgi.jaxrs.resource.base=/examples/example-addon",
- service = ExampleAddon.class
-)
-public class ExampleAddon {
-
- @GET
- @Path("/{name}")
- public String sayHello(@PathParam("name") String name) {
- return "Hello " + name;
- }
-
- @PostConstruct
- public void init() {
- System.out.println("URIINFO: " + _uriInfo);
- }
-
- @Context
- UriInfo _uriInfo;
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java b/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
deleted file mode 100644
index 25234b2..0000000
--- a/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
+++ /dev/null
@@ -1,46 +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.rest.example;
-
-import org.osgi.service.component.annotations.Component;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Application;
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-@Component(
- immediate = true,
- property = "osgi.jaxrs.application.base=/example-application",
- service = Application.class
-)
-public class ExampleApplication extends Application {
-
- @Override
- public Set<Object> getSingletons() {
- return Collections.<Object>singleton(this);
- }
-
- @GET
- @Produces("text/plain")
- public String sayHello() {
- return "Hello world";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java b/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
deleted file mode 100644
index c2e89ac..0000000
--- a/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
+++ /dev/null
@@ -1,44 +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.rest.example;
-
-import org.osgi.service.component.annotations.Component;
-
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.ext.Provider;
-import java.io.IOException;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-@Component(
- immediate = true,
- property = {
- "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)",
- "osgi.jaxrs.filter.base=/examples"
- }
-)
-@Provider
-public class ExampleFilter implements ContainerRequestFilter {
-
- @Override
- public void filter(ContainerRequestContext requestContext)
- throws IOException {
-
- System.out.println("FILTERED!");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
new file mode 100644
index 0000000..8384877
--- /dev/null
+++ b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.example;
+
+import org.osgi.service.component.annotations.Component;
+
+import javax.annotation.PostConstruct;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+@Component(
+ immediate = true,
+ property = "osgi.jaxrs.resource.base=/examples/example-addon",
+ service = ExampleAddon.class
+)
+public class ExampleAddon {
+
+ @GET
+ @Path("/{name}")
+ public String sayHello(@PathParam("name") String name) {
+ return "Hello " + name;
+ }
+
+ @PostConstruct
+ public void init() {
+ System.out.println("URIINFO: " + _uriInfo);
+ }
+
+ @Context
+ UriInfo _uriInfo;
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleApplication.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleApplication.java b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleApplication.java
new file mode 100644
index 0000000..c1de37b
--- /dev/null
+++ b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleApplication.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.example;
+
+import org.osgi.service.component.annotations.Component;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Application;
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+@Component(
+ immediate = true,
+ property = "osgi.jaxrs.application.base=/example-application",
+ service = Application.class
+)
+public class ExampleApplication extends Application {
+
+ @Override
+ public Set<Object> getSingletons() {
+ return Collections.<Object>singleton(this);
+ }
+
+ @GET
+ @Produces("text/plain")
+ public String sayHello() {
+ return "Hello world";
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
new file mode 100644
index 0000000..e741ef5
--- /dev/null
+++ b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.example;
+
+import org.osgi.service.component.annotations.Component;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+@Component(
+ immediate = true,
+ property = {
+ "jaxrs.application.select=(component.name=ExampleApplication)",
+ "osgi.jaxrs.filter.base=/examples"
+ }
+)
+@Provider
+public class ExampleFilter implements ContainerRequestFilter {
+
+ @Override
+ public void filter(ContainerRequestContext requestContext)
+ throws IOException {
+
+ System.out.println("FILTERED!");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.itests-run/LICENSE
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/LICENSE b/jax-rs.itests-run/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/jax-rs.itests-run/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.itests/LICENSE
----------------------------------------------------------------------
diff --git a/jax-rs.itests/LICENSE b/jax-rs.itests/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/jax-rs.itests/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.itests/src/main/java/test/JaxrsTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java
index c4afe0a..4e1fbce 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package test;
import java.util.Dictionary;
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.itests/src/main/java/test/types/TestAddon.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestAddon.java b/jax-rs.itests/src/main/java/test/types/TestAddon.java
index 849d582..3378140 100644
--- a/jax-rs.itests/src/main/java/test/types/TestAddon.java
+++ b/jax-rs.itests/src/main/java/test/types/TestAddon.java
@@ -1,15 +1,18 @@
-/**
- * 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.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package test.types;
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.itests/src/main/java/test/types/TestApplication.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestApplication.java b/jax-rs.itests/src/main/java/test/types/TestApplication.java
index c7e65f3..5c8c762 100644
--- a/jax-rs.itests/src/main/java/test/types/TestApplication.java
+++ b/jax-rs.itests/src/main/java/test/types/TestApplication.java
@@ -1,15 +1,18 @@
-/**
- * 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.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package test.types;
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.itests/src/main/java/test/types/TestFilter.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestFilter.java b/jax-rs.itests/src/main/java/test/types/TestFilter.java
index 928221a..dd8e1e9 100644
--- a/jax-rs.itests/src/main/java/test/types/TestFilter.java
+++ b/jax-rs.itests/src/main/java/test/types/TestFilter.java
@@ -1,15 +1,18 @@
-/**
- * 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.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package test.types;
@@ -21,7 +24,7 @@ import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.ext.Provider;
// property = {
-// "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)",
+// "jaxrs.application.select=(component.name=org.apache.aries.jax.rs.example.ExampleApplication)",
// "osgi.jaxrs.filter.base=/examples"
// }
@Provider
[40/50] [abbrv] aries-jax-rs-whiteboard git commit: renaming and
restructuring
Posted by cs...@apache.org.
renaming and restructuring
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/76e7db85
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/76e7db85
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/76e7db85
Branch: refs/heads/master
Commit: 76e7db853f4adfd8ae1d1cd13162972fabf1d906
Parents: 17c51be
Author: Raymond Auge <ra...@liferay.com>
Authored: Mon Nov 7 15:00:24 2016 -0500
Committer: Raymond Auge <ra...@liferay.com>
Committed: Mon Nov 7 15:00:24 2016 -0500
----------------------------------------------------------------------
jax-rs.example-run/augments.bnd | 77 +++++++++
jax-rs.example-run/example.bndrun | 47 ++++++
jax-rs.example-run/pom.xml | 71 +++++++++
jax-rs.example/.gitignore | 2 +
jax-rs.example/pom.xml | 27 ++++
.../portal/rest/example/ExampleAddon.java | 50 ++++++
.../portal/rest/example/ExampleApplication.java | 46 ++++++
.../portal/rest/example/ExampleFilter.java | 44 +++++
jax-rs.itests-run/itest.bndrun | 50 ++++++
jax-rs.itests-run/pom.xml | 64 ++++++++
jax-rs.itests/bnd.bnd | 5 +
jax-rs.itests/pom.xml | 33 ++++
jax-rs.itests/src/main/java/test/JaxrsTest.java | 53 +++++++
.../src/main/java/test/types/TestAddon.java | 41 +++++
.../main/java/test/types/TestApplication.java | 38 +++++
.../src/main/java/test/types/TestFilter.java | 37 +++++
jax-rs.whiteboard/.gitignore | 2 +
jax-rs.whiteboard/bnd.bnd | 61 +++++++
jax-rs.whiteboard/pom.xml | 82 ++++++++++
.../activator/CXFJaxRsBundleActivator.java | 101 ++++++++++++
.../extender/activator/ServicesRegistrator.java | 144 +++++++++++++++++
.../AddonsServiceTrackerCustomizer.java | 102 ++++++++++++
.../ApplicationServiceTrackerCustomizer.java | 141 ++++++++++++++++
.../internal/BusServiceTrackerCustomizer.java | 117 ++++++++++++++
.../internal/CXFJaxRsServiceRegistrator.java | 148 +++++++++++++++++
...AndInterceptorsServiceTrackerCustomizer.java | 123 ++++++++++++++
.../ServicesServiceTrackerCustomizer.java | 104 ++++++++++++
.../SingletonServiceTrackerCustomizer.java | 159 +++++++++++++++++++
org.apache.aries.jax-rs.bndrun/augments.bnd | 82 ----------
org.apache.aries.jax-rs.bndrun/pom.xml | 69 --------
org.apache.aries.jax-rs.bndrun/run.bndrun | 52 ------
org.apache.aries.jax-rs.example/.gitignore | 2 -
org.apache.aries.jax-rs.example/pom.xml | 27 ----
.../portal/rest/example/ExampleAddon.java | 50 ------
.../portal/rest/example/ExampleApplication.java | 46 ------
.../portal/rest/example/ExampleFilter.java | 44 -----
org.apache.aries.jax-rs.extender/.gitignore | 2 -
org.apache.aries.jax-rs.extender/bnd.bnd | 58 -------
org.apache.aries.jax-rs.extender/pom.xml | 82 ----------
.../activator/CXFJaxRsBundleActivator.java | 102 ------------
.../extender/activator/ServicesRegistrator.java | 151 ------------------
.../AddonsServiceTrackerCustomizer.java | 102 ------------
.../ApplicationServiceTrackerCustomizer.java | 141 ----------------
.../internal/BusServiceTrackerCustomizer.java | 117 --------------
.../internal/CXFJaxRsServiceRegistrator.java | 148 -----------------
...AndInterceptorsServiceTrackerCustomizer.java | 123 --------------
.../ServicesServiceTrackerCustomizer.java | 104 ------------
.../SingletonServiceTrackerCustomizer.java | 159 -------------------
.../integration-test.bndrun | 50 ------
.../pom.xml | 64 --------
org.apache.aries.jax-rs.tests/bnd.bnd | 5 -
org.apache.aries.jax-rs.tests/pom.xml | 33 ----
.../src/main/java/test/JaxrsTest.java | 55 -------
.../src/main/java/test/types/TestAddon.java | 41 -----
.../main/java/test/types/TestApplication.java | 38 -----
.../src/main/java/test/types/TestFilter.java | 37 -----
pom.xml | 12 +-
57 files changed, 1975 insertions(+), 1990 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.example-run/augments.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/augments.bnd b/jax-rs.example-run/augments.bnd
new file mode 100644
index 0000000..aa1cca1
--- /dev/null
+++ b/jax-rs.example-run/augments.bnd
@@ -0,0 +1,77 @@
+-augment.javax.servlet-api: \
+ javax.servlet-api; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
+
+-augment.javax.ws.rs-api: \
+ javax.ws.rs-api; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=aries.jax-rs)'"
+
+-augment.org.apache.commons.fileupload: \
+ org.apache.commons.fileupload; \
+ capability:=" generic.dependency;generic.dependency='commons.fileupload'"
+
+-augment.org.apache.felix.gogo.command: \
+ org.apache.felix.gogo.command; \
+ capability:=" generic.dependency;generic.dependency='gogo.shell.command';version:Version='1.0.0'"; \
+ version='1.0.0'
+
+-augment.org.apache.felix.gogo.shell: \
+ org.apache.felix.gogo.shell; \
+ capability:=" osgi.implementation;osgi.implementation='gogo.shell';version:Version='1.0.0'"; \
+ requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \
+ version='1.0.0'
+
+-augment.org.apache.felix.gogo.jline: \
+ org.apache.felix.gogo.jline; \
+ capability:=" osgi.implementation;osgi.implementation='gogo.jline';version:Version='1.0.0'"; \
+ requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \
+ version='1.0.0'
+
+-augment.org.apache.felix.log: \
+ org.apache.felix.log; \
+ capability:=" osgi.implementation;osgi.implementation=osgi.log"
+
+-augment.org.apache.felix.scr: \
+ org.apache.felix.scr; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
+
+-augment.org.eclipse.equinox.coordinator: \
+ org.eclipse.equinox.coordinator; \
+ capability:=" osgi.service;objectClass=org.osgi.service.coordinator.Coordinator;effective:=active, \
+ osgi.implementation;osgi.implementation=osgi.coordinator"
+
+-augment.org.eclipse.equinox.event: \
+ org.eclipse.equinox.event; \
+ capability:=" osgi.service;objectClass=org.osgi.service.event.EventAdmin;effective:=active, \
+ osgi.implementation;osgi.implementation=osgi.event"; \
+ requirement:="osgi.extender;filter:='(osgi.extender=osgi.component)'"
+
+-augment.org.eclipse.equinox.http.jetty: \
+ org.eclipse.equinox.http.jetty; \
+ capability:=" equinox.module.data;activation.policy=eager, \
+ generic.dependency;generic.dependency='osgi.servlet.container';version:Version='1.0.0'"
+
+-augment.org.eclipse.equinox.http.servlet: \
+ org.eclipse.equinox.http.servlet; \
+ capability:=" equinox.module.data;activation.policy=eager"; \
+ requirement:="generic.dependency;filter:='(generic.dependency=commons.fileupload)';effective:=active,\
+ generic.dependency;filter:='(generic.dependency=osgi.servlet.container)';effective:=active"
+
+-augment.org.knopflerfish.bundle.useradmin: \
+ org.knopflerfish.bundle.useradmin; \
+ capability:=" osgi.service;objectClass:List<String>=org.osgi.service.useradmin.UserAdmin;effective:=active, \
+ osgi.implementation;osgi.implementation=osgi.useradmin"
+
+-augment.org.osgi.service.event: \
+ org.osgi.service.event; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.event)'"
+
+-augment.org.osgi.service.metatype: \
+ org.osgi.service.metatype; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
+
+-augment.org.osgi.service.remoteserviceadmin: \
+ org.osgi.service.remoteserviceadmin; \
+ requirement:="osgi.remoteserviceadmin.distribution;filter:='(configs=*)', \
+ osgi.remoteserviceadmin.topology;filter:='(policy=*)', \
+ osgi.remoteserviceadmin.discovery;filter:='(protocols=*)'"
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.example-run/example.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/example.bndrun b/jax-rs.example-run/example.bndrun
new file mode 100644
index 0000000..0a28b1b
--- /dev/null
+++ b/jax-rs.example-run/example.bndrun
@@ -0,0 +1,47 @@
+-standalone:
+-include: ${.}/augments.bnd
+-resourceonly: true
+
+-plugin.A.pom.repo = \
+ aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
+ snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \
+ releaseUrls=https://repo1.maven.org/maven2/; \
+ pom=${.}/pom.xml; \
+ name=pom.repo; \
+ location=${.}/target/cached.xml
+
+-runrequires: \
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.example)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)'
+
+ # ,\
+# osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.whiteboard)'
+
+-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
+-runbundles: \
+ javax.annotation-api;version='[1.2.0,1.2.1)',\
+ javax.json-api;version='[1.0.0,1.0.1)',\
+ javax.ws.rs-api;version='[2.0.1,2.0.2)',\
+ log4j;version='[1.2.17,1.2.18)',\
+ org.apache.aries.jax-rs.example;version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax-rs.whiteboard;version='[1.0.0,1.0.1)',\
+ org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
+ org.apache.felix.http.jetty;version='[3.4.0,3.4.1)',\
+ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.felix.scr;version='[2.0.2,2.0.3)',\
+ org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
+ org.eclipse.equinox.event;version='[1.3.100,1.3.101)',\
+ org.eclipse.equinox.metatype;version='[1.4.100,1.4.101)',\
+ org.objectweb.asm;version='[5.0.4,5.0.5)',\
+ org.osgi.service.event;version='[1.3.1,1.3.2)',\
+ org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
+ slf4j.api;version='[1.7.21,1.7.22)',\
+ slf4j.log4j12;version='[1.6.1,1.6.2)'
+
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+-runproperties.eqnx: \
+ osgi.console.enable.builtin=false, \
+ osgi.console=, \
+ org.osgi.service.http.port=8080
+-runsystemcapabilities.dflt: ${native_capability}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.example-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/pom.xml b/jax-rs.example-run/pom.xml
new file mode 100644
index 0000000..31407b2
--- /dev/null
+++ b/jax-rs.example-run/pom.xml
@@ -0,0 +1,71 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.aries.jax-rs.example-run</artifactId>
+
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-export-maven-plugin</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <resolve>true</resolve>
+ <bndruns>
+ <bndrun>example.bndrun</bndrun>
+ </bndruns>
+ <targetDir>.</targetDir>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>export</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs.example</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs.whiteboard</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.command</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.jline</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.pom.distro</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.example/.gitignore
----------------------------------------------------------------------
diff --git a/jax-rs.example/.gitignore b/jax-rs.example/.gitignore
new file mode 100644
index 0000000..83ccc54
--- /dev/null
+++ b/jax-rs.example/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
new file mode 100644
index 0000000..a6473c4
--- /dev/null
+++ b/jax-rs.example/pom.xml
@@ -0,0 +1,27 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.aries.jax-rs.example</artifactId>
+ <packaging>jar</packaging>
+ <description>Apache Aries JAX-RS Example</description>
+ <dependencies>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java b/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
new file mode 100644
index 0000000..5431e76
--- /dev/null
+++ b/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
@@ -0,0 +1,50 @@
+/**
+ * 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.rest.example;
+
+import org.osgi.service.component.annotations.Component;
+
+import javax.annotation.PostConstruct;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+@Component(
+ immediate = true,
+ property = "osgi.jaxrs.resource.base=/examples/example-addon",
+ service = ExampleAddon.class
+)
+public class ExampleAddon {
+
+ @GET
+ @Path("/{name}")
+ public String sayHello(@PathParam("name") String name) {
+ return "Hello " + name;
+ }
+
+ @PostConstruct
+ public void init() {
+ System.out.println("URIINFO: " + _uriInfo);
+ }
+
+ @Context
+ UriInfo _uriInfo;
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java b/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
new file mode 100644
index 0000000..25234b2
--- /dev/null
+++ b/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
@@ -0,0 +1,46 @@
+/**
+ * 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.rest.example;
+
+import org.osgi.service.component.annotations.Component;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Application;
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+@Component(
+ immediate = true,
+ property = "osgi.jaxrs.application.base=/example-application",
+ service = Application.class
+)
+public class ExampleApplication extends Application {
+
+ @Override
+ public Set<Object> getSingletons() {
+ return Collections.<Object>singleton(this);
+ }
+
+ @GET
+ @Produces("text/plain")
+ public String sayHello() {
+ return "Hello world";
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java b/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
new file mode 100644
index 0000000..c2e89ac
--- /dev/null
+++ b/jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
@@ -0,0 +1,44 @@
+/**
+ * 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.rest.example;
+
+import org.osgi.service.component.annotations.Component;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+@Component(
+ immediate = true,
+ property = {
+ "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)",
+ "osgi.jaxrs.filter.base=/examples"
+ }
+)
+@Provider
+public class ExampleFilter implements ContainerRequestFilter {
+
+ @Override
+ public void filter(ContainerRequestContext requestContext)
+ throws IOException {
+
+ System.out.println("FILTERED!");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.itests-run/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/itest.bndrun b/jax-rs.itests-run/itest.bndrun
new file mode 100644
index 0000000..e610def
--- /dev/null
+++ b/jax-rs.itests-run/itest.bndrun
@@ -0,0 +1,50 @@
+-standalone:
+
+-plugin.integration.test = \
+ aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
+ snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \
+ releaseUrls=https://repo1.maven.org/maven2/; \
+ pom=${.}/pom.xml; \
+ name=integration.test; \
+ location=${.}/target/cached.xml
+
+-runrequires: \
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.itests)'
+
+-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
+
+#-runtrace: true
+
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+
+-runsystempackages.eqnx: javax.script
+-runsystemcapabilities.dflt: ${native_capability}
+-runproperties.eqnx: \
+ osgi.console.enable.builtin=false, \
+ osgi.console=, \
+ org.osgi.service.http.port=8080
+-runbundles: \
+ javax.annotation-api; version='[1.2.0,1.2.1)',\
+ javax.json-api; version='[1.0.0,1.0.1)',\
+ javax.ws.rs-api; version='[2.0.1,2.0.2)',\
+ log4j; version='[1.2.17,1.2.18)',\
+ org.apache.aries.jax-rs.itests; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax-rs.whiteboard; version='[1.0.0,1.0.1)',\
+ org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\
+ org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
+ org.apache.felix.http.api; version='[3.0.0,3.0.1)',\
+ org.apache.felix.http.jetty; version='[3.4.0,3.4.1)',\
+ org.apache.felix.http.servlet-api; version='[1.1.2,1.1.3)',\
+ org.apache.felix.scr; version='[2.0.2,2.0.3)',\
+ org.apache.ws.xmlschema.core; version='[2.2.1,2.2.2)',\
+ org.eclipse.equinox.event; version='[1.3.100,1.3.101)',\
+ org.eclipse.equinox.metatype; version='[1.4.100,1.4.101)',\
+ org.objectweb.asm; version='[5.0.4,5.0.5)',\
+ org.osgi.compendium; version='[4.1.0,4.1.1)',\
+ org.osgi.service.event; version='[1.3.1,1.3.2)',\
+ org.osgi.service.metatype; version='[1.3.0,1.3.1)',\
+ osgi.enroute.hamcrest.wrapper; version='[1.3.0,1.3.1)',\
+ osgi.enroute.junit.wrapper; version='[4.12.0,4.12.1)',\
+ slf4j.api; version='[1.7.21,1.7.22)',\
+ slf4j.log4j12; version='[1.6.1,1.6.2)'
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.itests-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/pom.xml b/jax-rs.itests-run/pom.xml
new file mode 100644
index 0000000..63ea8fe
--- /dev/null
+++ b/jax-rs.itests-run/pom.xml
@@ -0,0 +1,64 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>org.apache.aries.jax-rs.itests-run</artifactId>
+
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-testing-maven-plugin</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <resolve>false</resolve>
+ <bndruns>
+ <bndrun>itest.bndrun</bndrun>
+ </bndruns>
+ <targetDir>.</targetDir>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testing</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs.itests</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs.whiteboard</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.pom.distro</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.itests/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.itests/bnd.bnd b/jax-rs.itests/bnd.bnd
new file mode 100644
index 0000000..264db93
--- /dev/null
+++ b/jax-rs.itests/bnd.bnd
@@ -0,0 +1,5 @@
+Bundle-Description: Integration Test bundle for the JAX-RS extender
+
+Test-Cases: \
+ ${classes;CONCRETE;EXTENDS;junit.framework.TestCase},\
+ ${classes;CONCRETE;ANNOTATED;org.junit.Test}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.itests/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
new file mode 100644
index 0000000..42ed192
--- /dev/null
+++ b/jax-rs.itests/pom.xml
@@ -0,0 +1,33 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.aries.jax-rs.itests</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.junit.wrapper</artifactId>
+ <version>4.12.0</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.itests/src/main/java/test/JaxrsTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java
new file mode 100644
index 0000000..c4afe0a
--- /dev/null
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -0,0 +1,53 @@
+package test;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.util.tracker.ServiceTracker;
+
+import junit.framework.TestCase;
+import test.types.TestAddon;
+
+public class JaxrsTest extends TestCase {
+
+ static BundleContext bundleContext = FrameworkUtil.getBundle(
+ JaxrsTest.class).getBundleContext();
+
+ public void testEndPoint() throws Exception {
+ ServiceRegistration<?> serviceRegistration = null;
+
+ try {
+ TestAddon testAddon = new TestAddon();
+
+ Dictionary<String, Object> properties = new Hashtable<>();
+ properties.put("osgi.jaxrs.resource.base", "/test-addon");
+
+ serviceRegistration = bundleContext.registerService(
+ Object.class, testAddon, properties);
+
+ // TODO this availability should be checked through a jaxrs runtime service
+
+ Filter filter = bundleContext.createFilter("(CXF_ENDPOINT_ADDRESS=/test-addon)");
+
+ ServiceTracker<?, ?> st = new ServiceTracker<>(bundleContext, filter, null);
+
+ st.open();
+
+ if (st.waitForService(5000) == null) {
+ fail();
+ }
+
+ // TODO add http client to connect to the endpoint
+ }
+ finally {
+ if (serviceRegistration != null) {
+ serviceRegistration.unregister();
+ }
+ }
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.itests/src/main/java/test/types/TestAddon.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestAddon.java b/jax-rs.itests/src/main/java/test/types/TestAddon.java
new file mode 100644
index 0000000..849d582
--- /dev/null
+++ b/jax-rs.itests/src/main/java/test/types/TestAddon.java
@@ -0,0 +1,41 @@
+/**
+ * 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 test.types;
+
+import javax.annotation.PostConstruct;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+//property = "osgi.jaxrs.resource.base=/test-addon",
+public class TestAddon {
+
+ @GET
+ @Path("/{name}")
+ public String sayHello(@PathParam("name") String name) {
+ return "Hello " + name;
+ }
+
+ @PostConstruct
+ public void init() {
+ System.out.println("URIINFO: " + _uriInfo);
+ }
+
+ @Context
+ UriInfo _uriInfo;
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.itests/src/main/java/test/types/TestApplication.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestApplication.java b/jax-rs.itests/src/main/java/test/types/TestApplication.java
new file mode 100644
index 0000000..c7e65f3
--- /dev/null
+++ b/jax-rs.itests/src/main/java/test/types/TestApplication.java
@@ -0,0 +1,38 @@
+/**
+ * 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 test.types;
+
+import java.util.Collections;
+import java.util.Set;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Application;
+
+// property = "osgi.jaxrs.application.base=/example-application",
+public class TestApplication extends Application {
+
+ @Override
+ public Set<Object> getSingletons() {
+ return Collections.<Object>singleton(this);
+ }
+
+ @GET
+ @Produces("text/plain")
+ public String sayHello() {
+ return "Hello world";
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.itests/src/main/java/test/types/TestFilter.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestFilter.java b/jax-rs.itests/src/main/java/test/types/TestFilter.java
new file mode 100644
index 0000000..928221a
--- /dev/null
+++ b/jax-rs.itests/src/main/java/test/types/TestFilter.java
@@ -0,0 +1,37 @@
+/**
+ * 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 test.types;
+
+import java.io.IOException;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+// property = {
+// "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)",
+// "osgi.jaxrs.filter.base=/examples"
+// }
+@Provider
+public class TestFilter implements ContainerRequestFilter {
+
+ @Override
+ public void filter(ContainerRequestContext requestContext)
+ throws IOException {
+
+ System.out.println("FILTERED!");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.whiteboard/.gitignore
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/.gitignore b/jax-rs.whiteboard/.gitignore
new file mode 100644
index 0000000..83ccc54
--- /dev/null
+++ b/jax-rs.whiteboard/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.whiteboard/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/bnd.bnd b/jax-rs.whiteboard/bnd.bnd
new file mode 100644
index 0000000..c18bdf6
--- /dev/null
+++ b/jax-rs.whiteboard/bnd.bnd
@@ -0,0 +1,61 @@
+Bundle-Activator: com.liferay.portal.remote.rest.extender.activator.CXFJaxRsBundleActivator
+Provide-Capability: \
+ osgi.implementation; \
+ osgi.implementation='aries.jax-rs'; \
+ version:Version='${Bundle-Version}'
+Require-Capability: \
+ osgi.implementation; \
+ filter:='(osgi.implementation=osgi.http)'
+Import-Package:\
+ !com.sun.*,\
+ !com.ctc.wstx.*,\
+ !javax.imageio.*,\
+ !javax.jws.*,\
+ !javax.net.*,\
+ !javax.security.*,\
+ !javax.tools.*,\
+ !javax.validation.*,\
+ !javax.wsdl.*,\
+ !net.sf.cglib.proxy.*,\
+ !org.apache.abdera.*,\
+ !org.apache.aries.*,\
+ !org.apache.cxf.*,\
+ !org.apache.neethi.*,\
+ !org.apache.velocity.*,\
+ !org.apache.xerces.*,\
+ !org.apache.xml.resolver.*,\
+ !org.apache.xmlbeans.*,\
+ !org.codehaus.stax2.*,\
+ !org.dom4j.*,\
+ !org.junit.*,\
+ !org.jvnet.fastinfoset.*,\
+ !org.jvnet.staxex.*,\
+ !org.ietf.jgss.*,\
+ !org.osgi.service.blueprint.*,\
+ !org.relaxng.datatype.*,\
+ !org.slf4j.spi.*,\
+ !org.springframework.*,\
+ *
+
+#Provide-Capability:\
+# osgi.contract;\
+# osgi.contract=JavaJAXRS;\
+# uses:="javax.ws.rs,javax.ws.rs.core,javax.ws.rs.client,javax.ws.rs.container,javax.ws.rs.ext";\
+# version:Version=2,\
+# osgi.contract;\
+# osgi.contract=JavaJSONP;\
+# uses:="javax.json,javax.json.spi,javax.json.stream";\
+# version:Version=1
+
+-exportcontents:\
+ org.apache.cxf.jaxrs.ext.*
+
+-includeresource:\
+ lib/cxf-core.jar=cxf-core-*.jar;lib:=true,\
+ lib/cxf-rt-databinding-jaxb.jar=cxf-rt-databinding-jaxb-*.jar;lib:=true,\
+ lib/cxf-rt-frontend-jaxrs.jar=cxf-rt-frontend-jaxrs-*.jar;lib:=true,\
+ lib/cxf-rt-rs-extension-providers.jar=cxf-rt-rs-extension-providers-*.jar;lib:=true,\
+ lib/cxf-rt-transports-http.jar=cxf-rt-transports-http-*.jar;lib:=true,\
+ lib/cxf-tools-common.jar=cxf-tools-common-*.jar;lib:=true,\
+ lib/cxf-tools-validator.jar=cxf-tools-validator-*.jar;lib:=true,\
+ lib/jettison.jar=jettison-*.jar;lib:=true
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.whiteboard/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
new file mode 100644
index 0000000..10220a1
--- /dev/null
+++ b/jax-rs.whiteboard/pom.xml
@@ -0,0 +1,82 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.aries.jax-rs.whiteboard</artifactId>
+ <packaging>jar</packaging>
+ <description>Apache Aries JAX-RS Whiteboard</description>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-jaxb</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-common</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-validator</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.3.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation</artifactId>
+ <version>6.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.api</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.2</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
new file mode 100644
index 0000000..d81ff31
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
@@ -0,0 +1,101 @@
+/**
+ * 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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import javax.ws.rs.ext.RuntimeDelegate;
+
+import org.apache.cxf.Bus;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.util.tracker.ServiceTracker;
+
+import com.liferay.portal.remote.rest.extender.internal.BusServiceTrackerCustomizer;
+import com.liferay.portal.remote.rest.extender.internal.ServicesServiceTrackerCustomizer;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+public class CXFJaxRsBundleActivator implements BundleActivator {
+
+ private ServiceTracker<?, ?> _busServiceTracker;
+ private ServiceTracker<?, ?> _singletonsTracker;
+ private ServicesRegistrator _servicesRegistrator;
+
+ @Override
+ public void start(BundleContext bundleContext) throws Exception {
+ Thread thread = Thread.currentThread();
+
+ ClassLoader contextClassLoader = thread.getContextClassLoader();
+
+ Bundle bundle = bundleContext.getBundle();
+
+ BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
+
+ thread.setContextClassLoader(bundleWiring.getClassLoader());
+
+ try {
+
+ // Initialize instance so it is never looked up again
+
+ RuntimeDelegate.getInstance();
+ }
+ finally {
+ thread.setContextClassLoader(contextClassLoader);
+ }
+
+ Dictionary<String, Object> runtimeProperties = new Hashtable<>();
+
+ runtimeProperties.put("endpoints", new ArrayList<String>());
+
+ // TODO make the context path of the JAX-RS Whiteboard configurable.
+
+ _servicesRegistrator = new ServicesRegistrator(bundleContext);
+
+ _servicesRegistrator.start();
+
+ _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();
+
+ _servicesRegistrator.stop();
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
new file mode 100644
index 0000000..e457674
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
@@ -0,0 +1,144 @@
+/**
+ * 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.activator;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.http.context.ServletContextHelper;
+import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.Servlet;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+public class ServicesRegistrator
+ implements ServiceTrackerCustomizer<ServletContextHelper, Object> {
+
+ public ServicesRegistrator(BundleContext bundleContext) {
+ _bundleContext = bundleContext;
+ }
+
+ @Override
+ public Object addingService(
+ ServiceReference<ServletContextHelper> reference) {
+
+ String contextPath = (String)reference.getProperty(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH);
+
+ CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet();
+
+ CXFBusFactory cxfBusFactory =
+ (CXFBusFactory) CXFBusFactory.newInstance(
+ CXFBusFactory.class.getName());
+
+ Bus bus = cxfBusFactory.createBus();
+
+ Dictionary<String, Object> properties = new Hashtable<>();
+
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
+ "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" +
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME + ")");
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/*");
+ properties.put(Constants.SERVICE_RANKING, -1);
+
+ cxfNonSpringServlet.setBus(bus);
+
+ _servletServiceRegistration = _bundleContext.registerService(
+ Servlet.class, cxfNonSpringServlet, properties);
+
+ properties = new Hashtable<>();
+
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
+ contextPath);
+
+ _busServiceRegistration = _bundleContext.registerService(
+ Bus.class, bus, properties);
+
+ return new Object();
+ }
+
+ @Override
+ public void modifiedService(
+ ServiceReference<ServletContextHelper> reference, Object object) {
+ }
+
+ @Override
+ public void removedService(
+ ServiceReference<ServletContextHelper> reference, Object object) {
+
+ try {
+ _busServiceRegistration.unregister();
+ }
+ catch (Exception e) {
+ if (_logger.isWarnEnabled()) {
+ _logger.warn(
+ "Unable to unregister CXF bus service registration " +
+ _busServiceRegistration);
+ }
+ }
+
+ try {
+ _servletServiceRegistration.unregister();
+ }
+ catch (Exception e) {
+ if (_logger.isWarnEnabled()) {
+ _logger.warn(
+ "Unable to unregister servlet service registration " +
+ _servletServiceRegistration);
+ }
+ }
+ }
+
+ public void start() throws InvalidSyntaxException {
+ Filter filter = _bundleContext.createFilter(
+ "(&(objectClass=" + ServletContextHelper.class.getName() + ")(" +
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" +
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME +"))");
+
+ _serviceTracker = new ServiceTracker<>(_bundleContext, filter, this);
+
+ _serviceTracker.open();
+ }
+
+ public void stop() {
+ _serviceTracker.close();
+ }
+
+ private static final Logger _logger = LoggerFactory.getLogger(
+ ServicesRegistrator.class);
+
+ private final BundleContext _bundleContext;
+ private ServiceRegistration<Bus> _busServiceRegistration;
+ private ServiceTracker<ServletContextHelper, Object> _serviceTracker;
+ private ServiceRegistration<Servlet> _servletServiceRegistration;
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
new file mode 100644
index 0000000..8900ded
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
@@ -0,0 +1,102 @@
+/**
+ * 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/76e7db85/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
new file mode 100644
index 0000000..8296683
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
@@ -0,0 +1,141 @@
+/**
+ * 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 java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.ws.rs.core.Application;
+
+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;
+
+/**
+ * @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 (Throwable 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/76e7db85/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
new file mode 100644
index 0000000..ba15c1e
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
@@ -0,0 +1,117 @@
+/**
+ * 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 java.util.Arrays;
+import java.util.Collection;
+
+import javax.ws.rs.core.Application;
+
+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;
+
+/**
+ * @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, filtersAndInterceptorsServiceTracker);
+ }
+ 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/76e7db85/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
new file mode 100644
index 0000000..7449ec8
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
@@ -0,0 +1,148 @@
+/**
+ * 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/76e7db85/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
new file mode 100644
index 0000000..07e8c7a
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
@@ -0,0 +1,123 @@
+/**
+ * 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/76e7db85/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
new file mode 100644
index 0000000..433f70c
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
@@ -0,0 +1,104 @@
+/**
+ * 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/76e7db85/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
new file mode 100644
index 0000000..8645504
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
@@ -0,0 +1,159 @@
+/**
+ * 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/76e7db85/org.apache.aries.jax-rs.bndrun/augments.bnd
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.bndrun/augments.bnd b/org.apache.aries.jax-rs.bndrun/augments.bnd
deleted file mode 100644
index 4a16ea5..0000000
--- a/org.apache.aries.jax-rs.bndrun/augments.bnd
+++ /dev/null
@@ -1,82 +0,0 @@
--augment.javax.servlet-api: \
- javax.servlet-api; \
- requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
-
--augment.javax.ws.rs-api: \
- javax.ws.rs-api; \
- requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
-
--augment.org.apache.aries.jax-rs.cxf-common: \
- org.apache.aries.jax-rs.cxf-common; \
- requirement:="osgi.extender;filter:='(&(osgi.extender=aries.jax-rs)(version>=1.0.0)(!(version>=2.0.0)))', \
- osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
-
--augment.org.apache.commons.fileupload: \
- org.apache.commons.fileupload; \
- capability:=" generic.dependency;generic.dependency='commons.fileupload'"
-
--augment.org.apache.felix.gogo.command: \
- org.apache.felix.gogo.command; \
- capability:=" generic.dependency;generic.dependency='gogo.shell.command';version:Version='1.0.0'"; \
- version='1.0.0'
-
--augment.org.apache.felix.gogo.shell: \
- org.apache.felix.gogo.shell; \
- capability:=" osgi.implementation;osgi.implementation='gogo.shell';version:Version='1.0.0'"; \
- requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \
- version='1.0.0'
-
--augment.org.apache.felix.gogo.jline: \
- org.apache.felix.gogo.jline; \
- capability:=" osgi.implementation;osgi.implementation='gogo.jline';version:Version='1.0.0'"; \
- requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \
- version='1.0.0'
-
--augment.org.apache.felix.log: \
- org.apache.felix.log; \
- capability:=" osgi.implementation;osgi.implementation=osgi.log"
-
--augment.org.apache.felix.scr: \
- org.apache.felix.scr; \
- requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
-
--augment.org.eclipse.equinox.coordinator: \
- org.eclipse.equinox.coordinator; \
- capability:=" osgi.service;objectClass=org.osgi.service.coordinator.Coordinator;effective:=active, \
- osgi.implementation;osgi.implementation=osgi.coordinator"
-
--augment.org.eclipse.equinox.event: \
- org.eclipse.equinox.event; \
- capability:=" osgi.service;objectClass=org.osgi.service.event.EventAdmin;effective:=active, \
- osgi.implementation;osgi.implementation=osgi.event"; \
- requirement:="osgi.extender;filter:='(osgi.extender=osgi.component)'"
-
--augment.org.eclipse.equinox.http.jetty: \
- org.eclipse.equinox.http.jetty; \
- capability:=" equinox.module.data;activation.policy=eager, \
- generic.dependency;generic.dependency='osgi.servlet.container';version:Version='1.0.0'"
-
--augment.org.eclipse.equinox.http.servlet: \
- org.eclipse.equinox.http.servlet; \
- capability:=" equinox.module.data;activation.policy=eager"; \
- requirement:="generic.dependency;filter:='(generic.dependency=commons.fileupload)';effective:=active,\
- generic.dependency;filter:='(generic.dependency=osgi.servlet.container)';effective:=active"
-
--augment.org.knopflerfish.bundle.useradmin: \
- org.knopflerfish.bundle.useradmin; \
- capability:=" osgi.service;objectClass:List<String>=org.osgi.service.useradmin.UserAdmin;effective:=active, \
- osgi.implementation;osgi.implementation=osgi.useradmin"
-
--augment.org.osgi.service.event: \
- org.osgi.service.event; \
- requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.event)'"
-
--augment.org.osgi.service.metatype: \
- org.osgi.service.metatype; \
- requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
-
--augment.org.osgi.service.remoteserviceadmin: \
- org.osgi.service.remoteserviceadmin; \
- requirement:="osgi.remoteserviceadmin.distribution;filter:='(configs=*)', \
- osgi.remoteserviceadmin.topology;filter:='(policy=*)', \
- osgi.remoteserviceadmin.discovery;filter:='(protocols=*)'"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.bndrun/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.bndrun/pom.xml b/org.apache.aries.jax-rs.bndrun/pom.xml
deleted file mode 100644
index eecbde1..0000000
--- a/org.apache.aries.jax-rs.bndrun/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.apache.aries.jax-rs.bndrun</artifactId>
-
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-export-maven-plugin</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- <configuration>
- <failOnChanges>false</failOnChanges>
- <resolve>true</resolve>
- <bndruns>
- <bndrun>run.bndrun</bndrun>
- </bndruns>
- <targetDir>.</targetDir>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs.example</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs.extender</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>3.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.command</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.jline</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.pom.distro</artifactId>
- <version>2.0.0</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.bndrun/run.bndrun
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.bndrun/run.bndrun b/org.apache.aries.jax-rs.bndrun/run.bndrun
deleted file mode 100644
index 248a200..0000000
--- a/org.apache.aries.jax-rs.bndrun/run.bndrun
+++ /dev/null
@@ -1,52 +0,0 @@
--standalone:
--include: ${.}/augments.bnd
--resourceonly: true
-
--plugin.A.pom.repo = \
- aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
- snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \
- releaseUrls=https://repo1.maven.org/maven2/; \
- pom=${.}/pom.xml; \
- name=pom.repo; \
- location=${.}/target/cached.xml
-
--runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.example)',\
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.extender)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)'
-
--runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
--runbundles: \
- javax.annotation-api;version='[1.2.0,1.2.1)',\
- javax.json-api;version='[1.0.0,1.0.1)',\
- javax.ws.rs-api;version='[2.0.1,2.0.2)',\
- log4j;version='[1.2.17,1.2.18)',\
- org.apache.aries.jax-rs.example;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax-rs.extender;version='[1.0.0,1.0.1)',\
- org.apache.felix.bundlerepository;version='[1.6.0,1.6.1)',\
- org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
- org.apache.felix.gogo.command;version='[1.0.0,1.0.1)',\
- org.apache.felix.gogo.jline;version='[1.0.0,1.0.1)',\
- org.apache.felix.gogo.runtime;version='[1.0.0,1.0.1)',\
- org.apache.felix.http.api;version='[3.0.0,3.0.1)',\
- org.apache.felix.http.jetty;version='[3.4.0,3.4.1)',\
- org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
- org.apache.felix.scr;version='[2.0.2,2.0.3)',\
- org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
- org.eclipse.equinox.event;version='[1.3.100,1.3.101)',\
- org.eclipse.equinox.metatype;version='[1.4.100,1.4.101)',\
- org.jline;version='[3.0.0,3.0.1)',\
- org.objectweb.asm;version='[5.0.4,5.0.5)',\
- org.osgi.compendium;version='[4.1.0,4.1.1)',\
- org.osgi.service.event;version='[1.3.1,1.3.2)',\
- org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
- slf4j.api;version='[1.7.21,1.7.22)',\
- slf4j.log4j12;version='[1.6.1,1.6.2)'
-
--runee: JavaSE-1.8
--resolve.effective: resolve, active
--runproperties.eqnx: \
- osgi.console.enable.builtin=false, \
- osgi.console=, \
- org.osgi.service.http.port=8080
--runsystemcapabilities.dflt: ${native_capability}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.example/.gitignore
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.example/.gitignore b/org.apache.aries.jax-rs.example/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/org.apache.aries.jax-rs.example/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build/
-/bin/
[05/50] [abbrv] aries-jax-rs-whiteboard git commit: New tracker for
filter targeting singleton services
Posted by cs...@apache.org.
New tracker for filter targeting singleton services
The current impl will not make any distinction between a filter, an
interceptor or any other @Provider registered. It has a naive matching
of startWith().
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/ccba1224
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/ccba1224
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/ccba1224
Branch: refs/heads/master
Commit: ccba12244fab1c16e168d5d026e8bdfc9248a8bb
Parents: f50f916
Author: Carlos Sierra <ca...@liferay.com>
Authored: Tue Oct 11 19:02:25 2016 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Oct 11 19:02:25 2016 +0200
----------------------------------------------------------------------
.../internal/BusServiceTrackerCustomizer.java | 11 ++
...AndInterceptorsServiceTrackerCustomizer.java | 123 +++++++++++++++++++
2 files changed, 134 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ccba1224/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
index 0281efe..8440196 100644
--- 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
@@ -58,6 +58,13 @@ public class BusServiceTrackerCustomizer
singletonsServiceTracker.open();
+ ServiceTracker<Object, ?> filtersAndInterceptorsServiceTracker =
+ new ServiceTracker<>(_bundleContext, getFiltersFilter(),
+ new FiltersAndInterceptorsServiceTrackerCustomizer(
+ _bundleContext));
+
+ filtersAndInterceptorsServiceTracker.open();
+
return Arrays.asList(applicationTracker, singletonsServiceTracker);
}
catch (InvalidSyntaxException ise) {
@@ -70,6 +77,10 @@ public class BusServiceTrackerCustomizer
}
}
+ private Filter getFiltersFilter() throws InvalidSyntaxException {
+ return _bundleContext.createFilter("(osgi.jaxrs.filter.base=*)");
+ }
+
private Filter getApplicationFilter() throws InvalidSyntaxException {
return _bundleContext.createFilter(
"(&(objectClass=" + Application.class.getName() + ")" +
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ccba1224/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
new file mode 100644
index 0000000..07e8c7a
--- /dev/null
+++ b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
@@ -0,0 +1,123 @@
+/**
+ * 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();
+ }
+}
[02/50] [abbrv] aries-jax-rs-whiteboard git commit: Working similarly
as the spec mandates
Posted by cs...@apache.org.
Working similarly as the spec mandates
Now it is creating a default application for every deployed standalone
resource. You can also deploy applications. For the moment you can only
register providers to registered applications and the support for the
filters and interceptor with the base url is missing.
Build is still not working properly. Should fix that.
There is an initialization error log but everything works.
Updated to latest CXF version.
Needs cleanup... a lot of code moved around. :-(
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/87965d09
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/87965d09
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/87965d09
Branch: refs/heads/master
Commit: 87965d09da7dd0e677965f0e626938967d791e02
Parents: f040d02
Author: Carlos Sierra <ca...@liferay.com>
Authored: Tue Sep 6 18:11:28 2016 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Oct 4 15:46:54 2016 +0200
----------------------------------------------------------------------
.../portal/rest/example/ExampleAddon.java | 13 +-
.../portal/rest/example/ExampleApplication.java | 7 +-
.../portal/rest/example/ExampleFilter.java | 3 +-
portal-remote-cxf-common/bnd.bnd | 18 +--
portal-remote-cxf-common/build.gradle | 18 +--
.../portal-remote-cxf-common.iml | 31 ++--
portal-remote-cxf-jaxrs-common/bnd.bnd | 9 +-
portal-remote-cxf-jaxrs-common/build.gradle | 8 +-
.../portal-remote-cxf-jaxrs-common.iml | 10 +-
portal-remote-rest-extender/build.gradle | 8 +-
.../portal-remote-rest-extender.iml | 11 +-
.../AddonsServiceTrackerCustomizer.java | 102 ++++++++++++
.../ApplicationServiceTrackerCustomizer.java | 151 ++++++++++++++++++
.../activator/BusServiceTrackerCustomizer.java | 57 ++++---
.../activator/CXFJaxRsBundleActivator.java | 87 +---------
.../ServicesServiceTrackerCustomizer.java | 105 ++++++++++++
.../SingletonServiceTrackerCustomizer.java | 159 +++++++++++++++++++
.../SingletonsServiceTrackerCustomizer.java | 102 ------------
.../internal/CXFJaxRsServiceRegistrator.java | 10 +-
test-cxf/build.gradle | 1 +
20 files changed, 638 insertions(+), 272 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
index 6061222..206aebc 100644
--- a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
+++ b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
@@ -16,16 +16,19 @@ package com.liferay.portal.rest.example;
import org.osgi.service.component.annotations.Component;
+import javax.annotation.PostConstruct;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
/**
* @author Carlos Sierra Andr�s
*/
@Component(
immediate = true,
- property = "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)",
+ property = "osgi.jaxrs.resource.base=/example-addon",
service = ExampleAddon.class
)
public class ExampleAddon {
@@ -36,4 +39,12 @@ public class ExampleAddon {
return "Hello " + name;
}
+ @PostConstruct
+ public void init() {
+ System.out.println("URIINFO: " + _uriInfo);
+ }
+
+ @Context
+ UriInfo _uriInfo;
+
}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
index ad8f4be..4c09a82 100644
--- a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
+++ b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
@@ -26,8 +26,11 @@ import java.util.Set;
/**
* @author Carlos Sierra Andr�s
*/
-@Component(immediate = true, service = Application.class)
-@ApplicationPath("/example")
+@Component(
+ immediate = true,
+ property = "osgi.jaxrs.application.base=/example-application",
+ service = Application.class
+)
public class ExampleApplication extends Application {
@Override
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
index e7355a8..f5fdde3 100644
--- a/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
+++ b/example-jaxrs-application/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
@@ -26,7 +26,8 @@ import java.io.IOException;
*/
@Component(
immediate = true,
- property = "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)")
+ property = "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)"
+)
@Provider
public class ExampleFilter implements ContainerRequestFilter {
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/portal-remote-cxf-common/bnd.bnd
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/bnd.bnd b/portal-remote-cxf-common/bnd.bnd
index bc51f74..3daca64 100644
--- a/portal-remote-cxf-common/bnd.bnd
+++ b/portal-remote-cxf-common/bnd.bnd
@@ -17,7 +17,7 @@ Bundle-Version: 2.0.6
Export-Package:\
javax.wsdl.*;version="1.2",\
\
- org.apache.cxf.*;version="3.0.3",\
+ org.apache.cxf.*;version="3.1.7",\
org.apache.ws.commons.schema.*;version="2.1.0"
Import-Package:\
!com.sun.*,\
@@ -51,13 +51,13 @@ Import-Package:\
Liferay-Releng-Module-Group-Description:
Liferay-Releng-Module-Group-Title: Remote Service Engines
-includeresource:\
- lib/cxf-core.jar=cxf-core-3.0.3.jar,\
- lib/cxf-rt-bindings-soap.jar=cxf-rt-bindings-soap-3.0.3.jar,\
- lib/cxf-rt-databinding-jaxb.jar=cxf-rt-databinding-jaxb-3.0.3.jar,\
- lib/cxf-rt-transports-http.jar=cxf-rt-transports-http-3.0.3.jar,\
- lib/cxf-rt-wsdl.jar=cxf-rt-wsdl-3.0.3.jar,\
- lib/cxf-tools-common.jar=cxf-tools-common-3.0.3.jar,\
- lib/cxf-tools-validator.jar=cxf-tools-validator-3.0.3.jar,\
+ lib/cxf-core.jar=cxf-core-3.1.7.jar,\
+ lib/cxf-rt-bindings-soap.jar=cxf-rt-bindings-soap-3.1.7.jar,\
+ lib/cxf-rt-databinding-jaxb.jar=cxf-rt-databinding-jaxb-3.1.7.jar,\
+ lib/cxf-rt-transports-http.jar=cxf-rt-transports-http-3.1.7.jar,\
+ lib/cxf-rt-wsdl.jar=cxf-rt-wsdl-3.1.7.jar,\
+ lib/cxf-tools-common.jar=cxf-tools-common-3.1.7.jar,\
+ lib/cxf-tools-validator.jar=cxf-tools-validator-3.1.7.jar,\
lib/javax.annotation-api.jar=javax.annotation-api-1.2.jar,\
lib/wsdl4j.jar=wsdl4j-1.6.3.jar,\
- lib/xmlschema-core.jar=xmlschema-core-2.1.0.jar
\ No newline at end of file
+ lib/xmlschema-core.jar=xmlschema-core-2.2.1.jar
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/portal-remote-cxf-common/build.gradle
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/build.gradle b/portal-remote-cxf-common/build.gradle
index 54b78aa..f431c26 100644
--- a/portal-remote-cxf-common/build.gradle
+++ b/portal-remote-cxf-common/build.gradle
@@ -4,15 +4,15 @@ dependencies {
compile group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "3.1.0"
compile group: 'javax.annotation', name: 'javax.annotation-api', version: '1.2'
compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
- compile group: "org.apache.cxf", name: "cxf-core", version: "3.0.3"
- compile group: "org.apache.cxf", name: "cxf-rt-bindings-soap", version: "3.0.3"
- compile group: "org.apache.cxf", name: "cxf-rt-databinding-jaxb", version: "3.0.3"
- compile group: "org.apache.cxf", name: "cxf-rt-transports-http", version: "3.0.3"
- compile group: "org.apache.cxf", name: "cxf-rt-wsdl", version: "3.0.3"
- compile group: "org.apache.cxf", name: "cxf-tools-common", version: "3.0.3"
- compile group: "org.apache.cxf", name: "cxf-tools-validator", version: "3.0.3"
+ compile group: "org.apache.cxf", name: "cxf-core", version: "3.1.7"
+ compile group: "org.apache.cxf", name: "cxf-rt-bindings-soap", version: "3.1.7"
+ compile group: "org.apache.cxf", name: "cxf-rt-databinding-jaxb", version: "3.1.7"
+ compile group: "org.apache.cxf", name: "cxf-rt-transports-http", version: "3.1.7"
+ compile group: "org.apache.cxf", name: "cxf-rt-wsdl", version: "3.1.7"
+ compile group: "org.apache.cxf", name: "cxf-tools-common", version: "3.1.7"
+ compile group: "org.apache.cxf", name: "cxf-tools-validator", version: "3.1.7"
compile group: "org.apache.felix", name: "org.apache.felix.dependencymanager", version: "3.2.0"
- compile group: "org.apache.ws.xmlschema", name: "xmlschema-core", version: "2.1.0"
+// compile group: "org.apache.ws.xmlschema", name: "xmlschema-core", version: "2.1.0"
compile group: "org.codehaus.woodstox", name: "stax2-api", version: "3.1.4"
compile group: "org.codehaus.woodstox", name: "woodstox-core-asl", version: "4.4.1"
compile group: "org.osgi", name: "org.osgi.core", version: "5.0.0"
@@ -45,4 +45,4 @@ deployDependencies {
rename(/stax2-api-(.+)\.jar/, "org.codehaus.stax2" + renameSuffix)
rename(/woodstox-core-asl-(.+)\.jar/, "com.ctc.wstx" + renameSuffix)
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/portal-remote-cxf-common/portal-remote-cxf-common.iml
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/portal-remote-cxf-common.iml b/portal-remote-cxf-common/portal-remote-cxf-common.iml
index caa6a56..6dae0c0 100644
--- a/portal-remote-cxf-common/portal-remote-cxf-common.iml
+++ b/portal-remote-cxf-common/portal-remote-cxf-common.iml
@@ -17,33 +17,30 @@
<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: javax.servlet:javax.servlet-api:3.0.1" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-core:3.0.3" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-bindings-soap:3.0.3" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-databinding-jaxb:3.0.3" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-transports-http:3.0.3" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-wsdl:3.0.3" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-tools-common:3.0.3" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-tools-validator:3.0.3" 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-bindings-soap:3.1.7" level="project" />
+ <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-databinding-jaxb:3.1.7" 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.apache.cxf:cxf-rt-wsdl:3.1.7" level="project" />
+ <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-tools-common:3.1.7" level="project" />
+ <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-tools-validator: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.apache.ws.xmlschema:xmlschema-core:2.1.0" level="project" />
<orderEntry type="library" name="Gradle: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
<orderEntry type="library" name="Gradle: org.codehaus.woodstox:woodstox-core-asl:4.4.1" 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.component.annotations:1.3.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.slf4j:slf4j-api:1.7.2" level="project" />
<orderEntry type="library" name="Gradle: wsdl4j:wsdl4j:1.6.3" level="project" />
- <orderEntry type="library" name="Gradle: com.sun.xml.bind:jaxb-impl:2.1.14" level="project" />
- <orderEntry type="library" name="Gradle: com.sun.xml.bind:jaxb-core:2.1.14" level="project" />
- <orderEntry type="library" name="Gradle: asm:asm:3.3.1" level="project" />
<orderEntry type="library" name="Gradle: org.apache.velocity:velocity:1.7" level="project" />
- <orderEntry type="library" name="Gradle: com.sun.xml.bind:jaxb-xjc:2.1.14" level="project" />
<orderEntry type="library" name="Gradle: org.osgi:org.osgi.compendium:4.2.0" level="project" />
<orderEntry type="library" name="Gradle: javax.xml.stream:stax-api:1.0-2" level="project" />
- <orderEntry type="library" name="Gradle: com.sun.xml.fastinfoset:FastInfoset:1.2.12" level="project" />
- <orderEntry type="library" name="Gradle: javax.xml.bind:jaxb-api:2.1" level="project" />
- <orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Gradle: commons-lang:commons-lang:2.4" level="project" />
- <orderEntry type="library" name="Gradle: javax.activation:activation:1.1" level="project" />
+ <orderEntry type="library" name="Gradle: javax.annotation:javax.annotation-api:1.2" level="project" />
+ <orderEntry type="library" name="Gradle: org.apache.ws.xmlschema:xmlschema-core:2.2.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
+ <orderEntry type="library" name="Gradle: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
+ <orderEntry type="library" name="Gradle: org.ow2.asm:asm:5.0.4" level="project" />
+ <orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.2" level="project" />
+ <orderEntry type="library" name="Gradle: com.sun.xml.bind:jaxb-xjc:2.2.11" level="project" />
</component>
</module>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/portal-remote-cxf-jaxrs-common/bnd.bnd
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-jaxrs-common/bnd.bnd b/portal-remote-cxf-jaxrs-common/bnd.bnd
index 0db3e1f..34b55df 100644
--- a/portal-remote-cxf-jaxrs-common/bnd.bnd
+++ b/portal-remote-cxf-jaxrs-common/bnd.bnd
@@ -25,8 +25,7 @@ Import-Package:\
\
!org.apache.abdera.*,\
!org.apache.aries.*,\
- !org.apache.cxf.aegis.*,\
- !org.apache.cxf.ws.policy.*,\
+ !org.apache.cxf.*,\
!org.apache.neethi.*,\
!org.apache.velocity.*,\
!org.apache.xml.resolver.*,\
@@ -57,9 +56,9 @@ Provide-Capability:\
uses:="javax.json,javax.json.spi,javax.json.stream";\
version:Version=1
-includeresource:\
- lib/cxf-rt-frontend-jaxrs.jar=cxf-rt-frontend-jaxrs-3.0.3.jar,\
- lib/cxf-rt-rs-extension-providers.jar=cxf-rt-rs-extension-providers-3.0.3.jar,\
+ lib/cxf-rt-frontend-jaxrs.jar=cxf-rt-frontend-jaxrs-3.1.7.jar,\
+ lib/cxf-rt-rs-extension-providers.jar=cxf-rt-rs-extension-providers-3.1.7.jar,\
lib/javax.annotation-api.jar=javax.annotation-api-1.2.jar,\
lib/javax.json-api.jar=javax.json-api-1.0.jar,\
lib/javax.ws.rs-api.jar=javax.ws.rs-api-2.0.1.jar,\
- lib/jettison.jar=jettison-1.3.3.jar
\ No newline at end of file
+ lib/jettison.jar=jettison-1.3.3.jar
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/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
index 414473f..767a928 100644
--- a/portal-remote-cxf-jaxrs-common/build.gradle
+++ b/portal-remote-cxf-jaxrs-common/build.gradle
@@ -2,12 +2,12 @@ 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.0.3"
- compile group: "org.apache.cxf", name: "cxf-rt-frontend-jaxrs", version: "3.0.3"
- compile group: "org.apache.cxf", name: "cxf-rt-rs-extension-providers", version: "3.0.3"
+ 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"
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/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
index f88922f..d8085ca 100644
--- a/portal-remote-cxf-jaxrs-common/portal-remote-cxf-jaxrs-common.iml
+++ b/portal-remote-cxf-jaxrs-common/portal-remote-cxf-jaxrs-common.iml
@@ -17,19 +17,19 @@
<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.0.3" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-frontend-jaxrs:3.0.3" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-rs-extension-providers:3.0.3" 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.ws.xmlschema:xmlschema-core:2.1.0" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-transports-http:3.0.3" 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/87965d09/portal-remote-rest-extender/build.gradle
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/build.gradle b/portal-remote-rest-extender/build.gradle
index a9913c1..1a59902 100644
--- a/portal-remote-rest-extender/build.gradle
+++ b/portal-remote-rest-extender/build.gradle
@@ -3,11 +3,11 @@ dependencies {
compile group: "com.liferay", name: "com.liferay.portal.remote.cxf.jaxrs.common", version: "2.0.0"
compile group: "com.liferay", name: "com.liferay.portal.remote.dependency.manager.tccl", 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.0.3"
- compile group: "org.apache.cxf", name: "cxf-rt-frontend-jaxrs", version: "3.0.3"
- compile group: "org.apache.cxf", name: "cxf-rt-rs-extension-providers", version: "3.0.3"
+ 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"
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/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
index 324cd07..d376453 100644
--- a/portal-remote-rest-extender/portal-remote-rest-extender.iml
+++ b/portal-remote-rest-extender/portal-remote-rest-extender.iml
@@ -19,20 +19,19 @@
<orderEntry type="library" name="Gradle: com.liferay:com.liferay.portal.remote.cxf.jaxrs.common:2.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.liferay:com.liferay.portal.remote.dependency.manager.tccl: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.0.3" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-frontend-jaxrs:3.0.3" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-rs-extension-providers:3.0.3" 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.component.annotations:1.3.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: org.apache.ws.xmlschema:xmlschema-core:2.1.0" 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.0.3" 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/87965d09/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/AddonsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/AddonsServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/AddonsServiceTrackerCustomizer.java
new file mode 100644
index 0000000..c255313
--- /dev/null
+++ b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/AddonsServiceTrackerCustomizer.java
@@ -0,0 +1,102 @@
+/**
+ * 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.activator;
+
+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/87965d09/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ApplicationServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ApplicationServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ApplicationServiceTrackerCustomizer.java
new file mode 100644
index 0000000..b554cf5
--- /dev/null
+++ b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ApplicationServiceTrackerCustomizer.java
@@ -0,0 +1,151 @@
+/**
+ * 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.activator;
+
+import com.liferay.portal.remote.rest.extender.internal.CXFJaxRsServiceRegistrator;
+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.ServiceTracker;
+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(properties);
+
+ cxfJaxRsServiceRegistrator.addBus(_bus);
+ cxfJaxRsServiceRegistrator.addApplication(application);
+
+ 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);
+
+ Application application = tracked.getApplication();
+
+ CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator =
+ tracked.getCxfJaxRsServiceRegistrator();
+
+ cxfJaxRsServiceRegistrator.removeApplication(application);
+
+ cxfJaxRsServiceRegistrator.removeBus(_bus);
+
+ 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/87965d09/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/BusServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/BusServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/BusServiceTrackerCustomizer.java
index 45f0067..6832b18 100644
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/BusServiceTrackerCustomizer.java
+++ b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/BusServiceTrackerCustomizer.java
@@ -16,46 +16,52 @@ package com.liferay.portal.remote.rest.extender.activator;
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, ServiceTracker<Application,
- ApplicationServiceTrackerCustomizer.Tracked>> {
+ implements ServiceTrackerCustomizer<Bus, Collection<ServiceTracker<?, ?>>> {
private BundleContext _bundleContext;
- public BusServiceTrackerCustomizer(
- BundleContext bundleContext) {
-
+ public BusServiceTrackerCustomizer(BundleContext bundleContext) {
_bundleContext = bundleContext;
}
@Override
- public ServiceTracker
- <Application, ApplicationServiceTrackerCustomizer.Tracked>
+ public Collection<ServiceTracker<?, ?>>
addingService(ServiceReference<Bus> serviceReference) {
Bus bus = _bundleContext.getService(serviceReference);
try {
- ServiceTracker
- <Application,
- ApplicationServiceTrackerCustomizer.Tracked>
- applicationTracker =
- new ServiceTracker<>(_bundleContext, Application.class,
+ ServiceTracker<Application,?> applicationTracker =
+ new ServiceTracker<>(_bundleContext, getApplicationFilter(),
new ApplicationServiceTrackerCustomizer(
_bundleContext, bus));
applicationTracker.open();
- return applicationTracker;
+ ServiceTracker<Object, ?> singletonsServiceTracker =
+ new ServiceTracker<>(_bundleContext, getSingletonsFilter(),
+ new SingletonServiceTrackerCustomizer(_bundleContext, bus));
+
+ singletonsServiceTracker.open();
+
+ return Arrays.asList(applicationTracker, singletonsServiceTracker);
+ }
+ catch (InvalidSyntaxException ise) {
+ throw new RuntimeException(ise);
}
catch (Exception e) {
_bundleContext.ungetService(serviceReference);
@@ -64,14 +70,22 @@ public class BusServiceTrackerCustomizer
}
}
+ 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,
- ServiceTracker
- <Application, ApplicationServiceTrackerCustomizer.Tracked>
- service) {
+ Collection<ServiceTracker<?, ?>> serviceTrackers) {
- removedService(reference, service);
+ removedService(reference, serviceTrackers);
addingService(reference);
}
@@ -79,12 +93,13 @@ public class BusServiceTrackerCustomizer
@Override
public void removedService(
ServiceReference<Bus> serviceReference,
- ServiceTracker
- <Application, ApplicationServiceTrackerCustomizer.Tracked>
- serviceTracker) {
+ Collection<ServiceTracker<?, ?>> serviceTrackers) {
_bundleContext.ungetService(serviceReference);
- serviceTracker.close();
+ for (ServiceTracker<?, ?> serviceTracker : serviceTrackers) {
+ serviceTracker.close();
+ }
}
+
}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/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
index 999f29e..6950277 100644
--- 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
@@ -14,28 +14,21 @@
package com.liferay.portal.remote.rest.extender.activator;
-import javax.ws.rs.core.Application;
import javax.ws.rs.ext.RuntimeDelegate;
-import com.liferay.portal.remote.rest.extender.internal.CXFJaxRsServiceRegistrator;
import org.apache.cxf.Bus;
-import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
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 CXFJaxRsBundleActivator implements BundleActivator {
- private ServiceTracker<Object, ServiceTracker<CXFJaxRsServiceRegistrator, CXFJaxRsServiceRegistrator>> _singletonsTracker;
- private ServiceTracker<Bus, ServiceTracker<Application, ApplicationServiceTrackerCustomizer.Tracked>> _busServiceTracker;
+ private ServiceTracker<?, ?> _singletonsTracker;
+ private ServiceTracker<?, ?> _busServiceTracker;
@Override
public void start(BundleContext bundleContext) throws Exception {
@@ -80,80 +73,4 @@ public class CXFJaxRsBundleActivator implements BundleActivator {
_busServiceTracker.close();
}
- private static 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 SingletonsServiceTrackerCustomizer(
- _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);
- }
-
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesServiceTrackerCustomizer.java
new file mode 100644
index 0000000..df57cc6
--- /dev/null
+++ b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesServiceTrackerCustomizer.java
@@ -0,0 +1,105 @@
+/**
+ * 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.activator;
+
+import com.liferay.portal.remote.rest.extender.internal.CXFJaxRsServiceRegistrator;
+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
+ */
+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/87965d09/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/SingletonServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/SingletonServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/SingletonServiceTrackerCustomizer.java
new file mode 100644
index 0000000..e65f3a2
--- /dev/null
+++ b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/SingletonServiceTrackerCustomizer.java
@@ -0,0 +1,159 @@
+/**
+ * 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.activator;
+
+import com.liferay.portal.remote.rest.extender.internal.CXFJaxRsServiceRegistrator;
+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) {
+ properties.put(
+ propertyKey, serviceReference.getProperty(propertyKey));
+ }
+
+ properties.put(
+ "CXF_ENDPOINT_ADDRESS",
+ serviceReference.getProperty("osgi.jaxrs.resource.base").
+ toString());
+
+ CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator =
+ new CXFJaxRsServiceRegistrator(properties);
+
+ cxfJaxRsServiceRegistrator.addBus(_bus);
+ cxfJaxRsServiceRegistrator.addApplication(new Application() {
+ @Override
+ public Set<Object> getSingletons() {
+ return Collections.singleton(service);
+ }
+ });
+
+ 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.removeService(service);
+
+ cxfJaxRsServiceRegistrator.removeBus(_bus);
+
+ 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/87965d09/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/SingletonsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/SingletonsServiceTrackerCustomizer.java b/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/SingletonsServiceTrackerCustomizer.java
deleted file mode 100644
index 4fc29b5..0000000
--- a/portal-remote-rest-extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/SingletonsServiceTrackerCustomizer.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.activator;
-
-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 SingletonsServiceTrackerCustomizer
- implements ServiceTrackerCustomizer<CXFJaxRsServiceRegistrator, CXFJaxRsServiceRegistrator> {
-
- private final BundleContext _bundleContext;
- private final ClassLoader _classLoader;
- private final Class<?> _serviceClass;
- private final Object _service;
-
- public SingletonsServiceTrackerCustomizer(
- 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/87965d09/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
index 31b35fa..1e9635c 100644
--- 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
@@ -26,6 +26,7 @@ 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;
/**
@@ -119,7 +120,14 @@ public class CXFJaxRsServiceRegistrator {
}
for (Object service : _services) {
- jaxRsServerFactoryBean.setServiceBean(service);
+ jaxRsServerFactoryBean.setResourceProvider(
+ new SingletonResourceProvider(service, true));
+ }
+
+ String address = _properties.get("CXF_ENDPOINT_ADDRESS").toString();
+
+ if (address != null) {
+ jaxRsServerFactoryBean.setAddress(address);
}
Server server = jaxRsServerFactoryBean.create();
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/87965d09/test-cxf/build.gradle
----------------------------------------------------------------------
diff --git a/test-cxf/build.gradle b/test-cxf/build.gradle
index 0d87a81..0c0d5f4 100644
--- a/test-cxf/build.gradle
+++ b/test-cxf/build.gradle
@@ -48,6 +48,7 @@ dependencies {
compile group: "org.codehaus.woodstox", name: "stax2-api", transitive: false, version: "3.1.4"
compile group: "org.codehaus.woodstox", name: "woodstox-core-asl", transitive: false, version: "4.4.1"
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
+ compile group: 'org.ow2.asm', name: 'asm', version: '5.0.4'
}
task cleanDeps(type: Delete) {
[42/50] [abbrv] aries-jax-rs-whiteboard git commit: Update License
and packages
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.whiteboard/LICENSE
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/LICENSE b/jax-rs.whiteboard/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/jax-rs.whiteboard/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.whiteboard/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/bnd.bnd b/jax-rs.whiteboard/bnd.bnd
index c18bdf6..078b196 100644
--- a/jax-rs.whiteboard/bnd.bnd
+++ b/jax-rs.whiteboard/bnd.bnd
@@ -1,4 +1,4 @@
-Bundle-Activator: com.liferay.portal.remote.rest.extender.activator.CXFJaxRsBundleActivator
+Bundle-Activator: org.apache.aries.jax.rs.whiteboard.activator.CXFJaxRsBundleActivator
Provide-Capability: \
osgi.implementation; \
osgi.implementation='aries.jax-rs'; \
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
deleted file mode 100644
index d81ff31..0000000
--- a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
+++ /dev/null
@@ -1,101 +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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import javax.ws.rs.ext.RuntimeDelegate;
-
-import org.apache.cxf.Bus;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Filter;
-import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.util.tracker.ServiceTracker;
-
-import com.liferay.portal.remote.rest.extender.internal.BusServiceTrackerCustomizer;
-import com.liferay.portal.remote.rest.extender.internal.ServicesServiceTrackerCustomizer;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class CXFJaxRsBundleActivator implements BundleActivator {
-
- private ServiceTracker<?, ?> _busServiceTracker;
- private ServiceTracker<?, ?> _singletonsTracker;
- private ServicesRegistrator _servicesRegistrator;
-
- @Override
- public void start(BundleContext bundleContext) throws Exception {
- Thread thread = Thread.currentThread();
-
- ClassLoader contextClassLoader = thread.getContextClassLoader();
-
- Bundle bundle = bundleContext.getBundle();
-
- BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
-
- thread.setContextClassLoader(bundleWiring.getClassLoader());
-
- try {
-
- // Initialize instance so it is never looked up again
-
- RuntimeDelegate.getInstance();
- }
- finally {
- thread.setContextClassLoader(contextClassLoader);
- }
-
- Dictionary<String, Object> runtimeProperties = new Hashtable<>();
-
- runtimeProperties.put("endpoints", new ArrayList<String>());
-
- // TODO make the context path of the JAX-RS Whiteboard configurable.
-
- _servicesRegistrator = new ServicesRegistrator(bundleContext);
-
- _servicesRegistrator.start();
-
- _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();
-
- _servicesRegistrator.stop();
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
deleted file mode 100644
index e457674..0000000
--- a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
+++ /dev/null
@@ -1,144 +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.activator;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusFactory;
-import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Filter;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.http.context.ServletContextHelper;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.Servlet;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class ServicesRegistrator
- implements ServiceTrackerCustomizer<ServletContextHelper, Object> {
-
- public ServicesRegistrator(BundleContext bundleContext) {
- _bundleContext = bundleContext;
- }
-
- @Override
- public Object addingService(
- ServiceReference<ServletContextHelper> reference) {
-
- String contextPath = (String)reference.getProperty(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH);
-
- CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet();
-
- CXFBusFactory cxfBusFactory =
- (CXFBusFactory) CXFBusFactory.newInstance(
- CXFBusFactory.class.getName());
-
- Bus bus = cxfBusFactory.createBus();
-
- Dictionary<String, Object> properties = new Hashtable<>();
-
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
- "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" +
- HttpWhiteboardConstants.HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME + ")");
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/*");
- properties.put(Constants.SERVICE_RANKING, -1);
-
- cxfNonSpringServlet.setBus(bus);
-
- _servletServiceRegistration = _bundleContext.registerService(
- Servlet.class, cxfNonSpringServlet, properties);
-
- properties = new Hashtable<>();
-
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
- contextPath);
-
- _busServiceRegistration = _bundleContext.registerService(
- Bus.class, bus, properties);
-
- return new Object();
- }
-
- @Override
- public void modifiedService(
- ServiceReference<ServletContextHelper> reference, Object object) {
- }
-
- @Override
- public void removedService(
- ServiceReference<ServletContextHelper> reference, Object object) {
-
- try {
- _busServiceRegistration.unregister();
- }
- catch (Exception e) {
- if (_logger.isWarnEnabled()) {
- _logger.warn(
- "Unable to unregister CXF bus service registration " +
- _busServiceRegistration);
- }
- }
-
- try {
- _servletServiceRegistration.unregister();
- }
- catch (Exception e) {
- if (_logger.isWarnEnabled()) {
- _logger.warn(
- "Unable to unregister servlet service registration " +
- _servletServiceRegistration);
- }
- }
- }
-
- public void start() throws InvalidSyntaxException {
- Filter filter = _bundleContext.createFilter(
- "(&(objectClass=" + ServletContextHelper.class.getName() + ")(" +
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" +
- HttpWhiteboardConstants.HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME +"))");
-
- _serviceTracker = new ServiceTracker<>(_bundleContext, filter, this);
-
- _serviceTracker.open();
- }
-
- public void stop() {
- _serviceTracker.close();
- }
-
- private static final Logger _logger = LoggerFactory.getLogger(
- ServicesRegistrator.class);
-
- private final BundleContext _bundleContext;
- private ServiceRegistration<Bus> _busServiceRegistration;
- private ServiceTracker<ServletContextHelper, Object> _serviceTracker;
- private ServiceRegistration<Servlet> _servletServiceRegistration;
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
deleted file mode 100644
index 8900ded..0000000
--- a/jax-rs.whiteboard/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/fe021547/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
deleted file mode 100644
index 8296683..0000000
--- a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,141 +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 java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.ws.rs.core.Application;
-
-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;
-
-/**
- * @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 (Throwable 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/fe021547/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
deleted file mode 100644
index ba15c1e..0000000
--- a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,117 +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 java.util.Arrays;
-import java.util.Collection;
-
-import javax.ws.rs.core.Application;
-
-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;
-
-/**
- * @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, filtersAndInterceptorsServiceTracker);
- }
- 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/fe021547/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
deleted file mode 100644
index 7449ec8..0000000
--- a/jax-rs.whiteboard/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/fe021547/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
deleted file mode 100644
index 07e8c7a..0000000
--- a/jax-rs.whiteboard/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/fe021547/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
deleted file mode 100644
index 433f70c..0000000
--- a/jax-rs.whiteboard/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/fe021547/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
deleted file mode 100644
index 8645504..0000000
--- a/jax-rs.whiteboard/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/fe021547/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
new file mode 100644
index 0000000..9bff510
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CXFJaxRsBundleActivator.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.whiteboard.activator;
+
+import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import javax.ws.rs.ext.RuntimeDelegate;
+
+import org.apache.cxf.Bus;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.util.tracker.ServiceTracker;
+
+import org.apache.aries.jax.rs.whiteboard.internal.BusServiceTrackerCustomizer;
+import org.apache.aries.jax.rs.whiteboard.internal.ServicesServiceTrackerCustomizer;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+public class CXFJaxRsBundleActivator implements BundleActivator {
+
+ private ServiceTracker<?, ?> _busServiceTracker;
+ private ServiceTracker<?, ?> _singletonsTracker;
+ private ServicesRegistrator _servicesRegistrator;
+
+ @Override
+ public void start(BundleContext bundleContext) throws Exception {
+ Thread thread = Thread.currentThread();
+
+ ClassLoader contextClassLoader = thread.getContextClassLoader();
+
+ Bundle bundle = bundleContext.getBundle();
+
+ BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
+
+ thread.setContextClassLoader(bundleWiring.getClassLoader());
+
+ try {
+
+ // Initialize instance so it is never looked up again
+
+ RuntimeDelegate.getInstance();
+ }
+ finally {
+ thread.setContextClassLoader(contextClassLoader);
+ }
+
+ Dictionary<String, Object> runtimeProperties = new Hashtable<>();
+
+ runtimeProperties.put("endpoints", new ArrayList<String>());
+
+ // TODO make the context path of the JAX-RS Whiteboard configurable.
+
+ _servicesRegistrator = new ServicesRegistrator(bundleContext);
+
+ _servicesRegistrator.start();
+
+ _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();
+
+ _servicesRegistrator.stop();
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/ServicesRegistrator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/ServicesRegistrator.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/ServicesRegistrator.java
new file mode 100644
index 0000000..1aeee29
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/ServicesRegistrator.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.whiteboard.activator;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.http.context.ServletContextHelper;
+import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.Servlet;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+public class ServicesRegistrator
+ implements ServiceTrackerCustomizer<ServletContextHelper, Object> {
+
+ public ServicesRegistrator(BundleContext bundleContext) {
+ _bundleContext = bundleContext;
+ }
+
+ @Override
+ public Object addingService(
+ ServiceReference<ServletContextHelper> reference) {
+
+ String contextPath = (String)reference.getProperty(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH);
+
+ CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet();
+
+ CXFBusFactory cxfBusFactory =
+ (CXFBusFactory) CXFBusFactory.newInstance(
+ CXFBusFactory.class.getName());
+
+ Bus bus = cxfBusFactory.createBus();
+
+ Dictionary<String, Object> properties = new Hashtable<>();
+
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
+ "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" +
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME + ")");
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/*");
+ properties.put(Constants.SERVICE_RANKING, -1);
+
+ cxfNonSpringServlet.setBus(bus);
+
+ _servletServiceRegistration = _bundleContext.registerService(
+ Servlet.class, cxfNonSpringServlet, properties);
+
+ properties = new Hashtable<>();
+
+ properties.put(
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
+ contextPath);
+
+ _busServiceRegistration = _bundleContext.registerService(
+ Bus.class, bus, properties);
+
+ return new Object();
+ }
+
+ @Override
+ public void modifiedService(
+ ServiceReference<ServletContextHelper> reference, Object object) {
+ }
+
+ @Override
+ public void removedService(
+ ServiceReference<ServletContextHelper> reference, Object object) {
+
+ try {
+ _busServiceRegistration.unregister();
+ }
+ catch (Exception e) {
+ if (_logger.isWarnEnabled()) {
+ _logger.warn(
+ "Unable to unregister CXF bus service registration " +
+ _busServiceRegistration);
+ }
+ }
+
+ try {
+ _servletServiceRegistration.unregister();
+ }
+ catch (Exception e) {
+ if (_logger.isWarnEnabled()) {
+ _logger.warn(
+ "Unable to unregister servlet service registration " +
+ _servletServiceRegistration);
+ }
+ }
+ }
+
+ public void start() throws InvalidSyntaxException {
+ Filter filter = _bundleContext.createFilter(
+ "(&(objectClass=" + ServletContextHelper.class.getName() + ")(" +
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" +
+ HttpWhiteboardConstants.HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME +"))");
+
+ _serviceTracker = new ServiceTracker<>(_bundleContext, filter, this);
+
+ _serviceTracker.open();
+ }
+
+ public void stop() {
+ _serviceTracker.close();
+ }
+
+ private static final Logger _logger = LoggerFactory.getLogger(
+ ServicesRegistrator.class);
+
+ private final BundleContext _bundleContext;
+ private ServiceRegistration<Bus> _busServiceRegistration;
+ private ServiceTracker<ServletContextHelper, Object> _serviceTracker;
+ private ServiceRegistration<Servlet> _servletServiceRegistration;
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AddonsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AddonsServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AddonsServiceTrackerCustomizer.java
new file mode 100644
index 0000000..4e7a60a
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AddonsServiceTrackerCustomizer.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.whiteboard.internal;
+
+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 cxfJaxRsServiceRegistrator) {
+
+ removedService(reference, cxfJaxRsServiceRegistrator);
+
+ addingService(reference);
+ }
+
+ @Override
+ public void removedService(
+ ServiceReference<CXFJaxRsServiceRegistrator> reference,
+ CXFJaxRsServiceRegistrator cxfJaxRsServiceRegistrator) {
+
+ if (_serviceClass.isAnnotationPresent(Provider.class)) {
+ cxfJaxRsServiceRegistrator.removeProvider(_service);
+ } else {
+ cxfJaxRsServiceRegistrator.removeService(_service);
+ }
+
+ _bundleContext.ungetService(reference);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ApplicationServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ApplicationServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ApplicationServiceTrackerCustomizer.java
new file mode 100644
index 0000000..8f7acc0
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ApplicationServiceTrackerCustomizer.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.whiteboard.internal;
+
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.ws.rs.core.Application;
+
+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;
+
+/**
+ * @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);
+
+ ServiceRegistration<CXFJaxRsServiceRegistrator>
+ cxfJaxRsServiceRegistratorRegistration =
+ _bundleContext.registerService(
+ CXFJaxRsServiceRegistrator.class,
+ cxfJaxRsServiceRegistrator,
+ new Hashtable<>(properties));
+
+ return new Tracked(
+ cxfJaxRsServiceRegistrator, application,
+ cxfJaxRsServiceRegistratorRegistration);
+ }
+ catch (Throwable 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._cxfJaxRsServiceRegistrator.close();
+
+ tracked._cxfJaxRsServiceRegistratorServiceRegistration.unregister();
+ }
+
+ public static class Tracked {
+
+ private final CXFJaxRsServiceRegistrator _cxfJaxRsServiceRegistrator;
+ private final Application _application;
+ private final ServiceRegistration<CXFJaxRsServiceRegistrator>
+ _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/fe021547/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/BusServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/BusServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/BusServiceTrackerCustomizer.java
new file mode 100644
index 0000000..59d5323
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/BusServiceTrackerCustomizer.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.whiteboard.internal;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.ws.rs.core.Application;
+
+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;
+
+/**
+ * @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,
+ filtersAndInterceptorsServiceTracker);
+ }
+ 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/fe021547/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java
new file mode 100644
index 0000000..6cfc4d1
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.whiteboard.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/fe021547/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
new file mode 100644
index 0000000..671a413
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.whiteboard.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/fe021547/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ServicesServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ServicesServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ServicesServiceTrackerCustomizer.java
new file mode 100644
index 0000000..b1e6484
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/ServicesServiceTrackerCustomizer.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.whiteboard.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, ?>> {
+
+ private final BundleContext _bundleContext;
+
+ public ServicesServiceTrackerCustomizer(BundleContext bundleContext) {
+ _bundleContext = bundleContext;
+ }
+
+ @Override
+ public ServiceTracker
+ <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, ?>
+ 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, ?> serviceTracker) {
+
+ removedService(reference, serviceTracker);
+
+ addingService(reference);
+ }
+
+ @Override
+ public void removedService(
+ ServiceReference<Object> reference,
+ ServiceTracker<CXFJaxRsServiceRegistrator, ?> serviceTracker) {
+
+ serviceTracker.close();
+
+ _bundleContext.ungetService(reference);
+ }
+
+}
[31/50] [abbrv] aries-jax-rs-whiteboard git commit: [maven bndrun]
eliminate a useless warning
Posted by cs...@apache.org.
[maven bndrun] eliminate a useless warning
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/94077e7e
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/94077e7e
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/94077e7e
Branch: refs/heads/master
Commit: 94077e7ed1693e45a8d9a8aed7e05039249e0ae5
Parents: f1252f8
Author: Raymond Auge <ra...@liferay.com>
Authored: Fri Oct 28 11:45:54 2016 +0200
Committer: Raymond Auge <ra...@liferay.com>
Committed: Fri Oct 28 11:45:54 2016 +0200
----------------------------------------------------------------------
bndrun/org.apache.aries.jax-rs.example.bndrun | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/94077e7e/bndrun/org.apache.aries.jax-rs.example.bndrun
----------------------------------------------------------------------
diff --git a/bndrun/org.apache.aries.jax-rs.example.bndrun b/bndrun/org.apache.aries.jax-rs.example.bndrun
index e3ee47a..ec046a9 100644
--- a/bndrun/org.apache.aries.jax-rs.example.bndrun
+++ b/bndrun/org.apache.aries.jax-rs.example.bndrun
@@ -1,5 +1,6 @@
-standalone:
-include: ${.}/augments.bnd
+-resourceonly: true
-plugin.A.pom.repo = \
aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
[29/50] [abbrv] aries-jax-rs-whiteboard git commit: augments
Posted by cs...@apache.org.
augments
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/854ba8fb
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/854ba8fb
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/854ba8fb
Branch: refs/heads/master
Commit: 854ba8fb1b84543cbc9dbd54e20caea1cc7f02a8
Parents: bbd8291
Author: Raymond Auge <ra...@liferay.com>
Authored: Fri Oct 28 02:46:16 2016 +0200
Committer: Raymond Auge <ra...@liferay.com>
Committed: Fri Oct 28 02:46:16 2016 +0200
----------------------------------------------------------------------
bndrun/augments.bnd | 82 ++++++++++++++++++++++
bndrun/org.apache.aries.jax-rs.example.bndrun | 3 +-
2 files changed, 84 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/854ba8fb/bndrun/augments.bnd
----------------------------------------------------------------------
diff --git a/bndrun/augments.bnd b/bndrun/augments.bnd
new file mode 100644
index 0000000..4a16ea5
--- /dev/null
+++ b/bndrun/augments.bnd
@@ -0,0 +1,82 @@
+-augment.javax.servlet-api: \
+ javax.servlet-api; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
+
+-augment.javax.ws.rs-api: \
+ javax.ws.rs-api; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
+
+-augment.org.apache.aries.jax-rs.cxf-common: \
+ org.apache.aries.jax-rs.cxf-common; \
+ requirement:="osgi.extender;filter:='(&(osgi.extender=aries.jax-rs)(version>=1.0.0)(!(version>=2.0.0)))', \
+ osgi.implementation;filter:='(osgi.implementation=osgi.http)'"
+
+-augment.org.apache.commons.fileupload: \
+ org.apache.commons.fileupload; \
+ capability:=" generic.dependency;generic.dependency='commons.fileupload'"
+
+-augment.org.apache.felix.gogo.command: \
+ org.apache.felix.gogo.command; \
+ capability:=" generic.dependency;generic.dependency='gogo.shell.command';version:Version='1.0.0'"; \
+ version='1.0.0'
+
+-augment.org.apache.felix.gogo.shell: \
+ org.apache.felix.gogo.shell; \
+ capability:=" osgi.implementation;osgi.implementation='gogo.shell';version:Version='1.0.0'"; \
+ requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \
+ version='1.0.0'
+
+-augment.org.apache.felix.gogo.jline: \
+ org.apache.felix.gogo.jline; \
+ capability:=" osgi.implementation;osgi.implementation='gogo.jline';version:Version='1.0.0'"; \
+ requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \
+ version='1.0.0'
+
+-augment.org.apache.felix.log: \
+ org.apache.felix.log; \
+ capability:=" osgi.implementation;osgi.implementation=osgi.log"
+
+-augment.org.apache.felix.scr: \
+ org.apache.felix.scr; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
+
+-augment.org.eclipse.equinox.coordinator: \
+ org.eclipse.equinox.coordinator; \
+ capability:=" osgi.service;objectClass=org.osgi.service.coordinator.Coordinator;effective:=active, \
+ osgi.implementation;osgi.implementation=osgi.coordinator"
+
+-augment.org.eclipse.equinox.event: \
+ org.eclipse.equinox.event; \
+ capability:=" osgi.service;objectClass=org.osgi.service.event.EventAdmin;effective:=active, \
+ osgi.implementation;osgi.implementation=osgi.event"; \
+ requirement:="osgi.extender;filter:='(osgi.extender=osgi.component)'"
+
+-augment.org.eclipse.equinox.http.jetty: \
+ org.eclipse.equinox.http.jetty; \
+ capability:=" equinox.module.data;activation.policy=eager, \
+ generic.dependency;generic.dependency='osgi.servlet.container';version:Version='1.0.0'"
+
+-augment.org.eclipse.equinox.http.servlet: \
+ org.eclipse.equinox.http.servlet; \
+ capability:=" equinox.module.data;activation.policy=eager"; \
+ requirement:="generic.dependency;filter:='(generic.dependency=commons.fileupload)';effective:=active,\
+ generic.dependency;filter:='(generic.dependency=osgi.servlet.container)';effective:=active"
+
+-augment.org.knopflerfish.bundle.useradmin: \
+ org.knopflerfish.bundle.useradmin; \
+ capability:=" osgi.service;objectClass:List<String>=org.osgi.service.useradmin.UserAdmin;effective:=active, \
+ osgi.implementation;osgi.implementation=osgi.useradmin"
+
+-augment.org.osgi.service.event: \
+ org.osgi.service.event; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.event)'"
+
+-augment.org.osgi.service.metatype: \
+ org.osgi.service.metatype; \
+ requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
+
+-augment.org.osgi.service.remoteserviceadmin: \
+ org.osgi.service.remoteserviceadmin; \
+ requirement:="osgi.remoteserviceadmin.distribution;filter:='(configs=*)', \
+ osgi.remoteserviceadmin.topology;filter:='(policy=*)', \
+ osgi.remoteserviceadmin.discovery;filter:='(protocols=*)'"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/854ba8fb/bndrun/org.apache.aries.jax-rs.example.bndrun
----------------------------------------------------------------------
diff --git a/bndrun/org.apache.aries.jax-rs.example.bndrun b/bndrun/org.apache.aries.jax-rs.example.bndrun
index df887ad..27ef6ab 100644
--- a/bndrun/org.apache.aries.jax-rs.example.bndrun
+++ b/bndrun/org.apache.aries.jax-rs.example.bndrun
@@ -1,4 +1,5 @@
-standalone:
+-include: ${.}/augments.bnd
-plugin.pom.repo = \
aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
@@ -44,4 +45,4 @@
osgi.console.enable.builtin=false, \
osgi.console=, \
org.osgi.service.http.port=8080
--runsystemcapabilities.dflt: ${native_capability}
\ No newline at end of file
+-runsystemcapabilities.dflt: ${native_capability}
[39/50] [abbrv] aries-jax-rs-whiteboard git commit: renaming and
restructuring
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.example/pom.xml b/org.apache.aries.jax-rs.example/pom.xml
deleted file mode 100644
index 2a36d9b..0000000
--- a/org.apache.aries.jax-rs.example/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.aries.jax-rs.example</artifactId>
- <packaging>jar</packaging>
- <description>JAX-RS Example</description>
- <dependencies>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.component.annotations</artifactId>
- <version>1.3.0</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java b/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
deleted file mode 100644
index 5431e76..0000000
--- a/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
+++ /dev/null
@@ -1,50 +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.rest.example;
-
-import org.osgi.service.component.annotations.Component;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-@Component(
- immediate = true,
- property = "osgi.jaxrs.resource.base=/examples/example-addon",
- service = ExampleAddon.class
-)
-public class ExampleAddon {
-
- @GET
- @Path("/{name}")
- public String sayHello(@PathParam("name") String name) {
- return "Hello " + name;
- }
-
- @PostConstruct
- public void init() {
- System.out.println("URIINFO: " + _uriInfo);
- }
-
- @Context
- UriInfo _uriInfo;
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java b/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
deleted file mode 100644
index 25234b2..0000000
--- a/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
+++ /dev/null
@@ -1,46 +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.rest.example;
-
-import org.osgi.service.component.annotations.Component;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Application;
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-@Component(
- immediate = true,
- property = "osgi.jaxrs.application.base=/example-application",
- service = Application.class
-)
-public class ExampleApplication extends Application {
-
- @Override
- public Set<Object> getSingletons() {
- return Collections.<Object>singleton(this);
- }
-
- @GET
- @Produces("text/plain")
- public String sayHello() {
- return "Hello world";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java b/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
deleted file mode 100644
index c2e89ac..0000000
--- a/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
+++ /dev/null
@@ -1,44 +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.rest.example;
-
-import org.osgi.service.component.annotations.Component;
-
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.ext.Provider;
-import java.io.IOException;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-@Component(
- immediate = true,
- property = {
- "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)",
- "osgi.jaxrs.filter.base=/examples"
- }
-)
-@Provider
-public class ExampleFilter implements ContainerRequestFilter {
-
- @Override
- public void filter(ContainerRequestContext requestContext)
- throws IOException {
-
- System.out.println("FILTERED!");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.extender/.gitignore
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/.gitignore b/org.apache.aries.jax-rs.extender/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/org.apache.aries.jax-rs.extender/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build/
-/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.extender/bnd.bnd
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/bnd.bnd b/org.apache.aries.jax-rs.extender/bnd.bnd
deleted file mode 100644
index 1e44d09..0000000
--- a/org.apache.aries.jax-rs.extender/bnd.bnd
+++ /dev/null
@@ -1,58 +0,0 @@
-Bundle-Activator: com.liferay.portal.remote.rest.extender.activator.CXFJaxRsBundleActivator
-Provide-Capability: \
- osgi.extender; \
- osgi.extender='aries.jax-rs'; \
- version:Version='1.0.0'
-Import-Package:\
- !com.sun.*,\
- !com.ctc.wstx.*,\
- !javax.imageio.*,\
- !javax.jws.*,\
- !javax.net.*,\
- !javax.security.*,\
- !javax.tools.*,\
- !javax.validation.*,\
- !javax.wsdl.*,\
- !net.sf.cglib.proxy.*,\
- !org.apache.abdera.*,\
- !org.apache.aries.*,\
- !org.apache.cxf.*,\
- !org.apache.neethi.*,\
- !org.apache.velocity.*,\
- !org.apache.xerces.*,\
- !org.apache.xml.resolver.*,\
- !org.apache.xmlbeans.*,\
- !org.codehaus.stax2.*,\
- !org.dom4j.*,\
- !org.junit.*,\
- !org.jvnet.fastinfoset.*,\
- !org.jvnet.staxex.*,\
- !org.ietf.jgss.*,\
- !org.osgi.service.blueprint.*,\
- !org.relaxng.datatype.*,\
- !org.slf4j.spi.*,\
- !org.springframework.*,\
- *
-
-#Provide-Capability:\
-# osgi.contract;\
-# osgi.contract=JavaJAXRS;\
-# uses:="javax.ws.rs,javax.ws.rs.core,javax.ws.rs.client,javax.ws.rs.container,javax.ws.rs.ext";\
-# version:Version=2,\
-# osgi.contract;\
-# osgi.contract=JavaJSONP;\
-# uses:="javax.json,javax.json.spi,javax.json.stream";\
-# version:Version=1
-
-#-exportcontents:\
-# org.apache.cxf.jaxrs.ext.*
-
--includeresource:\
- lib/cxf-core.jar=cxf-core-*.jar;lib:=true,\
- lib/cxf-rt-databinding-jaxb.jar=cxf-rt-databinding-jaxb-*.jar;lib:=true,\
- lib/cxf-rt-frontend-jaxrs.jar=cxf-rt-frontend-jaxrs-*.jar;lib:=true,\
- lib/cxf-rt-rs-extension-providers.jar=cxf-rt-rs-extension-providers-*.jar;lib:=true,\
- lib/cxf-rt-transports-http.jar=cxf-rt-transports-http-*.jar;lib:=true,\
- lib/cxf-tools-common.jar=cxf-tools-common-*.jar;lib:=true,\
- lib/cxf-tools-validator.jar=cxf-tools-validator-*.jar;lib:=true,\
- lib/jettison.jar=jettison-*.jar;lib:=true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.extender/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/pom.xml b/org.apache.aries.jax-rs.extender/pom.xml
deleted file mode 100644
index 2e756de..0000000
--- a/org.apache.aries.jax-rs.extender/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.aries.jax-rs.extender</artifactId>
- <packaging>jar</packaging>
- <description>Aries JAX-RS Extender</description>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-validator</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3.8</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation</artifactId>
- <version>6.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>5.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>5.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.2</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
deleted file mode 100644
index f3203b0..0000000
--- a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
+++ /dev/null
@@ -1,102 +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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import javax.ws.rs.ext.RuntimeDelegate;
-
-import org.apache.cxf.Bus;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Filter;
-import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.util.tracker.ServiceTracker;
-
-import com.liferay.portal.remote.rest.extender.internal.BusServiceTrackerCustomizer;
-import com.liferay.portal.remote.rest.extender.internal.ServicesServiceTrackerCustomizer;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class CXFJaxRsBundleActivator implements BundleActivator {
-
- private ServiceTracker<?, ?> _busServiceTracker;
- private ServiceTracker<?, ?> _singletonsTracker;
- private ServicesRegistrator _servicesRegistrator;
-
- @Override
- public void start(BundleContext bundleContext) throws Exception {
- Thread thread = Thread.currentThread();
-
- ClassLoader contextClassLoader = thread.getContextClassLoader();
-
- Bundle bundle = bundleContext.getBundle();
-
- BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
-
- thread.setContextClassLoader(bundleWiring.getClassLoader());
-
- try {
-
- // Initialize instance so it is never looked up again
-
- RuntimeDelegate.getInstance();
- }
- finally {
- thread.setContextClassLoader(contextClassLoader);
- }
-
- Dictionary<String, Object> runtimeProperties = new Hashtable<>();
-
- runtimeProperties.put("endpoints", new ArrayList<String>());
-
- // TODO make the context path of the JAX-RS Whiteboard configurable.
-
- _servicesRegistrator = new ServicesRegistrator(
- bundleContext, Collections.singletonMap("contextPath", "/"));
-
- _servicesRegistrator.start();
-
- _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();
-
- _servicesRegistrator.stop();
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
deleted file mode 100644
index 83c802a..0000000
--- a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/ServicesRegistrator.java
+++ /dev/null
@@ -1,151 +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.activator;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusFactory;
-import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.http.context.ServletContextHelper;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.Servlet;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class ServicesRegistrator {
-
- public ServicesRegistrator(
- BundleContext bundleContext, Map<String, Object> properties) {
-
- _bundleContext = bundleContext;
-
- _properties = properties;
- }
-
- public void start() {
- Dictionary<String, Object> properties = new Hashtable<>();
-
- Object contextPathObject = _properties.get("contextPath");
-
- String contextPath = contextPathObject.toString();
-
- String contextName = contextPath.substring(1);
-
- contextName = contextName.replace("/", ".");
-
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME,
- contextName);
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
- contextPath);
-
- _servletContextHelperServiceRegistration =
- _bundleContext.registerService(
- ServletContextHelper.class,
- new ServletContextHelper(_bundleContext.getBundle()) {
- },
- properties);
-
- CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet();
-
- CXFBusFactory cxfBusFactory =
- (CXFBusFactory) CXFBusFactory.newInstance(
- CXFBusFactory.class.getName());
-
- Bus bus = cxfBusFactory.createBus();
-
- properties = new Hashtable<>();
-
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
- "(osgi.http.whiteboard.context.name=" + contextName + ")");
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME,
- CXFNonSpringServlet.class.getName());
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/*");
-
- cxfNonSpringServlet.setBus(bus);
-
- _servletServiceRegistration = _bundleContext.registerService(
- Servlet.class, cxfNonSpringServlet, properties);
-
- properties = new Hashtable<>();
-
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
- contextPath);
-
- _busServiceRegistration = _bundleContext.registerService(
- Bus.class, bus, properties);
- }
-
- public void stop() {
- try {
- _busServiceRegistration.unregister();
- }
- catch (Exception e) {
- if (_logger.isWarnEnabled()) {
- _logger.warn(
- "Unable to unregister CXF bus service registration " +
- _busServiceRegistration);
- }
- }
-
- try {
- _servletServiceRegistration.unregister();
- }
- catch (Exception e) {
- if (_logger.isWarnEnabled()) {
- _logger.warn(
- "Unable to unregister servlet service registration " +
- _servletServiceRegistration);
- }
- }
-
- try {
- _servletContextHelperServiceRegistration.unregister();
- }
- catch (Exception e) {
- if (_logger.isWarnEnabled()) {
- _logger.warn(
- "Unable to unregister servlet context helper service " +
- "registration " +
- _servletContextHelperServiceRegistration);
- }
- }
- }
-
- private static final Logger _logger = LoggerFactory.getLogger(
- ServicesRegistrator.class);
-
- private final BundleContext _bundleContext;
- private ServiceRegistration<Bus> _busServiceRegistration;
- private final Map<String, Object> _properties;
- private ServiceRegistration<ServletContextHelper>
- _servletContextHelperServiceRegistration;
- private ServiceRegistration<Servlet> _servletServiceRegistration;
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
deleted file mode 100644
index 8900ded..0000000
--- a/org.apache.aries.jax-rs.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/76e7db85/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
deleted file mode 100644
index 8296683..0000000
--- a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,141 +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 java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.ws.rs.core.Application;
-
-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;
-
-/**
- * @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 (Throwable 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/76e7db85/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
deleted file mode 100644
index ba15c1e..0000000
--- a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
+++ /dev/null
@@ -1,117 +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 java.util.Arrays;
-import java.util.Collection;
-
-import javax.ws.rs.core.Application;
-
-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;
-
-/**
- * @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, filtersAndInterceptorsServiceTracker);
- }
- 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/76e7db85/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
deleted file mode 100644
index 7449ec8..0000000
--- a/org.apache.aries.jax-rs.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/76e7db85/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
deleted file mode 100644
index 07e8c7a..0000000
--- a/org.apache.aries.jax-rs.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/76e7db85/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
deleted file mode 100644
index 433f70c..0000000
--- a/org.apache.aries.jax-rs.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/76e7db85/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java b/org.apache.aries.jax-rs.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
deleted file mode 100644
index 8645504..0000000
--- a/org.apache.aries.jax-rs.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/76e7db85/org.apache.aries.jax-rs.integration-test/integration-test.bndrun
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.integration-test/integration-test.bndrun b/org.apache.aries.jax-rs.integration-test/integration-test.bndrun
deleted file mode 100644
index 435ad96..0000000
--- a/org.apache.aries.jax-rs.integration-test/integration-test.bndrun
+++ /dev/null
@@ -1,50 +0,0 @@
--standalone:
-
--plugin.integration.test = \
- aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
- snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \
- releaseUrls=https://repo1.maven.org/maven2/; \
- pom=${.}/pom.xml; \
- name=integration.test; \
- location=${.}/target/cached.xml
-
--runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.tests)'
-
--runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
-
-#-runtrace: true
-
--runee: JavaSE-1.8
--resolve.effective: resolve, active
-
--runsystempackages.eqnx: javax.script
--runsystemcapabilities.dflt: ${native_capability}
--runproperties.eqnx: \
- osgi.console.enable.builtin=false, \
- osgi.console=, \
- org.osgi.service.http.port=8080
--runbundles: \
- javax.annotation-api; version='[1.2.0,1.2.1)',\
- javax.json-api; version='[1.0.0,1.0.1)',\
- javax.ws.rs-api; version='[2.0.1,2.0.2)',\
- log4j; version='[1.2.17,1.2.18)',\
- org.apache.aries.jax-rs.extender; version='[1.0.0,1.0.1)',\
- org.apache.aries.jax-rs.tests; version='[1.0.0,1.0.1)',\
- org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\
- org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
- org.apache.felix.http.api; version='[3.0.0,3.0.1)',\
- org.apache.felix.http.jetty; version='[3.4.0,3.4.1)',\
- org.apache.felix.http.servlet-api; version='[1.1.2,1.1.3)',\
- org.apache.felix.scr; version='[2.0.2,2.0.3)',\
- org.apache.ws.xmlschema.core; version='[2.2.1,2.2.2)',\
- org.eclipse.equinox.event; version='[1.3.100,1.3.101)',\
- org.eclipse.equinox.metatype; version='[1.4.100,1.4.101)',\
- org.objectweb.asm; version='[5.0.4,5.0.5)',\
- org.osgi.compendium; version='[4.1.0,4.1.1)',\
- org.osgi.service.event; version='[1.3.1,1.3.2)',\
- org.osgi.service.metatype; version='[1.3.0,1.3.1)',\
- osgi.enroute.hamcrest.wrapper; version='[1.3.0,1.3.1)',\
- osgi.enroute.junit.wrapper; version='[4.12.0,4.12.1)',\
- slf4j.api; version='[1.7.21,1.7.22)',\
- slf4j.log4j12; version='[1.6.1,1.6.2)'
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.integration-test/pom.xml b/org.apache.aries.jax-rs.integration-test/pom.xml
deleted file mode 100644
index 2650fc2..0000000
--- a/org.apache.aries.jax-rs.integration-test/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>org.apache.aries.jax-rs.integration-test</artifactId>
-
- <packaging>pom</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-testing-maven-plugin</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- <configuration>
- <failOnChanges>false</failOnChanges>
- <resolve>false</resolve>
- <bndruns>
- <bndrun>integration-test.bndrun</bndrun>
- </bndruns>
- <targetDir>.</targetDir>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>testing</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs.extender</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs.tests</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>3.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.pom.distro</artifactId>
- <version>2.0.0</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.tests/bnd.bnd
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/bnd.bnd b/org.apache.aries.jax-rs.tests/bnd.bnd
deleted file mode 100644
index 264db93..0000000
--- a/org.apache.aries.jax-rs.tests/bnd.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-Description: Integration Test bundle for the JAX-RS extender
-
-Test-Cases: \
- ${classes;CONCRETE;EXTENDS;junit.framework.TestCase},\
- ${classes;CONCRETE;ANNOTATED;org.junit.Test}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.tests/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/pom.xml b/org.apache.aries.jax-rs.tests/pom.xml
deleted file mode 100644
index 0a4a453..0000000
--- a/org.apache.aries.jax-rs.tests/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.apache.aries.jax-rs.tests</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>5.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.junit.wrapper</artifactId>
- <version>4.12.0</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.tests/src/main/java/test/JaxrsTest.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/src/main/java/test/JaxrsTest.java b/org.apache.aries.jax-rs.tests/src/main/java/test/JaxrsTest.java
deleted file mode 100644
index 38b03c2..0000000
--- a/org.apache.aries.jax-rs.tests/src/main/java/test/JaxrsTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package test;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Filter;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.util.tracker.ServiceTracker;
-
-import junit.framework.TestCase;
-import test.types.TestAddon;
-
-public class JaxrsTest extends TestCase {
-
- static BundleContext bundleContext = FrameworkUtil.getBundle(
- JaxrsTest.class).getBundleContext();
-
- public void testEndPoint() throws Exception {
- ServiceRegistration<?> serviceRegistration = null;
-
- try {
- TestAddon testAddon = new TestAddon();
-
- Dictionary<String, Object> properties = new Hashtable<>();
- properties.put("osgi.jaxrs.resource.base", "/test-addon");
-
- serviceRegistration = bundleContext.registerService(
- Object.class, testAddon, properties);
-
- // TODO this availability should be checked through a jaxrs runtime service of some kind
-
- Filter filter = bundleContext.createFilter(
- "(&(objectClass=com.liferay.portal.remote.rest.extender.internal.CXFJaxRsServiceRegistrator)" +
- "(CXF_ENDPOINT_ADDRESS=/test-addon))");
-
- ServiceTracker<?, ?> st = new ServiceTracker<>(bundleContext, filter, null);
-
- st.open();
-
- if (st.waitForService(5000) == null) {
- fail();
- }
-
- // TODO add http client to connect to the endpoint
- }
- finally {
- if (serviceRegistration != null) {
- serviceRegistration.unregister();
- }
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestAddon.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestAddon.java b/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestAddon.java
deleted file mode 100644
index 849d582..0000000
--- a/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestAddon.java
+++ /dev/null
@@ -1,41 +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 test.types;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-
-//property = "osgi.jaxrs.resource.base=/test-addon",
-public class TestAddon {
-
- @GET
- @Path("/{name}")
- public String sayHello(@PathParam("name") String name) {
- return "Hello " + name;
- }
-
- @PostConstruct
- public void init() {
- System.out.println("URIINFO: " + _uriInfo);
- }
-
- @Context
- UriInfo _uriInfo;
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestApplication.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestApplication.java b/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestApplication.java
deleted file mode 100644
index c7e65f3..0000000
--- a/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestApplication.java
+++ /dev/null
@@ -1,38 +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 test.types;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Application;
-
-// property = "osgi.jaxrs.application.base=/example-application",
-public class TestApplication extends Application {
-
- @Override
- public Set<Object> getSingletons() {
- return Collections.<Object>singleton(this);
- }
-
- @GET
- @Produces("text/plain")
- public String sayHello() {
- return "Hello world";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestFilter.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestFilter.java b/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestFilter.java
deleted file mode 100644
index 928221a..0000000
--- a/org.apache.aries.jax-rs.tests/src/main/java/test/types/TestFilter.java
+++ /dev/null
@@ -1,37 +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 test.types;
-
-import java.io.IOException;
-
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.ext.Provider;
-
-// property = {
-// "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)",
-// "osgi.jaxrs.filter.base=/examples"
-// }
-@Provider
-public class TestFilter implements ContainerRequestFilter {
-
- @Override
- public void filter(ContainerRequestContext requestContext)
- throws IOException {
-
- System.out.println("FILTERED!");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/76e7db85/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e0e1edf..6a426c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,11 +48,11 @@
</plugins>
</build>
<modules>
- <module>org.apache.aries.jax-rs.extender</module>
- <module>org.apache.aries.jax-rs.example</module>
- <module>org.apache.aries.jax-rs.bndrun</module>
- <module>org.apache.aries.jax-rs.tests</module>
- <module>org.apache.aries.jax-rs.integration-test</module>
+ <module>jax-rs.whiteboard</module>
+ <module>jax-rs.itests</module>
+ <module>jax-rs.itests-run</module>
+ <module>jax-rs.example</module>
+ <module>jax-rs.example-run</module>
</modules>
<dependencies>
<dependency>
@@ -80,4 +80,4 @@
<layout>default</layout>
</pluginRepository>
</pluginRepositories>
-</project>
\ No newline at end of file
+</project>
[47/50] [abbrv] aries-jax-rs-whiteboard git commit: use proper
versions
Posted by cs...@apache.org.
use proper versions
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/1cab2b1e
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/1cab2b1e
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/1cab2b1e
Branch: refs/heads/master
Commit: 1cab2b1e7763e39c222495926b173e70525c4818
Parents: ed563e7
Author: Carlos Sierra <ca...@liferay.com>
Authored: Tue Nov 8 19:22:37 2016 +0100
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Nov 8 14:29:25 2016 -0500
----------------------------------------------------------------------
jax-rs.example-run/pom.xml | 6 +++---
jax-rs.example/pom.xml | 2 +-
jax-rs.itests-run/pom.xml | 6 +++---
jax-rs.itests/pom.xml | 2 +-
jax-rs.whiteboard/pom.xml | 2 +-
pom.xml | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/1cab2b1e/jax-rs.example-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/pom.xml b/jax-rs.example-run/pom.xml
index 17721a2..a22ecbf 100644
--- a/jax-rs.example-run/pom.xml
+++ b/jax-rs.example-run/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jax.rs.example-run</artifactId>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs.example</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/1cab2b1e/jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index 3740a4d..5f36245 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jax.rs.example</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/1cab2b1e/jax-rs.itests-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/pom.xml b/jax-rs.itests-run/pom.xml
index 72469c8..81c4ab1 100644
--- a/jax-rs.itests-run/pom.xml
+++ b/jax-rs.itests-run/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs.itests</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/1cab2b1e/jax-rs.itests/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 61b93a9..c1a6880 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jax.rs.itests</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/1cab2b1e/jax-rs.whiteboard/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index 12b1996..16d787d 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/1cab2b1e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0059f50..455dd3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -81,4 +81,4 @@
<layout>default</layout>
</pluginRepository>
</pluginRepositories>
-</project>
\ No newline at end of file
+</project>
[22/50] [abbrv] aries-jax-rs-whiteboard git commit: Remove unused code
Posted by cs...@apache.org.
Remove unused code
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/2cd18949
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/2cd18949
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/2cd18949
Branch: refs/heads/master
Commit: 2cd18949a6fc7d346dd553fe5bf2caa48ea1cfb8
Parents: c7de775
Author: Carlos Sierra <ca...@liferay.com>
Authored: Tue Oct 25 18:48:14 2016 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Oct 25 18:48:14 2016 +0200
----------------------------------------------------------------------
.../remote/cxf/common/ServicesRegistrator.java | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/2cd18949/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java b/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
index 68d79f6..8169e78 100644
--- a/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
@@ -43,21 +43,6 @@ public class ServicesRegistrator {
_properties = properties;
}
- @SuppressWarnings("unused")
- protected void addExtension(
- Map<String, Object> properties, Object extension) {
-
- Class<?> extensionClass = (Class<?>) properties.get(
- "cxf.extension.class");
-
- if (extensionClass == null) {
- extensionClass = extension.getClass();
- }
-
- _extensions.put(extensionClass, extension);
- }
-
- @SuppressWarnings("unused")
public void start() {
Dictionary<String, Object> properties = new Hashtable<>();
@@ -89,7 +74,7 @@ public class ServicesRegistrator {
(CXFBusFactory) CXFBusFactory.newInstance(
CXFBusFactory.class.getName());
- Bus bus = cxfBusFactory.createBus(_extensions);
+ Bus bus = cxfBusFactory.createBus();
properties = new Hashtable<>();
@@ -117,7 +102,6 @@ public class ServicesRegistrator {
Bus.class, bus, properties);
}
- @SuppressWarnings("unused")
public void stop() {
try {
_busServiceRegistration.unregister();
@@ -159,7 +143,6 @@ public class ServicesRegistrator {
private final BundleContext _bundleContext;
private ServiceRegistration<Bus> _busServiceRegistration;
- private final Map<Class<?>, Object> _extensions = new HashMap<>();
private final Map<String, Object> _properties;
private ServiceRegistration<ServletContextHelper>
_servletContextHelperServiceRegistration;
[04/50] [abbrv] aries-jax-rs-whiteboard git commit: Fixed build
Posted by cs...@apache.org.
Fixed build
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/f50f9161
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f50f9161
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f50f9161
Branch: refs/heads/master
Commit: f50f9161aa1b2de185fac9bc24f994cd66adcce2
Parents: 64ea9eb
Author: Carlos Sierra <ca...@liferay.com>
Authored: Tue Oct 11 18:56:50 2016 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Oct 11 18:56:50 2016 +0200
----------------------------------------------------------------------
test-cxf/build.gradle | 40 +++++++++++++---------------------------
1 file changed, 13 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f50f9161/test-cxf/build.gradle
----------------------------------------------------------------------
diff --git a/test-cxf/build.gradle b/test-cxf/build.gradle
index 82d4055..010c76b 100644
--- a/test-cxf/build.gradle
+++ b/test-cxf/build.gradle
@@ -1,24 +1,4 @@
dependencies {
-// compile group: "org.osgi", name: "org.osgi.core", transitive: false, version: "6.0.0"
-// runtime group: "biz.aQute.bnd", name: "biz.aQute.bndlib", transitive: false, version: "3.1.0"
-// runtime group: "org.apache.felix", name: "org.apache.felix.configadmin", transitive: false, version: "1.8.8"
-// runtime group: "org.apache.felix", name: "org.apache.felix.dependencymanager", transitive: false, version: "3.2.0"
-// runtime group: "org.osgi", name: "org.osgi.service.http.whiteboard", transitive: false, version: "1.0.0"
-// runtime group: "org.apache.felix", name: "org.apache.felix.gogo.command", transitive: false, transitive: false, version: "0.12.0"
-// runtime group: "org.apache.felix", name: "org.apache.felix.gogo.runtime", transitive: false, transitive: false, version: "0.10.0"
-// runtime group: "org.apache.felix", name: "org.apache.felix.gogo.shell", transitive: false, transitive: false, version: "0.10.0"
-//
-// runtime group: "biz.aQute.bnd", name: "biz.aQute.bndlib", transitive: false, version: "3.1.0"
-// runtime group: "javax.servlet", name: "javax.servlet-api", transitive: false, version: "3.0.1"
-// runtime group: "org.osgi", name: "org.osgi.service.http.whiteboard", transitive: false, version: "1.0.0"
-// runtime group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', transitive: false, version: '2.6'
-// runtime group: "org.codehaus.woodstox", name: "stax2-api", transitive: false, version: "3.1.4"
-// runtime group: "org.codehaus.woodstox", name: "woodstox-core-asl", transitive: false, version: "4.4.1"
-// runtime group: "org.osgi", name: "org.osgi.service.metatype", transitive: false, version: "1.3.0"
-// runtime group: "log4j", name: "log4j", transitive: false, version: "1.2.17"
-// runtime group: "org.apache.felix", name: "org.apache.felix.fileinstall", transitive: false, version: "3.5.4"
-// runtime 'commons-fileupload:commons-fileupload:1.3.2'
-// compile group: 'org.json', name: 'json', transitive: false, version: '20160212'
compile project(path: ':example-jaxrs-application', transitive: false)
compile project(path: ':portal-remote-cxf-common', transitive: false)
compile project(path: ':portal-remote-cxf-jaxrs-common', transitive: false)
@@ -60,12 +40,18 @@ task getDeps(type: Copy, dependsOn:cleanDeps) {
}
task run(dependsOn:getDeps) << {
- new File('felix-cache').deleteDir()
- javaexec {
- main="-jar";
- args = ["bin/felix.jar"]
- jvmArgs = ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"]
- standardInput = System.in
- }
+ def felixCache = file('felix-cache')
+
+ if (felixCache.exists()) {
+ felixCache.deleteDir()
+ }
+
+ javaexec {
+ main="-jar";
+ args = ["bin/felix.jar"]
+ jvmArgs = ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"]
+ standardInput = System.in
+ }
+
}
[41/50] [abbrv] aries-jax-rs-whiteboard git commit: Update License
and packages
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fe021547/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/SingletonServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/SingletonServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/SingletonServiceTrackerCustomizer.java
new file mode 100644
index 0000000..8ed83da
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/SingletonServiceTrackerCustomizer.java
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.aries.jax.rs.whiteboard.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;
+ }
+
+ }
+
+}
+
+
[44/50] [abbrv] aries-jax-rs-whiteboard git commit: Update BSN
accordingly
Posted by cs...@apache.org.
Update BSN accordingly
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/650ec56d
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/650ec56d
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/650ec56d
Branch: refs/heads/master
Commit: 650ec56da1d184476674adf7ba2f2d53c5f3837e
Parents: fe02154
Author: Carlos Sierra <ca...@liferay.com>
Authored: Tue Nov 8 18:39:22 2016 +0100
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Nov 8 18:39:47 2016 +0100
----------------------------------------------------------------------
jax-rs.example-run/example.bndrun | 9 ++++-----
jax-rs.example-run/pom.xml | 8 ++++----
jax-rs.example/pom.xml | 4 ++--
jax-rs.itests-run/itest.bndrun | 6 +++---
jax-rs.itests-run/pom.xml | 8 ++++----
jax-rs.itests/pom.xml | 4 ++--
jax-rs.whiteboard/pom.xml | 4 ++--
pom.xml | 4 ++--
8 files changed, 23 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/650ec56d/jax-rs.example-run/example.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/example.bndrun b/jax-rs.example-run/example.bndrun
index 0a28b1b..dccf286 100644
--- a/jax-rs.example-run/example.bndrun
+++ b/jax-rs.example-run/example.bndrun
@@ -11,11 +11,11 @@
location=${.}/target/cached.xml
-runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.example)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.example)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)'
# ,\
-# osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.whiteboard)'
+# osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)'
-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
-runbundles: \
@@ -23,10 +23,9 @@
javax.json-api;version='[1.0.0,1.0.1)',\
javax.ws.rs-api;version='[2.0.1,2.0.2)',\
log4j;version='[1.2.17,1.2.18)',\
- org.apache.aries.jax-rs.example;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax-rs.whiteboard;version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.example;version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.0,1.0.1)',\
org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
- org.apache.felix.http.jetty;version='[3.4.0,3.4.1)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.felix.scr;version='[2.0.2,2.0.3)',\
org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/650ec56d/jax-rs.example-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/pom.xml b/jax-rs.example-run/pom.xml
index 31407b2..4041dd9 100644
--- a/jax-rs.example-run/pom.xml
+++ b/jax-rs.example-run/pom.xml
@@ -4,11 +4,11 @@
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.apache.aries.jax-rs.example-run</artifactId>
+ <artifactId>org.apache.aries.jax.rs.example-run</artifactId>
<packaging>pom</packaging>
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
<groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs.example</artifactId>
+ <artifactId>org.apache.aries.jax.rs.example</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs.whiteboard</artifactId>
+ <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/650ec56d/jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index a6473c4..3740a4d 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -6,10 +6,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.apache.aries.jax-rs.example</artifactId>
+ <artifactId>org.apache.aries.jax.rs.example</artifactId>
<packaging>jar</packaging>
<description>Apache Aries JAX-RS Example</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/650ec56d/jax-rs.itests-run/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/itest.bndrun b/jax-rs.itests-run/itest.bndrun
index e610def..6fb7b34 100644
--- a/jax-rs.itests-run/itest.bndrun
+++ b/jax-rs.itests-run/itest.bndrun
@@ -9,7 +9,7 @@
location=${.}/target/cached.xml
-runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.itests)'
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests)'
-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
@@ -29,8 +29,8 @@
javax.json-api; version='[1.0.0,1.0.1)',\
javax.ws.rs-api; version='[2.0.1,2.0.2)',\
log4j; version='[1.2.17,1.2.18)',\
- org.apache.aries.jax-rs.itests; version='[1.0.0,1.0.1)',\
- org.apache.aries.jax-rs.whiteboard; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.itests; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.whiteboard; version='[1.0.0,1.0.1)',\
org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\
org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
org.apache.felix.http.api; version='[3.0.0,3.0.1)',\
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/650ec56d/jax-rs.itests-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/pom.xml b/jax-rs.itests-run/pom.xml
index 63ea8fe..5852275 100644
--- a/jax-rs.itests-run/pom.xml
+++ b/jax-rs.itests-run/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>org.apache.aries.jax-rs.itests-run</artifactId>
+ <artifactId>org.apache.aries.jax.rs.itests-run</artifactId>
<packaging>pom</packaging>
@@ -42,12 +42,12 @@
<dependencies>
<dependency>
<groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs.itests</artifactId>
+ <artifactId>org.apache.aries.jax.rs.itests</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs.whiteboard</artifactId>
+ <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/650ec56d/jax-rs.itests/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 42ed192..61b93a9 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -7,11 +7,11 @@
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.apache.aries.jax-rs.itests</artifactId>
+ <artifactId>org.apache.aries.jax.rs.itests</artifactId>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/650ec56d/jax-rs.whiteboard/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index 10220a1..12b1996 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -6,10 +6,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.apache.aries.jax-rs.whiteboard</artifactId>
+ <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<packaging>jar</packaging>
<description>Apache Aries JAX-RS Whiteboard</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/650ec56d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6a426c8..6d81c11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.jax-rs</artifactId>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -80,4 +80,4 @@
<layout>default</layout>
</pluginRepository>
</pluginRepositories>
-</project>
+</project>
\ No newline at end of file
[34/50] [abbrv] aries-jax-rs-whiteboard git commit: restructure the
entire build
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_BR.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_BR.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_BR.properties
deleted file mode 100644
index cc489da..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_PT.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_PT.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_PT.properties
deleted file mode 100644
index cc489da..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_ro.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ro.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ro.properties
deleted file mode 100644
index 2c26380..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_ru.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ru.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ru.properties
deleted file mode 100644
index 068b2cd..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_sk.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_sk.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_sk.properties
deleted file mode 100644
index 05a4cbe..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_sl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_sl.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_sl.properties
deleted file mode 100644
index 393ff7f..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS_latin.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS_latin.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS_latin.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_sv.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_sv.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_sv.properties
deleted file mode 100644
index 9b885db..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_tr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_tr.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_tr.properties
deleted file mode 100644
index 87ddb28..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_uk.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_uk.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_uk.properties
deleted file mode 100644
index 2e65121..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_vi.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_vi.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_vi.properties
deleted file mode 100644
index e01047a..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_CN.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_CN.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_CN.properties
deleted file mode 100644
index 1d4ebb9..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_TW.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_TW.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_TW.properties
deleted file mode 100644
index 36dac4d..0000000
--- a/org.apache.aries.rest.extender/src/main/resources/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/17c51be0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4334170..e0e1edf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,9 +48,11 @@
</plugins>
</build>
<modules>
+ <module>org.apache.aries.jax-rs.extender</module>
<module>org.apache.aries.jax-rs.example</module>
- <module>org.apache.aries.jax-rs.cxf-common</module>
- <module>org.apache.aries.rest.extender</module>
+ <module>org.apache.aries.jax-rs.bndrun</module>
+ <module>org.apache.aries.jax-rs.tests</module>
+ <module>org.apache.aries.jax-rs.integration-test</module>
</modules>
<dependencies>
<dependency>
[20/50] [abbrv] aries-jax-rs-whiteboard git commit: [maven] convert
to maven build using bnd-maven-plugin
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_TW.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_TW.properties b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_TW.properties
new file mode 100644
index 0000000..c287f7f
--- /dev/null
+++ b/org.apache.aries.jax-rs.cxf-common/src/main/resources/content/Language_zh_TW.properties
@@ -0,0 +1 @@
+cxf.endpoint.configuration.name=CXF \u7d42\u7d50\u9ede (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.example/.gitignore
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.example/.gitignore b/org.apache.aries.jax-rs.example/.gitignore
new file mode 100644
index 0000000..83ccc54
--- /dev/null
+++ b/org.apache.aries.jax-rs.example/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.example/pom.xml b/org.apache.aries.jax-rs.example/pom.xml
new file mode 100644
index 0000000..252a6ba
--- /dev/null
+++ b/org.apache.aries.jax-rs.example/pom.xml
@@ -0,0 +1,27 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>com.liferay.portal.rest.example</artifactId>
+ <packaging>jar</packaging>
+ <description>REST Example</description>
+ <dependencies>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java b/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
new file mode 100644
index 0000000..5431e76
--- /dev/null
+++ b/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleAddon.java
@@ -0,0 +1,50 @@
+/**
+ * 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.rest.example;
+
+import org.osgi.service.component.annotations.Component;
+
+import javax.annotation.PostConstruct;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+@Component(
+ immediate = true,
+ property = "osgi.jaxrs.resource.base=/examples/example-addon",
+ service = ExampleAddon.class
+)
+public class ExampleAddon {
+
+ @GET
+ @Path("/{name}")
+ public String sayHello(@PathParam("name") String name) {
+ return "Hello " + name;
+ }
+
+ @PostConstruct
+ public void init() {
+ System.out.println("URIINFO: " + _uriInfo);
+ }
+
+ @Context
+ UriInfo _uriInfo;
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java b/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
new file mode 100644
index 0000000..25234b2
--- /dev/null
+++ b/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleApplication.java
@@ -0,0 +1,46 @@
+/**
+ * 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.rest.example;
+
+import org.osgi.service.component.annotations.Component;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Application;
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+@Component(
+ immediate = true,
+ property = "osgi.jaxrs.application.base=/example-application",
+ service = Application.class
+)
+public class ExampleApplication extends Application {
+
+ @Override
+ public Set<Object> getSingletons() {
+ return Collections.<Object>singleton(this);
+ }
+
+ @GET
+ @Produces("text/plain")
+ public String sayHello() {
+ return "Hello world";
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java b/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
new file mode 100644
index 0000000..c2e89ac
--- /dev/null
+++ b/org.apache.aries.jax-rs.example/src/main/java/com/liferay/portal/rest/example/ExampleFilter.java
@@ -0,0 +1,44 @@
+/**
+ * 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.rest.example;
+
+import org.osgi.service.component.annotations.Component;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+
+/**
+ * @author Carlos Sierra Andr�s
+ */
+@Component(
+ immediate = true,
+ property = {
+ "jaxrs.application.select=(component.name=com.liferay.portal.rest.example.ExampleApplication)",
+ "osgi.jaxrs.filter.base=/examples"
+ }
+)
+@Provider
+public class ExampleFilter implements ContainerRequestFilter {
+
+ @Override
+ public void filter(ContainerRequestContext requestContext)
+ throws IOException {
+
+ System.out.println("FILTERED!");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.rest.extender/.gitignore
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/.gitignore b/org.apache.aries.rest.extender/.gitignore
new file mode 100644
index 0000000..83ccc54
--- /dev/null
+++ b/org.apache.aries.rest.extender/.gitignore
@@ -0,0 +1,2 @@
+/build/
+/bin/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.rest.extender/bnd.bnd
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/bnd.bnd b/org.apache.aries.rest.extender/bnd.bnd
new file mode 100644
index 0000000..d03d478
--- /dev/null
+++ b/org.apache.aries.rest.extender/bnd.bnd
@@ -0,0 +1,5 @@
+Bundle-Activator: com.liferay.portal.remote.rest.extender.activator.CXFJaxRsBundleActivator
+Provide-Capability: \
+ osgi.extender; \
+ osgi.extender='aries.jax-rs'; \
+ version:Version='1.0.0'
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.rest.extender/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/pom.xml b/org.apache.aries.rest.extender/pom.xml
new file mode 100644
index 0000000..5952b5a
--- /dev/null
+++ b/org.apache.aries.rest.extender/pom.xml
@@ -0,0 +1,67 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.aries.rest.extender</artifactId>
+ <packaging>jar</packaging>
+ <description>Aries JAX-RS Extender</description>
+ <dependencies>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.liferay</groupId>
+ <artifactId>com.liferay.portal.remote.cxf.jaxrs.common</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>3.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>6.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http.whiteboard</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.dependencymanager</artifactId>
+ <version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.3.8</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
new file mode 100644
index 0000000..04017d6
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/activator/CXFJaxRsBundleActivator.java
@@ -0,0 +1,78 @@
+/**
+ * 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/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
new file mode 100644
index 0000000..8900ded
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/AddonsServiceTrackerCustomizer.java
@@ -0,0 +1,102 @@
+/**
+ * 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/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
new file mode 100644
index 0000000..2594ac3
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ApplicationServiceTrackerCustomizer.java
@@ -0,0 +1,140 @@
+/**
+ * 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/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
new file mode 100644
index 0000000..8440196
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/BusServiceTrackerCustomizer.java
@@ -0,0 +1,116 @@
+/**
+ * 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/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
new file mode 100644
index 0000000..7449ec8
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/CXFJaxRsServiceRegistrator.java
@@ -0,0 +1,148 @@
+/**
+ * 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/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
new file mode 100644
index 0000000..07e8c7a
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java
@@ -0,0 +1,123 @@
+/**
+ * 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/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
new file mode 100644
index 0000000..433f70c
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/ServicesServiceTrackerCustomizer.java
@@ -0,0 +1,104 @@
+/**
+ * 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/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
new file mode 100644
index 0000000..8645504
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/SingletonServiceTrackerCustomizer.java
@@ -0,0 +1,159 @@
+/**
+ * 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/org.apache.aries.rest.extender/src/main/resources/content/Language.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language.properties
new file mode 100644
index 0000000..ff2b883
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_ar.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ar.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ar.properties
new file mode 100644
index 0000000..f7ddde5
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_ar.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_bg.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_bg.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_bg.properties
new file mode 100644
index 0000000..93f99d3
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_bg.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_ca.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ca.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ca.properties
new file mode 100644
index 0000000..9476a3e
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_ca.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_cs.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_cs.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_cs.properties
new file mode 100644
index 0000000..76bc497
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_cs.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_da.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_da.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_da.properties
new file mode 100644
index 0000000..9b885db
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_da.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_de.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_de.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_de.properties
new file mode 100644
index 0000000..ff2b883
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_de.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_el.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_el.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_el.properties
new file mode 100644
index 0000000..1fd60a7
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_el.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_en.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_en.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_en.properties
new file mode 100644
index 0000000..ff2b883
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_en.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_es.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_es.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_es.properties
new file mode 100644
index 0000000..cc489da
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_es.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_et.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_et.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_et.properties
new file mode 100644
index 0000000..824e6e1
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_et.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_eu.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_eu.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_eu.properties
new file mode 100644
index 0000000..e82a9e0
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_eu.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_fa.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_fa.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_fa.properties
new file mode 100644
index 0000000..64e00d0
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_fa.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_fi.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_fi.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_fi.properties
new file mode 100644
index 0000000..d0e0a1d
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_fi.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_fr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_fr.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_fr.properties
new file mode 100644
index 0000000..52e43d9
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_fr.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_gl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_gl.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_gl.properties
new file mode 100644
index 0000000..e82a9e0
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_gl.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_hi_IN.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_hi_IN.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_hi_IN.properties
new file mode 100644
index 0000000..340d552
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_hi_IN.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_hr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_hr.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_hr.properties
new file mode 100644
index 0000000..e82a9e0
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_hr.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_hu.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_hu.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_hu.properties
new file mode 100644
index 0000000..cdc65c6
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_hu.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_in.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_in.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_in.properties
new file mode 100644
index 0000000..b60839d
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_in.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_it.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_it.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_it.properties
new file mode 100644
index 0000000..ff2b883
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_it.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_iw.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_iw.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_iw.properties
new file mode 100644
index 0000000..667e11d
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_iw.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_ja.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ja.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ja.properties
new file mode 100644
index 0000000..ff2b883
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_ja.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_ko.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ko.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ko.properties
new file mode 100644
index 0000000..3b3ecce
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_ko.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_lo.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_lo.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_lo.properties
new file mode 100644
index 0000000..e82a9e0
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_lo.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_lt.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_lt.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_lt.properties
new file mode 100644
index 0000000..4f37958
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_lt.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_nb.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_nb.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_nb.properties
new file mode 100644
index 0000000..9b885db
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_nb.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_nl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_nl.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_nl.properties
new file mode 100644
index 0000000..b62adc9
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_nl.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_nl_BE.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_nl_BE.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_nl_BE.properties
new file mode 100644
index 0000000..d137e77
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_nl_BE.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_pl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_pl.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_pl.properties
new file mode 100644
index 0000000..0055a27
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_pl.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_BR.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_BR.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_BR.properties
new file mode 100644
index 0000000..cc489da
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_BR.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_PT.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_PT.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_PT.properties
new file mode 100644
index 0000000..cc489da
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_pt_PT.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_ro.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ro.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ro.properties
new file mode 100644
index 0000000..2c26380
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_ro.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_ru.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_ru.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_ru.properties
new file mode 100644
index 0000000..068b2cd
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_ru.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_sk.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_sk.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_sk.properties
new file mode 100644
index 0000000..05a4cbe
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_sk.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_sl.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_sl.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_sl.properties
new file mode 100644
index 0000000..393ff7f
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_sl.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS.properties
new file mode 100644
index 0000000..e82a9e0
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS_latin.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS_latin.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS_latin.properties
new file mode 100644
index 0000000..e82a9e0
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_sr_RS_latin.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_sv.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_sv.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_sv.properties
new file mode 100644
index 0000000..9b885db
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_sv.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_tr.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_tr.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_tr.properties
new file mode 100644
index 0000000..87ddb28
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_tr.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_uk.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_uk.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_uk.properties
new file mode 100644
index 0000000..2e65121
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_uk.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_vi.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_vi.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_vi.properties
new file mode 100644
index 0000000..e01047a
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_vi.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_CN.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_CN.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_CN.properties
new file mode 100644
index 0000000..1d4ebb9
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_CN.properties
@@ -0,0 +1 @@
+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/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_TW.properties
----------------------------------------------------------------------
diff --git a/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_TW.properties b/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_TW.properties
new file mode 100644
index 0000000..36dac4d
--- /dev/null
+++ b/org.apache.aries.rest.extender/src/main/resources/content/Language_zh_TW.properties
@@ -0,0 +1 @@
+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/osgi-rest.iml
----------------------------------------------------------------------
diff --git a/osgi-rest.iml b/osgi-rest.iml
deleted file mode 100644
index caad45e..0000000
--- a/osgi-rest.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="osgi-rest" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/build" />
- <output-test url="file://$MODULE_DIR$/build" />
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/.gradle" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2ef5d2b..3da7abe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0-SNAPSHOT</version>
<executions>
<execution>
<goals>
@@ -47,6 +47,11 @@
</plugin>
</plugins>
</build>
+ <modules>
+ <module>org.apache.aries.jax-rs.example</module>
+ <module>org.apache.aries.jax-rs.cxf-common</module>
+ <module>org.apache.aries.rest.extender</module>
+ </modules>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -71,4 +76,11 @@
<layout>default</layout>
</repository>
</repositories>
-</project>
\ No newline at end of file
+ <pluginRepositories>
+ <pluginRepository>
+ <id>bnd-snapshots</id>
+ <url>https://bndtools.ci.cloudbees.com/job/bnd.master/lastSuccessfulBuild/artifact/dist/bundles/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/.gitignore
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/.gitignore b/portal-remote-cxf-common/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/portal-remote-cxf-common/.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-cxf-common/.lfrbuild-portal
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/.lfrbuild-portal b/portal-remote-cxf-common/.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-cxf-common/bnd.bnd
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/bnd.bnd b/portal-remote-cxf-common/bnd.bnd
deleted file mode 100644
index 3daca64..0000000
--- a/portal-remote-cxf-common/bnd.bnd
+++ /dev/null
@@ -1,63 +0,0 @@
-Bundle-Activator: com.liferay.portal.remote.cxf.common.activator.CXFEndpointPublisherActivator
-Bundle-ClassPath:\
- .,\
- lib/cxf-core.jar,\
- lib/cxf-rt-bindings-soap.jar,\
- lib/cxf-rt-databinding-jaxb.jar,\
- lib/cxf-rt-transports-http.jar,\
- lib/cxf-rt-wsdl.jar,\
- lib/cxf-tools-common.jar,\
- lib/cxf-tools-validator.jar,\
- lib/javax.annotation-api.jar,\
- lib/wsdl4j.jar,\
- lib/xmlschema-core.jar
-Bundle-Name: Liferay Portal Remote CXF Common
-Bundle-SymbolicName: com.liferay.portal.remote.cxf.common
-Bundle-Version: 2.0.6
-Export-Package:\
- javax.wsdl.*;version="1.2",\
- \
- org.apache.cxf.*;version="3.1.7",\
- org.apache.ws.commons.schema.*;version="2.1.0"
-Import-Package:\
- !com.sun.*,\
- \
- !javax.validation.*,\
- \
- !net.sf.cglib.proxy.*,\
- \
- !org.apache.abdera.*,\
- !org.apache.aries.*,\
- !org.apache.cxf.aegis.*,\
- !org.apache.cxf.ws.policy.*,\
- !org.apache.neethi.*,\
- !org.apache.velocity.*,\
- !org.apache.xml.resolver.*,\
- !org.apache.xmlbeans.*,\
- \
- !org.junit.*,\
- \
- !org.jvnet.fastinfoset.*,\
- !org.jvnet.staxex.*,\
- \
- !org.osgi.service.blueprint.*,\
- \
- !org.relaxng.datatype.*,\
- \
- !org.slf4j.spi.*,\
- \
- !org.springframework.*,\
- *
-Liferay-Releng-Module-Group-Description:
-Liferay-Releng-Module-Group-Title: Remote Service Engines
--includeresource:\
- lib/cxf-core.jar=cxf-core-3.1.7.jar,\
- lib/cxf-rt-bindings-soap.jar=cxf-rt-bindings-soap-3.1.7.jar,\
- lib/cxf-rt-databinding-jaxb.jar=cxf-rt-databinding-jaxb-3.1.7.jar,\
- lib/cxf-rt-transports-http.jar=cxf-rt-transports-http-3.1.7.jar,\
- lib/cxf-rt-wsdl.jar=cxf-rt-wsdl-3.1.7.jar,\
- lib/cxf-tools-common.jar=cxf-tools-common-3.1.7.jar,\
- lib/cxf-tools-validator.jar=cxf-tools-validator-3.1.7.jar,\
- lib/javax.annotation-api.jar=javax.annotation-api-1.2.jar,\
- lib/wsdl4j.jar=wsdl4j-1.6.3.jar,\
- lib/xmlschema-core.jar=xmlschema-core-2.2.1.jar
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/build.gradle
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/build.gradle b/portal-remote-cxf-common/build.gradle
deleted file mode 100644
index f431c26..0000000
--- a/portal-remote-cxf-common/build.gradle
+++ /dev/null
@@ -1,48 +0,0 @@
-task deployDependencies(type: Copy)
-
-dependencies {
- compile group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "3.1.0"
- compile group: 'javax.annotation', name: 'javax.annotation-api', version: '1.2'
- compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
- compile group: "org.apache.cxf", name: "cxf-core", version: "3.1.7"
- compile group: "org.apache.cxf", name: "cxf-rt-bindings-soap", version: "3.1.7"
- compile group: "org.apache.cxf", name: "cxf-rt-databinding-jaxb", version: "3.1.7"
- compile group: "org.apache.cxf", name: "cxf-rt-transports-http", version: "3.1.7"
- compile group: "org.apache.cxf", name: "cxf-rt-wsdl", version: "3.1.7"
- compile group: "org.apache.cxf", name: "cxf-tools-common", version: "3.1.7"
- compile group: "org.apache.cxf", name: "cxf-tools-validator", version: "3.1.7"
- compile group: "org.apache.felix", name: "org.apache.felix.dependencymanager", version: "3.2.0"
-// compile group: "org.apache.ws.xmlschema", name: "xmlschema-core", version: "2.1.0"
- compile group: "org.codehaus.woodstox", name: "stax2-api", version: "3.1.4"
- compile group: "org.codehaus.woodstox", name: "woodstox-core-asl", version: "4.4.1"
- 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"
- compile group: "org.slf4j", name: "slf4j-api", version: "1.7.2"
- compile group: "wsdl4j", name: "wsdl4j", version: "1.6.3"
-}
-
-deployDependencies {
- boolean keepDependencyVersions = Boolean.getBoolean("deploy.dependencies.keep.versions")
-
- ext {
- autoClean = false
- }
-
- from configurations.runtime
-
- include "stax2-api-*.jar"
- include "woodstox-core-asl-*.jar"
-
- into {
- liferay.deployDir
- }
-
- String renameSuffix = ".jar"
-
- if (keepDependencyVersions) {
- renameSuffix = '-$1.jar'
- }
-
- rename(/stax2-api-(.+)\.jar/, "org.codehaus.stax2" + renameSuffix)
- rename(/woodstox-core-asl-(.+)\.jar/, "com.ctc.wstx" + renameSuffix)
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$1.class
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$1.class b/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$1.class
deleted file mode 100644
index 8bcb75e..0000000
Binary files a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$1.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator$1.class
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator$1.class b/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator$1.class
deleted file mode 100644
index 524bf3a..0000000
Binary files a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator$1.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator$RemoteAccessFilter.class
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator$RemoteAccessFilter.class b/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator$RemoteAccessFilter.class
deleted file mode 100644
index 359d9e3..0000000
Binary files a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator$RemoteAccessFilter.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator.class
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator.class b/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator.class
deleted file mode 100644
index fe4d730..0000000
Binary files a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher$ServicesRegistrator.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher.class
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher.class b/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher.class
deleted file mode 100644
index 01b4059..0000000
Binary files a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/CXFEndpointPublisher.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/ExtensionManager.class
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/ExtensionManager.class b/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/ExtensionManager.class
deleted file mode 100644
index c54e11c..0000000
Binary files a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/ExtensionManager.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/configuration/CXFEndpointPublisherConfiguration.class
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/configuration/CXFEndpointPublisherConfiguration.class b/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/configuration/CXFEndpointPublisherConfiguration.class
deleted file mode 100644
index aabdb47..0000000
Binary files a/portal-remote-cxf-common/classes/com/liferay/portal/remote/cxf/common/configuration/CXFEndpointPublisherConfiguration.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language.properties b/portal-remote-cxf-common/classes/content/Language.properties
deleted file mode 100644
index 12dd09d..0000000
--- a/portal-remote-cxf-common/classes/content/Language.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_ar.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_ar.properties b/portal-remote-cxf-common/classes/content/Language_ar.properties
deleted file mode 100644
index 1e2a617..0000000
--- a/portal-remote-cxf-common/classes/content/Language_ar.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u0646\u0642\u0627\u0637 \u0627\u0644\u0646\u0647\u0627\u064a\u0629 CXF (Automatic Translation)
\ No newline at end of file
[46/50] [abbrv] aries-jax-rs-whiteboard git commit: add logging to
example and integration tests and other cleanup
Posted by cs...@apache.org.
add logging to example and integration tests and other cleanup
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/ed563e77
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/ed563e77
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/ed563e77
Branch: refs/heads/master
Commit: ed563e771736e4a577ef53fe7f39354f3debb5d0
Parents: e2a4c01
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Nov 8 14:26:24 2016 -0500
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Nov 8 14:26:24 2016 -0500
----------------------------------------------------------------------
jax-rs.example-run/example.bndrun | 45 +++++++++++++++++++++-------------
jax-rs.example-run/pom.xml | 7 +++++-
jax-rs.itests-run/itest.bndrun | 6 +++--
jax-rs.itests-run/pom.xml | 5 ++++
4 files changed, 43 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ed563e77/jax-rs.example-run/example.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/example.bndrun b/jax-rs.example-run/example.bndrun
index dccf286..2f2c96a 100644
--- a/jax-rs.example-run/example.bndrun
+++ b/jax-rs.example-run/example.bndrun
@@ -12,6 +12,7 @@
-runrequires: \
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.example)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.log4j-configuration)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)'
# ,\
@@ -19,28 +20,38 @@
-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
-runbundles: \
- javax.annotation-api;version='[1.2.0,1.2.1)',\
- javax.json-api;version='[1.0.0,1.0.1)',\
- javax.ws.rs-api;version='[2.0.1,2.0.2)',\
- log4j;version='[1.2.17,1.2.18)',\
- org.apache.aries.jax.rs.example;version='[1.0.0,1.0.1)',\
- org.apache.aries.jax.rs.whiteboard;version='[1.0.0,1.0.1)',\
- org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
- org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
- org.apache.felix.scr;version='[2.0.2,2.0.3)',\
- org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
- org.eclipse.equinox.event;version='[1.3.100,1.3.101)',\
- org.eclipse.equinox.metatype;version='[1.4.100,1.4.101)',\
- org.objectweb.asm;version='[5.0.4,5.0.5)',\
- org.osgi.service.event;version='[1.3.1,1.3.2)',\
- org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
- slf4j.api;version='[1.7.21,1.7.22)',\
+ javax.annotation-api; version='[1.2.0,1.2.1)',\
+ javax.json-api; version='[1.0.0,1.0.1)',\
+ javax.ws.rs-api; version='[2.0.1,2.0.2)',\
+ log4j; version='[1.2.17,1.2.18)',\
+ org.apache.aries.jax.rs.example; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.log4j-configuration; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.whiteboard; version='[1.0.0,1.0.1)',\
+ org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\
+ org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
+ org.apache.felix.gogo.command; version='[1.0.0,1.0.1)',\
+ org.apache.felix.gogo.jline; version='[1.0.0,1.0.1)',\
+ org.apache.felix.gogo.runtime; version='[1.0.0,1.0.1)',\
+ org.apache.felix.http.api; version='[3.0.0,3.0.1)',\
+ org.apache.felix.http.jetty; version='[3.4.0,3.4.1)',\
+ org.apache.felix.http.servlet-api; version='[1.1.2,1.1.3)',\
+ org.apache.felix.scr; version='[2.0.2,2.0.3)',\
+ org.apache.ws.xmlschema.core; version='[2.2.1,2.2.2)',\
+ org.eclipse.equinox.event; version='[1.3.100,1.3.101)',\
+ org.eclipse.equinox.metatype; version='[1.4.100,1.4.101)',\
+ org.jline; version='[3.0.0,3.0.1)',\
+ org.objectweb.asm; version='[5.0.4,5.0.5)',\
+ org.osgi.service.event; version='[1.3.1,1.3.2)',\
+ org.osgi.service.metatype; version='[1.3.0,1.3.1)',\
+ slf4j.api; version='[1.7.21,1.7.22)',\
slf4j.log4j12;version='[1.6.1,1.6.2)'
-runee: JavaSE-1.8
-resolve.effective: resolve, active
--runproperties.eqnx: \
+-runproperties: \
osgi.console.enable.builtin=false, \
osgi.console=, \
org.osgi.service.http.port=8080
-runsystemcapabilities.dflt: ${native_capability}
+-runblacklist:\
+ osgi.identity;filter:='(osgi.identity=org.osgi.compendium)'
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ed563e77/jax-rs.example-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/pom.xml b/jax-rs.example-run/pom.xml
index 4041dd9..17721a2 100644
--- a/jax-rs.example-run/pom.xml
+++ b/jax-rs.example-run/pom.xml
@@ -20,7 +20,7 @@
<version>3.4.0-SNAPSHOT</version>
<configuration>
<failOnChanges>false</failOnChanges>
- <resolve>true</resolve>
+ <resolve>false</resolve>
<bndruns>
<bndrun>example.bndrun</bndrun>
</bndruns>
@@ -44,6 +44,11 @@
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ed563e77/jax-rs.itests-run/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/itest.bndrun b/jax-rs.itests-run/itest.bndrun
index 6fb7b34..847b2ae 100644
--- a/jax-rs.itests-run/itest.bndrun
+++ b/jax-rs.itests-run/itest.bndrun
@@ -9,7 +9,8 @@
location=${.}/target/cached.xml
-runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests)'
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.log4j-configuration)'
-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
@@ -20,7 +21,7 @@
-runsystempackages.eqnx: javax.script
-runsystemcapabilities.dflt: ${native_capability}
--runproperties.eqnx: \
+-runproperties: \
osgi.console.enable.builtin=false, \
osgi.console=, \
org.osgi.service.http.port=8080
@@ -30,6 +31,7 @@
javax.ws.rs-api; version='[2.0.1,2.0.2)',\
log4j; version='[1.2.17,1.2.18)',\
org.apache.aries.jax.rs.itests; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax.rs.log4j-configuration; version='[1.0.0,1.0.1)',\
org.apache.aries.jax.rs.whiteboard; version='[1.0.0,1.0.1)',\
org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\
org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ed563e77/jax-rs.itests-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/pom.xml b/jax-rs.itests-run/pom.xml
index 5852275..72469c8 100644
--- a/jax-rs.itests-run/pom.xml
+++ b/jax-rs.itests-run/pom.xml
@@ -47,6 +47,11 @@
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
[45/50] [abbrv] aries-jax-rs-whiteboard git commit: log4j
configuration fragment
Posted by cs...@apache.org.
log4j configuration fragment
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/e2a4c01b
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/e2a4c01b
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/e2a4c01b
Branch: refs/heads/master
Commit: e2a4c01b82ec9bd0cd8c1c776905ed2d964ba44a
Parents: 650ec56
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Nov 8 14:24:18 2016 -0500
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Nov 8 14:24:18 2016 -0500
----------------------------------------------------------------------
jax-rs.log4j-configuration/bnd.bnd | 1 +
jax-rs.log4j-configuration/pom.xml | 15 +++++++++++++++
.../src/main/resources/log4j.properties | 9 +++++++++
pom.xml | 1 +
4 files changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/e2a4c01b/jax-rs.log4j-configuration/bnd.bnd
----------------------------------------------------------------------
diff --git a/jax-rs.log4j-configuration/bnd.bnd b/jax-rs.log4j-configuration/bnd.bnd
new file mode 100644
index 0000000..a63d4d6
--- /dev/null
+++ b/jax-rs.log4j-configuration/bnd.bnd
@@ -0,0 +1 @@
+Fragment-Host: log4j
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/e2a4c01b/jax-rs.log4j-configuration/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.log4j-configuration/pom.xml b/jax-rs.log4j-configuration/pom.xml
new file mode 100644
index 0000000..25c5358
--- /dev/null
+++ b/jax-rs.log4j-configuration/pom.xml
@@ -0,0 +1,15 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
+ <packaging>jar</packaging>
+ <description>Apache Aries JAX-RS Log4J Configuration Fragment</description>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/e2a4c01b/jax-rs.log4j-configuration/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/jax-rs.log4j-configuration/src/main/resources/log4j.properties b/jax-rs.log4j-configuration/src/main/resources/log4j.properties
new file mode 100644
index 0000000..a136842
--- /dev/null
+++ b/jax-rs.log4j-configuration/src/main/resources/log4j.properties
@@ -0,0 +1,9 @@
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=ERROR, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/e2a4c01b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d81c11..0059f50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
</build>
<modules>
<module>jax-rs.whiteboard</module>
+ <module>jax-rs.log4j-configuration</module>
<module>jax-rs.itests</module>
<module>jax-rs.itests-run</module>
<module>jax-rs.example</module>
[18/50] [abbrv] aries-jax-rs-whiteboard git commit: [maven] convert
to maven build using bnd-maven-plugin
Posted by cs...@apache.org.
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
[15/50] [abbrv] aries-jax-rs-whiteboard git commit: maven
Posted by cs...@apache.org.
maven
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/f9c4f9f3
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f9c4f9f3
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f9c4f9f3
Branch: refs/heads/master
Commit: f9c4f9f3e254c07205f85469620b67c784056d55
Parents: 97d9eea
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Oct 11 15:00:16 2016 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Oct 11 15:00:49 2016 -0400
----------------------------------------------------------------------
pom.xml | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f9c4f9f3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..2ef5d2b
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,74 @@
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>3.3.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.base.api</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>osgi-snapshots</id>
+ <url>https://oss.sonatype.org/content/groups/osgi/</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <id>bnd-snapshots</id>
+ <url>https://bndtools.ci.cloudbees.com/job/bnd.master/lastSuccessfulBuild/artifact/dist/bundles/</url>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+</project>
\ No newline at end of file
[27/50] [abbrv] aries-jax-rs-whiteboard git commit: run -- notworking
Posted by cs...@apache.org.
run -- notworking
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/890a5b8a
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/890a5b8a
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/890a5b8a
Branch: refs/heads/master
Commit: 890a5b8a5bf8793408b697b236ac0d13324d9e76
Parents: fc1456a
Author: Raymond Auge <ra...@liferay.com>
Authored: Wed Oct 26 00:19:17 2016 +0200
Committer: Raymond Auge <ra...@liferay.com>
Committed: Wed Oct 26 00:19:17 2016 +0200
----------------------------------------------------------------------
bndrun/cnf/cache/pom-OSGi-MC.query | 1 +
bndrun/cnf/cache/pom-OSGi-MC.query.json | 1 +
bndrun/cnf/cache/pom-OSGi-MC.xml | 2838 ++++++++++++++++++++
bndrun/org.apache.aries.jax-rs.example.bndrun | 47 +
bndrun/pom.xml | 50 +
5 files changed, 2937 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/890a5b8a/bndrun/cnf/cache/pom-OSGi-MC.query
----------------------------------------------------------------------
diff --git a/bndrun/cnf/cache/pom-OSGi-MC.query b/bndrun/cnf/cache/pom-OSGi-MC.query
new file mode 100644
index 0000000..cea5693
--- /dev/null
+++ b/bndrun/cnf/cache/pom-OSGi-MC.query
@@ -0,0 +1 @@
+{"responseHeader":{"status":0,"QTime":1,"params":{"spellcheck":"true","fl":"id,g,a,latestVersion,p,ec,repositoryId,text,timestamp,versionCount","sort":"score desc,timestamp desc,g asc,a asc","indent":"off","q":"g:org.osgi AND a:org.osgi.*","spellcheck.count":"5","wt":"json","rows":"10000","version":"2.2"}},"response":{"numFound":56,"start":0,"docs":[{"id":"org.osgi:org.osgi.service.metatype","g":"org.osgi","a":"org.osgi.service.metatype","latestVersion":"1.3.0","repositoryId":"central","p":"jar","timestamp":1439920690000,"versionCount":1,"text":["org.osgi","org.osgi.service.metatype","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.util.position","g":"org.osgi","a":"org.osgi.util.position","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439920658000,"versionCount":1,"text":["org.osgi","org.osgi.util.position","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar
",".jar",".pom"]},{"id":"org.osgi:org.osgi.util.xml","g":"org.osgi","a":"org.osgi.util.xml","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439906999000,"versionCount":1,"text":["org.osgi","org.osgi.util.xml","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.util.tracker","g":"org.osgi","a":"org.osgi.util.tracker","latestVersion":"1.5.1","repositoryId":"central","p":"jar","timestamp":1439906887000,"versionCount":1,"text":["org.osgi","org.osgi.util.tracker","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.util.promise","g":"org.osgi","a":"org.osgi.util.promise","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906825000,"versionCount":1,"text":["org.osgi","org.osgi.util.promise","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org
.osgi.util.measurement","g":"org.osgi","a":"org.osgi.util.measurement","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439906706000,"versionCount":1,"text":["org.osgi","org.osgi.util.measurement","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.util.function","g":"org.osgi","a":"org.osgi.util.function","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906642000,"versionCount":1,"text":["org.osgi","org.osgi.util.function","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.wireadmin","g":"org.osgi","a":"org.osgi.service.wireadmin","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439906593000,"versionCount":1,"text":["org.osgi","org.osgi.service.wireadmin","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osg
i:org.osgi.service.useradmin","g":"org.osgi","a":"org.osgi.service.useradmin","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439906543000,"versionCount":1,"text":["org.osgi","org.osgi.service.useradmin","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.usbinfo","g":"org.osgi","a":"org.osgi.service.usbinfo","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906485000,"versionCount":1,"text":["org.osgi","org.osgi.service.usbinfo","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.upnp","g":"org.osgi","a":"org.osgi.service.upnp","latestVersion":"1.2.0","repositoryId":"central","p":"jar","timestamp":1439906401000,"versionCount":1,"text":["org.osgi","org.osgi.service.upnp","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi
:org.osgi.service.tr069todmt","g":"org.osgi","a":"org.osgi.service.tr069todmt","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439906348000,"versionCount":1,"text":["org.osgi","org.osgi.service.tr069todmt","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.subsystem","g":"org.osgi","a":"org.osgi.service.subsystem","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439906303000,"versionCount":1,"text":["org.osgi","org.osgi.service.subsystem","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.serviceloader","g":"org.osgi","a":"org.osgi.service.serviceloader","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906217000,"versionCount":1,"text":["org.osgi","org.osgi.service.serviceloader","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.j
ar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.serial","g":"org.osgi","a":"org.osgi.service.serial","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906094000,"versionCount":1,"text":["org.osgi","org.osgi.service.serial","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.rest","g":"org.osgi","a":"org.osgi.service.rest","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439906029000,"versionCount":1,"text":["org.osgi","org.osgi.service.rest","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.resourcemonitoring","g":"org.osgi","a":"org.osgi.service.resourcemonitoring","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905962000,"versionCount":1,"text":["org.osgi","org.osgi.service.resourcemonitoring","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-j
avadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.resolver","g":"org.osgi","a":"org.osgi.service.resolver","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439905840000,"versionCount":1,"text":["org.osgi","org.osgi.service.resolver","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.repository","g":"org.osgi","a":"org.osgi.service.repository","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439905786000,"versionCount":1,"text":["org.osgi","org.osgi.service.repository","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.remoteserviceadmin","g":"org.osgi","a":"org.osgi.service.remoteserviceadmin","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439905726000,"versionCount":1,"text":["org.osgi","org.osgi.service.remoteserviceadmin","-sourc
es.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.provisioning","g":"org.osgi","a":"org.osgi.service.provisioning","latestVersion":"1.2.0","repositoryId":"central","p":"jar","timestamp":1439905672000,"versionCount":1,"text":["org.osgi","org.osgi.service.provisioning","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.prefs","g":"org.osgi","a":"org.osgi.service.prefs","latestVersion":"1.1.1","repositoryId":"central","p":"jar","timestamp":1439905619000,"versionCount":1,"text":["org.osgi","org.osgi.service.prefs","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.networkadapter","g":"org.osgi","a":"org.osgi.service.networkadapter","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905562000,"versionCount":1,"text":["org.osgi","org.osgi
.service.networkadapter","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.monitor","g":"org.osgi","a":"org.osgi.service.monitor","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905497000,"versionCount":1,"text":["org.osgi","org.osgi.service.monitor","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.metatype.annotations","g":"org.osgi","a":"org.osgi.service.metatype.annotations","latestVersion":"1.3.0","repositoryId":"central","p":"jar","timestamp":1439905442000,"versionCount":1,"text":["org.osgi","org.osgi.service.metatype.annotations","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.log","g":"org.osgi","a":"org.osgi.service.log","latestVersion":"1.3.0","repositoryId":"central","p":"jar","timestamp":1439905251000,"vers
ionCount":1,"text":["org.osgi","org.osgi.service.log","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.jpa","g":"org.osgi","a":"org.osgi.service.jpa","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905187000,"versionCount":1,"text":["org.osgi","org.osgi.service.jpa","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.jndi","g":"org.osgi","a":"org.osgi.service.jndi","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905149000,"versionCount":1,"text":["org.osgi","org.osgi.service.jndi","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.jdbc","g":"org.osgi","a":"org.osgi.service.jdbc","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905081000,"versionCount":1,"text":["org.osgi
","org.osgi.service.jdbc","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.io","g":"org.osgi","a":"org.osgi.service.io","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439905026000,"versionCount":1,"text":["org.osgi","org.osgi.service.io","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.http.whiteboard","g":"org.osgi","a":"org.osgi.service.http.whiteboard","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439904950000,"versionCount":1,"text":["org.osgi","org.osgi.service.http.whiteboard","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.http","g":"org.osgi","a":"org.osgi.service.http","latestVersion":"1.2.1","repositoryId":"central","p":"jar","timestamp":1439904873000,"versionCount":1,"text":["org.os
gi","org.osgi.service.http","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.event","g":"org.osgi","a":"org.osgi.service.event","latestVersion":"1.3.1","repositoryId":"central","p":"jar","timestamp":1439904828000,"versionCount":1,"text":["org.osgi","org.osgi.service.event","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.enocean","g":"org.osgi","a":"org.osgi.service.enocean","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439904772000,"versionCount":1,"text":["org.osgi","org.osgi.service.enocean","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.dmt","g":"org.osgi","a":"org.osgi.service.dmt","latestVersion":"2.0.1","repositoryId":"central","p":"jar","timestamp":1439904722000,"versionCount":1,"text":["org.osgi","org.osgi.s
ervice.dmt","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.device","g":"org.osgi","a":"org.osgi.service.device","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439904682000,"versionCount":1,"text":["org.osgi","org.osgi.service.device","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.deploymentadmin","g":"org.osgi","a":"org.osgi.service.deploymentadmin","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439904607000,"versionCount":1,"text":["org.osgi","org.osgi.service.deploymentadmin","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.dal.functions","g":"org.osgi","a":"org.osgi.service.dal.functions","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439904560000,"versionCount":1
,"text":["org.osgi","org.osgi.service.dal.functions","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.dal","g":"org.osgi","a":"org.osgi.service.dal","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439904518000,"versionCount":1,"text":["org.osgi","org.osgi.service.dal","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.coordinator","g":"org.osgi","a":"org.osgi.service.coordinator","latestVersion":"1.0.2","repositoryId":"central","p":"jar","timestamp":1439904439000,"versionCount":1,"text":["org.osgi","org.osgi.service.coordinator","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.component.annotations","g":"org.osgi","a":"org.osgi.service.component.annotations","latestVersion":"1.3.0","repositoryId":"central","p":"jar","times
tamp":1439904362000,"versionCount":1,"text":["org.osgi","org.osgi.service.component.annotations","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.component","g":"org.osgi","a":"org.osgi.service.component","latestVersion":"1.3.0","repositoryId":"central","p":"jar","timestamp":1439904241000,"versionCount":1,"text":["org.osgi","org.osgi.service.component","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.cm","g":"org.osgi","a":"org.osgi.service.cm","latestVersion":"1.5.0","repositoryId":"central","p":"jar","timestamp":1439904190000,"versionCount":1,"text":["org.osgi","org.osgi.service.cm","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.blueprint","g":"org.osgi","a":"org.osgi.service.blueprint","latestVersion":"1.0.2","repositoryId":"central","p":"
jar","timestamp":1439904150000,"versionCount":1,"text":["org.osgi","org.osgi.service.blueprint","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.async","g":"org.osgi","a":"org.osgi.service.async","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439904092000,"versionCount":1,"text":["org.osgi","org.osgi.service.async","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.service.application","g":"org.osgi","a":"org.osgi.service.application","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439904057000,"versionCount":1,"text":["org.osgi","org.osgi.service.application","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.namespace.service","g":"org.osgi","a":"org.osgi.namespace.service","latestVersion":"1.0.0","repositoryId":"
central","p":"jar","timestamp":1439904004000,"versionCount":1,"text":["org.osgi","org.osgi.namespace.service","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.namespace.implementation","g":"org.osgi","a":"org.osgi.namespace.implementation","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439903963000,"versionCount":1,"text":["org.osgi","org.osgi.namespace.implementation","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.namespace.extender","g":"org.osgi","a":"org.osgi.namespace.extender","latestVersion":"1.0.1","repositoryId":"central","p":"jar","timestamp":1439903903000,"versionCount":1,"text":["org.osgi","org.osgi.namespace.extender","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.namespace.contract","g":"org.osgi","a":"org.osgi.namespace.cont
ract","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439903860000,"versionCount":1,"text":["org.osgi","org.osgi.namespace.contract","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.jmx","g":"org.osgi","a":"org.osgi.jmx","latestVersion":"1.1.0","repositoryId":"central","p":"jar","timestamp":1439903815000,"versionCount":1,"text":["org.osgi","org.osgi.jmx","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.application","g":"org.osgi","a":"org.osgi.application","latestVersion":"1.0.0","repositoryId":"central","p":"jar","timestamp":1439903772000,"versionCount":1,"text":["org.osgi","org.osgi.application","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.core","g":"org.osgi","a":"org.osgi.core","latestVersion":"6.0.0","repositoryId":"central","p":"jar",
"timestamp":1406692071000,"versionCount":8,"text":["org.osgi","org.osgi.core","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.annotation","g":"org.osgi","a":"org.osgi.annotation","latestVersion":"6.0.0","repositoryId":"central","p":"jar","timestamp":1406692049000,"versionCount":1,"text":["org.osgi","org.osgi.annotation","-javadoc.jar","-sources.jar",".jar",".pom"],"ec":["-javadoc.jar","-sources.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.compendium","g":"org.osgi","a":"org.osgi.compendium","latestVersion":"5.0.0","repositoryId":"central","p":"jar","timestamp":1380053541000,"versionCount":7,"text":["org.osgi","org.osgi.compendium","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]},{"id":"org.osgi:org.osgi.enterprise","g":"org.osgi","a":"org.osgi.enterprise","latestVersion":"5.0.0","repositoryId":"central","p":"jar","timestamp":1339673704000,"versionCount":2,"text"
:["org.osgi","org.osgi.enterprise","-sources.jar","-javadoc.jar",".jar",".pom"],"ec":["-sources.jar","-javadoc.jar",".jar",".pom"]}]},"spellcheck":{"suggestions":[]}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/890a5b8a/bndrun/cnf/cache/pom-OSGi-MC.query.json
----------------------------------------------------------------------
diff --git a/bndrun/cnf/cache/pom-OSGi-MC.query.json b/bndrun/cnf/cache/pom-OSGi-MC.query.json
new file mode 100644
index 0000000..1a72d06
--- /dev/null
+++ b/bndrun/cnf/cache/pom-OSGi-MC.query.json
@@ -0,0 +1 @@
+{"modified":1477433605000,"sha_1":"3F59264D7D63B9C86AD23930FC89ED87734944D0","sha_256":"AE635498CFD9A54F53A725AE0F6643FF1DA116603A85EFBCE36A3E538D67805B","uri":"http://search.maven.org/solrsearch/select?q=g:org.osgi+AND+a:org.osgi.*&rows=10000"}
\ No newline at end of file
[17/50] [abbrv] aries-jax-rs-whiteboard git commit: [maven] convert
to maven build using bnd-maven-plugin
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-rest-extender/src/main/resources/content/Language_ja.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_ja.properties b/portal-remote-rest-extender/src/main/resources/content/Language_ja.properties
deleted file mode 100644
index ff2b883..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_ko.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_ko.properties b/portal-remote-rest-extender/src/main/resources/content/Language_ko.properties
deleted file mode 100644
index 3b3ecce..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_lo.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_lo.properties b/portal-remote-rest-extender/src/main/resources/content/Language_lo.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_lt.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_lt.properties b/portal-remote-rest-extender/src/main/resources/content/Language_lt.properties
deleted file mode 100644
index 4f37958..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_nb.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_nb.properties b/portal-remote-rest-extender/src/main/resources/content/Language_nb.properties
deleted file mode 100644
index 9b885db..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_nl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_nl.properties b/portal-remote-rest-extender/src/main/resources/content/Language_nl.properties
deleted file mode 100644
index b62adc9..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_nl_BE.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_nl_BE.properties b/portal-remote-rest-extender/src/main/resources/content/Language_nl_BE.properties
deleted file mode 100644
index d137e77..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_pl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_pl.properties b/portal-remote-rest-extender/src/main/resources/content/Language_pl.properties
deleted file mode 100644
index 0055a27..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_pt_BR.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_pt_BR.properties b/portal-remote-rest-extender/src/main/resources/content/Language_pt_BR.properties
deleted file mode 100644
index cc489da..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_pt_PT.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_pt_PT.properties b/portal-remote-rest-extender/src/main/resources/content/Language_pt_PT.properties
deleted file mode 100644
index cc489da..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_ro.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_ro.properties b/portal-remote-rest-extender/src/main/resources/content/Language_ro.properties
deleted file mode 100644
index 2c26380..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_ru.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_ru.properties b/portal-remote-rest-extender/src/main/resources/content/Language_ru.properties
deleted file mode 100644
index 068b2cd..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_sk.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_sk.properties b/portal-remote-rest-extender/src/main/resources/content/Language_sk.properties
deleted file mode 100644
index 05a4cbe..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_sl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_sl.properties b/portal-remote-rest-extender/src/main/resources/content/Language_sl.properties
deleted file mode 100644
index 393ff7f..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_sr_RS.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_sr_RS.properties b/portal-remote-rest-extender/src/main/resources/content/Language_sr_RS.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_sr_RS_latin.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_sr_RS_latin.properties b/portal-remote-rest-extender/src/main/resources/content/Language_sr_RS_latin.properties
deleted file mode 100644
index e82a9e0..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_sv.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_sv.properties b/portal-remote-rest-extender/src/main/resources/content/Language_sv.properties
deleted file mode 100644
index 9b885db..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_tr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_tr.properties b/portal-remote-rest-extender/src/main/resources/content/Language_tr.properties
deleted file mode 100644
index 87ddb28..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_uk.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_uk.properties b/portal-remote-rest-extender/src/main/resources/content/Language_uk.properties
deleted file mode 100644
index 2e65121..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_vi.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_vi.properties b/portal-remote-rest-extender/src/main/resources/content/Language_vi.properties
deleted file mode 100644
index e01047a..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_zh_CN.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_zh_CN.properties b/portal-remote-rest-extender/src/main/resources/content/Language_zh_CN.properties
deleted file mode 100644
index 1d4ebb9..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/src/main/resources/content/Language_zh_TW.properties
----------------------------------------------------------------------
diff --git a/portal-remote-rest-extender/src/main/resources/content/Language_zh_TW.properties b/portal-remote-rest-extender/src/main/resources/content/Language_zh_TW.properties
deleted file mode 100644
index 36dac4d..0000000
--- a/portal-remote-rest-extender/src/main/resources/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/run.sh
----------------------------------------------------------------------
diff --git a/run.sh b/run.sh
deleted file mode 100644
index c6d6dae..0000000
--- a/run.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./gradlew -q test-cxf:run
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index cfc5db4..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-include(
- 'example-jaxrs-application',
- 'portal-remote-cxf-common',
- 'portal-remote-cxf-jaxrs-common',
- 'portal-remote-rest-extender',
- 'test-cxf'
-)
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/.gitignore
----------------------------------------------------------------------
diff --git a/test-cxf/.gitignore b/test-cxf/.gitignore
deleted file mode 100644
index abc78ba..0000000
--- a/test-cxf/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.gradle/
-/build/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/.idea/.name
----------------------------------------------------------------------
diff --git a/test-cxf/.idea/.name b/test-cxf/.idea/.name
deleted file mode 100644
index 24e6e5c..0000000
--- a/test-cxf/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-test-cxf
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/.idea/compiler.xml
----------------------------------------------------------------------
diff --git a/test-cxf/.idea/compiler.xml b/test-cxf/.idea/compiler.xml
deleted file mode 100644
index 9a8b7e5..0000000
--- a/test-cxf/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="CompilerConfiguration">
- <option name="DEFAULT_COMPILER" value="Javac" />
- <resourceExtensions />
- <wildcardResourcePatterns>
- <entry name="!?*.java" />
- <entry name="!?*.form" />
- <entry name="!?*.class" />
- <entry name="!?*.groovy" />
- <entry name="!?*.scala" />
- <entry name="!?*.flex" />
- <entry name="!?*.kt" />
- <entry name="!?*.clj" />
- </wildcardResourcePatterns>
- <annotationProcessing>
- <profile default="true" name="Default" enabled="false">
- <processorPath useClasspath="true" />
- </profile>
- </annotationProcessing>
- </component>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/.idea/copyright/profiles_settings.xml
----------------------------------------------------------------------
diff --git a/test-cxf/.idea/copyright/profiles_settings.xml b/test-cxf/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/test-cxf/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
- <settings default="" />
-</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/.idea/encodings.xml
----------------------------------------------------------------------
diff --git a/test-cxf/.idea/encodings.xml b/test-cxf/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/test-cxf/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Encoding">
- <file url="PROJECT" charset="UTF-8" />
- </component>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/.idea/libraries/org_osgi_core_6_0_0.xml
----------------------------------------------------------------------
diff --git a/test-cxf/.idea/libraries/org_osgi_core_6_0_0.xml b/test-cxf/.idea/libraries/org_osgi_core_6_0_0.xml
deleted file mode 100644
index f968e9f..0000000
--- a/test-cxf/.idea/libraries/org_osgi_core_6_0_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="org.osgi.core-6.0.0" type="org.osgi.core">
- <properties version="6.0.0" />
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/org.osgi.core-6.0.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$PROJECT_DIR$/lib/org.osgi.core-6.0.0-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/.idea/misc.xml
----------------------------------------------------------------------
diff --git a/test-cxf/.idea/misc.xml b/test-cxf/.idea/misc.xml
deleted file mode 100644
index 9793229..0000000
--- a/test-cxf/.idea/misc.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="EntryPointsManager">
- <entry_points version="2.0" />
- </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
- <OptionsSetting value="true" id="Add" />
- <OptionsSetting value="true" id="Remove" />
- <OptionsSetting value="true" id="Checkout" />
- <OptionsSetting value="true" id="Update" />
- <OptionsSetting value="true" id="Status" />
- <OptionsSetting value="true" id="Edit" />
- <ConfirmationsSetting value="0" id="Add" />
- <ConfirmationsSetting value="0" id="Remove" />
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/out" />
- </component>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/.idea/modules.xml
----------------------------------------------------------------------
diff --git a/test-cxf/.idea/modules.xml b/test-cxf/.idea/modules.xml
deleted file mode 100644
index 7f62abd..0000000
--- a/test-cxf/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/test-cxf.iml" filepath="$PROJECT_DIR$/test-cxf.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/.idea/uiDesigner.xml
----------------------------------------------------------------------
diff --git a/test-cxf/.idea/uiDesigner.xml b/test-cxf/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/test-cxf/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Palette2">
- <group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
- </item>
- <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
- <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
- <initial-values>
- <property name="text" value="Button" />
- </initial-values>
- </item>
- <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="RadioButton" />
- </initial-values>
- </item>
- <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="CheckBox" />
- </initial-values>
- </item>
- <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="Label" />
- </initial-values>
- </item>
- <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
- <preferred-size width="-1" height="20" />
- </default-constraints>
- </item>
- <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
- </item>
- </group>
- </component>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/.idea/workspace.xml
----------------------------------------------------------------------
diff --git a/test-cxf/.idea/workspace.xml b/test-cxf/.idea/workspace.xml
deleted file mode 100644
index 768c013..0000000
--- a/test-cxf/.idea/workspace.xml
+++ /dev/null
@@ -1,893 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ChangeListManager">
- <list default="true" id="10104abc-e670-4c81-a551-a00721d3dde4" name="Default" comment="" />
- <ignored path="test-cxf.iws" />
- <ignored path=".idea/workspace.xml" />
- <ignored path="$PROJECT_DIR$/out/" />
- <ignored path=".idea/dataSources.local.xml" />
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
- <option name="TRACKING_ENABLED" value="true" />
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
- <component name="CreatePatchCommitExecutor">
- <option name="PATCH_PATH" value="" />
- </component>
- <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
- <component name="FavoritesManager">
- <favorites_list name="test-cxf" />
- </component>
- <component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="TestApplication.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/liferay/cxf/TestApplication.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="19" column="59" selection-start-line="19" selection-start-column="59" selection-end-line="19" selection-end-column="59" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Optional.java" pinned="false" current-in-tab="false">
- <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/Optional.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="209" column="26" selection-start-line="209" selection-start-column="26" selection-end-line="209" selection-end-column="26" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Path.java" pinned="false" current-in-tab="false">
- <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/nio/file/Path.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="305" column="12" selection-start-line="305" selection-start-column="12" selection-end-line="305" selection-end-column="12" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Files.java" pinned="false" current-in-tab="false">
- <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/nio/file/Files.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="3623" column="31" selection-start-line="3623" selection-start-column="31" selection-end-line="3623" selection-end-column="31" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.3653846">
- <caret line="15" column="66" selection-start-line="15" selection-start-column="66" selection-end-line="15" selection-end-column="66" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="Class" />
- </list>
- </option>
- </component>
- <component name="GradleLocalSettings">
- <option name="externalProjectsViewState">
- <projects_view />
- </option>
- </component>
- <component name="IdeDocumentHistory">
- <option name="CHANGED_PATHS">
- <list>
- <option value="/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/ServiceLoader.java" />
- <option value="/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/nio/file/Files.java" />
- <option value="/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/nio/file/Path.java" />
- <option value="/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/Optional.java" />
- <option value="$PROJECT_DIR$/src/com/liferay/cxf/Main.java" />
- <option value="$PROJECT_DIR$/src/com/liferay/cxf/TestApplication.java" />
- <option value="$PROJECT_DIR$/build.gradle" />
- </list>
- </option>
- </component>
- <component name="JsBuildToolGruntFileManager" detection-done="true" />
- <component name="JsBuildToolPackageJson" detection-done="true" />
- <component name="JsGulpfileManager">
- <detection-done>true</detection-done>
- </component>
- <component name="MavenImportPreferences">
- <option name="generalSettings">
- <MavenGeneralSettings>
- <option name="mavenHome" value="Bundled (Maven 3)" />
- </MavenGeneralSettings>
- </option>
- </component>
- <component name="ProjectFrameBounds">
- <option name="x" value="27" />
- <option name="y" value="-884" />
- <option name="width" value="1393" />
- <option name="height" value="877" />
- </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
- <OptionsSetting value="true" id="Add" />
- <OptionsSetting value="true" id="Remove" />
- <OptionsSetting value="true" id="Checkout" />
- <OptionsSetting value="true" id="Update" />
- <OptionsSetting value="true" id="Status" />
- <OptionsSetting value="true" id="Edit" />
- <ConfirmationsSetting value="0" id="Add" />
- <ConfirmationsSetting value="0" id="Remove" />
- </component>
- <component name="ProjectView">
- <navigator currentView="ProjectPane" proportions="" version="1">
- <flattenPackages />
- <showMembers />
- <showModules />
- <showLibraryContents />
- <hideEmptyPackages />
- <abbreviatePackageNames />
- <autoscrollToSource />
- <autoscrollFromSource />
- <sortByType />
- <manualOrder />
- <foldersAlwaysOnTop value="true" />
- </navigator>
- <panes>
- <pane id="PackagesPane" />
- <pane id="Scope" />
- <pane id="ProjectPane">
- <subPane>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="test-cxf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
- <pane id="Scratches" />
- </panes>
- </component>
- <component name="PropertiesComponent">
- <property name="GoToClass.includeLibraries" value="false" />
- <property name="GoToClass.toSaveIncludeLibraries" value="false" />
- <property name="GoToFile.includeJavaFiles" value="false" />
- <property name="MemberChooser.sorted" value="false" />
- <property name="MemberChooser.showClasses" value="true" />
- <property name="MemberChooser.copyJavadoc" value="false" />
- <property name="aspect.path.notification.shown" value="true" />
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
- <property name="settings.editor.splitter.proportion" value="0.2" />
- <property name="js-jscs-nodeInterpreter" value="/usr/local/bin/node" />
- <property name="project.structure.last.edited" value="Modules" />
- <property name="project.structure.proportion" value="0.14650935" />
- <property name="project.structure.side.proportion" value="0.2" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/felix.jar!/" />
- </component>
- <component name="RunManager" selected="Application.TestApplication">
- <configuration default="false" name="TestApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
- <pattern>
- <option name="PATTERN" value="com.liferay.cxf.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <option name="MAIN_CLASS_NAME" value="com.liferay.cxf.TestApplication" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="test-cxf" />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
- <module name="" />
- <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
- <option name="PROGRAM_PARAMETERS" />
- <method />
- </configuration>
- <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
- <module name="" />
- <option name="ACTIVITY_CLASS" value="" />
- <option name="MODE" value="default_activity" />
- <option name="DEPLOY" value="true" />
- <option name="ARTIFACT_NAME" value="" />
- <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
- <option name="USE_LAST_SELECTED_DEVICE" value="false" />
- <option name="PREFERRED_AVD" value="" />
- <option name="USE_COMMAND_LINE" value="true" />
- <option name="COMMAND_LINE" value="" />
- <option name="WIPE_USER_DATA" value="false" />
- <option name="DISABLE_BOOT_ANIMATION" value="false" />
- <option name="NETWORK_SPEED" value="full" />
- <option name="NETWORK_LATENCY" value="none" />
- <option name="CLEAR_LOGCAT" value="false" />
- <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
- <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
- <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
- <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
- <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
- <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" />
- <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" />
- <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" />
- <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" />
- <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" />
- <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" />
- <method />
- </configuration>
- <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
- <module name="" />
- <option name="TESTING_TYPE" value="0" />
- <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
- <option name="METHOD_NAME" value="" />
- <option name="CLASS_NAME" value="" />
- <option name="PACKAGE_NAME" value="" />
- <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
- <option name="USE_LAST_SELECTED_DEVICE" value="false" />
- <option name="PREFERRED_AVD" value="" />
- <option name="USE_COMMAND_LINE" value="true" />
- <option name="COMMAND_LINE" value="" />
- <option name="WIPE_USER_DATA" value="false" />
- <option name="DISABLE_BOOT_ANIMATION" value="false" />
- <option name="NETWORK_SPEED" value="full" />
- <option name="NETWORK_LATENCY" value="none" />
- <option name="CLEAR_LOGCAT" value="false" />
- <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
- <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
- <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
- <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
- <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
- <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" />
- <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" />
- <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" />
- <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" />
- <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" />
- <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" />
- <method />
- </configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <module />
- <method />
- </configuration>
- <configuration default="true" type="Application" factoryName="Application">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="" />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="ArquillianJUnit" factoryName="">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="arquillianRunConfiguration">
- <value>
- <option name="containerStateName" value="" />
- </value>
- </option>
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <envs />
- <patterns />
- <method />
- </configuration>
- <configuration default="true" type="ArquillianTestNG" factoryName="">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="arquillianRunConfiguration">
- <value>
- <option name="containerStateName" value="" />
- </value>
- </option>
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <option name="USE_DEFAULT_REPORTERS" value="false" />
- <option name="PROPERTIES_FILE" />
- <envs />
- <properties />
- <listeners />
- <method />
- </configuration>
- <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="myFilePath" />
- <option name="GLUE" />
- <option name="myNameFilter" />
- <option name="myGeneratedName" />
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="" />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
- <option name="BCName" value="" />
- <option name="IOSSimulatorSdkPath" value="" />
- <option name="adlOptions" value="" />
- <option name="airProgramParameters" value="" />
- <option name="appDescriptorForEmulator" value="Android" />
- <option name="debugTransport" value="USB" />
- <option name="debuggerSdkRaw" value="BC SDK" />
- <option name="emulator" value="NexusOne" />
- <option name="emulatorAdlOptions" value="" />
- <option name="fastPackaging" value="true" />
- <option name="fullScreenHeight" value="0" />
- <option name="fullScreenWidth" value="0" />
- <option name="launchUrl" value="false" />
- <option name="launcherParameters">
- <LauncherParameters>
- <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
- <option name="launcherType" value="OSDefault" />
- <option name="newPlayerInstance" value="false" />
- <option name="playerPath" value="/Applications/Flash Player Debugger.app" />
- </LauncherParameters>
- </option>
- <option name="mobileRunTarget" value="Emulator" />
- <option name="moduleName" value="" />
- <option name="overriddenMainClass" value="" />
- <option name="overriddenOutputFileName" value="" />
- <option name="overrideMainClass" value="false" />
- <option name="runTrusted" value="true" />
- <option name="screenDpi" value="0" />
- <option name="screenHeight" value="0" />
- <option name="screenWidth" value="0" />
- <option name="url" value="http://" />
- <option name="usbDebugPort" value="7936" />
- <method />
- </configuration>
- <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
- <option name="BCName" value="" />
- <option name="launcherParameters">
- <LauncherParameters>
- <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
- <option name="launcherType" value="OSDefault" />
- <option name="newPlayerInstance" value="false" />
- <option name="playerPath" value="/Applications/Flash Player Debugger.app" />
- </LauncherParameters>
- </option>
- <option name="moduleName" value="" />
- <option name="trusted" value="true" />
- <method />
- </configuration>
- <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
- <ExternalSystemSettings>
- <option name="executionName" />
- <option name="externalProjectPath" />
- <option name="externalSystemIdString" value="GRADLE" />
- <option name="scriptParameters" />
- <option name="taskDescriptions">
- <list />
- </option>
- <option name="taskNames">
- <list />
- </option>
- <option name="vmOptions" />
- </ExternalSystemSettings>
- <method />
- </configuration>
- <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
- <module name="" />
- <setting name="vmparams" value="" />
- <setting name="cmdLine" value="run-app" />
- <setting name="depsClasspath" value="false" />
- <setting name="passParentEnv" value="true" />
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <setting name="launchBrowser" value="false" />
- <method />
- </configuration>
- <configuration default="true" type="GroovyScriptRunConfiguration" factoryName="Groovy">
- <module name="" />
- <setting name="path" value="" />
- <setting name="vmparams" value="" />
- <setting name="params" value="" />
- <setting name="workDir" value="file://$PROJECT_DIR$" />
- <setting name="debug" value="false" />
- <method />
- </configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" value="-ea" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <envs />
- <patterns />
- <method />
- </configuration>
- <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <envs />
- <patterns />
- <method />
- </configuration>
- <configuration default="true" type="JarApplication" factoryName="JAR Application">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="SCRATCH_FILE_ID" value="0" />
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="" />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
- <method />
- </configuration>
- <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="test-cxf" />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="filePath" />
- <option name="vmParameters" />
- <option name="alternativeJrePath" />
- <option name="programParameters" />
- <option name="passParentEnvs" value="true" />
- <option name="workingDirectory" />
- <option name="isAlternativeJrePathEnabled" value="false" />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- <method />
- </configuration>
- <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="TestNG" factoryName="TestNG">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" value="-ea" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
- <option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <option name="USE_DEFAULT_REPORTERS" value="false" />
- <option name="PROPERTIES_FILE" />
- <envs />
- <properties />
- <listeners />
- <method />
- </configuration>
- <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <option name="USE_DEFAULT_REPORTERS" value="false" />
- <option name="PROPERTIES_FILE" />
- <envs />
- <properties />
- <listeners />
- <method />
- </configuration>
- <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
- <node-options />
- <gulpfile />
- <tasks />
- <arguments />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="js.build_tools.npm" factoryName="npm">
- <command value="run-script" />
- <scripts />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
- <method />
- </configuration>
- <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
- <method />
- </configuration>
- <list size="1">
- <item index="0" class="java.lang.String" itemvalue="Application.TestApplication" />
- </list>
- <recent_temporary>
- <list size="1">
- <item index="0" class="java.lang.String" itemvalue="Application.TestApplication" />
- </list>
- </recent_temporary>
- </component>
- <component name="ShelveChangesManager" show_recycled="false" />
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="10104abc-e670-4c81-a551-a00721d3dde4" name="Default" comment="" />
- <created>1466165385927</created>
- <option name="number" value="Default" />
- <updated>1466165385927</updated>
- <workItem from="1466165389502" duration="20165000" />
- <workItem from="1467111101869" duration="9000" />
- </task>
- <servers />
- </component>
- <component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="20174000" />
- </component>
- <component name="ToolWindowManager">
- <frame x="27" y="-884" width="1393" height="877" extended-state="0" />
- <editor active="false" />
- <layout>
- <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34458005" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3299595" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43688118" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- </layout>
- </component>
- <component name="Vcs.Log.UiProperties">
- <option name="RECENTLY_FILTERED_USER_GROUPS">
- <collection />
- </option>
- <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
- <collection />
- </option>
- </component>
- <component name="VcsContentAnnotationSettings">
- <option name="myLimit" value="2678400000" />
- </component>
- <component name="XDebuggerManager">
- <breakpoint-manager />
- <watches-manager />
- </component>
- <component name="antWorkspaceConfiguration">
- <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
- <option name="FILTER_TARGETS" value="false" />
- </component>
- <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/com/liferay/cxf/TestApplication.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="19" column="59" selection-start-line="19" selection-start-column="59" selection-end-line="19" selection-end-column="59" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/Optional.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="209" column="26" selection-start-line="209" selection-start-column="26" selection-end-line="209" selection-end-column="26" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/nio/file/Path.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="305" column="12" selection-start-line="305" selection-start-column="12" selection-end-line="305" selection-end-column="12" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/nio/file/Files.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="3623" column="31" selection-start-line="3623" selection-start-column="31" selection-end-line="3623" selection-end-column="31" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/ServiceLoader.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.35625">
- <caret line="184" column="19" selection-start-line="184" selection-start-column="19" selection-end-line="184" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$PROJECT_DIR$/lib/org.osgi.core-6.0.0-sources.jar!/org/osgi/framework/launch/Framework.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5725552">
- <caret line="152" column="24" selection-start-line="152" selection-start-column="24" selection-end-line="152" selection-end-column="24" />
- </state>
- </provider>
- </entry>
- <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/nio/file/Files.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="3623" column="31" selection-start-line="3623" selection-start-column="31" selection-end-line="3623" selection-end-column="31" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="jar://$PROJECT_DIR$/lib/org.osgi.core-6.0.0-sources.jar!/org/osgi/framework/launch/FrameworkFactory.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.6451104">
- <caret line="50" column="17" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="17" />
- </state>
- </provider>
- </entry>
- <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/nio/file/Path.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="305" column="12" selection-start-line="305" selection-start-column="12" selection-end-line="305" selection-end-column="12" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/Optional.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="209" column="26" selection-start-line="209" selection-start-column="26" selection-end-line="209" selection-end-column="26" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/com/liferay/cxf/TestApplication.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="19" column="59" selection-start-line="19" selection-start-column="59" selection-end-line="19" selection-end-column="59" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.3653846">
- <caret line="15" column="66" selection-start-line="15" selection-start-column="66" selection-end-line="15" selection-end-column="66" />
- <folding />
- </state>
- </provider>
- </entry>
- </component>
- <component name="masterDetails">
- <states>
- <state key="ArtifactsStructureConfigurable.UI">
- <settings>
- <artifact-editor />
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="FacetStructureConfigurable.UI">
- <settings>
- <last-edited>OSGi (test-cxf)|OSGi</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="GlobalLibrariesConfigurable.UI">
- <settings>
- <last-edited>scala-sdk-2.10.5</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="JdkListConfigurable.UI">
- <settings>
- <last-edited>1.8</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ModuleStructureConfigurable.UI">
- <settings>
- <last-edited>test-cxf</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ProjectJDKs.UI">
- <settings>
- <last-edited>1.6</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ProjectLibrariesConfigurable.UI">
- <settings>
- <last-edited>org.osgi.core-6.0.0</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- </states>
- </component>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/bnd.bnd
----------------------------------------------------------------------
diff --git a/test-cxf/bnd.bnd b/test-cxf/bnd.bnd
deleted file mode 100644
index f35be71..0000000
--- a/test-cxf/bnd.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-Name: Test CXF
-Bundle-SymbolicName: test.cxf
-Bundle-Version: 1.0.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/build.gradle
----------------------------------------------------------------------
diff --git a/test-cxf/build.gradle b/test-cxf/build.gradle
deleted file mode 100644
index 010c76b..0000000
--- a/test-cxf/build.gradle
+++ /dev/null
@@ -1,57 +0,0 @@
-dependencies {
- compile project(path: ':example-jaxrs-application', transitive: false)
- compile project(path: ':portal-remote-cxf-common', transitive: false)
- compile project(path: ':portal-remote-cxf-jaxrs-common', transitive: false)
- compile project(path: ':portal-remote-rest-extender', transitive: false)
- compile group: "biz.aQute.bnd", name: "biz.aQute.bndlib", transitive: false, version: "3.1.0"
- compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.2'
- compile group: "javax.ws.rs", name: "javax.ws.rs-api", transitive: false, version: "2.0.1"
- compile group: 'org.json', name: 'json', transitive: false, version: '20160212'
- compile group: 'org.apache.felix', name: 'org.apache.felix.configadmin', transitive: false, version: '1.8.8'
- compile group: 'org.apache.felix', name: 'org.apache.felix.dependencymanager', transitive: false, version: '3.2.0'
- compile group: 'org.apache.felix', name: 'org.apache.felix.eventadmin', transitive: false, version: '1.4.6'
- compile group: 'org.apache.felix', name: 'org.apache.felix.fileinstall', transitive: false, version: '3.5.4'
- compile group: 'org.apache.felix', name: 'org.apache.felix.gogo.command', transitive: false, version: '0.12.0'
- compile group: 'org.apache.felix', name: 'org.apache.felix.gogo.runtime', transitive: false, version: '0.10.0'
- compile group: 'org.apache.felix', name: 'org.apache.felix.gogo.shell', transitive: false, version: '0.10.0'
- compile group: 'org.apache.felix', name: 'org.apache.felix.http.jetty', transitive: false, version: '3.2.0'
- compile group: 'org.apache.felix', name: 'org.apache.felix.http.servlet-api', transitive: false, version: '1.1.2'
- compile group: 'org.apache.felix', name: 'org.apache.felix.inventory', transitive: false, version: '1.0.4'
- compile group: 'org.apache.felix', name: 'org.apache.felix.metatype', transitive: false, version: '1.1.2'
- compile group: 'org.apache.felix', name: 'org.apache.felix.scr', transitive: false, version: '2.0.6'
- compile group: 'org.apache.felix', name: 'org.apache.felix.webconsole', transitive: false, version: '4.2.16'
- compile group: 'org.apache.felix', name: 'org.apache.felix.webconsole.plugins.ds', transitive: false, version: '2.0.2'
- compile group: 'log4j', name: 'log4j', version: '1.2.17'
- compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.6.1'
- compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', transitive: false, version: '2.6.1'
- compile group: "org.codehaus.woodstox", name: "stax2-api", transitive: false, version: "3.1.4"
- compile group: "org.codehaus.woodstox", name: "woodstox-core-asl", transitive: false, version: "4.4.1"
- compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
- compile group: 'org.ow2.asm', name: 'asm', version: '5.0.4'
-}
-
-task cleanDeps(type: Delete) {
- delete 'bundle'
-}
-
-task getDeps(type: Copy, dependsOn:cleanDeps) {
- from sourceSets.main.compileClasspath
- into 'bundle/'
-}
-
-task run(dependsOn:getDeps) << {
- def felixCache = file('felix-cache')
-
- if (felixCache.exists()) {
- felixCache.deleteDir()
- }
-
- javaexec {
- main="-jar";
- args = ["bin/felix.jar"]
- jvmArgs = ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"]
- standardInput = System.in
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/conf/config.properties
----------------------------------------------------------------------
diff --git a/test-cxf/conf/config.properties b/test-cxf/conf/config.properties
deleted file mode 100644
index ad75723..0000000
--- a/test-cxf/conf/config.properties
+++ /dev/null
@@ -1,105 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# Framework config properties.
-#
-
-# To override the packages the framework exports by default from the
-# class path, set this variable.
-#org.osgi.framework.system.packages=
-
-# To append packages to the default set of exported system packages,
-# set this value.
-#org.osgi.framework.system.packages.extra=javax.annotation
-
-# The following property makes specified packages from the class path
-# available to all bundles. You should avoid using this property.
-#org.osgi.framework.bootdelegation=sun.*,com.sun.*
-
-# Felix tries to guess when to implicitly boot delegate in certain
-# situations to ease integration without outside code. This feature
-# is enabled by default, uncomment the following line to disable it.
-#felix.bootdelegation.implicit=false
-
-# The following property explicitly specifies the location of the bundle
-# cache, which defaults to "felix-cache" in the current working directory.
-# If this value is not absolute, then the felix.cache.rootdir controls
-# how the absolute location is calculated. (See next property)
-#org.osgi.framework.storage=${felix.cache.rootdir}/felix-cache
-
-# The following property is used to convert a relative bundle cache
-# location into an absolute one by specifying the root to prepend to
-# the relative cache path. The default for this property is the
-# current working directory.
-#felix.cache.rootdir=${user.dir}
-
-# The following property controls whether the bundle cache is flushed
-# the first time the framework is initialized. Possible values are
-# "none" and "onFirstInit"; the default is "none".
-#org.osgi.framework.storage.clean=onFirstInit
-
-# The following property determines which actions are performed when
-# processing the auto-deploy directory. It is a comma-delimited list of
-# the following values: 'install', 'start', 'update', and 'uninstall'.
-# An undefined or blank value is equivalent to disabling auto-deploy
-# processing.
-felix.auto.deploy.action=install,start
-
-# The following property specifies the directory to use as the bundle
-# auto-deploy directory; the default is 'bundle' in the working directory.
-#felix.auto.deploy.dir=bundle
-
-# The following property is a space-delimited list of bundle URLs
-# to install when the framework starts. The ending numerical component
-# is the target start level. Any number of these properties may be
-# specified for different start levels.
-#felix.auto.install.1=
-
-# The following property is a space-delimited list of bundle URLs
-# to install and start when the framework starts. The ending numerical
-# component is the target start level. Any number of these properties
-# may be specified for different start levels.
-#felix.auto.start.1=
-
-felix.log.level=1
-
-# Sets the initial start level of the framework upon startup.
-#org.osgi.framework.startlevel.beginning=1
-
-# Sets the start level of newly installed bundles.
-#felix.startlevel.bundle=1
-
-# Felix installs a stream and content handler factories by default,
-# uncomment the following line to not install them.
-#felix.service.urlhandlers=false
-
-# The launcher registers a shutdown hook to cleanly stop the framework
-# by default, uncomment the following line to disable it.
-#felix.shutdown.hook=false
-
-#
-# Bundle config properties.
-#
-
-org.osgi.service.http.port=8080
-obr.repository.url=http://felix.apache.org/obr/releases.xml
-
-org.osgi.framework.system.packages.extra=org.apache.xerces.dom,org.apache.xerces.xs,org.objectweb.asm,javax.ws.rs.ext,org.dom4j,org.ietf.jgss,org.w3c.dom,org.w3c.dom.ls,org.xml.sax,org.xml.sax.helpers,org.dom4j.io,org.json
-
-felix.fileinstall.dir=configurations
-felix.fileinstall.enableConfigSave=false
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/configurations/com.liferay.portal.remote.cxf.common.configuration.CXFEndpointPublisherConfiguration-one.cfg
----------------------------------------------------------------------
diff --git a/test-cxf/configurations/com.liferay.portal.remote.cxf.common.configuration.CXFEndpointPublisherConfiguration-one.cfg b/test-cxf/configurations/com.liferay.portal.remote.cxf.common.configuration.CXFEndpointPublisherConfiguration-one.cfg
deleted file mode 100644
index b336051..0000000
--- a/test-cxf/configurations/com.liferay.portal.remote.cxf.common.configuration.CXFEndpointPublisherConfiguration-one.cfg
+++ /dev/null
@@ -1 +0,0 @@
-contextPath=/cxf
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/configurations/com.liferay.portal.remote.rest.extender.configuration.RestExtenderConfiguration-one.cfg
----------------------------------------------------------------------
diff --git a/test-cxf/configurations/com.liferay.portal.remote.rest.extender.configuration.RestExtenderConfiguration-one.cfg b/test-cxf/configurations/com.liferay.portal.remote.rest.extender.configuration.RestExtenderConfiguration-one.cfg
deleted file mode 100644
index 08362ac..0000000
--- a/test-cxf/configurations/com.liferay.portal.remote.rest.extender.configuration.RestExtenderConfiguration-one.cfg
+++ /dev/null
@@ -1 +0,0 @@
-contextPaths=/cxf
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/test-cxf/src/main/java/com/liferay/cxf/TestApplication.java
----------------------------------------------------------------------
diff --git a/test-cxf/src/main/java/com/liferay/cxf/TestApplication.java b/test-cxf/src/main/java/com/liferay/cxf/TestApplication.java
deleted file mode 100644
index bcae956..0000000
--- a/test-cxf/src/main/java/com/liferay/cxf/TestApplication.java
+++ /dev/null
@@ -1,22 +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.cxf;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class TestApplication extends javax.ws.rs.core.Application {
-
-}
[24/50] [abbrv] aries-jax-rs-whiteboard git commit: rename example
Posted by cs...@apache.org.
rename example
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/fc1456a6
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/fc1456a6
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/fc1456a6
Branch: refs/heads/master
Commit: fc1456a63c1195e35c76a1f8b473abc74b0ea57e
Parents: b9f4201
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Oct 25 15:58:00 2016 +0200
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Oct 25 23:42:22 2016 +0200
----------------------------------------------------------------------
org.apache.aries.jax-rs.example/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/fc1456a6/org.apache.aries.jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.aries.jax-rs.example/pom.xml b/org.apache.aries.jax-rs.example/pom.xml
index 252a6ba..2a36d9b 100644
--- a/org.apache.aries.jax-rs.example/pom.xml
+++ b/org.apache.aries.jax-rs.example/pom.xml
@@ -9,9 +9,9 @@
<artifactId>org.apache.aries.jax-rs</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>com.liferay.portal.rest.example</artifactId>
+ <artifactId>org.apache.aries.jax-rs.example</artifactId>
<packaging>jar</packaging>
- <description>REST Example</description>
+ <description>JAX-RS Example</description>
<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
[13/50] [abbrv] aries-jax-rs-whiteboard git commit: fix ignores and
remove generated file
Posted by cs...@apache.org.
fix ignores and remove generated file
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/7694659d
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/7694659d
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/7694659d
Branch: refs/heads/master
Commit: 7694659dde83927d81333e5db48a095bbcaeec49
Parents: f16ef4a
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Oct 11 13:27:28 2016 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Oct 11 13:27:28 2016 -0400
----------------------------------------------------------------------
.gitignore | 2 +-
example-jaxrs-application/build/tmp/jar/bnd.bnd | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7694659d/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0bb5a07..2920297 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
*/.project
*/.settings/
*/bin/
-*/build/
+**/build/
/.gradle/
/test-cxf/felix-cache/
/test-cxf/bundle/
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7694659d/example-jaxrs-application/build/tmp/jar/bnd.bnd
----------------------------------------------------------------------
diff --git a/example-jaxrs-application/build/tmp/jar/bnd.bnd b/example-jaxrs-application/build/tmp/jar/bnd.bnd
deleted file mode 100644
index 37c72f2..0000000
--- a/example-jaxrs-application/build/tmp/jar/bnd.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Sep 07 14:15:05 CEST 2016
-Bundle-SymbolicName=com.liferay.portal.rest.example
-Bundle-Version=1.0.0
-Bundle-Name=Example OSGi Rest Application
[25/50] [abbrv] aries-jax-rs-whiteboard git commit: run -- notworking
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/890a5b8a/bndrun/org.apache.aries.jax-rs.example.bndrun
----------------------------------------------------------------------
diff --git a/bndrun/org.apache.aries.jax-rs.example.bndrun b/bndrun/org.apache.aries.jax-rs.example.bndrun
new file mode 100644
index 0000000..df887ad
--- /dev/null
+++ b/bndrun/org.apache.aries.jax-rs.example.bndrun
@@ -0,0 +1,47 @@
+-standalone:
+
+-plugin.pom.repo = \
+ aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
+ snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \
+ releaseUrls=https://repo1.maven.org/maven2/; \
+ pom=${.}/pom.xml; \
+ name=pom.repo; \
+ location=${.}/target/cached.xml
+
+-runrequires: osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.example)'
+-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
+-runbundles: \
+ log4j;version='[1.2.17,1.2.18)',\
+ org.apache.aries.jax-rs.example;version=snapshot,\
+ org.apache.aries.jax-rs.cxf-common;version='[1.0.0,1.0.1)',\
+ org.apache.aries.rest.extender;version='[1.0.0,1.0.1)',\
+ org.apache.commons.fileupload;version='[1.2.2,1.2.3)',\
+ org.apache.commons.io;version='[2.4.0,2.4.1)',\
+ org.apache.felix.configadmin;version='[1.8.6,1.8.7)',\
+ org.apache.felix.http.api;version='[3.0.0,3.0.1)',\
+ org.apache.felix.scr;version='[2.0.6,2.0.7)',\
+ org.eclipse.equinox.http.jetty;version='[3.4.0,3.4.1)',\
+ org.eclipse.equinox.http.servlet;version='[1.4.0,1.4.1)',\
+ org.eclipse.equinox.metatype;version='[1.4.200,1.4.201)',\
+ org.eclipse.jetty.http;version='[9.3.9,9.3.10)',\
+ org.eclipse.jetty.io;version='[9.3.9,9.3.10)',\
+ org.eclipse.jetty.security;version='[9.3.9,9.3.10)',\
+ org.eclipse.jetty.server;version='[9.3.9,9.3.10)',\
+ org.eclipse.jetty.servlet;version='[9.3.9,9.3.10)',\
+ org.eclipse.jetty.util;version='[9.3.9,9.3.10)',\
+ org.objectweb.asm.all.debug;version='[5.0.3,5.0.4)',\
+ org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
+ org.slf4j.api;version='[1.7.2,1.7.3)',\
+ org.apache.felix.bundlerepository;version='[2.0.8,2.0.9)',\
+ org.apache.felix.gogo.command;version='[1.0.0,1.0.1)',\
+ org.apache.felix.gogo.runtime;version='[1.0.0,1.0.1)',\
+ org.apache.felix.gogo.shell;version='[1.0.0,1.0.1)',\
+ javax.servlet-api;version='[3.1.0,3.1.1)'
+
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+-runproperties.eqnx: \
+ osgi.console.enable.builtin=false, \
+ osgi.console=, \
+ org.osgi.service.http.port=8080
+-runsystemcapabilities.dflt: ${native_capability}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/890a5b8a/bndrun/pom.xml
----------------------------------------------------------------------
diff --git a/bndrun/pom.xml b/bndrun/pom.xml
new file mode 100644
index 0000000..444e74d
--- /dev/null
+++ b/bndrun/pom.xml
@@ -0,0 +1,50 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.aries.jax-rs.example.bndrun</artifactId>
+
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-export-maven-plugin</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <configuration>
+ <resolve>true</resolve>
+ <bndruns>
+ <bndrun>org.apache.aries.jax-rs.example.bndrun</bndrun>
+ </bndruns>
+ <targetDir>.</targetDir>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>export</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs.example</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.pom.distro</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
[08/50] [abbrv] aries-jax-rs-whiteboard git commit: fix default build
instruction
Posted by cs...@apache.org.
fix default build instruction
./gradlew # now works without error
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/d086f10e
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/d086f10e
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/d086f10e
Branch: refs/heads/master
Commit: d086f10e121c3ff1556ed87732788f37b9d64816
Parents: 118fb42
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Aug 2 14:58:29 2016 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Oct 11 13:20:31 2016 -0400
----------------------------------------------------------------------
build.gradle | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/d086f10e/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 3dc5282..c7e6814 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,8 @@ buildscript {
}
}
+defaultTasks 'build'
+
subprojects {
buildscript {
repositories {
@@ -19,8 +21,13 @@ subprojects {
}
}
- apply plugin: 'biz.aQute.bnd.builder'
- sourceCompatibility = 1.7
+ if (file('bnd.bnd').exists()) {
+ apply plugin: 'biz.aQute.bnd.builder'
+ sourceCompatibility = 1.7
+ }
+ else {
+ apply plugin: 'java'
+ }
repositories {
maven {
[14/50] [abbrv] aries-jax-rs-whiteboard git commit: bnd 3.3.0
Posted by cs...@apache.org.
bnd 3.3.0
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/97d9eea6
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/97d9eea6
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/97d9eea6
Branch: refs/heads/master
Commit: 97d9eea6353bd32a62117607b287d6d2f6acf91d
Parents: 7694659
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Oct 11 14:02:04 2016 -0400
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Oct 11 14:02:04 2016 -0400
----------------------------------------------------------------------
build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/97d9eea6/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index c7e6814..989ec63 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
}
}
dependencies {
- classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:3.1.0'
+ classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:3.3.0'
classpath 'com.liferay:com.liferay.ant.bnd:2.0.21'
}
}
@@ -37,5 +37,5 @@ subprojects {
}
task wrapper(type:Wrapper){
- gradleVersion = '2.9'
+ gradleVersion = '3.1'
}
[19/50] [abbrv] aries-jax-rs-whiteboard git commit: [maven] convert
to maven build using bnd-maven-plugin
Posted by cs...@apache.org.
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_bg.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_bg.properties b/portal-remote-cxf-common/classes/content/Language_bg.properties
deleted file mode 100644
index 64113eb..0000000
--- a/portal-remote-cxf-common/classes/content/Language_bg.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u043a\u0440\u0430\u0439\u043d\u0438 \u0442\u043e\u0447\u043a\u0438 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_ca.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_ca.properties b/portal-remote-cxf-common/classes/content/Language_ca.properties
deleted file mode 100644
index d434f12..0000000
--- a/portal-remote-cxf-common/classes/content/Language_ca.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Punts finals CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_cs.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_cs.properties b/portal-remote-cxf-common/classes/content/Language_cs.properties
deleted file mode 100644
index d6e9761..0000000
--- a/portal-remote-cxf-common/classes/content/Language_cs.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF koncov� body (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_da.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_da.properties b/portal-remote-cxf-common/classes/content/Language_da.properties
deleted file mode 100644
index c97e7ad..0000000
--- a/portal-remote-cxf-common/classes/content/Language_da.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF slutpunkter (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_de.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_de.properties b/portal-remote-cxf-common/classes/content/Language_de.properties
deleted file mode 100644
index 12dd09d..0000000
--- a/portal-remote-cxf-common/classes/content/Language_de.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_el.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_el.properties b/portal-remote-cxf-common/classes/content/Language_el.properties
deleted file mode 100644
index 62c364f..0000000
--- a/portal-remote-cxf-common/classes/content/Language_el.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u03b1\u03c0\u03bf\u03bb\u03ae\u03be\u03b5\u03b9\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-cxf-common/classes/content/Language_en.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_en.properties b/portal-remote-cxf-common/classes/content/Language_en.properties
deleted file mode 100644
index 12dd09d..0000000
--- a/portal-remote-cxf-common/classes/content/Language_en.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_es.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_es.properties b/portal-remote-cxf-common/classes/content/Language_es.properties
deleted file mode 100644
index a7da044..0000000
--- a/portal-remote-cxf-common/classes/content/Language_es.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Puntos finales CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_et.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_et.properties b/portal-remote-cxf-common/classes/content/Language_et.properties
deleted file mode 100644
index 50810e0..0000000
--- a/portal-remote-cxf-common/classes/content/Language_et.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF l�pp (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_eu.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_eu.properties b/portal-remote-cxf-common/classes/content/Language_eu.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/classes/content/Language_eu.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_fa.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_fa.properties b/portal-remote-cxf-common/classes/content/Language_fa.properties
deleted file mode 100644
index a344c54..0000000
--- a/portal-remote-cxf-common/classes/content/Language_fa.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u0646\u0642\u0637\u0647 \u067e\u0627\u06cc\u0627\u0646\u06cc CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_fi.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_fi.properties b/portal-remote-cxf-common/classes/content/Language_fi.properties
deleted file mode 100644
index 513c688..0000000
--- a/portal-remote-cxf-common/classes/content/Language_fi.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF-p��tepisteet
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_fr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_fr.properties b/portal-remote-cxf-common/classes/content/Language_fr.properties
deleted file mode 100644
index 079f60e..0000000
--- a/portal-remote-cxf-common/classes/content/Language_fr.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Extr�mit�s CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_gl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_gl.properties b/portal-remote-cxf-common/classes/content/Language_gl.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/classes/content/Language_gl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_hi_IN.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_hi_IN.properties b/portal-remote-cxf-common/classes/content/Language_hi_IN.properties
deleted file mode 100644
index bce7eb1..0000000
--- a/portal-remote-cxf-common/classes/content/Language_hi_IN.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u0905\u0902\u0924\u093f\u092e\u092c\u093f\u0902\u0926\u0941 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_hr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_hr.properties b/portal-remote-cxf-common/classes/content/Language_hr.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/classes/content/Language_hr.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_hu.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_hu.properties b/portal-remote-cxf-common/classes/content/Language_hu.properties
deleted file mode 100644
index f529f91..0000000
--- a/portal-remote-cxf-common/classes/content/Language_hu.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF v�gpontok
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_in.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_in.properties b/portal-remote-cxf-common/classes/content/Language_in.properties
deleted file mode 100644
index 6b2166f..0000000
--- a/portal-remote-cxf-common/classes/content/Language_in.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoint (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_it.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_it.properties b/portal-remote-cxf-common/classes/content/Language_it.properties
deleted file mode 100644
index 9792228..0000000
--- a/portal-remote-cxf-common/classes/content/Language_it.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Endpoint CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_iw.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_iw.properties b/portal-remote-cxf-common/classes/content/Language_iw.properties
deleted file mode 100644
index 709f990..0000000
--- a/portal-remote-cxf-common/classes/content/Language_iw.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u05e0\u05e7\u05d5\u05d3\u05d5\u05ea \u05e7\u05e6\u05d4 CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_ja.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_ja.properties b/portal-remote-cxf-common/classes/content/Language_ja.properties
deleted file mode 100644
index 6227a00..0000000
--- a/portal-remote-cxf-common/classes/content/Language_ja.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_ko.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_ko.properties b/portal-remote-cxf-common/classes/content/Language_ko.properties
deleted file mode 100644
index 0ec8433..0000000
--- a/portal-remote-cxf-common/classes/content/Language_ko.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \ub05d\uc810 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_lo.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_lo.properties b/portal-remote-cxf-common/classes/content/Language_lo.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/classes/content/Language_lo.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_lt.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_lt.properties b/portal-remote-cxf-common/classes/content/Language_lt.properties
deleted file mode 100644
index c22d773..0000000
--- a/portal-remote-cxf-common/classes/content/Language_lt.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF importas galiniai punktai (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_nb.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_nb.properties b/portal-remote-cxf-common/classes/content/Language_nb.properties
deleted file mode 100644
index 034a23f..0000000
--- a/portal-remote-cxf-common/classes/content/Language_nb.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF endepunkt (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_nl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_nl.properties b/portal-remote-cxf-common/classes/content/Language_nl.properties
deleted file mode 100644
index eef886c..0000000
--- a/portal-remote-cxf-common/classes/content/Language_nl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF-endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_nl_BE.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_nl_BE.properties b/portal-remote-cxf-common/classes/content/Language_nl_BE.properties
deleted file mode 100644
index f517012..0000000
--- a/portal-remote-cxf-common/classes/content/Language_nl_BE.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF eindpunten (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_pl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_pl.properties b/portal-remote-cxf-common/classes/content/Language_pl.properties
deleted file mode 100644
index f755610..0000000
--- a/portal-remote-cxf-common/classes/content/Language_pl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF'A ko\u0144cowe (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_pt_BR.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_pt_BR.properties b/portal-remote-cxf-common/classes/content/Language_pt_BR.properties
deleted file mode 100644
index bd24788..0000000
--- a/portal-remote-cxf-common/classes/content/Language_pt_BR.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Terminais CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_pt_PT.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_pt_PT.properties b/portal-remote-cxf-common/classes/content/Language_pt_PT.properties
deleted file mode 100644
index bd24788..0000000
--- a/portal-remote-cxf-common/classes/content/Language_pt_PT.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Terminais CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_ro.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_ro.properties b/portal-remote-cxf-common/classes/content/Language_ro.properties
deleted file mode 100644
index ae28733..0000000
--- a/portal-remote-cxf-common/classes/content/Language_ro.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF obiective (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_ru.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_ru.properties b/portal-remote-cxf-common/classes/content/Language_ru.properties
deleted file mode 100644
index 6e3bb27..0000000
--- a/portal-remote-cxf-common/classes/content/Language_ru.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u043a\u043e\u043d\u0435\u0447\u043d\u044b\u0435 \u0442\u043e\u0447\u043a\u0438 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_sk.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_sk.properties b/portal-remote-cxf-common/classes/content/Language_sk.properties
deleted file mode 100644
index d6e9761..0000000
--- a/portal-remote-cxf-common/classes/content/Language_sk.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF koncov� body (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_sl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_sl.properties b/portal-remote-cxf-common/classes/content/Language_sl.properties
deleted file mode 100644
index 2706ade..0000000
--- a/portal-remote-cxf-common/classes/content/Language_sl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Kon\u010dne to\u010dke CXF (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_sr_RS.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_sr_RS.properties b/portal-remote-cxf-common/classes/content/Language_sr_RS.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/classes/content/Language_sr_RS.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_sr_RS_latin.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_sr_RS_latin.properties b/portal-remote-cxf-common/classes/content/Language_sr_RS_latin.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/classes/content/Language_sr_RS_latin.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_sv.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_sv.properties b/portal-remote-cxf-common/classes/content/Language_sv.properties
deleted file mode 100644
index ccbfe3c..0000000
--- a/portal-remote-cxf-common/classes/content/Language_sv.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF �ndpunkter (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_tr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_tr.properties b/portal-remote-cxf-common/classes/content/Language_tr.properties
deleted file mode 100644
index ecc09cc..0000000
--- a/portal-remote-cxf-common/classes/content/Language_tr.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF biti\u015f noktalar\u0131 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_uk.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_uk.properties b/portal-remote-cxf-common/classes/content/Language_uk.properties
deleted file mode 100644
index 8de2199..0000000
--- a/portal-remote-cxf-common/classes/content/Language_uk.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u0426\u044c\u043e\u0433\u043e \u041e\u041f\u0418\u0421\u0423 \u043a\u0456\u043d\u0446\u0435\u0432\u0438\u0445 \u0442\u043e\u0447\u043e\u043a (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_vi.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_vi.properties b/portal-remote-cxf-common/classes/content/Language_vi.properties
deleted file mode 100644
index 2bfeb99..0000000
--- a/portal-remote-cxf-common/classes/content/Language_vi.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Hai \u0111i\u1ec3m cu\u1ed1i CXF (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_zh_CN.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_zh_CN.properties b/portal-remote-cxf-common/classes/content/Language_zh_CN.properties
deleted file mode 100644
index 9b60693..0000000
--- a/portal-remote-cxf-common/classes/content/Language_zh_CN.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF\u7ec8\u7ed3\u70b9
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/content/Language_zh_TW.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/content/Language_zh_TW.properties b/portal-remote-cxf-common/classes/content/Language_zh_TW.properties
deleted file mode 100644
index c287f7f..0000000
--- a/portal-remote-cxf-common/classes/content/Language_zh_TW.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u7d42\u7d50\u9ede (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/javax/wsdl/extensions/http/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/javax/wsdl/extensions/http/packageinfo b/portal-remote-cxf-common/classes/javax/wsdl/extensions/http/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/classes/javax/wsdl/extensions/http/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/javax/wsdl/extensions/mime/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/javax/wsdl/extensions/mime/packageinfo b/portal-remote-cxf-common/classes/javax/wsdl/extensions/mime/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/classes/javax/wsdl/extensions/mime/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/javax/wsdl/extensions/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/javax/wsdl/extensions/packageinfo b/portal-remote-cxf-common/classes/javax/wsdl/extensions/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/classes/javax/wsdl/extensions/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/javax/wsdl/extensions/schema/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/javax/wsdl/extensions/schema/packageinfo b/portal-remote-cxf-common/classes/javax/wsdl/extensions/schema/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/classes/javax/wsdl/extensions/schema/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/javax/wsdl/extensions/soap/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/javax/wsdl/extensions/soap/packageinfo b/portal-remote-cxf-common/classes/javax/wsdl/extensions/soap/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/classes/javax/wsdl/extensions/soap/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/javax/wsdl/extensions/soap12/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/javax/wsdl/extensions/soap12/packageinfo b/portal-remote-cxf-common/classes/javax/wsdl/extensions/soap12/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/classes/javax/wsdl/extensions/soap12/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/javax/wsdl/factory/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/javax/wsdl/factory/packageinfo b/portal-remote-cxf-common/classes/javax/wsdl/factory/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/classes/javax/wsdl/factory/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/javax/wsdl/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/javax/wsdl/packageinfo b/portal-remote-cxf-common/classes/javax/wsdl/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/classes/javax/wsdl/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/javax/wsdl/xml/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/javax/wsdl/xml/packageinfo b/portal-remote-cxf-common/classes/javax/wsdl/xml/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/classes/javax/wsdl/xml/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/org/apache/cxf/binding/soap/wsdl/extensions/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/org/apache/cxf/binding/soap/wsdl/extensions/packageinfo b/portal-remote-cxf-common/classes/org/apache/cxf/binding/soap/wsdl/extensions/packageinfo
deleted file mode 100644
index bd33369..0000000
--- a/portal-remote-cxf-common/classes/org/apache/cxf/binding/soap/wsdl/extensions/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 4.0.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/org/apache/cxf/databinding/source/mime/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/org/apache/cxf/databinding/source/mime/packageinfo b/portal-remote-cxf-common/classes/org/apache/cxf/databinding/source/mime/packageinfo
deleted file mode 100644
index 59ff96a..0000000
--- a/portal-remote-cxf-common/classes/org/apache/cxf/databinding/source/mime/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 3.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/constants/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/constants/packageinfo b/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/constants/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/constants/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/extensions/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/extensions/packageinfo b/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/extensions/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/extensions/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/internal/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/internal/packageinfo b/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/internal/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/internal/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/packageinfo b/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/resolver/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/resolver/packageinfo b/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/resolver/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/resolver/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/utils/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/utils/packageinfo b/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/utils/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/classes/org/apache/ws/commons/schema/utils/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/portal-remote-cxf-common.iml
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/portal-remote-cxf-common.iml b/portal-remote-cxf-common/portal-remote-cxf-common.iml
deleted file mode 100644
index 6dae0c0..0000000
--- a/portal-remote-cxf-common/portal-remote-cxf-common.iml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":portal-remote-cxf-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" 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: javax.servlet:javax.servlet-api:3.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-bindings-soap:3.1.7" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-rt-databinding-jaxb:3.1.7" 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.apache.cxf:cxf-rt-wsdl:3.1.7" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-tools-common:3.1.7" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.cxf:cxf-tools-validator: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.woodstox:stax2-api:3.1.4" level="project" />
- <orderEntry type="library" name="Gradle: org.codehaus.woodstox:woodstox-core-asl:4.4.1" 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.slf4j:slf4j-api:1.7.2" level="project" />
- <orderEntry type="library" name="Gradle: wsdl4j:wsdl4j:1.6.3" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.velocity:velocity:1.7" level="project" />
- <orderEntry type="library" name="Gradle: org.osgi:org.osgi.compendium:4.2.0" level="project" />
- <orderEntry type="library" name="Gradle: javax.xml.stream:stax-api:1.0-2" level="project" />
- <orderEntry type="library" name="Gradle: commons-lang:commons-lang:2.4" level="project" />
- <orderEntry type="library" name="Gradle: javax.annotation:javax.annotation-api:1.2" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.ws.xmlschema:xmlschema-core:2.2.1" level="project" />
- <orderEntry type="library" name="Gradle: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
- <orderEntry type="library" name="Gradle: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
- <orderEntry type="library" name="Gradle: org.ow2.asm:asm:5.0.4" level="project" />
- <orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.2" level="project" />
- <orderEntry type="library" name="Gradle: com.sun.xml.bind:jaxb-xjc:2.2.11" 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-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java b/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
deleted file mode 100644
index 68d79f6..0000000
--- a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/ServicesRegistrator.java
+++ /dev/null
@@ -1,168 +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.cxf.common;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusFactory;
-import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.http.context.ServletContextHelper;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.Servlet;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class ServicesRegistrator {
-
- public ServicesRegistrator(
- BundleContext bundleContext, Map<String, Object> properties) {
-
- _bundleContext = bundleContext;
-
- _properties = properties;
- }
-
- @SuppressWarnings("unused")
- protected void addExtension(
- Map<String, Object> properties, Object extension) {
-
- Class<?> extensionClass = (Class<?>) properties.get(
- "cxf.extension.class");
-
- if (extensionClass == null) {
- extensionClass = extension.getClass();
- }
-
- _extensions.put(extensionClass, extension);
- }
-
- @SuppressWarnings("unused")
- public void start() {
- Dictionary<String, Object> properties = new Hashtable<>();
-
- Object contextPathObject = _properties.get("contextPath");
-
- String contextPath = contextPathObject.toString();
-
- String contextName = contextPath.substring(1);
-
- contextName = contextName.replace("/", ".");
-
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME,
- contextName);
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
- contextPath);
-
- _servletContextHelperServiceRegistration =
- _bundleContext.registerService(
- ServletContextHelper.class,
- new ServletContextHelper(_bundleContext.getBundle()) {
- },
- properties);
-
- CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet();
-
- CXFBusFactory cxfBusFactory =
- (CXFBusFactory) CXFBusFactory.newInstance(
- CXFBusFactory.class.getName());
-
- Bus bus = cxfBusFactory.createBus(_extensions);
-
- properties = new Hashtable<>();
-
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
- "(osgi.http.whiteboard.context.name=" + contextName + ")");
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME,
- CXFNonSpringServlet.class.getName());
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/*");
-
- cxfNonSpringServlet.setBus(bus);
-
- _servletServiceRegistration = _bundleContext.registerService(
- Servlet.class, cxfNonSpringServlet, properties);
-
- properties = new Hashtable<>();
-
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH,
- contextPath);
-
- _busServiceRegistration = _bundleContext.registerService(
- Bus.class, bus, properties);
- }
-
- @SuppressWarnings("unused")
- public void stop() {
- try {
- _busServiceRegistration.unregister();
- }
- catch (Exception e) {
- if (_logger.isWarnEnabled()) {
- _logger.warn(
- "Unable to unregister CXF bus service registration " +
- _busServiceRegistration);
- }
- }
-
- try {
- _servletServiceRegistration.unregister();
- }
- catch (Exception e) {
- if (_logger.isWarnEnabled()) {
- _logger.warn(
- "Unable to unregister servlet service registration " +
- _servletServiceRegistration);
- }
- }
-
- try {
- _servletContextHelperServiceRegistration.unregister();
- }
- catch (Exception e) {
- if (_logger.isWarnEnabled()) {
- _logger.warn(
- "Unable to unregister servlet context helper service " +
- "registration " +
- _servletContextHelperServiceRegistration);
- }
- }
- }
-
- private static final Logger _logger = LoggerFactory.getLogger(
- ServicesRegistrator.class);
-
- private final BundleContext _bundleContext;
- private ServiceRegistration<Bus> _busServiceRegistration;
- private final Map<Class<?>, Object> _extensions = new HashMap<>();
- private final Map<String, Object> _properties;
- private ServiceRegistration<ServletContextHelper>
- _servletContextHelperServiceRegistration;
- private ServiceRegistration<Servlet> _servletServiceRegistration;
-
-}
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java b/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java
deleted file mode 100644
index df299db..0000000
--- a/portal-remote-cxf-common/src/main/java/com/liferay/portal/remote/cxf/common/activator/CXFEndpointPublisherActivator.java
+++ /dev/null
@@ -1,47 +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.cxf.common.activator;
-
-import com.liferay.portal.remote.cxf.common.ServicesRegistrator;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-import java.util.HashMap;
-
-/**
- * @author Carlos Sierra Andr�s
- */
-public class CXFEndpointPublisherActivator implements BundleActivator {
-
- private ServicesRegistrator _servicesRegistrator;
-
- @Override
- public void start(BundleContext bundleContext) throws Exception {
- HashMap<String, Object> properties = new HashMap<String, Object>() {{
- put("contextPath", "/cxf");
- }};
-
- _servicesRegistrator = new ServicesRegistrator(
- bundleContext, properties);
-
- _servicesRegistrator.start();
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- _servicesRegistrator.stop();
- }
-}
-
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language.properties b/portal-remote-cxf-common/src/main/resources/content/Language.properties
deleted file mode 100644
index 12dd09d..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_ar.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_ar.properties b/portal-remote-cxf-common/src/main/resources/content/Language_ar.properties
deleted file mode 100644
index 1e2a617..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_ar.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u0646\u0642\u0627\u0637 \u0627\u0644\u0646\u0647\u0627\u064a\u0629 CXF (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_bg.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_bg.properties b/portal-remote-cxf-common/src/main/resources/content/Language_bg.properties
deleted file mode 100644
index 64113eb..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_bg.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u043a\u0440\u0430\u0439\u043d\u0438 \u0442\u043e\u0447\u043a\u0438 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_ca.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_ca.properties b/portal-remote-cxf-common/src/main/resources/content/Language_ca.properties
deleted file mode 100644
index d434f12..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_ca.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Punts finals CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_cs.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_cs.properties b/portal-remote-cxf-common/src/main/resources/content/Language_cs.properties
deleted file mode 100644
index d6e9761..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_cs.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF koncov� body (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_da.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_da.properties b/portal-remote-cxf-common/src/main/resources/content/Language_da.properties
deleted file mode 100644
index c97e7ad..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_da.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF slutpunkter (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_de.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_de.properties b/portal-remote-cxf-common/src/main/resources/content/Language_de.properties
deleted file mode 100644
index 12dd09d..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_de.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_el.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_el.properties b/portal-remote-cxf-common/src/main/resources/content/Language_el.properties
deleted file mode 100644
index 62c364f..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_el.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u03b1\u03c0\u03bf\u03bb\u03ae\u03be\u03b5\u03b9\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-cxf-common/src/main/resources/content/Language_en.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_en.properties b/portal-remote-cxf-common/src/main/resources/content/Language_en.properties
deleted file mode 100644
index 12dd09d..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_en.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_es.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_es.properties b/portal-remote-cxf-common/src/main/resources/content/Language_es.properties
deleted file mode 100644
index a7da044..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_es.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Puntos finales CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_et.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_et.properties b/portal-remote-cxf-common/src/main/resources/content/Language_et.properties
deleted file mode 100644
index 50810e0..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_et.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF l�pp (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_eu.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_eu.properties b/portal-remote-cxf-common/src/main/resources/content/Language_eu.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_eu.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_fa.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_fa.properties b/portal-remote-cxf-common/src/main/resources/content/Language_fa.properties
deleted file mode 100644
index a344c54..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_fa.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u0646\u0642\u0637\u0647 \u067e\u0627\u06cc\u0627\u0646\u06cc CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_fi.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_fi.properties b/portal-remote-cxf-common/src/main/resources/content/Language_fi.properties
deleted file mode 100644
index 513c688..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_fi.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF-p��tepisteet
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_fr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_fr.properties b/portal-remote-cxf-common/src/main/resources/content/Language_fr.properties
deleted file mode 100644
index 079f60e..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_fr.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Extr�mit�s CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_gl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_gl.properties b/portal-remote-cxf-common/src/main/resources/content/Language_gl.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_gl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_hi_IN.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_hi_IN.properties b/portal-remote-cxf-common/src/main/resources/content/Language_hi_IN.properties
deleted file mode 100644
index bce7eb1..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_hi_IN.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u0905\u0902\u0924\u093f\u092e\u092c\u093f\u0902\u0926\u0941 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_hr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_hr.properties b/portal-remote-cxf-common/src/main/resources/content/Language_hr.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_hr.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_hu.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_hu.properties b/portal-remote-cxf-common/src/main/resources/content/Language_hu.properties
deleted file mode 100644
index f529f91..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_hu.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF v�gpontok
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_in.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_in.properties b/portal-remote-cxf-common/src/main/resources/content/Language_in.properties
deleted file mode 100644
index 6b2166f..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_in.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoint (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_it.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_it.properties b/portal-remote-cxf-common/src/main/resources/content/Language_it.properties
deleted file mode 100644
index 9792228..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_it.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Endpoint CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_iw.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_iw.properties b/portal-remote-cxf-common/src/main/resources/content/Language_iw.properties
deleted file mode 100644
index 709f990..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_iw.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u05e0\u05e7\u05d5\u05d3\u05d5\u05ea \u05e7\u05e6\u05d4 CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_ja.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_ja.properties b/portal-remote-cxf-common/src/main/resources/content/Language_ja.properties
deleted file mode 100644
index 6227a00..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_ja.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_ko.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_ko.properties b/portal-remote-cxf-common/src/main/resources/content/Language_ko.properties
deleted file mode 100644
index 0ec8433..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_ko.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \ub05d\uc810 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_lo.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_lo.properties b/portal-remote-cxf-common/src/main/resources/content/Language_lo.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_lo.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_lt.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_lt.properties b/portal-remote-cxf-common/src/main/resources/content/Language_lt.properties
deleted file mode 100644
index c22d773..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_lt.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF importas galiniai punktai (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_nb.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_nb.properties b/portal-remote-cxf-common/src/main/resources/content/Language_nb.properties
deleted file mode 100644
index 034a23f..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_nb.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF endepunkt (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_nl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_nl.properties b/portal-remote-cxf-common/src/main/resources/content/Language_nl.properties
deleted file mode 100644
index eef886c..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_nl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF-endpoints
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_nl_BE.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_nl_BE.properties b/portal-remote-cxf-common/src/main/resources/content/Language_nl_BE.properties
deleted file mode 100644
index f517012..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_nl_BE.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF eindpunten (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_pl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_pl.properties b/portal-remote-cxf-common/src/main/resources/content/Language_pl.properties
deleted file mode 100644
index f755610..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_pl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF'A ko\u0144cowe (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_pt_BR.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_pt_BR.properties b/portal-remote-cxf-common/src/main/resources/content/Language_pt_BR.properties
deleted file mode 100644
index bd24788..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_pt_BR.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Terminais CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_pt_PT.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_pt_PT.properties b/portal-remote-cxf-common/src/main/resources/content/Language_pt_PT.properties
deleted file mode 100644
index bd24788..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_pt_PT.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Terminais CXF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_ro.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_ro.properties b/portal-remote-cxf-common/src/main/resources/content/Language_ro.properties
deleted file mode 100644
index ae28733..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_ro.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF obiective (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_ru.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_ru.properties b/portal-remote-cxf-common/src/main/resources/content/Language_ru.properties
deleted file mode 100644
index 6e3bb27..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_ru.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u043a\u043e\u043d\u0435\u0447\u043d\u044b\u0435 \u0442\u043e\u0447\u043a\u0438 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_sk.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_sk.properties b/portal-remote-cxf-common/src/main/resources/content/Language_sk.properties
deleted file mode 100644
index d6e9761..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_sk.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF koncov� body (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_sl.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_sl.properties b/portal-remote-cxf-common/src/main/resources/content/Language_sl.properties
deleted file mode 100644
index 2706ade..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_sl.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Kon\u010dne to\u010dke CXF (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_sr_RS.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_sr_RS.properties b/portal-remote-cxf-common/src/main/resources/content/Language_sr_RS.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_sr_RS.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_sr_RS_latin.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_sr_RS_latin.properties b/portal-remote-cxf-common/src/main/resources/content/Language_sr_RS_latin.properties
deleted file mode 100644
index b79f51c..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_sr_RS_latin.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF Endpoints (Automatic Copy)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_sv.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_sv.properties b/portal-remote-cxf-common/src/main/resources/content/Language_sv.properties
deleted file mode 100644
index ccbfe3c..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_sv.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF �ndpunkter (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_tr.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_tr.properties b/portal-remote-cxf-common/src/main/resources/content/Language_tr.properties
deleted file mode 100644
index ecc09cc..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_tr.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF biti\u015f noktalar\u0131 (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_uk.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_uk.properties b/portal-remote-cxf-common/src/main/resources/content/Language_uk.properties
deleted file mode 100644
index 8de2199..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_uk.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=\u0426\u044c\u043e\u0433\u043e \u041e\u041f\u0418\u0421\u0423 \u043a\u0456\u043d\u0446\u0435\u0432\u0438\u0445 \u0442\u043e\u0447\u043e\u043a (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_vi.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_vi.properties b/portal-remote-cxf-common/src/main/resources/content/Language_vi.properties
deleted file mode 100644
index 2bfeb99..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_vi.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=Hai \u0111i\u1ec3m cu\u1ed1i CXF (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_zh_CN.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_zh_CN.properties b/portal-remote-cxf-common/src/main/resources/content/Language_zh_CN.properties
deleted file mode 100644
index 9b60693..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_zh_CN.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF\u7ec8\u7ed3\u70b9
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/content/Language_zh_TW.properties
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/content/Language_zh_TW.properties b/portal-remote-cxf-common/src/main/resources/content/Language_zh_TW.properties
deleted file mode 100644
index c287f7f..0000000
--- a/portal-remote-cxf-common/src/main/resources/content/Language_zh_TW.properties
+++ /dev/null
@@ -1 +0,0 @@
-cxf.endpoint.configuration.name=CXF \u7d42\u7d50\u9ede (Automatic Translation)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/http/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/http/packageinfo b/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/http/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/http/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/mime/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/mime/packageinfo b/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/mime/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/mime/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/packageinfo b/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/schema/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/schema/packageinfo b/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/schema/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/schema/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/soap/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/soap/packageinfo b/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/soap/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/soap/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/soap12/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/soap12/packageinfo b/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/soap12/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/src/main/resources/javax/wsdl/extensions/soap12/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/javax/wsdl/factory/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/javax/wsdl/factory/packageinfo b/portal-remote-cxf-common/src/main/resources/javax/wsdl/factory/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/src/main/resources/javax/wsdl/factory/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/javax/wsdl/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/javax/wsdl/packageinfo b/portal-remote-cxf-common/src/main/resources/javax/wsdl/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/src/main/resources/javax/wsdl/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/javax/wsdl/xml/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/javax/wsdl/xml/packageinfo b/portal-remote-cxf-common/src/main/resources/javax/wsdl/xml/packageinfo
deleted file mode 100644
index d96c0b8..0000000
--- a/portal-remote-cxf-common/src/main/resources/javax/wsdl/xml/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/org/apache/cxf/binding/soap/wsdl/extensions/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/org/apache/cxf/binding/soap/wsdl/extensions/packageinfo b/portal-remote-cxf-common/src/main/resources/org/apache/cxf/binding/soap/wsdl/extensions/packageinfo
deleted file mode 100644
index bd33369..0000000
--- a/portal-remote-cxf-common/src/main/resources/org/apache/cxf/binding/soap/wsdl/extensions/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 4.0.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/org/apache/cxf/databinding/source/mime/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/org/apache/cxf/databinding/source/mime/packageinfo b/portal-remote-cxf-common/src/main/resources/org/apache/cxf/databinding/source/mime/packageinfo
deleted file mode 100644
index 59ff96a..0000000
--- a/portal-remote-cxf-common/src/main/resources/org/apache/cxf/databinding/source/mime/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 3.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/constants/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/constants/packageinfo b/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/constants/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/constants/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/extensions/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/extensions/packageinfo b/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/extensions/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/extensions/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/internal/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/internal/packageinfo b/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/internal/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/internal/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/packageinfo b/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/resolver/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/resolver/packageinfo b/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/resolver/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/resolver/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/utils/packageinfo
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/utils/packageinfo b/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/utils/packageinfo
deleted file mode 100644
index 2c9afe8..0000000
--- a/portal-remote-cxf-common/src/main/resources/org/apache/ws/commons/schema/utils/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 2.1.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/c7de7755/portal-remote-cxf-jaxrs-common/.gitignore
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-jaxrs-common/.gitignore b/portal-remote-cxf-jaxrs-common/.gitignore
deleted file mode 100644
index 83ccc54..0000000
--- a/portal-remote-cxf-jaxrs-common/.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-cxf-jaxrs-common/.lfrbuild-portal
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-jaxrs-common/.lfrbuild-portal b/portal-remote-cxf-jaxrs-common/.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-cxf-jaxrs-common/bnd.bnd
----------------------------------------------------------------------
diff --git a/portal-remote-cxf-jaxrs-common/bnd.bnd b/portal-remote-cxf-jaxrs-common/bnd.bnd
deleted file mode 100644
index 34b55df..0000000
--- a/portal-remote-cxf-jaxrs-common/bnd.bnd
+++ /dev/null
@@ -1,64 +0,0 @@
-Bundle-ClassPath:\
- .,\
- lib/cxf-rt-frontend-jaxrs.jar,\
- lib/cxf-rt-rs-extension-providers.jar,\
- lib/javax.annotation-api.jar,\
- lib/javax.json-api.jar,\
- lib/javax.ws.rs-api.jar,\
- lib/jettison.jar
-Bundle-Name: Liferay Portal Remote CXF JAX-RS Common
-Bundle-SymbolicName: com.liferay.portal.remote.cxf.jaxrs.common
-Bundle-Version: 2.0.3
-Export-Package:\
- javax.json.*,\
- \
- javax.ws.rs.*,\
- \
- org.apache.cxf.jaxrs.*
-Fragment-Host: com.liferay.portal.remote.cxf.common
-Import-Package:\
- !com.sun.*,\
- \
- !javax.validation.*,\
- \
- !net.sf.cglib.proxy.*,\
- \
- !org.apache.abdera.*,\
- !org.apache.aries.*,\
- !org.apache.cxf.*,\
- !org.apache.neethi.*,\
- !org.apache.velocity.*,\
- !org.apache.xml.resolver.*,\
- !org.apache.xmlbeans.*,\
- \
- !org.junit.*,\
- \
- !org.jvnet.fastinfoset.*,\
- !org.jvnet.staxex.*,\
- \
- !org.osgi.service.blueprint.*,\
- \
- !org.relaxng.datatype.*,\
- \
- !org.slf4j.spi.*,\
- \
- !org.springframework.*,\
- *
-Liferay-Releng-Module-Group-Description:
-Liferay-Releng-Module-Group-Title: Remote Service Engines
-Provide-Capability:\
- osgi.contract;\
- osgi.contract=JavaJAXRS;\
- uses:="javax.ws.rs,javax.ws.rs.core,javax.ws.rs.client,javax.ws.rs.container,javax.ws.rs.ext";\
- version:Version=2,\
- osgi.contract;\
- osgi.contract=JavaJSONP;\
- uses:="javax.json,javax.json.spi,javax.json.stream";\
- version:Version=1
--includeresource:\
- lib/cxf-rt-frontend-jaxrs.jar=cxf-rt-frontend-jaxrs-3.1.7.jar,\
- lib/cxf-rt-rs-extension-providers.jar=cxf-rt-rs-extension-providers-3.1.7.jar,\
- lib/javax.annotation-api.jar=javax.annotation-api-1.2.jar,\
- lib/javax.json-api.jar=javax.json-api-1.0.jar,\
- lib/javax.ws.rs-api.jar=javax.ws.rs-api-2.0.1.jar,\
- lib/jettison.jar=jettison-1.3.3.jar
[49/50] [abbrv] aries-jax-rs-whiteboard git commit: group under
jax.rs suffix
Posted by cs...@apache.org.
group under jax.rs suffix
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/94e21e80
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/94e21e80
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/94e21e80
Branch: refs/heads/master
Commit: 94e21e80b4e6b38c9996c6c508512853cf014411
Parents: 253fc76
Author: Raymond Auge <ra...@liferay.com>
Authored: Tue Nov 8 14:51:16 2016 -0500
Committer: Raymond Auge <ra...@liferay.com>
Committed: Tue Nov 8 14:51:16 2016 -0500
----------------------------------------------------------------------
jax-rs.example-run/pom.xml | 8 ++++----
jax-rs.example/pom.xml | 2 +-
jax-rs.itests-run/pom.xml | 8 ++++----
jax-rs.itests/pom.xml | 2 +-
jax-rs.log4j-configuration/pom.xml | 2 +-
jax-rs.whiteboard/pom.xml | 2 +-
pom.xml | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/94e21e80/jax-rs.example-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example-run/pom.xml b/jax-rs.example-run/pom.xml
index 97559da..8d298e6 100644
--- a/jax-rs.example-run/pom.xml
+++ b/jax-rs.example-run/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -40,17 +40,17 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.example</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/94e21e80/jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index 7d0b8b2..560fdc3 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -5,7 +5,7 @@
>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/94e21e80/jax-rs.itests-run/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-run/pom.xml b/jax-rs.itests-run/pom.xml
index 2796be4..653ad8b 100644
--- a/jax-rs.itests-run/pom.xml
+++ b/jax-rs.itests-run/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>..</relativePath>
@@ -43,17 +43,17 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.itests</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/94e21e80/jax-rs.itests/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index e70444b..d3f8411 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/94e21e80/jax-rs.log4j-configuration/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.log4j-configuration/pom.xml b/jax-rs.log4j-configuration/pom.xml
index bfcf417..077b299 100644
--- a/jax-rs.log4j-configuration/pom.xml
+++ b/jax-rs.log4j-configuration/pom.xml
@@ -5,7 +5,7 @@
>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/94e21e80/jax-rs.whiteboard/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index 63308ae..7459dab 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -5,7 +5,7 @@
>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/94e21e80/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 455dd3b..6022520 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.aries</groupId>
+ <groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>