[aries] branch trunk updated: ARIES-2127: Add constants for Java 20/21
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new fa6225495 ARIES-2127: Add constants for Java 20/21
new a5064f116 Merge pull request #243 from rovarga/aries2127
fa6225495 is described below
commit fa62254951363bfa95872866d535898cde26430b
Author: Robert Varga
AuthorDate: Fri Sep 29 17:15:05 2023 +0200
ARIES-2127: Add constants for Java 20/21
Signed-off-by: Robert Varga
---
.../src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java | 8
1 file changed, 8 insertions(+)
diff --git
a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
index 5d5eecc9e..e46be59ee 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
@@ -39,6 +39,14 @@ public class ProxyUtils
//In order to avoid an inconsistent stack error the version of the woven
byte code needs to match
//the level of byte codes in the original class
switch(JAVA_CLASS_VERSION) {
+case Opcodes.V21:
+ LOGGER.debug("Weaving to Java 21");
+ weavingJavaVersion = Opcodes.V21;
+ break;
+case Opcodes.V20:
+ LOGGER.debug("Weaving to Java 20");
+ weavingJavaVersion = Opcodes.V20;
+ break;
case Opcodes.V19:
LOGGER.debug("Weaving to Java 19");
weavingJavaVersion = Opcodes.V19;
[aries] branch trunk updated: ARIES-2126: Update ASM to 9.5
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/aries.git The following commit(s) were added to refs/heads/trunk by this push: new e49322620 ARIES-2126: Update ASM to 9.5 new 1c66f6c90 Merge pull request #242 from rovarga/aries2126 e49322620 is described below commit e49322620e128bb2eef438ee3e15ea9541cb1014 Author: Robert Varga AuthorDate: Fri Sep 29 17:09:08 2023 +0200 ARIES-2126: Update ASM to 9.5 Signed-off-by: Robert Varga --- proxy/proxy-impl/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml index a11ebac66..1a19492d5 100644 --- a/proxy/proxy-impl/pom.xml +++ b/proxy/proxy-impl/pom.xml @@ -77,13 +77,13 @@ org.ow2.asm asm true -9.4 +9.5 org.ow2.asm asm-commons true -9.4 +9.5 org.slf4j
[aries] branch trunk updated: [ARIES-2108] Catch NoClassDefFoundError when loading Service-Providers
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 891b7318d [ARIES-2108] Catch NoClassDefFoundError when loading
Service-Providers
new 09b2d7593 Merge pull request #233 from HannesWell/noClassDefFoundError
891b7318d is described below
commit 891b7318d7925f58303ff8314660085c74a6d2cf
Author: Hannes Wellmann
AuthorDate: Tue Jul 4 13:40:15 2023 +0200
[ARIES-2108] Catch NoClassDefFoundError when loading Service-Providers
Fixes https://issues.apache.org/jira/browse/ARIES-2108.
Loading ServiceProvider instances, which depend on classes absent at
runtime (e.g. because they are contained in an optional dependency)
throws a NoClassDefFoundError instead of a ClassNotFoundException,
which is propagated to the caller of
ProviderBundleTrackerCustomizer.addingBundle() and leads to an empty
list of providers.
Instead a NoClassDefFoundError should be handled like a
ClassNotFoundException.
The reason for this different exception in this case is that although
the service class is found it cannot be defined.
The javadoc of 'NoClassDefFoundError' states:
"Thrown if the Java Virtual Machine or a ClassLoader instance tries to
load in the definition of a class (as part of a normal method call or as
part of creating a new instance using the new expression) and no
definition of the class could be found."
The javadoc of 'ClassNotFoundException' states:
"Thrown when an application tries to load in a class through its string
name using:
- The forName method in class Class.
- The findSystemClass method in class ClassLoader .
- The loadClass method in class ClassLoader.
but no definition for the class with the specified name could be found."
---
.../java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
b/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
index 178ec992c..974daec81 100644
---
a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
+++
b/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
@@ -172,7 +172,7 @@ public class ProviderBundleTrackerCustomizer implements
BundleTrackerCustomizer
activator.registerProviderBundle(details.serviceType, bundle,
details.properties);
log(Level.INFO, "Registered provider " + details.instanceType
+ " of service " + details.serviceType + " in bundle " +
bundle.getSymbolicName());
-} catch (Exception e) {
+} catch (Exception | NoClassDefFoundError e) {
log(Level.FINE,
"Could not load provider " + details.instanceType + " of
service " + details.serviceType, e);
}
[aries-rsa] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new 6cc0974 [maven-release-plugin] prepare for next development iteration 6cc0974 is described below commit 6cc09749e600b5c96fe4995e6b677df91aafeeeb Author: Christian Schneider AuthorDate: Sat Sep 18 08:32:41 2021 +0200 [maven-release-plugin] prepare for next development iteration --- discovery/command/pom.xml | 2 +- discovery/config/pom.xml| 2 +- discovery/local/pom.xml | 2 +- discovery/mdns/pom.xml | 2 +- discovery/pom.xml | 2 +- discovery/zookeeper/pom.xml | 2 +- eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml | 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml| 2 +- examples/echotcp/api/pom.xml| 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml| 2 +- examples/echotcp/service/pom.xml| 2 +- examples/pom.xml| 2 +- features/pom.xml| 2 +- itests/felix/pom.xml| 2 +- itests/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- provider/fastbin/pom.xml| 2 +- provider/pom.xml| 2 +- provider/tcp/pom.xml| 2 +- repository/pom.xml | 2 +- rsa/pom.xml | 2 +- spi/pom.xml | 2 +- topology-manager/pom.xml| 2 +- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml index a2a7c8d..56f20a3 100644 --- a/discovery/command/pom.xml +++ b/discovery/command/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.1 +1.17.1-SNAPSHOT ../../parent/pom.xml diff --git a/discovery/config/pom.xml b/discovery/config/pom.xml index 9409b02..d8cf65f 100644 --- a/discovery/config/pom.xml +++ b/discovery/config/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.discovery -1.16.1 +1.17.1-SNAPSHOT org.apache.aries.rsa.discovery diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index e85fbbb..b684899 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.1 +1.17.1-SNAPSHOT ../../parent/pom.xml diff --git a/discovery/mdns/pom.xml b/discovery/mdns/pom.xml index 7b7904d..3809388 100644 --- a/discovery/mdns/pom.xml +++ b/discovery/mdns/pom.xml @@ -3,7 +3,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.1 +1.17.1-SNAPSHOT ../../parent/pom.xml diff --git a/discovery/pom.xml b/discovery/pom.xml index 3681586..da13345 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent - 1.16.1 + 1.17.1-SNAPSHOT ../parent/pom.xml diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index e7581a2..952cc5b 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.1 +1.17.1-SNAPSHOT ../../parent/pom.xml diff --git a/eapub/pom.xml b/eapub/pom.xml index 105c883..124b84c 100644 --- a/eapub/pom.xml +++ b/eapub/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.1 +1.17.1-SNAPSHOT ../parent/pom.xml org.apache.aries.rsa.eapub diff --git a/examples/echofastbin/fbapi/pom.xml b/examples/echofastbin/fbapi/pom.xml index f569870..14e14ef 100644 --- a/examples/echofastbin/fbapi/pom.xml +++ b/examples/echofastbin/fbapi/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.1 +1.17.1-SNAPSHOT ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbconsumer/pom.xml b/examples/echofastbin/fbconsumer/pom.xml index 677450a..60528ae 100644 --- a/examples/echofastbin/fbconsumer/pom.xml +++ b/examples/echofastbin/fbconsumer/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.1 +1.17.1-SNAPSHOT ../pom.xml
[aries-rsa] annotated tag org.apache.aries.rsa-1.17.0 updated (1521de6 -> 7de93d8)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to annotated tag org.apache.aries.rsa-1.17.0 in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. *** WARNING: tag org.apache.aries.rsa-1.17.0 was modified! *** from 1521de6 (commit) to 7de93d8 (tag) tagging 1521de654cc75ea6f6b3de2e82b644ea9f0de76c (commit) replaces org.apache.aries.rsa-1.16.0 by Christian Schneider on Sat Sep 18 08:32:39 2021 +0200 - Log - [maven-release-plugin] copy for tag org.apache.aries.rsa-1.17.0 --- No new revisions were added by this update. Summary of changes:
[aries-rsa] branch master updated: [maven-release-plugin] prepare release org.apache.aries.rsa-1.17.0
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new 1521de6 [maven-release-plugin] prepare release org.apache.aries.rsa-1.17.0 1521de6 is described below commit 1521de654cc75ea6f6b3de2e82b644ea9f0de76c Author: Christian Schneider AuthorDate: Sat Sep 18 08:32:27 2021 +0200 [maven-release-plugin] prepare release org.apache.aries.rsa-1.17.0 --- discovery/command/pom.xml | 2 +- discovery/config/pom.xml| 2 +- discovery/local/pom.xml | 2 +- discovery/mdns/pom.xml | 2 +- discovery/pom.xml | 2 +- discovery/zookeeper/pom.xml | 2 +- eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml | 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml| 2 +- examples/echotcp/api/pom.xml| 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml| 2 +- examples/echotcp/service/pom.xml| 2 +- examples/pom.xml| 2 +- features/pom.xml| 2 +- itests/felix/pom.xml| 2 +- itests/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- provider/fastbin/pom.xml| 2 +- provider/pom.xml| 2 +- provider/tcp/pom.xml| 2 +- repository/pom.xml | 2 +- rsa/pom.xml | 2 +- spi/pom.xml | 2 +- topology-manager/pom.xml| 2 +- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml index a405444..a2a7c8d 100644 --- a/discovery/command/pom.xml +++ b/discovery/command/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.1-SNAPSHOT +1.16.1 ../../parent/pom.xml diff --git a/discovery/config/pom.xml b/discovery/config/pom.xml index b30ba8b..9409b02 100644 --- a/discovery/config/pom.xml +++ b/discovery/config/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.discovery -1.16.1-SNAPSHOT +1.16.1 org.apache.aries.rsa.discovery diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index 9ef01a2..e85fbbb 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.1-SNAPSHOT +1.16.1 ../../parent/pom.xml diff --git a/discovery/mdns/pom.xml b/discovery/mdns/pom.xml index 3f917b5..7b7904d 100644 --- a/discovery/mdns/pom.xml +++ b/discovery/mdns/pom.xml @@ -3,7 +3,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.1-SNAPSHOT +1.16.1 ../../parent/pom.xml diff --git a/discovery/pom.xml b/discovery/pom.xml index 496ed22..3681586 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent - 1.16.1-SNAPSHOT + 1.16.1 ../parent/pom.xml diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index d612639..e7581a2 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.1-SNAPSHOT +1.16.1 ../../parent/pom.xml diff --git a/eapub/pom.xml b/eapub/pom.xml index be53aa5..105c883 100644 --- a/eapub/pom.xml +++ b/eapub/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.1-SNAPSHOT +1.16.1 ../parent/pom.xml org.apache.aries.rsa.eapub diff --git a/examples/echofastbin/fbapi/pom.xml b/examples/echofastbin/fbapi/pom.xml index a205f49..f569870 100644 --- a/examples/echofastbin/fbapi/pom.xml +++ b/examples/echofastbin/fbapi/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.1-SNAPSHOT +1.16.1 ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbconsumer/pom.xml b/examples/echofastbin/fbconsumer/pom.xml index 62ce3b7..677450a 100644 --- a/examples/echofastbin/fbconsumer/pom.xml +++ b/examples/echofastbin/fbconsumer/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.1-SNAPSHOT +1.16.1 ../pom.xml
[aries-rsa] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new c364720 [maven-release-plugin] prepare for next development iteration c364720 is described below commit c3647206d76247e7985c727316f12a3542019e8e Author: Christian Schneider AuthorDate: Mon Feb 15 13:37:12 2021 +0100 [maven-release-plugin] prepare for next development iteration --- discovery/command/pom.xml | 2 +- discovery/config/pom.xml| 2 +- discovery/local/pom.xml | 2 +- discovery/pom.xml | 2 +- discovery/zookeeper/pom.xml | 2 +- eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml | 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml| 2 +- examples/echotcp/api/pom.xml| 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml| 2 +- examples/echotcp/service/pom.xml| 2 +- examples/pom.xml| 2 +- features/pom.xml| 2 +- itests/felix/pom.xml| 2 +- itests/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- provider/fastbin/pom.xml| 2 +- provider/pom.xml| 2 +- provider/tcp/pom.xml| 2 +- repository/pom.xml | 2 +- rsa/pom.xml | 2 +- spi/pom.xml | 2 +- topology-manager/pom.xml| 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml index d8f11af..a405444 100644 --- a/discovery/command/pom.xml +++ b/discovery/command/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0 +1.16.1-SNAPSHOT ../../parent/pom.xml diff --git a/discovery/config/pom.xml b/discovery/config/pom.xml index ac81293..b30ba8b 100644 --- a/discovery/config/pom.xml +++ b/discovery/config/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.discovery -1.16.0 +1.16.1-SNAPSHOT org.apache.aries.rsa.discovery diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index bab7acd..9ef01a2 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0 +1.16.1-SNAPSHOT ../../parent/pom.xml diff --git a/discovery/pom.xml b/discovery/pom.xml index cd85424..82b8f87 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent - 1.16.0 + 1.16.1-SNAPSHOT ../parent/pom.xml diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index d5c1bde..d612639 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0 +1.16.1-SNAPSHOT ../../parent/pom.xml diff --git a/eapub/pom.xml b/eapub/pom.xml index b886640..be53aa5 100644 --- a/eapub/pom.xml +++ b/eapub/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0 +1.16.1-SNAPSHOT ../parent/pom.xml org.apache.aries.rsa.eapub diff --git a/examples/echofastbin/fbapi/pom.xml b/examples/echofastbin/fbapi/pom.xml index b25bf40..a205f49 100644 --- a/examples/echofastbin/fbapi/pom.xml +++ b/examples/echofastbin/fbapi/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.0 +1.16.1-SNAPSHOT ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbconsumer/pom.xml b/examples/echofastbin/fbconsumer/pom.xml index 9ef246e..62ce3b7 100644 --- a/examples/echofastbin/fbconsumer/pom.xml +++ b/examples/echofastbin/fbconsumer/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.0 +1.16.1-SNAPSHOT ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbservice/pom.xml b/examples/echofastbin/fbservice/pom.xml index 43c4a70..54d1641 100644 --- a/examples/echofastbin/fbservice/pom.xml +++ b/examples/echofastbin/fbservice/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin
[aries-rsa] annotated tag org.apache.aries.rsa-1.16.0 updated (53075bd -> 1a8ab12)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to annotated tag org.apache.aries.rsa-1.16.0 in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. *** WARNING: tag org.apache.aries.rsa-1.16.0 was modified! *** from 53075bd (commit) to 1a8ab12 (tag) tagging 53075bd05e380a39eea103ed8ce9c5f68d9a2018 (commit) replaces org.apache.aries.rsa-1.15.0 by Christian Schneider on Mon Feb 15 13:37:09 2021 +0100 - Log - [maven-release-plugin] copy for tag org.apache.aries.rsa-1.16.0 --- No new revisions were added by this update. Summary of changes:
[aries-rsa] branch master updated: [maven-release-plugin] prepare release org.apache.aries.rsa-1.16.0
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new 53075bd [maven-release-plugin] prepare release org.apache.aries.rsa-1.16.0 53075bd is described below commit 53075bd05e380a39eea103ed8ce9c5f68d9a2018 Author: Christian Schneider AuthorDate: Mon Feb 15 13:36:56 2021 +0100 [maven-release-plugin] prepare release org.apache.aries.rsa-1.16.0 --- discovery/command/pom.xml | 2 +- discovery/config/pom.xml| 2 +- discovery/local/pom.xml | 2 +- discovery/pom.xml | 2 +- discovery/zookeeper/pom.xml | 2 +- eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml | 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml| 2 +- examples/echotcp/api/pom.xml| 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml| 2 +- examples/echotcp/service/pom.xml| 2 +- examples/pom.xml| 2 +- features/pom.xml| 2 +- itests/felix/pom.xml| 2 +- itests/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- provider/fastbin/pom.xml| 2 +- provider/pom.xml| 2 +- provider/tcp/pom.xml| 2 +- repository/pom.xml | 2 +- rsa/pom.xml | 2 +- spi/pom.xml | 2 +- topology-manager/pom.xml| 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml index 70e8a04..d8f11af 100644 --- a/discovery/command/pom.xml +++ b/discovery/command/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0-SNAPSHOT +1.16.0 ../../parent/pom.xml diff --git a/discovery/config/pom.xml b/discovery/config/pom.xml index 67103cc..ac81293 100644 --- a/discovery/config/pom.xml +++ b/discovery/config/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.discovery -1.16.0-SNAPSHOT +1.16.0 org.apache.aries.rsa.discovery diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index 369583f..bab7acd 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0-SNAPSHOT +1.16.0 ../../parent/pom.xml diff --git a/discovery/pom.xml b/discovery/pom.xml index 924f09f..cd85424 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent - 1.16.0-SNAPSHOT + 1.16.0 ../parent/pom.xml diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index 907c179..d5c1bde 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0-SNAPSHOT +1.16.0 ../../parent/pom.xml diff --git a/eapub/pom.xml b/eapub/pom.xml index 564ffb0..b886640 100644 --- a/eapub/pom.xml +++ b/eapub/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0-SNAPSHOT +1.16.0 ../parent/pom.xml org.apache.aries.rsa.eapub diff --git a/examples/echofastbin/fbapi/pom.xml b/examples/echofastbin/fbapi/pom.xml index fb7acee..b25bf40 100644 --- a/examples/echofastbin/fbapi/pom.xml +++ b/examples/echofastbin/fbapi/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.0-SNAPSHOT +1.16.0 ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbconsumer/pom.xml b/examples/echofastbin/fbconsumer/pom.xml index 90455c3..9ef246e 100644 --- a/examples/echofastbin/fbconsumer/pom.xml +++ b/examples/echofastbin/fbconsumer/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.0-SNAPSHOT +1.16.0 ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbservice/pom.xml b/examples/echofastbin/fbservice/pom.xml index b5b70a7..43c4a70 100644 --- a/examples/echofastbin/fbservice/pom.xml +++ b/examples/echofastbin/fbservice/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples
[aries-rsa] branch master updated: Revert "[maven-release-plugin] prepare release org.apache.aries.rsa-1.16.0"
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new 7c68c48 Revert "[maven-release-plugin] prepare release org.apache.aries.rsa-1.16.0" 7c68c48 is described below commit 7c68c484d1bc3080a8dea1817d6c3483efc2443f Author: Christian Schneider AuthorDate: Mon Feb 15 13:34:47 2021 +0100 Revert "[maven-release-plugin] prepare release org.apache.aries.rsa-1.16.0" This reverts commit ce9c950927ea64229f5c94e1333a3afa68ce91d5. --- discovery/command/pom.xml | 2 +- discovery/config/pom.xml| 2 +- discovery/local/pom.xml | 2 +- discovery/pom.xml | 2 +- discovery/zookeeper/pom.xml | 2 +- eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml | 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml| 2 +- examples/echotcp/api/pom.xml| 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml| 2 +- examples/echotcp/service/pom.xml| 2 +- examples/pom.xml| 2 +- features/pom.xml| 2 +- itests/felix/pom.xml| 2 +- itests/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- provider/fastbin/pom.xml| 2 +- provider/pom.xml| 2 +- provider/tcp/pom.xml| 2 +- repository/pom.xml | 2 +- rsa/pom.xml | 2 +- spi/pom.xml | 2 +- topology-manager/pom.xml| 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml index d8f11af..70e8a04 100644 --- a/discovery/command/pom.xml +++ b/discovery/command/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0 +1.16.0-SNAPSHOT ../../parent/pom.xml diff --git a/discovery/config/pom.xml b/discovery/config/pom.xml index ac81293..67103cc 100644 --- a/discovery/config/pom.xml +++ b/discovery/config/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.discovery -1.16.0 +1.16.0-SNAPSHOT org.apache.aries.rsa.discovery diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index bab7acd..369583f 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0 +1.16.0-SNAPSHOT ../../parent/pom.xml diff --git a/discovery/pom.xml b/discovery/pom.xml index cd85424..924f09f 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent - 1.16.0 + 1.16.0-SNAPSHOT ../parent/pom.xml diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index d5c1bde..907c179 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0 +1.16.0-SNAPSHOT ../../parent/pom.xml diff --git a/eapub/pom.xml b/eapub/pom.xml index b886640..564ffb0 100644 --- a/eapub/pom.xml +++ b/eapub/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0 +1.16.0-SNAPSHOT ../parent/pom.xml org.apache.aries.rsa.eapub diff --git a/examples/echofastbin/fbapi/pom.xml b/examples/echofastbin/fbapi/pom.xml index b25bf40..fb7acee 100644 --- a/examples/echofastbin/fbapi/pom.xml +++ b/examples/echofastbin/fbapi/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.0 +1.16.0-SNAPSHOT ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbconsumer/pom.xml b/examples/echofastbin/fbconsumer/pom.xml index 9ef246e..90455c3 100644 --- a/examples/echofastbin/fbconsumer/pom.xml +++ b/examples/echofastbin/fbconsumer/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.0 +1.16.0-SNAPSHOT ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbservice/pom.xml b/examples/echofastbin/fbservice/pom.xml index 43c4a70..b5b70a7 100644 --- a/examples/echofastbin/fbservice/pom.xml +++ b/examples/echofastbin/fbserv
[aries-rsa] tag org.apache.aries.rsa-1.16.0 created (now ce9c950)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to tag org.apache.aries.rsa-1.16.0 in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. at ce9c950 (commit) No new revisions were added by this update.
[aries-rsa] branch master updated: [maven-release-plugin] prepare release org.apache.aries.rsa-1.16.0
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new ce9c950 [maven-release-plugin] prepare release org.apache.aries.rsa-1.16.0 ce9c950 is described below commit ce9c950927ea64229f5c94e1333a3afa68ce91d5 Author: Christian Schneider AuthorDate: Mon Feb 15 12:55:28 2021 +0100 [maven-release-plugin] prepare release org.apache.aries.rsa-1.16.0 --- discovery/command/pom.xml | 2 +- discovery/config/pom.xml| 2 +- discovery/local/pom.xml | 2 +- discovery/pom.xml | 2 +- discovery/zookeeper/pom.xml | 2 +- eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml | 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml| 2 +- examples/echotcp/api/pom.xml| 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml| 2 +- examples/echotcp/service/pom.xml| 2 +- examples/pom.xml| 2 +- features/pom.xml| 2 +- itests/felix/pom.xml| 2 +- itests/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- provider/fastbin/pom.xml| 2 +- provider/pom.xml| 2 +- provider/tcp/pom.xml| 2 +- repository/pom.xml | 2 +- rsa/pom.xml | 2 +- spi/pom.xml | 2 +- topology-manager/pom.xml| 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml index 70e8a04..d8f11af 100644 --- a/discovery/command/pom.xml +++ b/discovery/command/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0-SNAPSHOT +1.16.0 ../../parent/pom.xml diff --git a/discovery/config/pom.xml b/discovery/config/pom.xml index 67103cc..ac81293 100644 --- a/discovery/config/pom.xml +++ b/discovery/config/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.discovery -1.16.0-SNAPSHOT +1.16.0 org.apache.aries.rsa.discovery diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index 369583f..bab7acd 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0-SNAPSHOT +1.16.0 ../../parent/pom.xml diff --git a/discovery/pom.xml b/discovery/pom.xml index 924f09f..cd85424 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent - 1.16.0-SNAPSHOT + 1.16.0 ../parent/pom.xml diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index 907c179..d5c1bde 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0-SNAPSHOT +1.16.0 ../../parent/pom.xml diff --git a/eapub/pom.xml b/eapub/pom.xml index 564ffb0..b886640 100644 --- a/eapub/pom.xml +++ b/eapub/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.16.0-SNAPSHOT +1.16.0 ../parent/pom.xml org.apache.aries.rsa.eapub diff --git a/examples/echofastbin/fbapi/pom.xml b/examples/echofastbin/fbapi/pom.xml index fb7acee..b25bf40 100644 --- a/examples/echofastbin/fbapi/pom.xml +++ b/examples/echofastbin/fbapi/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.0-SNAPSHOT +1.16.0 ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbconsumer/pom.xml b/examples/echofastbin/fbconsumer/pom.xml index 90455c3..9ef246e 100644 --- a/examples/echofastbin/fbconsumer/pom.xml +++ b/examples/echofastbin/fbconsumer/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.16.0-SNAPSHOT +1.16.0 ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbservice/pom.xml b/examples/echofastbin/fbservice/pom.xml index b5b70a7..43c4a70 100644 --- a/examples/echofastbin/fbservice/pom.xml +++ b/examples/echofastbin/fbservice/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples
[aries-rsa] branch master updated (2b1778c -> cd6f665)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. from 2b1778c Fix ref in javadoc add cd6f665 [maven-release-plugin] prepare release org.apache.aries.rsa-1.15.0 No new revisions were added by this update. Summary of changes: discovery/command/pom.xml | 2 +- discovery/config/pom.xml| 2 +- discovery/local/pom.xml | 2 +- discovery/pom.xml | 2 +- discovery/zookeeper/pom.xml | 2 +- eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml | 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml| 2 +- examples/echotcp/api/pom.xml| 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml| 2 +- examples/echotcp/service/pom.xml| 2 +- examples/pom.xml| 2 +- features/pom.xml| 2 +- itests/felix/pom.xml| 2 +- itests/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- provider/fastbin/pom.xml| 2 +- provider/pom.xml| 2 +- provider/tcp/pom.xml| 2 +- repository/pom.xml | 2 +- rsa/pom.xml | 2 +- spi/pom.xml | 2 +- topology-manager/pom.xml| 2 +- 27 files changed, 28 insertions(+), 28 deletions(-)
[aries-rsa] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new 68662b0 [maven-release-plugin] prepare for next development iteration 68662b0 is described below commit 68662b0f170e771df2a1cd34141f82c646a2192c Author: Christian Schneider AuthorDate: Tue Oct 13 12:08:51 2020 +0200 [maven-release-plugin] prepare for next development iteration --- discovery/command/pom.xml | 2 +- discovery/config/pom.xml| 2 +- discovery/local/pom.xml | 2 +- discovery/pom.xml | 2 +- discovery/zookeeper/pom.xml | 2 +- eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml | 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml| 2 +- examples/echotcp/api/pom.xml| 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml| 2 +- examples/echotcp/service/pom.xml| 2 +- examples/pom.xml| 2 +- features/pom.xml| 2 +- itests/felix/pom.xml| 2 +- itests/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- provider/fastbin/pom.xml| 2 +- provider/pom.xml| 2 +- provider/tcp/pom.xml| 2 +- repository/pom.xml | 2 +- rsa/pom.xml | 2 +- spi/pom.xml | 2 +- topology-manager/pom.xml| 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml index 9d00901..70e8a04 100644 --- a/discovery/command/pom.xml +++ b/discovery/command/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.15.0 +1.16.0-SNAPSHOT ../../parent/pom.xml diff --git a/discovery/config/pom.xml b/discovery/config/pom.xml index 1f4c311..67103cc 100644 --- a/discovery/config/pom.xml +++ b/discovery/config/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.discovery -1.15.0 +1.16.0-SNAPSHOT org.apache.aries.rsa.discovery diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index c030309..369583f 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.15.0 +1.16.0-SNAPSHOT ../../parent/pom.xml diff --git a/discovery/pom.xml b/discovery/pom.xml index 2976c03..924f09f 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent - 1.15.0 + 1.16.0-SNAPSHOT ../parent/pom.xml diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index 55b16a5..907c179 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.15.0 +1.16.0-SNAPSHOT ../../parent/pom.xml diff --git a/eapub/pom.xml b/eapub/pom.xml index c435777..564ffb0 100644 --- a/eapub/pom.xml +++ b/eapub/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.15.0 +1.16.0-SNAPSHOT ../parent/pom.xml org.apache.aries.rsa.eapub diff --git a/examples/echofastbin/fbapi/pom.xml b/examples/echofastbin/fbapi/pom.xml index 6e1e280..fb7acee 100644 --- a/examples/echofastbin/fbapi/pom.xml +++ b/examples/echofastbin/fbapi/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.15.0 +1.16.0-SNAPSHOT ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbconsumer/pom.xml b/examples/echofastbin/fbconsumer/pom.xml index bb3fbe6..90455c3 100644 --- a/examples/echofastbin/fbconsumer/pom.xml +++ b/examples/echofastbin/fbconsumer/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.15.0 +1.16.0-SNAPSHOT ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbservice/pom.xml b/examples/echofastbin/fbservice/pom.xml index c6cddfa..b5b70a7 100644 --- a/examples/echofastbin/fbservice/pom.xml +++ b/examples/echofastbin/fbservice/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin
[aries-rsa] annotated tag org.apache.aries.rsa-1.15.0 updated (cd6f665 -> 2f6702f)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to annotated tag org.apache.aries.rsa-1.15.0 in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. *** WARNING: tag org.apache.aries.rsa-1.15.0 was modified! *** from cd6f665 (commit) to 2f6702f (tag) tagging cd6f665437bce3c1eb9326568b7405e5d469d6eb (commit) replaces org.apache.aries.rsa-1.14.0 by Christian Schneider on Tue Oct 13 12:08:47 2020 +0200 - Log - [maven-release-plugin] copy for tag org.apache.aries.rsa-1.15.0 --- No new revisions were added by this update. Summary of changes:
[aries-rsa] branch master updated: Fix ref in javadoc
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new 2b1778c Fix ref in javadoc
2b1778c is described below
commit 2b1778c87706379f549d669b4d4c1434b44e7a7a
Author: Christian Schneider
AuthorDate: Tue Oct 13 11:54:33 2020 +0200
Fix ref in javadoc
---
.../aries/rsa/discovery/zookeeper/PublishingEndpointListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/PublishingEndpointListener.java
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/PublishingEndpointListener.java
index d5526fc..f43975e 100644
---
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/PublishingEndpointListener.java
+++
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/PublishingEndpointListener.java
@@ -38,7 +38,7 @@ import org.osgi.service.remoteserviceadmin.RemoteConstants;
/**
* Listens for local {@link EndpointEvent}s using {@link
EndpointEventListener} and old style {@link EndpointListener}
- * and publishes changes to the {@link ZooKeeperEndpointRepository}
+ * and publishes changes to the {@link ZookeeperEndpointRepository}
*/
@SuppressWarnings("deprecation")
@Component(service = {}, immediate = true)
[aries-jax-rs-whiteboard] branch master updated: Document configuration properties (thanks to Ray)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git The following commit(s) were added to refs/heads/master by this push: new 7be5ee8 Document configuration properties (thanks to Ray) 7be5ee8 is described below commit 7be5ee821956fe5c5723ba4749956683ebdbefd6 Author: Christian Schneider AuthorDate: Sun Apr 5 08:59:34 2020 +0200 Document configuration properties (thanks to Ray) --- README.md | 19 +++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index 746000f..cbc3664 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,25 @@ Aries JAX-RS Whiteboard is the reference implementation of the [OSGi JAX-RS Services Whiteboard 1.0](https://osgi.org/specification/osgi.cmpn/7.0.0/service.jaxrs.html). + +## Configuration + +The whiteboard is configured using configuration admin. + +PID| Purpose +---| --- +org.apache.aries.jax.rs.whiteboard.default | Default JAX-RS Whiteboard instance +org.apache.aries.jax.rs.whiteboard | Factory PID for creating additional JAX-RS Whiteboard instances + +Property| Default| Description +|| +enabled | true | Enable or disable the whiteboard instance +default.application.base| / | Default path for applications +application.base.prefix | "" | Prefix for application base +osgi.http.whiteboard.target | (osgi.http.endpoint=*) | Select the http whiteboard service if there are several +osgi.http.whiteboard.context.select || Select the http whiteboard context to be used +hide-service-list-page | true | Hide the CXF service list + ## Integrations The `integrations` folder contains OSGi enabled integrations for a variety of useful libraries that you might want to use with JAX-RS. In many cases these are just adding OSGi lifecycle and configuration to existing JAX-RS enabled libraries.
[aries-jax-rs-whiteboard] 01/01: Document configuration properties (thanks to Ray)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch pr-test in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git commit a8e9806043b9c71d8705fbe25ec30652ee96d99e Author: Christian Schneider AuthorDate: Sun Apr 5 08:59:34 2020 +0200 Document configuration properties (thanks to Ray) --- README.md | 19 +++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index e93ab2a..b2c6025 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,25 @@ Aries JAX-RS Whiteboard is the reference implementation of the [OSGi JAX-RS Services Whiteboard 1.0](https://osgi.org/specification/osgi.cmpn/7.0.0/service.jaxrs.html). + +## Configuration + +The whiteboard is configured using configuration admin. + +PID| Purpose +---| --- +org.apache.aries.jax.rs.whiteboard.default | Default JAX-RS Whiteboard instance +org.apache.aries.jax.rs.whiteboard | Factory PID for creating additional JAX-RS Whiteboard instances + +Property| Default| Description +|| +enabled | true | Enable or disable the whiteboard instance +default.application.base| / | Default path for applications +application.base.prefix | "" | Prefix for application base +osgi.http.whiteboard.target | (osgi.http.endpoint=*) | Select the http whiteboard service if there are several +osgi.http.whiteboard.context.select || Select the http whiteboard context to be used +hide-service-list-page | true | Hide the CXF service list + ## Integrations The `integrations` folder contains OSGi enabled integrations for a variety of useful libraries that you might want to use with JAX-RS. In many cases these are just adding OSGi lifecycle and configuration to existing JAX-RS enabled libraries.
[aries-jax-rs-whiteboard] branch pr-test created (now a8e9806)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch pr-test in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git. at a8e9806 Document configuration properties (thanks to Ray) This branch includes the following new commits: new a8e9806 Document configuration properties (thanks to Ray) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[aries-rsa] branch master updated: Use HTTPS instead of HTTP to resolve dependencies (#41)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new 0e22df9 Use HTTPS instead of HTTP to resolve dependencies (#41) 0e22df9 is described below commit 0e22df9a4f6d4298dd0189dddb34f57530328c92 Author: Jonathan Leitschuh AuthorDate: Wed Mar 4 03:31:10 2020 -0500 Use HTTPS instead of HTTP to resolve dependencies (#41) This fixes a security vulnerability in this project where the `pom.xml` files were configuring Maven to resolve dependencies over HTTP instead of HTTPS. Signed-off-by: Jonathan Leitschuh --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2c4fc66..870d6ec 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -311,7 +311,7 @@ apache.snapshots Apache Maven Snapshot Repository -http://repository.apache.org/content/groups/snapshots/ +https://repository.apache.org/content/groups/snapshots/ false @@ -326,7 +326,7 @@ apache.snapshots Apache Maven Snapshot Repository -http://repository.apache.org/content/groups/snapshots/ +https://repository.apache.org/content/groups/snapshots/ default true
[aries-journaled-events] branch master updated: Use HTTPS instead of HTTP to resolve dependencies (#22)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-journaled-events.git The following commit(s) were added to refs/heads/master by this push: new c297a41 Use HTTPS instead of HTTP to resolve dependencies (#22) c297a41 is described below commit c297a412e9d865f4f914ee389ea8905474caf5bd Author: Jonathan Leitschuh AuthorDate: Wed Mar 4 03:24:22 2020 -0500 Use HTTPS instead of HTTP to resolve dependencies (#22) This fixes a security vulnerability in this project where the `pom.xml` files were configuring Maven to resolve dependencies over HTTP instead of HTTPS. Signed-off-by: Jonathan Leitschuh --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6366297..9094ea9 100644 --- a/pom.xml +++ b/pom.xml @@ -274,7 +274,7 @@ apache.snapshots Apache Maven Snapshot Repository -http://repository.apache.org/content/groups/snapshots/ +https://repository.apache.org/content/groups/snapshots/ false @@ -289,7 +289,7 @@ apache.snapshots Apache Maven Snapshot Repository -http://repository.apache.org/content/groups/snapshots/ +https://repository.apache.org/content/groups/snapshots/ default true
[aries] branch trunk updated: Switch to using a more recent version of commons-io
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/aries.git The following commit(s) were added to refs/heads/trunk by this push: new 2998a69 Switch to using a more recent version of commons-io new af91e84 Merge pull request #105 from coheigea/commons-io 2998a69 is described below commit 2998a69b9d2af97ffc228b289b0d51072b2c7418 Author: Colm O hEigeartaigh AuthorDate: Mon Jan 13 10:23:45 2020 + Switch to using a more recent version of commons-io --- proxy/proxy-impl/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml index 545d535..454d32c 100644 --- a/proxy/proxy-impl/pom.xml +++ b/proxy/proxy-impl/pom.xml @@ -102,9 +102,9 @@ -org.apache.commons +commons-io commons-io -1.3.2 +2.5 test
[aries] branch trunk updated: ARIES-1887 - Improve handling of optional
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new ee16fd2 ARIES-1887 - Improve handling of optional
ee16fd2 is described below
commit ee16fd21f22624947a991c80503d819424497567
Author: Christian Schneider
AuthorDate: Tue Dec 3 15:02:58 2019 +0100
ARIES-1887 - Improve handling of optional
---
.../apache/aries/transaction/ComponentTxData.java | 43 +++---
.../aries/transaction/TxInterceptorImpl.java | 15
.../aries/transaction/ComponentTxDataTest.java | 2 +-
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git
a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java
b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java
index d4ccf97..d7499bc 100644
---
a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java
+++
b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java
@@ -34,22 +34,15 @@ public class ComponentTxData {
}
}
-TransactionalAnnotationAttributes getEffectiveType(Method m) {
+Optional getEffectiveType(Method m) {
if (txMap.containsKey(m)) {
-Optional optional =
txMap.get(m);
-if(optional == null || !optional.isPresent()) {
-return null;
-}
-return optional.get();
+return getTxAttr(m);
}
try {
Method effectiveMethod = beanClass.getDeclaredMethod(m.getName(),
m.getParameterTypes());
-Optional optional =
txMap.get(effectiveMethod);
-if(optional == null) {
-optional = Optional.empty();
-}
-txMap.put(m, optional);
-return optional.isPresent() ? optional.get() : null;
+Optional txAttr =
getTxAttr(effectiveMethod);
+txMap.put(m, txAttr);
+return txAttr;
} catch (NoSuchMethodException e) { // NOSONAR
return getFromMethod(m);
} catch (SecurityException e) {
@@ -57,22 +50,28 @@ public class ComponentTxData {
}
}
-private TransactionalAnnotationAttributes getFromMethod(Method m) {
+private Optional getFromMethod(Method
m) {
try {
Method effectiveMethod = beanClass.getMethod(m.getName(),
m.getParameterTypes());
-Optional optional =
txMap.get(effectiveMethod);
-if(optional == null) {
-optional = Optional.empty();
-}
-txMap.put(m, optional);
-return optional.isPresent() ? optional.get() : null;
+Optional txAttr =
getTxAttr(effectiveMethod);
+txMap.put(m, txAttr);
+return txAttr;
} catch (NoSuchMethodException e1) {
LOG.debug("No method found when scanning for transactions", e1);
-return null;
+return Optional.empty();
} catch (SecurityException e1) {
throw new RuntimeException("Security exception when determining
effective method", e1); // NOSONAR
}
}
+
+private Optional getTxAttr(Method
method) {
+Optional txAttr = txMap.get(method);
+if (txAttr == null) {
+return Optional.empty();
+} else {
+return txAttr;
+}
+}
private boolean parseTxData(Class c) {
boolean shouldAssignInterceptor = false;
@@ -86,9 +85,9 @@ public class ComponentTxData {
Transactional methodAnnotation =
m.getAnnotation(Transactional.class);
TxType t = getType(methodAnnotation);
if (t != null) {
-TransactionalAnnotationAttributes txData = new
TransactionalAnnotationAttributes(t,
+ TransactionalAnnotationAttributes txData = new
TransactionalAnnotationAttributes(t,
methodAnnotation.dontRollbackOn(),
methodAnnotation.rollbackOn());
-assertAllowedModifier(m);
+ assertAllowedModifier(m);
txMap.put(m, Optional.of(txData));
shouldAssignInterceptor = true;
} else if (defaultType != null){
diff --git
a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
index a61d42c..8974a40 100644
---
a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
+++
b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
@@ -19,6 +19,7 @@
package org.apac
[aries] branch trunk updated: [ARIES-1887] ComponentTxData in transaction-blueprint was not thread safe
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3a26f7c [ARIES-1887] ComponentTxData in transaction-blueprint was not
thread safe
new fd261f3 Merge pull request #104 from nicolas-dutertry/ARIES-1887
3a26f7c is described below
commit 3a26f7c4b813332c7bbfb10c9013f100fa84ca18
Author: Nicolas Dutertry
AuthorDate: Tue Dec 3 14:03:43 2019 +0100
[ARIES-1887] ComponentTxData in transaction-blueprint was not thread safe
---
.../apache/aries/transaction/ComponentTxData.java | 35 ++
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git
a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java
b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java
index 223b862..d4ccf97 100644
---
a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java
+++
b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java
@@ -2,8 +2,9 @@ package org.apache.aries.transaction;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
import javax.transaction.Transactional;
import javax.transaction.Transactional.TxType;
@@ -15,7 +16,7 @@ public class ComponentTxData {
private static final Logger LOG =
LoggerFactory.getLogger(ComponentTxData.class);
private static final int BANNED_MODIFIERS = Modifier.PRIVATE |
Modifier.STATIC;
-private Map txMap = new
HashMap();
+private Map> txMap =
new ConcurrentHashMap>();
private boolean isTransactional;
private Class beanClass;
@@ -35,13 +36,20 @@ public class ComponentTxData {
TransactionalAnnotationAttributes getEffectiveType(Method m) {
if (txMap.containsKey(m)) {
-return txMap.get(m);
+Optional optional =
txMap.get(m);
+if(optional == null || !optional.isPresent()) {
+return null;
+}
+return optional.get();
}
try {
Method effectiveMethod = beanClass.getDeclaredMethod(m.getName(),
m.getParameterTypes());
-TransactionalAnnotationAttributes txData =
txMap.get(effectiveMethod);
-txMap.put(m, txData);
-return txData;
+Optional optional =
txMap.get(effectiveMethod);
+if(optional == null) {
+optional = Optional.empty();
+}
+txMap.put(m, optional);
+return optional.isPresent() ? optional.get() : null;
} catch (NoSuchMethodException e) { // NOSONAR
return getFromMethod(m);
} catch (SecurityException e) {
@@ -52,9 +60,12 @@ public class ComponentTxData {
private TransactionalAnnotationAttributes getFromMethod(Method m) {
try {
Method effectiveMethod = beanClass.getMethod(m.getName(),
m.getParameterTypes());
-TransactionalAnnotationAttributes txData =
txMap.get(effectiveMethod);
-txMap.put(m, txData);
-return txData;
+Optional optional =
txMap.get(effectiveMethod);
+if(optional == null) {
+optional = Optional.empty();
+}
+txMap.put(m, optional);
+return optional.isPresent() ? optional.get() : null;
} catch (NoSuchMethodException e1) {
LOG.debug("No method found when scanning for transactions", e1);
return null;
@@ -78,11 +89,11 @@ public class ComponentTxData {
TransactionalAnnotationAttributes txData = new
TransactionalAnnotationAttributes(t,
methodAnnotation.dontRollbackOn(),
methodAnnotation.rollbackOn());
assertAllowedModifier(m);
- txMap.put(m, txData);
+ txMap.put(m, Optional.of(txData));
shouldAssignInterceptor = true;
} else if (defaultType != null){
-txMap.put(m, new
TransactionalAnnotationAttributes(defaultType, classAnnotation.dontRollbackOn(),
-classAnnotation.rollbackOn()));
+txMap.put(m, Optional.of(new
TransactionalAnnotationAttributes(defaultType, classAnnotation.dontRollbackOn(),
+classAnnotation.rollbackOn(;
}
} catch(IllegalStateException e) {
LOG.warn("Invalid transaction annoation found", e);
[aries-rsa] branch master updated: Avoid cycle between packages
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
View the commit online:
https://github.com/apache/aries-rsa/commit/bfe7872e90e54b6085de31e66bf901f21b3f0e8e
The following commit(s) were added to refs/heads/master by this push:
new bfe7872 Avoid cycle between packages
bfe7872 is described below
commit bfe7872e90e54b6085de31e66bf901f21b3f0e8e
Author: Christian Schneider
AuthorDate: Wed Nov 20 13:34:02 2019 +0100
Avoid cycle between packages
---
.../src/main/java/org/apache/aries/rsa/topologymanager/Activator.java | 1 +
.../aries/rsa/topologymanager/{ => importer}/NamedThreadFactory.java| 2 +-
.../aries/rsa/topologymanager/importer/TopologyManagerImport.java | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
index 221ba95..c80be7a 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
@@ -28,6 +28,7 @@ import org.apache.aries.rsa.spi.ExportPolicy;
import org.apache.aries.rsa.topologymanager.exporter.DefaultExportPolicy;
import org.apache.aries.rsa.topologymanager.exporter.EndpointListenerNotifier;
import org.apache.aries.rsa.topologymanager.exporter.TopologyManagerExport;
+import org.apache.aries.rsa.topologymanager.importer.NamedThreadFactory;
import org.apache.aries.rsa.topologymanager.importer.TopologyManagerImport;
import
org.apache.aries.rsa.topologymanager.importer.local.EndpointListenerManager;
import org.osgi.annotation.bundle.Capability;
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/NamedThreadFactory.java
similarity index 96%
rename from
topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java
rename to
topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/NamedThreadFactory.java
index 724bede..e0e2360 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/NamedThreadFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.rsa.topologymanager;
+package org.apache.aries.rsa.topologymanager.importer;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
index 5e4baf8..896f1e0 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
@@ -26,7 +26,6 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
-import org.apache.aries.rsa.topologymanager.NamedThreadFactory;
import org.osgi.framework.BundleContext;
import org.osgi.service.remoteserviceadmin.EndpointDescription;
import org.osgi.service.remoteserviceadmin.EndpointEvent;
[aries-rsa] branch master updated: ARIES-1944 - Make sure closed ImportRegistrations are removed (#40)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new a00d663 ARIES-1944 - Make sure closed ImportRegistrations are removed
(#40)
a00d663 is described below
commit a00d663c9586990eaea35e066cdc11390adfe913
Author: Christian Schneider
AuthorDate: Wed Nov 20 13:30:03 2019 +0100
ARIES-1944 - Make sure closed ImportRegistrations are removed (#40)
---
.../rsa/topologymanager/importer/ImportDiff.java | 19 +++-
.../importer/TopologyManagerImport.java| 25 +++---
2 files changed, 26 insertions(+), 18 deletions(-)
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
index 4f7dc72..468d235 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
@@ -37,19 +37,28 @@ public class ImportDiff {
this.imported = imported;
}
-public Stream getRemoved() {
+public Stream getRemoved() {
return imported.stream()
-.map(ImportRegistration::getImportReference)
-.filter(Objects::nonNull)
-.filter(ir -> !possible.contains(ir.getImportedEndpoint()));
+.filter(this::toRemove);
}
-
+
public Stream getAdded() {
Set importedEndpoints = importedEndpoints();
return possible.stream()
.filter(not(importedEndpoints::contains));
}
+/**
+ * Checks if the import registration is not possible anymore or closed
+ *
+ * @param ireg registration to check
+ * @return
+ */
+private boolean toRemove(ImportRegistration ireg) {
+ImportReference iref = ireg != null ? ireg.getImportReference() : null;
+return iref == null || !possible.contains(iref.getImportedEndpoint());
+}
+
private Set importedEndpoints() {
return imported.stream()
.map(ImportRegistration::getImportReference).filter(Objects::nonNull)
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
index 2543da9..5e4baf8 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
@@ -85,7 +85,7 @@ public class TopologyManagerImport implements
EndpointEventListener, RemoteServi
}
// close all imports
importPossibilities.clear();
-importedServices.allValues().forEach(ir ->
unimportService(ir.getImportReference()));
+importedServices.allValues().forEach(this::unimportRegistration);
}
public void add(RemoteServiceAdmin rsa) {
@@ -99,8 +99,11 @@ public class TopologyManagerImport implements
EndpointEventListener, RemoteServi
@Override
public void remoteAdminEvent(RemoteServiceAdminEvent event) {
-if (event.getType() == RemoteServiceAdminEvent.IMPORT_UNREGISTRATION) {
-unimportService(event.getImportReference());
+ImportReference ref = event.getImportReference();
+if (event.getType() == RemoteServiceAdminEvent.IMPORT_UNREGISTRATION
&& ref != null) {
+importedServices.allValues().stream()
+.filter(ir -> ref.equals(ir.getImportReference()))
+.forEach(this::unimportRegistration);
}
}
@@ -125,7 +128,7 @@ public class TopologyManagerImport implements
EndpointEventListener, RemoteServi
try {
ImportDiff diff = new ImportDiff(importPossibilities.get(filter),
importedServices.get(filter));
diff.getRemoved()
-.forEach(this::unimportService);
+.forEach(this::unimportRegistration);
diff.getAdded()
.flatMap(this::importService)
.forEach(ir -> importedServices.put(filter, ir));
@@ -156,16 +159,12 @@ public class TopologyManagerImport implements
EndpointEventListener, RemoteServi
}
return Stream.empty();
}
-
-private void unimportService(ImportReference ref) {
-importedServices.allValues().stream()
-.filter(ir -> ref != null && ref.equals(ir.getImportReference()))
-.forEach(ir -> {
-importedServices.remove(ir);
-ir.close();
-});
+
+private void unimportR
[aries] branch trunk updated: ARIES-1934 - Make sure jar/zip files are jailed to the destination directory
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new e8477fa ARIES-1934 - Make sure jar/zip files are jailed to the
destination directory
new 9ef209c Merge pull request #102 from coheigea/ARIES-1934
e8477fa is described below
commit e8477faa3f37b7b1cab61e634137224552978f80
Author: Colm O hEigeartaigh
AuthorDate: Tue Oct 8 12:45:00 2019 +0100
ARIES-1934 - Make sure jar/zip files are jailed to the destination directory
---
.../src/main/java/org/apache/aries/spifly/statictool/Main.java | 9 ++---
util/src/main/java/org/apache/aries/util/io/IOUtils.java | 7 ++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git
a/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java
b/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java
index 5bb448c..a4e2c14 100644
---
a/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java
+++
b/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java
@@ -243,14 +243,17 @@ public class Main {
JarInputStream jis = new JarInputStream(new FileInputStream(jarFile));
JarEntry je = null;
while((je = jis.getNextJarEntry()) != null) {
+File outFile = new File(tempDir, je.getName());
+if
(!outFile.getCanonicalPath().startsWith(tempDir.getCanonicalPath())) {
+throw new IOException("The output file is not contained in the
destination directory");
+}
+
if (je.isDirectory()) {
-File outDir = new File(tempDir, je.getName());
-ensureDirectory(outDir);
+ensureDirectory(outFile);
continue;
}
-File outFile = new File(tempDir, je.getName());
File outDir = outFile.getParentFile();
ensureDirectory(outDir);
diff --git a/util/src/main/java/org/apache/aries/util/io/IOUtils.java
b/util/src/main/java/org/apache/aries/util/io/IOUtils.java
index a926ea3..39054b2 100644
--- a/util/src/main/java/org/apache/aries/util/io/IOUtils.java
+++ b/util/src/main/java/org/apache/aries/util/io/IOUtils.java
@@ -274,7 +274,12 @@ public class IOUtils
isZip = false; // It's not a zip - that's
ok, we'll return that below.
}
if(isZip){
-do {
+do {
+ File outFile = new File(outputDir, zipEntry.getName());
+ if
(!outFile.getCanonicalPath().startsWith(outputDir.getCanonicalPath())) {
+throw new IOException("The output file is not contained in the
destination directory");
+ }
+
if (!zipEntry.isDirectory()) {
writeOutAndDontCloseInputStream(outputDir, zipEntry.getName(),
zis);
}
[aries] branch trunk updated: Disallow DocTypes in the Blueprint Parser
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 13bce34 Disallow DocTypes in the Blueprint Parser
new c50b099 Merge pull request #100 from coheigea/parser-doctypes
13bce34 is described below
commit 13bce34434779722b394d58576fa45eb7261fbb8
Author: Colm O hEigeartaigh
AuthorDate: Wed Sep 25 14:40:48 2019 +0100
Disallow DocTypes in the Blueprint Parser
---
.../src/main/java/org/apache/aries/blueprint/parser/Parser.java| 7 +++
1 file changed, 7 insertions(+)
diff --git
a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java
b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java
index 10a9b39..3afcf50 100644
---
a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java
+++
b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java
@@ -22,6 +22,7 @@ import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.dom.DOMSource;
import javax.xml.validation.Schema;
import javax.xml.validation.Validator;
@@ -1461,6 +1462,12 @@ public class Parser {
if (documentBuilderFactory == null) {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
+try {
+
dbf.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
+
dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl;, true);
+} catch (ParserConfigurationException ex) {
+throw new ComponentDefinitionException("Unable to create the
document builder", ex);
+}
documentBuilderFactory = dbf;
}
return documentBuilderFactory;
[aries] branch trunk updated: Fixed bug causing array properties to not evaluate as equal
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 62d2997 Fixed bug causing array properties to not evaluate as equal
62d2997 is described below
commit 62d29975a3bbf639d0d8e09ef72348ed1b26ba3d
Author: Shannon Gallagher
AuthorDate: Wed Dec 12 13:11:59 2018 -0700
Fixed bug causing array properties to not evaluate as equal
---
.../aries/blueprint/compendium/cm/CmPropertyPlaceholder.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git
a/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
b/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
index 840d3c6..1af990a 100644
---
a/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
+++
b/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
@@ -18,6 +18,7 @@
*/
package org.apache.aries.blueprint.compendium.cm;
+import java.util.Arrays;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Properties;
@@ -40,7 +41,7 @@ public class CmPropertyPlaceholder extends
PropertyPlaceholderExt implements Man
private static final Logger LOGGER =
LoggerFactory.getLogger(CmPropertyPlaceholder.class);
private ExtendedBlueprintContainer blueprintContainer;
-private ConfigurationAdmin configAdmin;
+private ConfigurationAdmin configAdmin;
private String persistentId;
private String updateStrategy;
private ManagedObjectManager managedObjectManager;
@@ -154,10 +155,12 @@ public class CmPropertyPlaceholder extends
PropertyPlaceholderExt implements Man
if (v2 != null) {
return false;
}
-} else {
-if (!v1.equals(v2)) {
+} else if (v1 instanceof Object[] && v2 instanceof Object[]) {
+if (!Arrays.deepEquals((Object[]) v1, (Object[]) v2)) {
return false;
}
+} else if (!v1.equals(v2)) {
+return false;
}
}
return true;
[aries] branch trunk updated: Fix the problem of using '+' and '+=' operators to concatenate strings in a loop.
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 56a76d3 Fix the problem of using '+' and '+=' operators to
concatenate strings in a loop.
56a76d3 is described below
commit 56a76d3e9cf64479620482320912b254caae1462
Author: Kui LIU
AuthorDate: Mon Oct 9 22:15:04 2017 +0200
Fix the problem of using '+' and '+=' operators to concatenate strings in a
loop.
The method is building a String using concatenation in a loop.
In each iteration, the String is converted to a StringBuilder, appended to,
and converted back to a String.
This can lead to a cost quadratic in the number of iterations, as the
growing string is recopied in each iteration.
Better performance can be obtained by using a StringBuilder explicitly.
http://findbugs.sourceforge.net/bugDescriptions.html#SBSC_USE_STRINGBUFFER_CONCATENATION
---
.../api/persistence/MarketSummaryDataBean.java | 24 +++---
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git
a/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java
b/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java
index 13df51e..a5fff45 100644
---
a/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java
+++
b/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java
@@ -62,30 +62,30 @@ public class MarketSummaryDataBean implements Serializable
public String toString()
{
- String ret = "\n\tMarket Summary at: " + getSummaryDate()
- + "\n\t\tTSIA:" + getTSIA()
- + "\n\t\topenTSIA:" + getOpenTSIA()
- + "\n\t\tgain:" + getGainPercent()
- + "\n\t\t volume:" + getVolume()
- ;
+ StringBuilder ret = new StringBuilder();
+ ret.append("\n\tMarket Summary at: ").append(getSummaryDate())
+ .append("\n\t\tTSIA:").append(getTSIA())
+ .append("\n\t\topenTSIA:").append(getOpenTSIA())
+ .append("\n\t\tgain:").append(getGainPercent())
+ .append("\n\t\t volume:").append(getVolume());
if ( (getTopGainers()==null) || (getTopLosers()==null) )
- return ret;
- ret += "\n\t\t Current Top Gainers:";
+ return ret.toString();
+ ret.append("\n\t\t Current Top Gainers:");
Iterator it = getTopGainers().iterator();
while ( it.hasNext() )
{
QuoteDataBean quoteData = (QuoteDataBean) it.next();
- ret += ( "\n\t\t\t" + quoteData.toString() );
+ ret.append("\n\t\t\t").append(quoteData.toString());
}
- ret += "\n\t\t Current Top Losers:";
+ ret.append("\n\t\t Current Top Losers:");
it = getTopLosers().iterator();
while ( it.hasNext() )
{
QuoteDataBean quoteData = (QuoteDataBean) it.next();
- ret += ( "\n\t\t\t" + quoteData.toString() );
+ ret.append("\n\t\t\t").append(quoteData.toString());
}
- return ret;
+ return ret.toString();
}
public String toHTML()
{
[aries] branch trunk updated: Remove the useless conditional sub-expression.
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new adba1eb Remove the useless conditional sub-expression.
adba1eb is described below
commit adba1eb62c755347c6f0edd4db5a65effa079e48
Author: Kui LIU
AuthorDate: Mon Oct 9 10:25:47 2017 +0200
Remove the useless conditional sub-expression.
This statement contains a useless conditional expression, where this
conditional expression returns a false value regardless of what the value of
isValid is.
http://findbugs.sourceforge.net/bugDescriptions.html#UCF_USELESS_CONTROL_FLOW
---
.../src/main/java/org/apache/aries/ant/taskdefs/BundleSelector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/esa-ant-task/src/main/java/org/apache/aries/ant/taskdefs/BundleSelector.java
b/esa-ant-task/src/main/java/org/apache/aries/ant/taskdefs/BundleSelector.java
index 31793f8..75bdbe3 100755
---
a/esa-ant-task/src/main/java/org/apache/aries/ant/taskdefs/BundleSelector.java
+++
b/esa-ant-task/src/main/java/org/apache/aries/ant/taskdefs/BundleSelector.java
@@ -60,7 +60,7 @@ public class BundleSelector implements FileSelector {
}
catch (Exception e) {
// nothing to do
- isValid = isValid && false;
+ isValid = false;
}
finally {
try {
[aries] branch trunk updated: Update tests to current snapshot
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/aries.git The following commit(s) were added to refs/heads/trunk by this push: new 55d3c8d Update tests to current snapshot 55d3c8d is described below commit 55d3c8d002ac329acbfef9bf97cbc198d2405de5 Author: Christian Schneider AuthorDate: Mon Nov 18 08:50:29 2019 +0100 Update tests to current snapshot --- proxy/proxy-itests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml index 39f22b9..81781b7 100644 --- a/proxy/proxy-itests/pom.xml +++ b/proxy/proxy-itests/pom.xml @@ -69,7 +69,7 @@ org.apache.aries.proxy org.apache.aries.proxy test -1.1.5-SNAPSHOT +1.1.7-SNAPSHOT
[aries-rsa] 01/01: ARIES-1944 - Make sure closed ImportRegistrations are removed
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch ARIES-1944
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 0e74b19854cc5bf0898df76afcd51a3ac5cc2e03
Author: Christian Schneider
AuthorDate: Sun Nov 17 10:00:58 2019 +0100
ARIES-1944 - Make sure closed ImportRegistrations are removed
---
.../rsa/topologymanager/importer/ImportDiff.java | 19 +++-
.../importer/TopologyManagerImport.java| 25 +++---
2 files changed, 26 insertions(+), 18 deletions(-)
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
index 4f7dc72..468d235 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
@@ -37,19 +37,28 @@ public class ImportDiff {
this.imported = imported;
}
-public Stream getRemoved() {
+public Stream getRemoved() {
return imported.stream()
-.map(ImportRegistration::getImportReference)
-.filter(Objects::nonNull)
-.filter(ir -> !possible.contains(ir.getImportedEndpoint()));
+.filter(this::toRemove);
}
-
+
public Stream getAdded() {
Set importedEndpoints = importedEndpoints();
return possible.stream()
.filter(not(importedEndpoints::contains));
}
+/**
+ * Checks if the import registration is not possible anymore or closed
+ *
+ * @param ireg registration to check
+ * @return
+ */
+private boolean toRemove(ImportRegistration ireg) {
+ImportReference iref = ireg != null ? ireg.getImportReference() : null;
+return iref == null || !possible.contains(iref.getImportedEndpoint());
+}
+
private Set importedEndpoints() {
return imported.stream()
.map(ImportRegistration::getImportReference).filter(Objects::nonNull)
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
index 2543da9..5e4baf8 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
@@ -85,7 +85,7 @@ public class TopologyManagerImport implements
EndpointEventListener, RemoteServi
}
// close all imports
importPossibilities.clear();
-importedServices.allValues().forEach(ir ->
unimportService(ir.getImportReference()));
+importedServices.allValues().forEach(this::unimportRegistration);
}
public void add(RemoteServiceAdmin rsa) {
@@ -99,8 +99,11 @@ public class TopologyManagerImport implements
EndpointEventListener, RemoteServi
@Override
public void remoteAdminEvent(RemoteServiceAdminEvent event) {
-if (event.getType() == RemoteServiceAdminEvent.IMPORT_UNREGISTRATION) {
-unimportService(event.getImportReference());
+ImportReference ref = event.getImportReference();
+if (event.getType() == RemoteServiceAdminEvent.IMPORT_UNREGISTRATION
&& ref != null) {
+importedServices.allValues().stream()
+.filter(ir -> ref.equals(ir.getImportReference()))
+.forEach(this::unimportRegistration);
}
}
@@ -125,7 +128,7 @@ public class TopologyManagerImport implements
EndpointEventListener, RemoteServi
try {
ImportDiff diff = new ImportDiff(importPossibilities.get(filter),
importedServices.get(filter));
diff.getRemoved()
-.forEach(this::unimportService);
+.forEach(this::unimportRegistration);
diff.getAdded()
.flatMap(this::importService)
.forEach(ir -> importedServices.put(filter, ir));
@@ -156,16 +159,12 @@ public class TopologyManagerImport implements
EndpointEventListener, RemoteServi
}
return Stream.empty();
}
-
-private void unimportService(ImportReference ref) {
-importedServices.allValues().stream()
-.filter(ir -> ref != null && ref.equals(ir.getImportReference()))
-.forEach(ir -> {
-importedServices.remove(ir);
-ir.close();
-});
+
+private void unimportRegistration(ImportRegistration reg) {
+importedServices.remove(reg);
+reg.close();
}
-
+
@Override
public void endpointChanged(EndpointEvent event, String filter) {
if (stopped) {
[aries-rsa] branch ARIES-1944 created (now 0e74b19)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch ARIES-1944 in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. at 0e74b19 ARIES-1944 - Make sure closed ImportRegistrations are removed This branch includes the following new commits: new 0e74b19 ARIES-1944 - Make sure closed ImportRegistrations are removed The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[aries-rsa] branch master updated: Factor out diffing of imported and possible (#39)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new b774069 Factor out diffing of imported and possible (#39)
b774069 is described below
commit b774069193c5b0cf06687e414c813e2057d0
Author: Christian Schneider
AuthorDate: Sun Nov 17 09:16:44 2019 +0100
Factor out diffing of imported and possible (#39)
* Factor out diffing of imported and possible
* Small fix
---
.../rsa/topologymanager/importer/ImportDiff.java | 63 ++
.../importer/TopologyManagerImport.java| 53 +-
2 files changed, 77 insertions(+), 39 deletions(-)
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
new file mode 100644
index 000..4f7dc72
--- /dev/null
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
@@ -0,0 +1,63 @@
+/*
+ * 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.rsa.topologymanager.importer;
+
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.osgi.service.remoteserviceadmin.EndpointDescription;
+import org.osgi.service.remoteserviceadmin.ImportReference;
+import org.osgi.service.remoteserviceadmin.ImportRegistration;
+
+public class ImportDiff {
+private Set possible;
+private Set imported;
+
+public ImportDiff(Set possible,
Set imported) {
+this.possible = possible;
+this.imported = imported;
+}
+
+public Stream getRemoved() {
+return imported.stream()
+.map(ImportRegistration::getImportReference)
+.filter(Objects::nonNull)
+.filter(ir -> !possible.contains(ir.getImportedEndpoint()));
+}
+
+public Stream getAdded() {
+Set importedEndpoints = importedEndpoints();
+return possible.stream()
+.filter(not(importedEndpoints::contains));
+}
+
+private Set importedEndpoints() {
+return imported.stream()
+
.map(ImportRegistration::getImportReference).filter(Objects::nonNull)
+.map(ImportReference::getImportedEndpoint).filter(Objects::nonNull)
+.collect(Collectors.toSet());
+}
+
+private static Predicate not(Predicate t) {
+return t.negate();
+}
+}
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
index 95d3aee..2543da9 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
import org.apache.aries.rsa.topologymanager.NamedThreadFactory;
import org.osgi.framework.BundleContext;
@@ -114,17 +115,20 @@ public class TopologyManagerImport implements
EndpointEventListener, RemoteServi
* Synchronizes the actual imports with the possible imports for the given
filter,
* i.e. unimports previously imported endpoints that are no longer
possible,
* and imports new possible endpoints that are not already imported.
+ *
+ * TODO but optional: if the service is already imported and the endpoint
is still
+ * in the list of possible imports check if a "better" endpoint is now in
the list
*
* @param filter the filter whose endpoints are synchronized
*/
private void synchronizeImports(fi
[aries-rsa] branch master updated: ARIES-1780 - Fix cycle between packages
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new c245463 ARIES-1780 - Fix cycle between packages
c245463 is described below
commit c2454633ac9aff751efe6ba5b3791b8747388e52
Author: Christian Schneider
AuthorDate: Sat Nov 16 22:38:47 2019 +0100
ARIES-1780 - Fix cycle between packages
---
.../rsa/discovery/zookeeper/InterestManager.java | 8 +---
.../zookeeper/client/ZookeeperEndpointListener.java | 19 +--
.../zookeeper/client/ZookeeperEndpointRepository.java | 4 ++--
.../rsa/discovery/zookeeper/InterestManagerTest.java | 3 +++
4 files changed, 19 insertions(+), 15 deletions(-)
diff --git
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/InterestManager.java
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/InterestManager.java
index 3d4f59e..0d22a47 100644
---
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/InterestManager.java
+++
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/InterestManager.java
@@ -56,7 +56,7 @@ public class InterestManager {
// Using ARepository name to make sure it is injected first
@Reference
public void bindARepository(ZookeeperEndpointRepository repository) {
-this.listener = repository.createListener(this::onEndpointChanged);
+this.listener = repository.createListener(this::onEndpointEvent);
}
@Deactivate
@@ -65,7 +65,7 @@ public class InterestManager {
interests.clear();
}
-private void onEndpointChanged(EndpointEvent event, String filter) {
+private void onEndpointEvent(EndpointEvent event) {
interests.forEach(interest -> interest.notifyListener(event));
}
@@ -103,7 +103,9 @@ public class InterestManager {
Interest interest = new Interest(sref, epListener);
update(interest);
if (listener != null) {
-listener.sendExistingEndpoints(interest);
+listener.getEndpoints().stream()
+.map(endpoint -> new EndpointEvent(EndpointEvent.ADDED,
endpoint))
+.forEach(interest::notifyListener);
}
}
diff --git
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java
index fbacfe4..ba82e3a 100644
---
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java
+++
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java
@@ -20,11 +20,13 @@ package org.apache.aries.rsa.discovery.zookeeper.client;
import java.io.ByteArrayInputStream;
import java.io.Closeable;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
-import org.apache.aries.rsa.discovery.zookeeper.Interest;
import org.apache.aries.rsa.spi.EndpointDescriptionParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.ConnectionLossException;
@@ -35,7 +37,6 @@ import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.data.Stat;
import org.osgi.service.remoteserviceadmin.EndpointDescription;
import org.osgi.service.remoteserviceadmin.EndpointEvent;
-import org.osgi.service.remoteserviceadmin.EndpointEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,19 +52,17 @@ public class ZookeeperEndpointListener implements Closeable
{
private EndpointDescriptionParser parser;
-private EndpointEventListener listener;
+private Consumer listener;
-ZookeeperEndpointListener(ZooKeeper zk, EndpointDescriptionParser parser,
EndpointEventListener listener) {
+ZookeeperEndpointListener(ZooKeeper zk, EndpointDescriptionParser parser,
Consumer listener) {
this.zk = zk;
this.parser = parser;
this.listener = listener;
watchRecursive(ZookeeperEndpointRepository.PATH_PREFIX);
}
-public void sendExistingEndpoints(Interest interest) {
-endpoints.values().stream()
-.map(endpoint -> new EndpointEvent(EndpointEvent.ADDED, endpoint))
-.forEach(interest::notifyListener);
+public Collection getEndpoints() {
+return endpoints.values();
}
@Override
@@ -116,14 +115,14 @@ public class ZookeeperEndpointListener implements
Closeable {
EndpointDescription old = endpoints.put(path, endpoint);
int type = old == null ? EndpointEvent.ADDED : EndpointEvent
[aries-rsa] branch refactor_tm updated: Factor out diffing of imported and possible
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch refactor_tm
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/refactor_tm by this push:
new 603832b Factor out diffing of imported and possible
603832b is described below
commit 603832bc31dc8c9d2468313695c1fcf3cf535f14
Author: Christian Schneider
AuthorDate: Fri Nov 15 13:34:46 2019 +0100
Factor out diffing of imported and possible
---
.../rsa/topologymanager/importer/ImportDiff.java | 63 ++
.../importer/TopologyManagerImport.java| 53 +-
2 files changed, 77 insertions(+), 39 deletions(-)
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
new file mode 100644
index 000..05d8e90
--- /dev/null
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/ImportDiff.java
@@ -0,0 +1,63 @@
+/*
+ * 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.rsa.topologymanager.importer;
+
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.osgi.service.remoteserviceadmin.EndpointDescription;
+import org.osgi.service.remoteserviceadmin.ImportReference;
+import org.osgi.service.remoteserviceadmin.ImportRegistration;
+
+public class ImportDiff {
+private Set possible;
+private Set imported;
+
+public ImportDiff(Set possible,
Set imported) {
+this.possible = possible;
+this.imported = imported;
+}
+
+public Stream getRemoved() {
+return imported.stream()
+.map(ImportRegistration::getImportReference)
+.filter(Objects::nonNull)
+.filter(ir -> !possible.contains(ir.getImportedEndpoint()));
+}
+
+private Set importedEndpoints() {
+return imported.stream()
+
.map(ImportRegistration::getImportReference).filter(Objects::nonNull)
+.map(ImportReference::getImportedEndpoint).filter(Objects::nonNull)
+.collect(Collectors.toSet());
+}
+
+public Stream getAdded() {
+Set importedEndpoints = importedEndpoints();
+return possible.stream()
+.filter(not(importedEndpoints::contains));
+}
+
+public static Predicate not(Predicate t) {
+return t.negate();
+}
+}
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
index 95d3aee..2543da9 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
import org.apache.aries.rsa.topologymanager.NamedThreadFactory;
import org.osgi.framework.BundleContext;
@@ -114,17 +115,20 @@ public class TopologyManagerImport implements
EndpointEventListener, RemoteServi
* Synchronizes the actual imports with the possible imports for the given
filter,
* i.e. unimports previously imported endpoints that are no longer
possible,
* and imports new possible endpoints that are not already imported.
+ *
+ * TODO but optional: if the service is already imported and the endpoint
is still
+ * in the list of possible imports check if a "better" endpoint is now in
the list
*
* @param filter the filter whose endpoints are synchronized
*/
private void synchronizeImports(final String filter) {
try {
-// unimport endp
[aries-rsa] branch refactor_tm created (now 853abf7)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch refactor_tm in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. at 853abf7 Refactor TopologyManagerImport No new revisions were added by this update.
[aries-rsa] branch master updated: ARIES-1943 Changed TopologyManager importer logic to not assume all referenced ImportRegistrations are 'open'. (#36)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new 0f48071 ARIES-1943 Changed TopologyManager importer logic to not
assume all referenced ImportRegistrations are 'open'. (#36)
0f48071 is described below
commit 0f48071f60263d35e55dcf7f510f06dd75018da5
Author: Arnoud Glimmerveen
AuthorDate: Wed Nov 13 15:04:16 2019 +0100
ARIES-1943 Changed TopologyManager importer logic to not assume all
referenced ImportRegistrations are 'open'. (#36)
* ARIES-1943 Changed TopologyManager importer logic to not assume all
referenced ImportRegistrations are 'open'.
In addition assigned functional thread names to the ExecutorServices used
by Importer and Exporter logic.
* Based threadName pattern on using class.
* Changed approach to naming threads, as discussed in the comments of PR
#36.
---
.../aries/rsa/topologymanager/Activator.java | 2 +-
.../rsa/topologymanager/NamedThreadFactory.java| 46 ++
.../importer/TopologyManagerImport.java| 34 +---
3 files changed, 75 insertions(+), 7 deletions(-)
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
index 3ff832f..352a294 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
@@ -119,7 +119,7 @@ public class Activator implements BundleActivator {
public void doStart(final BundleContext bc, ExportPolicy policy) {
LOG.debug("TopologyManager: start()");
notifier = new EndpointListenerNotifier();
-exportExecutor = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS,
new LinkedBlockingQueue());
+exportExecutor = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS,
new LinkedBlockingQueue(), new
NamedThreadFactory(TopologyManagerExport.class));
exportManager = new TopologyManagerExport(notifier, exportExecutor,
policy);
epeListenerTracker = new EndpointEventListenerTracker(bc,
exportManager);
importManager = new TopologyManagerImport(bc);
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java
new file mode 100644
index 000..724bede
--- /dev/null
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java
@@ -0,0 +1,46 @@
+/**
+ * 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.rsa.topologymanager;
+
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class NamedThreadFactory implements ThreadFactory {
+/**
+ * Counter used when constructing unique Thread names
+ */
+private final AtomicInteger count = new AtomicInteger(0);
+/**
+ * Pattern used when constructing Thread names. This pattern must include
the sequence
+ * %d which will be used to replace with a Thread count.
+ */
+private final String namePattern;
+
+/**
+ * @param context Class name will be used to name threads created by this
ThreadFactory.
+ */
+public NamedThreadFactory(Class context) {
+this.namePattern = context.getSimpleName() + "-%d";
+}
+
+@Override
+public Thread newThread(Runnable r) {
+return new Thread(r, String.format(namePattern,
count.getAndIncrement()));
+}
+}
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
index e28089b..1225a6e 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
+++
b/t
[aries-rsa] branch master updated (8035bca -> 98d9f42)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. from 8035bca Standardize license headers add 98d9f42 ARIES-1942 - Use annotation based bundle configs (#35) No new revisions were added by this update. Summary of changes: discovery/command/bnd.bnd | 22 -- discovery/command/pom.xml | 2 +- discovery/config/bnd.bnd | 21 -- discovery/config/pom.xml | 2 +- .../aries/rsa/discovery/config/Activator.java | 8 discovery/local/bnd.bnd| 9 +--- discovery/local/pom.xml| 3 +- .../aries/rsa/discovery/local/package-info.java| 24 --- discovery/zookeeper/bnd.bnd| 19 - discovery/zookeeper/pom.xml| 2 +- .../rsa/discovery/zookeeper/InterestManager.java | 29 ++--- .../client/ZookeeperEndpointListener.java | 12 +++--- .../client/ZookeeperEndpointRepository.java| 2 +- .../discovery/zookeeper/client/package-info.java | 10 ++--- .../rsa/discovery/zookeeper/package-info.java | 6 +-- .../discovery/zookeeper/InterestManagerTest.java | 5 +-- .../zookeeper/ZookeeperDiscoveryTest.java | 6 +-- eapub/bnd.bnd | 1 - eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml| 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml | 29 - examples/echotcp/api/pom.xml | 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml | 26 examples/echotcp/service/pom.xml | 2 +- .../rsa/itests/felix/rsa/TestRSAListener.java | 2 +- parent/pom.xml | 49 -- provider/fastbin/bnd.bnd | 5 +-- provider/fastbin/pom.xml | 2 +- .../aries/rsa/provider/fastbin/Activator.java | 9 provider/tcp/bnd.bnd | 4 -- provider/tcp/pom.xml | 2 +- .../apache/aries/rsa/provider/tcp/TCPProvider.java | 8 +++- rsa/bnd.bnd| 10 + rsa/pom.xml| 2 +- .../java/org/apache/aries/rsa/core/Activator.java | 9 spi/bnd.bnd| 20 - spi/pom.xml| 2 +- .../rsa/annotations/RSADiscoveryProvider.java | 12 ++ .../rsa/annotations/RSADistributionProvider.java | 12 ++ .../apache/aries/rsa/annotations/package-info.java | 9 ++-- .../org/apache/aries/rsa/spi/package-info.java | 9 ++-- .../main/java/org/apache/aries/rsa/spi/packageinfo | 19 - .../org/apache/aries/rsa/util/package-info.java| 9 ++-- .../java/org/apache/aries/rsa/util/packageinfo | 19 - topology-manager/bnd.bnd | 24 --- topology-manager/pom.xml | 2 +- .../aries/rsa/topologymanager/Activator.java | 21 ++ 50 files changed, 176 insertions(+), 336 deletions(-) delete mode 100644 discovery/command/bnd.bnd delete mode 100644 discovery/config/bnd.bnd copy provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/api/Dispatched.java => discovery/local/src/main/java/org/apache/aries/rsa/discovery/local/package-info.java (68%) delete mode 100644 discovery/zookeeper/bnd.bnd copy examples/echotcp/api/src/main/java/org/apache/aries/rsa/examples/echotcp/api/EchoService.java => discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/package-info.java (84%) delete mode 100644 spi/bnd.bnd create mode 100644 spi/src/main/java/org/apache/aries/rsa/annotations/RSADiscoveryProvider.java create mode 100644 spi/src/main/java/org/apache/aries/rsa/annotations/RSADistributionProvider.java copy provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/myservice/DTOType.java => spi/src/main/java/org/apache/aries/rsa/annotations/package-info.java (86%) copy provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/myservice/DTOType.java => spi/src/main/java/org/apache/aries/rsa/spi/package-info.java (86%) delete mode 100644 spi/src/main/java/org/apache/aries/rsa/spi/packageinfo copy provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/myservice/DTOType.java => spi/src/main/java/org/apache/aries/rsa/util/package-info.java (86%) delete mode 100644 spi/src/main/java/org/apache
[aries-rsa] branch ARIES-1942 updated (e1bc7d4 -> fd72e6a)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch ARIES-1942 in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. from e1bc7d4 ARIES-1942 - Use custom annotations for discovery and distribution add 54c6972 Simplify MultiMap add 10348ce Made MultiMap key a generic type add 17a3898 Remove redundant semicolon add 85f26da Fix TopologyManagerImport concurrency add 8035bca Standardize license headers add fd72e6a Merge branch 'master' into ARIES-1942 No new revisions were added by this update. Summary of changes: .../aries/rsa/discovery/config/Activator.java | 1 - .../rsa/discovery/config/ConfigDiscovery.java | 1 - .../rsa/discovery/config/PropertyValidator.java| 1 - .../discovery/config/PropertyValidatorTest.java| 3 +- .../endpoint/EndpointDescriptionParserImpl.java| 2 +- .../rsa/discovery/endpoint/PropertiesMapper.java | 2 +- .../local/EndpointDescriptionBundleParser.java | 2 +- .../aries/rsa/discovery/local/LocalDiscovery.java | 2 +- .../endpoint/EndpointDescriptionParserTest.java| 2 +- .../discovery/endpoint/PropertiesMapperTest.java | 2 +- .../local/EndpointDescriptionBundleParserTest.java | 2 +- .../rsa/discovery/local/LocalDiscoveryTest.java| 2 +- .../aries/rsa/discovery/zookeeper/Interest.java| 4 +- .../rsa/discovery/zookeeper/InterestManager.java | 2 +- .../zookeeper/PublishingEndpointListener.java | 2 +- .../discovery/zookeeper/client/ClientManager.java | 2 +- .../client/ZookeeperEndpointListener.java | 2 +- .../client/ZookeeperEndpointRepository.java| 2 +- .../rsa/discovery/zookeeper/package-info.java | 2 +- .../zookeeper/server/MyQuorumPeerMain.java | 4 +- .../zookeeper/server/MyZooKeeperServerMain.java| 4 +- .../zookeeper/server/ZookeeperServer.java | 4 +- .../zookeeper/server/ZookeeperStarter.java | 2 +- .../discovery/zookeeper/InterestManagerTest.java | 2 +- .../zookeeper/PublishingEndpointListenerTest.java | 2 +- .../zookeeper/ZookeeperDiscoveryTest.java | 2 +- .../zookeeper/client/ClientManagerTest.java| 2 +- .../ZookeeperEndpointRepositoryPathTest.java | 2 +- .../zookeeper/server/ZookeeperStarterTest.java | 2 +- .../java/org/apache/aries/rsa/eapub/Activator.java | 2 +- .../apache/aries/rsa/eapub/EventAdminHelper.java | 2 +- .../aries/rsa/eapub/EventAdminHelperTest.java | 2 +- .../rsa/examples/fastbin/api/EchoService.java | 2 +- .../examples/fastbin/consumer/EchoConsumer.java| 2 +- .../examples/fastbin/service/EchoServiceImpl.java | 2 +- .../rsa/examples/echotcp/api/EchoService.java | 2 +- .../examples/echotcp/consumer/EchoConsumer.java| 2 +- .../examples/echotcp/service/EchoServiceImpl.java | 2 +- .../apache/aries/rsa/itests/felix/RsaTestBase.java | 3 +- .../rsa/itests/felix/ServerConfiguration.java | 3 +- .../rsa/itests/felix/TwoContainerPaxExam.java | 3 +- .../config/TestConfigDiscoveryRoundTrip.java | 5 +- .../itests/felix/fastbin/TestFastbinRoundTrip.java | 4 +- .../rsa/itests/felix/rsa/TestRSAListener.java | 5 +- .../rsa/itests/felix/tcp/TestDiscoveryExport.java | 2 +- .../rsa/itests/felix/tcp/TestDiscoveryImport.java | 4 +- .../aries/rsa/itests/felix/tcp/TestFindHook.java | 5 +- .../aries/rsa/itests/felix/tcp/TestRoundTrip.java | 5 +- .../aries/rsa/provider/fastbin/Activator.java | 2 +- .../aries/rsa/provider/fastbin/BaseActivator.java | 2 +- .../rsa/provider/fastbin/FastBinProvider.java | 2 +- .../rsa/provider/fastbin/api/AsyncCallback.java| 2 +- .../provider/fastbin/api/AsyncCallbackFuture.java | 2 +- .../aries/rsa/provider/fastbin/api/Dispatched.java | 2 +- .../fastbin/api/ObjectSerializationStrategy.java | 2 +- .../fastbin/api/ProtobufSerializationStrategy.java | 2 +- .../rsa/provider/fastbin/api/Serialization.java| 2 +- .../fastbin/api/SerializationStrategy.java | 2 +- .../rsa/provider/fastbin/io/ClientInvoker.java | 2 +- .../rsa/provider/fastbin/io/ProtocolCodec.java | 2 +- .../rsa/provider/fastbin/io/ServerInvoker.java | 2 +- .../aries/rsa/provider/fastbin/io/Service.java | 2 +- .../aries/rsa/provider/fastbin/io/Transport.java | 2 +- .../fastbin/io/TransportAcceptListener.java| 3 +- .../rsa/provider/fastbin/io/TransportListener.java | 2 +- .../rsa/provider/fastbin/io/TransportServer.java | 2 +- .../aries/rsa/provider/fastbin/streams/Chunk.java | 2 +- .../provider/fastbin/streams/InputStreamProxy.java | 2 +- .../fastbin/streams/OutputStreamProxy.java | 2 +- .../provider/fastbin/streams/StreamProvider.java | 2 +- .../fastbin/streams/StreamProviderImpl.java| 2 +- .../fastbin/tcp/AbstractInvocationStrategy.java| 2 +- .../fastbin/tcp/AsyncFutureInvocationStrategy.java
[aries-rsa] branch ARIES-1942 updated (33b001d -> e1bc7d4)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a change to branch ARIES-1942
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git.
from 33b001d ARIES-1942 - Use annotation based bundle configs
add e1bc7d4 ARIES-1942 - Use custom annotations for discovery and
distribution
No new revisions were added by this update.
Summary of changes:
discovery/local/bnd.bnd| 5 -
.../aries/rsa/discovery/local/package-info.java| 24 ++
.../rsa/discovery/zookeeper/package-info.java | 6 +-
.../apache/aries/rsa/provider/tcp/TCPProvider.java | 7 ++-
.../rsa/annotations/RSADiscoveryProvider.java | 12 +++
.../rsa/annotations/RSADistributionProvider.java | 12 +++
.../aries/rsa/annotations}/package-info.java | 3 ++-
.../org/apache/aries/rsa/spi/package-info.java | 19 +
.../org/apache/aries/rsa/util/package-info.java| 19 +
9 files changed, 91 insertions(+), 16 deletions(-)
create mode 100644
spi/src/main/java/org/apache/aries/rsa/annotations/RSADiscoveryProvider.java
create mode 100644
spi/src/main/java/org/apache/aries/rsa/annotations/RSADistributionProvider.java
copy
{discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client
=> spi/src/main/java/org/apache/aries/rsa/annotations}/package-info.java (93%)
[aries-rsa] branch ARIES-1942 created (now 33b001d)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch ARIES-1942 in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. at 33b001d ARIES-1942 - Use annotation based bundle configs No new revisions were added by this update.
[aries-rsa] branch master updated: ARIES-1780 - Improved design
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new db530ba ARIES-1780 - Improved design
db530ba is described below
commit db530ba5e43aabfd6e60328f9a05043fccbf32e8
Author: Christian Schneider
AuthorDate: Sun Nov 10 16:32:21 2019 +0100
ARIES-1780 - Improved design
---
discovery/zookeeper/bnd.bnd| 2 +-
.../aries/rsa/discovery/zookeeper/Interest.java| 134 +++
.../rsa/discovery/zookeeper/InterestManager.java | 181 +
.../zookeeper/PublishingEndpointListener.java | 8 +-
.../zookeeper/{ => client}/ClientManager.java | 6 +-
.../{ => client}/ZookeeperEndpointListener.java| 68 +---
.../ZookeeperEndpointRepository.java} | 22 ++-
.../zookeeper/server/MyZooKeeperServerMain.java| 2 +-
.../discovery/zookeeper/InterestManagerTest.java | 65 +---
.../zookeeper/PublishingEndpointListenerTest.java | 3 +-
.../zookeeper/ZookeeperDiscoveryTest.java | 29 +++-
.../zookeeper/{ => client}/ClientManagerTest.java | 5 +-
.../ZookeeperEndpointRepositoryPathTest.java} | 11 +-
.../rsa/itests/felix/tcp/TestDiscoveryExport.java | 6 +-
.../rsa/itests/felix/tcp/TestDiscoveryImport.java | 4 +-
.../aries/rsa/itests/felix/tcp/TestFindHook.java | 10 +-
.../rsa/topologymanager/importer/MultiMap.java | 2 +-
17 files changed, 335 insertions(+), 223 deletions(-)
diff --git a/discovery/zookeeper/bnd.bnd b/discovery/zookeeper/bnd.bnd
index 4f06393..b7d484e 100644
--- a/discovery/zookeeper/bnd.bnd
+++ b/discovery/zookeeper/bnd.bnd
@@ -16,4 +16,4 @@
#under the License.
Provide-Capability: osgi.remoteserviceadmin.discovery;\
protocols:List="zookeeper"; version:Version=1.1.0
-Export-Package: org.apache.aries.rsa.discovery.zookeeper
\ No newline at end of file
+Export-Package: org.apache.aries.rsa.discovery.zookeeper.client
\ No newline at end of file
diff --git
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Interest.java
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Interest.java
new file mode 100644
index 000..a74324b
--- /dev/null
+++
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Interest.java
@@ -0,0 +1,134 @@
+/**
+ * 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.rsa.discovery.zookeeper;
+
+import static
org.osgi.service.remoteserviceadmin.EndpointEventListener.ENDPOINT_LISTENER_SCOPE;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.aries.rsa.util.StringPlus;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.remoteserviceadmin.EndpointDescription;
+import org.osgi.service.remoteserviceadmin.EndpointEvent;
+import org.osgi.service.remoteserviceadmin.EndpointEventListener;
+import org.osgi.service.remoteserviceadmin.EndpointListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings("deprecation")
+public class Interest {
+private static final Logger LOG = LoggerFactory.getLogger(Interest.class);
+
+private final ServiceReference sref;
+private final List scopes;
+private final Object epListener;
+
+public Interest(ServiceReference sref) {
+this(sref, null);
+}
+
+public Interest(ServiceReference sref, Object epListener) {
+this.sref = sref;
+this.scopes =
StringPlus.normalize(sref.getProperty(ENDPOINT_LISTENER_SCOPE));
+this.epListener = epListener;
+}
+
+public List getScopes() {
+return scopes;
+}
+
+public Object getEpListener() {
+return epListener;
+}
+
+public void notifyListener(EndpointEvent event) {
+EndpointDescription endpoint = event.getEndpoint();
+Optional currentScope = getFirstMatch(endpoint);
+if (currentScope.isPresent()) {
+LOG.debug("Matched {} against {}", endpoint,
[aries-rsa] branch master updated: Two inconsistency introduced with ARIES-1941: (#34)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new c73cd37 Two inconsistency introduced with ARIES-1941: (#34)
c73cd37 is described below
commit c73cd3764676e4234ef0d00339cea45afe0df754
Author: Arnoud Glimmerveen
AuthorDate: Sun Nov 10 12:50:41 2019 +0100
Two inconsistency introduced with ARIES-1941: (#34)
1) The copy of the keySet was incorrectly removed by 927d0b3, and is needed
regardless of the external methods being thread-safe.
2) Clear method of MultiMap must use the same mutex as the other public
methods.
---
.../org/apache/aries/rsa/topologymanager/importer/MultiMap.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/MultiMap.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/MultiMap.java
index b0f8dbe..37cbcf7 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/MultiMap.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/MultiMap.java
@@ -65,12 +65,14 @@ public class MultiMap {
}
public synchronized void remove(T toRemove) {
-for (String key : map.keySet()) {
+// Use copy of keySet, as subsequent remove may modify the keySet
itself
+Set keys = new HashSet<>(map.keySet());
+for (String key : keys) {
remove(key, toRemove);
}
}
-public void clear() {
+public synchronized void clear() {
map.clear();
}
}
[aries-rsa] branch master updated: ARIES-1941 Addressed synchronization inconsistency in (using) MultiMap (#31)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new f14ba9d ARIES-1941 Addressed synchronization inconsistency in (using)
MultiMap (#31)
f14ba9d is described below
commit f14ba9d7a13eedbb5a9195e87a6e8f9417de3369
Author: Arnoud Glimmerveen
AuthorDate: Sat Nov 9 23:33:34 2019 +0100
ARIES-1941 Addressed synchronization inconsistency in (using) MultiMap (#31)
* ARIES-1941 Addressed synchronization inconsistency in (using) MultiMap
Changed the approach to MultiMap to have all public method thread-safe:
using synchronized keyword *and* returning read-only *copies* when a Set is to
be returned
Changed the one case where a defensive copy was made. Note that this old
approach was not thread-safe, as the copy-constructors' iterator could be
'tripped' by a concurrent modification.
* With the change to regular HashMap, a defensive copy of keySet is needed.
---
.../aries/rsa/topologymanager/importer/MultiMap.java | 19 +++
.../importer/TopologyManagerImport.java | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/MultiMap.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/MultiMap.java
index eac5f40..b0f8dbe 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/MultiMap.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/MultiMap.java
@@ -19,10 +19,10 @@
package org.apache.aries.rsa.topologymanager.importer;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
-import java.util.Map;
+import java.util.Map;;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
/**
* Minimal implementation of a synchronized map
@@ -32,7 +32,7 @@ public class MultiMap {
private Map> map;
public MultiMap() {
-map = new ConcurrentHashMap<>();
+map = new HashMap<>();
}
public synchronized void put(String key, T value) {
@@ -45,7 +45,11 @@ public class MultiMap {
}
public synchronized Set get(String key) {
-return map.getOrDefault(key, Collections.emptySet());
+if (map.containsKey(key)) {
+return Collections.unmodifiableSet(new HashSet<>(map.get(key)));
+} else {
+return Collections.emptySet();
+}
}
public synchronized void remove(String key, T value) {
@@ -57,12 +61,11 @@ public class MultiMap {
}
public synchronized Set keySet() {
-return map.keySet();
+return Collections.unmodifiableSet(new HashSet<>(map.keySet()));
}
-public void remove(T toRemove) {
-Set keys = new HashSet<>(map.keySet());
-for (String key : keys) {
+public synchronized void remove(T toRemove) {
+for (String key : map.keySet()) {
remove(key, toRemove);
}
}
diff --git
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
index cbe8d5e..43c0bd5 100644
---
a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
+++
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
@@ -176,7 +176,7 @@ public class TopologyManagerImport implements
EndpointEventListener, RemoteServi
}
private void unImportForGoneEndpoints(String filter) {
-Set importRegistrations = new
HashSet<>(importedServices.get(filter));
+Set importRegistrations =
importedServices.get(filter);
Set endpoints = importPossibilities.get(filter);
for (ImportRegistration ir : importRegistrations) {
EndpointDescription endpoint =
ir.getImportReference().getImportedEndpoint();
[aries-rsa] branch master updated (f40a512 -> 9aeafe8)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git.
from f40a512 ARIES-1940 Handle failure that can happen during service
export (#30)
add 9aeafe8 ARIES-1780 - Redesign of zookeeper discovery using DS
No new revisions were added by this update.
Summary of changes:
.gitignore | 1 +
discovery/local/bnd.bnd| 3 +-
...ser.java => EndpointDescriptionParserImpl.java} | 7 +-
.../aries/rsa/discovery/local/Activator.java | 78 ---
.../local/EndpointDescriptionBundleParser.java | 8 +-
.../aries/rsa/discovery/local/LocalDiscovery.java | 23 +-
.../endpoint/EndpointDescriptionParserTest.java| 2 +-
.../discovery/endpoint/PropertiesMapperTest.java | 2 +-
.../rsa/discovery/local/LocalDiscoveryTest.java| 20 +-
discovery/zookeeper/bnd.bnd| 1 +
.../rsa/discovery/zookeeper/ClientManager.java | 17 +-
.../zookeeper/{subscribe => }/InterestManager.java | 91 ++--
.../{publish => }/PublishingEndpointListener.java | 82 +++
.../discovery/zookeeper/ZooKeeperDiscovery.java| 70 --
.../zookeeper/ZookeeperEndpointListener.java | 120 ++
.../zookeeper/ZookeeperEndpointPublisher.java | 187 +++
.../rsa/discovery/zookeeper/package-info.java} | 15 +-
.../repository/ZookeeperEndpointRepository.java| 260 -
.../subscribe/EndpointListenerTracker.java | 72 --
...orManagerTest.java => InterestManagerTest.java} | 44 ++--
.../zookeeper/PublishingEndpointListenerTest.java | 64 +
...sitoryTest.java => ZookeeperDiscoveryTest.java} | 112 -
.../ZookeeperEndpointPublisherPathTest.java| 21 +-
.../publish/PublishingEndpointListenerTest.java| 86 ---
.../zookeeper}/src/test/resources/logback.xml | 4 +-
.../rsa/itests/felix/tcp/TestDiscoveryExport.java | 55 ++---
.../rsa/itests/felix/tcp/TestDiscoveryImport.java | 41 ++--
.../aries/rsa/itests/felix/tcp/TestFindHook.java | 49 +---
.../aries/rsa/itests/felix/tcp/TestRoundTrip.java | 2 +-
itests/felix/src/test/resources/logback.xml| 4 +-
parent/pom.xml | 13 +-
...ndpoint.java => EndpointDescriptionParser.java} | 13 +-
.../main/java/org/apache/aries/rsa/spi/packageinfo | 2 +-
33 files changed, 694 insertions(+), 875 deletions(-)
rename
discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/{EndpointDescriptionParser.java
=> EndpointDescriptionParserImpl.java} (94%)
delete mode 100644
discovery/local/src/main/java/org/apache/aries/rsa/discovery/local/Activator.java
rename
discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/{subscribe
=> }/InterestManager.java (63%)
rename
discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/{publish
=> }/PublishingEndpointListener.java (53%)
delete mode 100644
discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/ZooKeeperDiscovery.java
create mode 100644
discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperEndpointListener.java
create mode 100644
discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperEndpointPublisher.java
rename
discovery/{local/src/test/java/org/apache/aries/rsa/discovery/local/ActivatorTest.java
=>
zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/package-info.java}
(76%)
delete mode 100644
discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java
delete mode 100644
discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/subscribe/EndpointListenerTracker.java
rename
discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/{subscribe/InterfaceMonitorManagerTest.java
=> InterestManagerTest.java} (59%)
create mode 100644
discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/PublishingEndpointListenerTest.java
rename
discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/{repository/ZookeeperEndpointRepositoryTest.java
=> ZookeeperDiscoveryTest.java} (66%)
copy
provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/TransportAcceptListener.java
=>
discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperEndpointPublisherPathTest.java
(61%)
delete mode 100644
discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/publish/PublishingEndpointListenerTest.java
copy {itests/felix => discovery/zookeeper}/src/test/resources/logback.xml (88%)
copy spi/src/main/java/org/apache/aries/rsa/spi/{Endpoint.java =>
EndpointDescriptionParser.java} (73%)
[aries-rsa] branch ARIES-1780 created (now 0cc0dd4)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch ARIES-1780 in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. at 0cc0dd4 ARIES-1780 - Redesign of zookeeper discovery using DS No new revisions were added by this update.
[aries-rsa] branch master updated: ARIES-1940 Handle failure that can happen during service export (#30)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new f40a512 ARIES-1940 Handle failure that can happen during service
export (#30)
f40a512 is described below
commit f40a512a43d2ebf5a7896dbe4559b3ac03c0394f
Author: Arnoud Glimmerveen
AuthorDate: Fri Nov 8 17:00:06 2019 +0100
ARIES-1940 Handle failure that can happen during service export (#30)
Changed implementation and use of ExportRegistration to align with
specification
Changed use of ExportRegistration to deal with cases the ExportRegistration
relates to a failed exported services
---
.../org/apache/aries/rsa/core/ExportRegistrationImpl.java | 13 -
.../org/apache/aries/rsa/core/RemoteServiceAdminCore.java | 12
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git
a/rsa/src/main/java/org/apache/aries/rsa/core/ExportRegistrationImpl.java
b/rsa/src/main/java/org/apache/aries/rsa/core/ExportRegistrationImpl.java
index a02ff3a..715efd2 100644
--- a/rsa/src/main/java/org/apache/aries/rsa/core/ExportRegistrationImpl.java
+++ b/rsa/src/main/java/org/apache/aries/rsa/core/ExportRegistrationImpl.java
@@ -99,12 +99,15 @@ public class ExportRegistrationImpl implements
ExportRegistration {
}
public ExportReference getExportReference() {
-/* TODO check if we need to throw exception here
-if (exportReference == null) {
-throw new IllegalStateException(getException());
+if (closed) {
+return null;
+} else {
+if (exportReference == null) {
+throw new IllegalStateException(getException());
+} else {
+return exportReference;
+}
}
-*/
-return closed ? null : exportReference;
}
public Throwable getException() {
diff --git
a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
index d48283c..207c98a 100644
--- a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
+++ b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
@@ -379,7 +379,7 @@ public class RemoteServiceAdminCore implements
RemoteServiceAdmin {
List ers = new ArrayList<>();
for (Collection exportRegistrations :
exportedServices.values()) {
for (ExportRegistration er : exportRegistrations) {
-if (er.getExportReference() != null) {
+if (er.getException() == null && er.getExportReference()
!= null) {
ers.add(new
ExportReferenceImpl(er.getExportReference()));
}
}
@@ -502,7 +502,9 @@ public class RemoteServiceAdminCore implements
RemoteServiceAdmin {
synchronized (exportedServices) {
for (Collection value :
exportedServices.values()) {
for (ExportRegistration er : value) {
-if
(er.getExportReference().getExportedService().equals(sref)) {
+if (er.getException() != null &&
+er.getExportReference() != null &&
+
er.getExportReference().getExportedService().equals(sref)) {
regs.add(er);
}
}
@@ -530,7 +532,9 @@ public class RemoteServiceAdminCore implements
RemoteServiceAdmin {
for (Iterator it2 = value.iterator();
it2.hasNext();) {
ExportRegistration er = it2.next();
if (er.equals(eri)) {
-eventProducer.notifyRemoval(eri.getExportReference());
+if (eri.getException() == null &&
eri.getExportReference() != null) {
+
eventProducer.notifyRemoval(eri.getExportReference());
+}
it2.remove();
if (value.isEmpty()) {
it.remove();
@@ -569,7 +573,7 @@ public class RemoteServiceAdminCore implements
RemoteServiceAdmin {
for (Collection regs :
exportedServices.values()) {
if (!regs.isEmpty()) {
ExportRegistration exportRegistration =
regs.iterator().next();
-if (exportRegistration.getException() == null) {
+if (exportRegistration.getException() == null &&
exportRegistration.getExportReference() != null) {
Bundle regBundle =
exportRegistration.getExportReference().getExportedService().getBundle();
if (exportingBundle.equals(regBundle)) {
bundleRegs.addAll(regs);
[aries-rsa] branch master updated: ARIES-1937 - Require Java 8
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new 3b49157 ARIES-1937 - Require Java 8
3b49157 is described below
commit 3b4915788406bbd0785efbd955fcd9c8f91e2034
Author: Christian Schneider
AuthorDate: Tue Oct 29 08:23:13 2019 +0100
ARIES-1937 - Require Java 8
---
parent/pom.xml | 6 +++---
.../rsa/topologymanager/importer/TopologyManagerImportTest.java | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index b7c12d6..ab071f9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -240,10 +240,10 @@
org.apache.maven.plugins
maven-compiler-plugin
-3.8.0
+3.8.1
-1.7
-1.7
+1.8
+1.8
diff --git
a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java
b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java
index e93be3b..4f01fc1 100644
---
a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java
+++
b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java
@@ -35,6 +35,7 @@ import org.osgi.service.remoteserviceadmin.EndpointEvent;
import org.osgi.service.remoteserviceadmin.ImportReference;
import org.osgi.service.remoteserviceadmin.ImportRegistration;
import org.osgi.service.remoteserviceadmin.RemoteServiceAdmin;
+import org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener;
public class TopologyManagerImportTest {
@@ -83,8 +84,8 @@ public class TopologyManagerImportTest {
private BundleContext getBundleContext(IMocksControl c) {
ServiceRegistration sreg = c.createMock(ServiceRegistration.class);
BundleContext bc = c.createMock(BundleContext.class);
-EasyMock.expect(bc.registerService(EasyMock.anyObject(Class.class),
- EasyMock.anyObject(),
+
EasyMock.expect(bc.registerService(EasyMock.eq(RemoteServiceAdminListener.class),
+
EasyMock.anyObject(RemoteServiceAdminListener.class),
(Dictionary)EasyMock.anyObject())).andReturn(sreg).anyTimes();
return bc;
}
[aries-rsa] branch master updated: ARIES-1780 - Start zookeeper synchronously as it should not block anyway
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new 0459da9 ARIES-1780 - Start zookeeper synchronously as it should not
block anyway
0459da9 is described below
commit 0459da97d86601a9643b96082247bcd8d574e688
Author: Christian Schneider
AuthorDate: Mon Oct 28 17:36:38 2019 +0100
ARIES-1780 - Start zookeeper synchronously as it should not block anyway
---
.../rsa/discovery/zookeeper/ClientManager.java | 29 +-
1 file changed, 1 insertion(+), 28 deletions(-)
diff --git
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/ClientManager.java
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/ClientManager.java
index 691cc50..9ba3fd2 100644
---
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/ClientManager.java
+++
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/ClientManager.java
@@ -19,7 +19,6 @@
package org.apache.aries.rsa.discovery.zookeeper;
import java.io.IOException;
-import java.net.Socket;
import java.util.Hashtable;
import java.util.concurrent.CompletableFuture;
@@ -46,7 +45,6 @@ import org.slf4j.LoggerFactory;
)
public class ClientManager implements Watcher {
-private static final int MAX_PORT_WAIT_MS = 2000;
private static final Logger LOG =
LoggerFactory.getLogger(ClientManager.class);
private ZooKeeper zkClient;
@@ -59,11 +57,7 @@ public class ClientManager implements Watcher {
this.config = config;
this.context = context;
LOG.debug("Received configuration update for Zookeeper Discovery: {}",
config);
-CompletableFuture.runAsync(new Runnable() {
-public void run() {
-startClient();
-}
-});
+startClient();
}
private void startClient() {
@@ -76,7 +70,6 @@ public class ClientManager implements Watcher {
protected ZooKeeper createClient(DiscoveryConfig config) throws
IOException {
LOG.info("ZooKeeper discovery connecting to {}:{} with timeout {}",
config.zookeeper_host(), config.zookeeper_port(), config.zookeeper_timeout());
-waitPort(config);
return new ZooKeeper(config.zookeeper_host() + ":" +
config.zookeeper_port(), config.zookeeper_timeout(), this);
}
@@ -119,26 +112,6 @@ public class ClientManager implements Watcher {
}
}
-private void waitPort(DiscoveryConfig config) {
-String host = config.zookeeper_host();
-Integer port = Integer.parseInt(config.zookeeper_port());
-long start = System.currentTimeMillis();
-while (System.currentTimeMillis() - start < MAX_PORT_WAIT_MS) {
-try (Socket socket = new Socket(host, port)) {
-return;
-} catch (IOException e) {
-safeSleep();
-}
-}
-}
-
-private void safeSleep() {
-try {
-Thread.sleep(100);
-} catch (InterruptedException e1) {
-}
-}
-
@ObjectClassDefinition(name = "Zookeeper discovery config")
public @interface DiscoveryConfig {
String zookeeper_host() default "localhost";
[aries-rsa] 02/02: ARIES-1780 - Use DS instead of Activator
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit afc1141c1ad52218e05fec654a6f9b1a6533bb0e
Author: Christian Schneider
AuthorDate: Mon Oct 28 16:32:28 2019 +0100
ARIES-1780 - Use DS instead of Activator
---
discovery/zookeeper/bnd.bnd| 1 -
discovery/zookeeper/pom.xml| 6 +-
.../aries/rsa/discovery/zookeeper/Activator.java | 54 --
.../rsa/discovery/zookeeper/ClientManager.java | 148
.../discovery/zookeeper/ZooKeeperDiscovery.java| 186 +++--
.../repository/ZookeeperEndpointRepository.java| 24 +--
.../zookeeper/server/ZookeeperStarter.java | 3 -
.../rsa/discovery/zookeeper/ClientManagerTest.java | 100 +++
.../zookeeper/ZookeeperDiscoveryTest.java | 76 -
.../ZookeeperEndpointRepositoryTest.java | 4 +-
10 files changed, 285 insertions(+), 317 deletions(-)
diff --git a/discovery/zookeeper/bnd.bnd b/discovery/zookeeper/bnd.bnd
index 13b126e..4a8cc29 100644
--- a/discovery/zookeeper/bnd.bnd
+++ b/discovery/zookeeper/bnd.bnd
@@ -14,6 +14,5 @@
#KIND, either express or implied. See the License for the
#specific language governing permissions and limitations
#under the License.
-Bundle-Activator: org.apache.aries.rsa.discovery.zookeeper.Activator
Provide-Capability: osgi.remoteserviceadmin.discovery;\
protocols:List="zookeeper"; version:Version=1.1.0
diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml
index 81fce9d..12612d8 100644
--- a/discovery/zookeeper/pom.xml
+++ b/discovery/zookeeper/pom.xml
@@ -94,7 +94,11 @@
1.3
test
-
+
+org.apache.felix
+org.apache.felix.converter
+test
+
diff --git
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java
deleted file mode 100644
index 8003849..000
---
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java
+++ /dev/null
@@ -1,54 +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.
- */
-package org.apache.aries.rsa.discovery.zookeeper;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.apache.zookeeper.server.ZooTrace;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.service.cm.ManagedService;
-
-public class Activator implements BundleActivator {
-
-private static final String PID_DISCOVERY_ZOOKEEPER =
"org.apache.aries.rsa.discovery.zookeeper";
-
-private ZooKeeperDiscovery zkd;
-
-public synchronized void start(BundleContext bc) throws Exception {
-zkd = new ZooKeeperDiscovery(bc);
-bc.registerService(ManagedService.class, zkd,
configProperties(PID_DISCOVERY_ZOOKEEPER));
-
-}
-
-public synchronized void stop(BundleContext bc) throws Exception {
- // Load ZooTrace class early to avoid ClassNotFoundException on shutdown
- ZooTrace.getTextTraceLevel();
-
-zkd.stop(true);
-}
-
-private Dictionary configProperties(String pid) {
-Dictionary props = new Hashtable<>();
-props.put(Constants.SERVICE_PID, pid);
-return props;
-}
-}
diff --git
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/ClientManager.java
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/ClientManager.java
new file mode 100644
index 000..691cc50
--- /dev/null
+++
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/ClientManager.java
@@ -0,0 +1,148 @@
+/**
+ * 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
[aries-rsa] branch master updated (40ffcb3 -> afc1141)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. from 40ffcb3 ARIES-1936 - Switch zookeeper starter to DS and mockito new f9ad1bb ARIES-1780 - Use logback in itests new afc1141 ARIES-1780 - Use DS instead of Activator The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: discovery/zookeeper/bnd.bnd| 1 - discovery/zookeeper/pom.xml| 6 +- .../aries/rsa/discovery/zookeeper/Activator.java | 54 -- .../rsa/discovery/zookeeper/ClientManager.java | 148 .../discovery/zookeeper/ZooKeeperDiscovery.java| 186 +++-- .../repository/ZookeeperEndpointRepository.java| 24 +-- .../zookeeper/server/ZookeeperStarter.java | 3 - .../rsa/discovery/zookeeper/ClientManagerTest.java | 100 +++ .../zookeeper/ZookeeperDiscoveryTest.java | 76 - .../ZookeeperEndpointRepositoryTest.java | 4 +- .../apache/aries/rsa/itests/felix/RsaTestBase.java | 8 + itests/felix/src/test/resources/exam.properties| 1 + itests/felix/src/test/resources/logback.xml| 30 13 files changed, 324 insertions(+), 317 deletions(-) delete mode 100644 discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java create mode 100644 discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/ClientManager.java create mode 100644 discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/ClientManagerTest.java delete mode 100644 discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperDiscoveryTest.java create mode 100644 itests/felix/src/test/resources/exam.properties create mode 100644 itests/felix/src/test/resources/logback.xml
[aries-rsa] 01/02: ARIES-1780 - Use logback in itests
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit f9ad1bb090b5027d99a923e5cd5d4a800757cfd9
Author: Christian Schneider
AuthorDate: Mon Oct 28 16:23:31 2019 +0100
ARIES-1780 - Use logback in itests
---
.../apache/aries/rsa/itests/felix/RsaTestBase.java | 8 ++
itests/felix/src/test/resources/exam.properties| 1 +
itests/felix/src/test/resources/logback.xml| 30 ++
3 files changed, 39 insertions(+)
diff --git
a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
index c08bfce..8e3e371 100644
---
a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
+++
b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
@@ -124,6 +124,7 @@ public class RsaTestBase {
protected static Option rsaCore() {
return composite(junit(),
localRepo(),
+ logback(),
systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
systemProperty("aries.rsa.hostname").value("localhost"),
@@ -139,6 +140,13 @@ public class RsaTestBase {
);
}
+public static Option logback() {
+return
composite(systemProperty("logback.configurationFile").value("src/test/resources/logback.xml"),
+
mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").version("1.7.6"),
+
mavenBundle().groupId("ch.qos.logback").artifactId("logback-core").version("1.0.13"),
+
mavenBundle().groupId("ch.qos.logback").artifactId("logback-classic").version("1.0.13"));
+}
+
protected static Option debug() {
return
CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005");
}
diff --git a/itests/felix/src/test/resources/exam.properties
b/itests/felix/src/test/resources/exam.properties
new file mode 100644
index 000..88239dd
--- /dev/null
+++ b/itests/felix/src/test/resources/exam.properties
@@ -0,0 +1 @@
+pax.exam.logging = none
\ No newline at end of file
diff --git a/itests/felix/src/test/resources/logback.xml
b/itests/felix/src/test/resources/logback.xml
new file mode 100644
index 000..f4696e4
--- /dev/null
+++ b/itests/felix/src/test/resources/logback.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+ %date %level %logger [%file : %line] %msg - %mdc %n
+
+
+
+
+
+
+
\ No newline at end of file
[aries-rsa] branch master updated: ARIES-1936 - Switch zookeeper starter to DS and mockito
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new 40ffcb3 ARIES-1936 - Switch zookeeper starter to DS and mockito
40ffcb3 is described below
commit 40ffcb37c5abb7090f61b90604426473d7c258a1
Author: Christian Schneider
AuthorDate: Mon Oct 28 11:34:20 2019 +0100
ARIES-1936 - Switch zookeeper starter to DS and mockito
---
discovery/zookeeper/pom.xml| 14 +
.../aries/rsa/discovery/zookeeper/Activator.java | 10 +-
.../zookeeper/server/MyQuorumPeerMain.java | 43 +++
.../zookeeper/server/MyZooKeeperServerMain.java| 51
.../rsa/discovery/zookeeper/server/Utils.java | 108
.../zookeeper/server/ZookeeperServer.java | 26 ++
.../zookeeper/server/ZookeeperStarter.java | 163 +--
.../discovery/zookeeper/DiscoveryDriverTest.java | 135 -
.../zookeeper/FindInZooKeeperCustomizerTest.java | 301 -
.../InterfaceDataMonitorListenerImplTest.java | 183 -
.../zookeeper/ZookeeperDiscoveryTest.java | 22 +-
.../ZookeeperEndpointRepositoryTest.java | 6 +-
.../zookeeper/server/ZookeeperStarterTest.java | 105 +++
13 files changed, 272 insertions(+), 895 deletions(-)
diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml
index 466c350..81fce9d 100644
--- a/discovery/zookeeper/pom.xml
+++ b/discovery/zookeeper/pom.xml
@@ -81,6 +81,20 @@
org.apache.aries.rsa.discovery.local
${project.version}
+
+
+org.mockito
+mockito-all
+1.10.19
+test
+
+
+org.hamcrest
+hamcrest-all
+1.3
+test
+
+
diff --git
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java
index 076159b..8003849 100644
---
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java
+++
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java
@@ -21,7 +21,6 @@ package org.apache.aries.rsa.discovery.zookeeper;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.aries.rsa.discovery.zookeeper.server.ZookeeperStarter;
import org.apache.zookeeper.server.ZooTrace;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -31,16 +30,13 @@ import org.osgi.service.cm.ManagedService;
public class Activator implements BundleActivator {
private static final String PID_DISCOVERY_ZOOKEEPER =
"org.apache.aries.rsa.discovery.zookeeper";
-private static final String PID_ZOOKEEPER_SERVER=
"org.apache.aries.rsa.discovery.zookeeper.server";
+
private ZooKeeperDiscovery zkd;
-private ZookeeperStarter zkStarter;
public synchronized void start(BundleContext bc) throws Exception {
zkd = new ZooKeeperDiscovery(bc);
bc.registerService(ManagedService.class, zkd,
configProperties(PID_DISCOVERY_ZOOKEEPER));
-zkStarter = new ZookeeperStarter(bc);
-bc.registerService(ManagedService.class, zkStarter,
configProperties(PID_ZOOKEEPER_SERVER));
}
public synchronized void stop(BundleContext bc) throws Exception {
@@ -48,10 +44,6 @@ public class Activator implements BundleActivator {
ZooTrace.getTextTraceLevel();
zkd.stop(true);
-
-if (zkStarter != null) {
-zkStarter.shutdown();
-}
}
private Dictionary configProperties(String pid) {
diff --git
a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyQuorumPeerMain.java
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyQuorumPeerMain.java
new file mode 100644
index 000..9f078f9
--- /dev/null
+++
b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyQuorumPeerMain.java
@@ -0,0 +1,43 @@
+/**
+ * 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
[aries] branch trunk updated: Fix documentation in transaction20 schema
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/aries.git The following commit(s) were added to refs/heads/trunk by this push: new 7b2ab44 Fix documentation in transaction20 schema new d4b06c2 Merge pull request #103 from Smasherr/trunk 7b2ab44 is described below commit 7b2ab44f7b346402d6fe4a6162449e5359faad3d Author: Smasherr AuthorDate: Tue Nov 27 11:51:37 2018 +0100 Fix documentation in transaction20 schema --- .../resources/org/apache/aries/transaction/parsing/transactionv20.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv20.xsd b/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv20.xsd index 5f0e000..cc11435 100644 --- a/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv20.xsd +++ b/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv20.xsd @@ -26,7 +26,7 @@
[aries] branch trunk updated: Upgrade to ASM 7.2 for Java 14 support
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4c21235 Upgrade to ASM 7.2 for Java 14 support
new 85da51f Merge pull request #101 from aguibert/proxy-impl-java14
4c21235 is described below
commit 4c21235280c8672613a4cef590073e855392441e
Author: Andrew Guibert
AuthorDate: Tue Oct 1 16:32:31 2019 -0500
Upgrade to ASM 7.2 for Java 14 support
---
proxy/proxy-impl/pom.xml | 4 +-
.../org/apache/aries/proxy/impl/ProxyUtils.java| 90 +++---
2 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml
index 80161d7..545d535 100644
--- a/proxy/proxy-impl/pom.xml
+++ b/proxy/proxy-impl/pom.xml
@@ -77,13 +77,13 @@
org.ow2.asm
asm
true
-7.1
+7.2
org.ow2.asm
asm-commons
true
-7.1
+7.2
org.slf4j
diff --git
a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
index e91cbf4..0babe4e 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
@@ -36,49 +36,53 @@ public class ProxyUtils
*/
public static int getWeavingJavaVersion() {
if (weavingJavaVersion == -1 ) {
- //In order to avoid an inconsistent stack error the version of the
woven byte code needs to match
- //the level of byte codes in the original class
- switch(JAVA_CLASS_VERSION) {
-case Opcodes.V13:
-LOGGER.debug("Weaving to Java 13");
-weavingJavaVersion = Opcodes.V13;
-break;
-case Opcodes.V12:
-LOGGER.debug("Weaving to Java 12");
-weavingJavaVersion = Opcodes.V12;
-break;
- case Opcodes.V11:
- LOGGER.debug("Weaving to Java 11");
- weavingJavaVersion = Opcodes.V11;
- break;
- case Opcodes.V10:
- LOGGER.debug("Weaving to Java 10");
- weavingJavaVersion = Opcodes.V10;
- break;
- case Opcodes.V9:
- LOGGER.debug("Weaving to Java 9");
- weavingJavaVersion = Opcodes.V9;
- break;
- case Opcodes.V1_8:
- LOGGER.debug("Weaving to Java 8");
- weavingJavaVersion = Opcodes.V1_8;
- break;
- case Opcodes.V1_7:
- LOGGER.debug("Weaving to Java 7");
- weavingJavaVersion = Opcodes.V1_7;
- break;
- case Opcodes.V1_6:
- LOGGER.debug("Weaving to Java 6");
- weavingJavaVersion = Opcodes.V1_6;
- break;
- case Opcodes.V1_5:
- LOGGER.debug("Weaving to Java 5");
- weavingJavaVersion = Opcodes.V1_5;
- break;
- default:
- //aries should work with Java 5 or above - also will
highlight when a higher level (and unsupported) level of Java is released
- throw new IllegalArgumentException("Invalid Java
version " + JAVA_CLASS_VERSION);
- }
+ //In order to avoid an inconsistent stack error the version of the woven
byte code needs to match
+ //the level of byte codes in the original class
+ switch(JAVA_CLASS_VERSION) {
+case Opcodes.V14:
+ LOGGER.debug("Weaving to Java 14");
+ weavingJavaVersion = Opcodes.V14;
+ break;
+case Opcodes.V13:
+ LOGGER.debug("Weaving to Java 13");
+ weavingJavaVersion = Opcodes.V13;
+ break;
+case Opcodes.V12:
+ LOGGER.debug("Weaving to Java 12");
+ weavingJavaVersion = Opcodes.V12;
+ break;
+case Opcodes.V11:
+ LOGGER.debug("Weaving to Java 11");
+ weavingJavaVersion = Opcodes.V11;
+ break;
+case Opcodes.V10:
+ LOGGER.debug("Weaving to Java 10");
+ weavingJavaVersi
[aries-site] branch master created (now e050694)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/aries-site.git. at e050694 Create Readme.md This branch includes the following new commits: new e050694 Create Readme.md The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[aries-site] 01/01: Create Readme.md
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-site.git commit e050694087458cc59ebbb952c3e0e75631faf2d9 Author: Christian Schneider AuthorDate: Wed Jul 3 11:53:49 2019 +0200 Create Readme.md --- Readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Readme.md b/Readme.md new file mode 100644 index 000..3b2b59f --- /dev/null +++ b/Readme.md @@ -0,0 +1 @@ +# Aries website
[aries-jpa] branch master updated: Update README.md
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-jpa.git The following commit(s) were added to refs/heads/master by this push: new 119c7eb Update README.md 119c7eb is described below commit 119c7eb0aa83b6d83955d2c0aa0fa837d04566e2 Author: Christian Schneider AuthorDate: Wed May 29 14:15:03 2019 +0200 Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a6e3d57..78326a3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Aries JPA -[](https://builds.apache.org/job/Aries-JPA-Trunk-JDK8-Deploy/) +[](https://builds.apache.org/job/Aries-JPA-Trunk-JDK8/) Implements the [JPA Service Specification from the OSGi compendium spec](https://osgi.org/specification/osgi.cmpn/7.0.0/service.jpa.html). Additionally some convenience services are provided to make it easier to use JPA in blueprint and DS.
[aries] branch trunk updated: Only display github url. Add cdi and component-dsl
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/aries.git The following commit(s) were added to refs/heads/trunk by this push: new b319b3c Only display github url. Add cdi and component-dsl b319b3c is described below commit b319b3c19516a5d3076dcb78c000b7da296b3e28 Author: Christian Schneider AuthorDate: Wed May 29 07:34:46 2019 +0200 Only display github url. Add cdi and component-dsl --- README.md | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9f67c93..d12ed3f 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,15 @@ The sources are now directly availble in [aries github](https://github.com/apach Some of the subprojects have their own git repos: -| Subproject | Apache Git | Github Mirror | -| -- | -- | - | -| Aries Containers | [apache](https://git-wip-us.apache.org/repos/asf/aries-containers.git) | [github](https://github.com/apache/aries-containers) | -| Aries JAX-RS whiteboard | [apache](https://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard.git) | [github](https://github.com/apache/aries-jax-rs-whiteboard) | -| Aries JPA | [apache](https://git-wip-us.apache.org/repos/asf/aries-jpa.git) | [github](https://github.com/apache/aries-jpa) | -| Aries RSA | [apache](https://git-wip-us.apache.org/repos/asf/aries-rsa.git) | [github](https://github.com/apache/aries-rsa) | -| Aries Transaction Control | [apache](https://gitbox.apache.org/repos/asf?p=aries-tx-control.git) | [github](https://github.com/apache/aries-tx-control) | +| Subproject | +| -- | +| [Aries CDI](https://github.com/apache/aries-cdi) | +| [Aries Component DSL](https://github.com/apache/aries-component-dsl) | +| [Aries Containers](https://github.com/apache/aries-containers) | +| [Aries JAX-RS whiteboard](https://github.com/apache/aries-jax-rs-whiteboard) | +| [Aries JPA](https://github.com/apache/aries-jpa) | +| [Aries RSA](https://github.com/apache/aries-rsa) | +| [Aries Transaction Control](https://github.com/apache/aries-tx-control) | ## Build
svn commit: r1045221 - /websites/production/aries/content/
Author: cschneider Date: Mon May 20 10:20:45 2019 New Revision: 1045221 Log: Publishing svnmucc operation to aries site by cschneider Added: websites/production/aries/content/ - copied from r1045220, websites/staging/aries/trunk/content/
[aries-rsa] branch master updated: Update Readme.md
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new 4cd3b14 Update Readme.md 4cd3b14 is described below commit 4cd3b14d0bcc1bc680f15ab3133cda76df0dbb88 Author: Christian Schneider AuthorDate: Mon May 20 10:18:33 2019 +0200 Update Readme.md Added docs for doing releases --- Readme.md | 23 +++ 1 file changed, 23 insertions(+) diff --git a/Readme.md b/Readme.md index 445a253..544c494 100644 --- a/Readme.md +++ b/Readme.md @@ -22,3 +22,26 @@ The discovery providers are responsible for finding the available endpoint descr * [zookeeper](discovery/zookeeper/Readme.md) - Manages endpoint descriptions as zookeeper nodes. * [local](discovery/local/Readme.md) - Scans bundles for endpoint descriptions * [config](discovery/config/Readme.md) - Reads endpoint descriptions from ConfigAdmin service + +## Releasing + +### Maven release + +mvn clean release:prepare -DskipTests -Darguments=-DskipTests +mvn release:perform -DskipTests -Darguments=-DskipTests + +This creates a staging repository. After all artifacts are deployed login to the [Apache maven repo](https://repository.apache.org) and close the staging repository. + +### Vote + +### Promote in Apache Repository + + + +### Copy to apache release svn + +The source zip needs to be copied to the [Apache release svn](https://dist.apache.org/repos/dist/release/aries). + +### Add checksum + +gpg --print-md SHA512 > .sha512
svn commit: r34114 - in /release/aries: org.apache.aries.rsa.main-1.14.0-source-release.zip org.apache.aries.rsa.main-1.14.0-source-release.zip.asc org.apache.aries.rsa.main-1.14.0-source-release.zip.
Author: cschneider Date: Mon May 20 08:12:31 2019 New Revision: 34114 Log: rsa 1.14.0 Added: release/aries/org.apache.aries.rsa.main-1.14.0-source-release.zip (with props) release/aries/org.apache.aries.rsa.main-1.14.0-source-release.zip.asc release/aries/org.apache.aries.rsa.main-1.14.0-source-release.zip.sha512 Added: release/aries/org.apache.aries.rsa.main-1.14.0-source-release.zip == Binary file - no diff available. Propchange: release/aries/org.apache.aries.rsa.main-1.14.0-source-release.zip -- svn:mime-type = application/octet-stream Added: release/aries/org.apache.aries.rsa.main-1.14.0-source-release.zip.asc == --- release/aries/org.apache.aries.rsa.main-1.14.0-source-release.zip.asc (added) +++ release/aries/org.apache.aries.rsa.main-1.14.0-source-release.zip.asc Mon May 20 08:12:31 2019 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEDLT+fgdDryZhCJjCRxXcAmQovboFAlzdYmEACgkQRxXcAmQo +vbpDWwf/c/aQ91ykSHGcpEYYGnvZFS+lpothx0gDHNYPhVGU+Lro0JPOscvTU1pO +lL0WDepxmc432jzzg/eDlXp5wEtzIqPgZ5Aaqa2/0bdahmiCkiTxdmxRciNdnFJV +NM1ferGkZX1OUHdJLcA33k9i18yuWgJRPURCUSw0BTlbl/xAg87sBMGQg8yUiOfs +3w+T2YHNwqbrKimrT1Lo2SMuhb8Ws7Odsrv7lYG6o+SOpUm/U5wnR7QUUmb2qy64 +/wnXs1Bft76w/54cHHR8Y7KfNsEShcFupm1M8NMKW9kfUobsRDkDQW9FEDH1ilzg +ozbyoIp48/ikOunGxdZcqqb6PgLj0w== +=vWgD +-END PGP SIGNATURE- Added: release/aries/org.apache.aries.rsa.main-1.14.0-source-release.zip.sha512 == --- release/aries/org.apache.aries.rsa.main-1.14.0-source-release.zip.sha512 (added) +++ release/aries/org.apache.aries.rsa.main-1.14.0-source-release.zip.sha512 Mon May 20 08:12:31 2019 @@ -0,0 +1,3 @@ +org.apache.aries.rsa.main-1.14.0-source-release.zip: +26B140A1 23919DA9 0E0DB15E D3DA7790 EEAAFF0A D072B3C6 83847E96 B8181F9B 39C5E7A4 + E57B8668 1E16BC1A 3FD5B31B FB82FD3E 4586FF3B C3FBB49C 921A0BFD
[aries-rsa] annotated tag org.apache.aries.rsa-1.14.0 updated (4915ae3 -> ee851d9)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to annotated tag org.apache.aries.rsa-1.14.0 in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. *** WARNING: tag org.apache.aries.rsa-1.14.0 was modified! *** from 4915ae3 (commit) to ee851d9 (tag) tagging 4915ae34f7dc32fdff6422afebc6ab6d19101e43 (commit) replaces org.apache.aries.rsa-1.13.0 by Christian Schneider on Thu May 16 15:03:29 2019 +0200 - Log - [maven-release-plugin] copy for tag org.apache.aries.rsa-1.14.0 --- No new revisions were added by this update. Summary of changes:
[aries-rsa] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new 935f977 [maven-release-plugin] prepare for next development iteration 935f977 is described below commit 935f977cf788b6a2e1a039afb753d61ad4762972 Author: Christian Schneider AuthorDate: Thu May 16 15:03:33 2019 +0200 [maven-release-plugin] prepare for next development iteration --- discovery/command/pom.xml | 2 +- discovery/config/pom.xml| 2 +- discovery/local/pom.xml | 2 +- discovery/pom.xml | 2 +- discovery/zookeeper/pom.xml | 2 +- eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml | 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml| 2 +- examples/echotcp/api/pom.xml| 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml| 2 +- examples/echotcp/service/pom.xml| 2 +- examples/pom.xml| 2 +- features/pom.xml| 2 +- itests/felix/pom.xml| 2 +- itests/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- provider/fastbin/pom.xml| 2 +- provider/pom.xml| 2 +- provider/tcp/pom.xml| 2 +- repository/pom.xml | 2 +- rsa/pom.xml | 2 +- spi/pom.xml | 2 +- topology-manager/pom.xml| 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml index 8fef317..7ca5301 100644 --- a/discovery/command/pom.xml +++ b/discovery/command/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.14.0 +1.15.0-SNAPSHOT ../../parent/pom.xml diff --git a/discovery/config/pom.xml b/discovery/config/pom.xml index 24538cf..2ee2848 100644 --- a/discovery/config/pom.xml +++ b/discovery/config/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.discovery -1.14.0 +1.15.0-SNAPSHOT org.apache.aries.rsa.discovery diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index 06b0248..aff4451 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.14.0 +1.15.0-SNAPSHOT ../../parent/pom.xml diff --git a/discovery/pom.xml b/discovery/pom.xml index c170b3a..6706855 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent - 1.14.0 + 1.15.0-SNAPSHOT ../parent/pom.xml diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index 9eb30ee..466c350 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.14.0 +1.15.0-SNAPSHOT ../../parent/pom.xml diff --git a/eapub/pom.xml b/eapub/pom.xml index 640b640..ae3594f 100644 --- a/eapub/pom.xml +++ b/eapub/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.14.0 +1.15.0-SNAPSHOT ../parent/pom.xml org.apache.aries.rsa.eapub diff --git a/examples/echofastbin/fbapi/pom.xml b/examples/echofastbin/fbapi/pom.xml index 96c5d9c..2b5bc13 100644 --- a/examples/echofastbin/fbapi/pom.xml +++ b/examples/echofastbin/fbapi/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.14.0 +1.15.0-SNAPSHOT ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbconsumer/pom.xml b/examples/echofastbin/fbconsumer/pom.xml index 00e4289..4155d3a 100644 --- a/examples/echofastbin/fbconsumer/pom.xml +++ b/examples/echofastbin/fbconsumer/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.14.0 +1.15.0-SNAPSHOT ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbservice/pom.xml b/examples/echofastbin/fbservice/pom.xml index 4e7f8cb..60ff116 100644 --- a/examples/echofastbin/fbservice/pom.xml +++ b/examples/echofastbin/fbservice/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples
[aries-rsa] branch master updated: [maven-release-plugin] prepare release org.apache.aries.rsa-1.14.0
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new 4915ae3 [maven-release-plugin] prepare release org.apache.aries.rsa-1.14.0 4915ae3 is described below commit 4915ae34f7dc32fdff6422afebc6ab6d19101e43 Author: Christian Schneider AuthorDate: Thu May 16 15:03:16 2019 +0200 [maven-release-plugin] prepare release org.apache.aries.rsa-1.14.0 --- discovery/command/pom.xml | 2 +- discovery/config/pom.xml| 2 +- discovery/local/pom.xml | 2 +- discovery/pom.xml | 2 +- discovery/zookeeper/pom.xml | 2 +- eapub/pom.xml | 2 +- examples/echofastbin/fbapi/pom.xml | 2 +- examples/echofastbin/fbconsumer/pom.xml | 2 +- examples/echofastbin/fbservice/pom.xml | 2 +- examples/echofastbin/pom.xml| 2 +- examples/echotcp/api/pom.xml| 2 +- examples/echotcp/consumer/pom.xml | 2 +- examples/echotcp/pom.xml| 2 +- examples/echotcp/service/pom.xml| 2 +- examples/pom.xml| 2 +- features/pom.xml| 2 +- itests/felix/pom.xml| 2 +- itests/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- provider/fastbin/pom.xml| 2 +- provider/pom.xml| 2 +- provider/tcp/pom.xml| 2 +- repository/pom.xml | 2 +- rsa/pom.xml | 2 +- spi/pom.xml | 2 +- topology-manager/pom.xml| 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml index 0dfcf30..8fef317 100644 --- a/discovery/command/pom.xml +++ b/discovery/command/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.14.0-SNAPSHOT +1.14.0 ../../parent/pom.xml diff --git a/discovery/config/pom.xml b/discovery/config/pom.xml index f7d69a0..24538cf 100644 --- a/discovery/config/pom.xml +++ b/discovery/config/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.discovery -1.14.0-SNAPSHOT +1.14.0 org.apache.aries.rsa.discovery diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index a9754a9..06b0248 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.14.0-SNAPSHOT +1.14.0 ../../parent/pom.xml diff --git a/discovery/pom.xml b/discovery/pom.xml index ca68041..c170b3a 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent - 1.14.0-SNAPSHOT + 1.14.0 ../parent/pom.xml diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index 4f65f21..9eb30ee 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.14.0-SNAPSHOT +1.14.0 ../../parent/pom.xml diff --git a/eapub/pom.xml b/eapub/pom.xml index 7120b34..640b640 100644 --- a/eapub/pom.xml +++ b/eapub/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa org.apache.aries.rsa.parent -1.14.0-SNAPSHOT +1.14.0 ../parent/pom.xml org.apache.aries.rsa.eapub diff --git a/examples/echofastbin/fbapi/pom.xml b/examples/echofastbin/fbapi/pom.xml index 60cad46..96c5d9c 100644 --- a/examples/echofastbin/fbapi/pom.xml +++ b/examples/echofastbin/fbapi/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.14.0-SNAPSHOT +1.14.0 ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbconsumer/pom.xml b/examples/echofastbin/fbconsumer/pom.xml index db5325c..00e4289 100644 --- a/examples/echofastbin/fbconsumer/pom.xml +++ b/examples/echofastbin/fbconsumer/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples org.apache.aries.rsa.examples.echofastbin -1.14.0-SNAPSHOT +1.14.0 ../pom.xml org.apache.aries.rsa.examples.echofastbin diff --git a/examples/echofastbin/fbservice/pom.xml b/examples/echofastbin/fbservice/pom.xml index b40a2a5..4e7f8cb 100644 --- a/examples/echofastbin/fbservice/pom.xml +++ b/examples/echofastbin/fbservice/pom.xml @@ -22,7 +22,7 @@ org.apache.aries.rsa.examples
[aries-rsa] branch master updated: Add explicit IllegalStateException in exportService when service object is null
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new b2325ce Add explicit IllegalStateException in exportService when
service object is null
new 3d1b29f Merge pull request #28 from amichair/illegalstate
b2325ce is described below
commit b2325ce116ab53eead73bb80873b371088615da5
Author: Amichai Rothman
AuthorDate: Tue May 14 12:06:39 2019 +0300
Add explicit IllegalStateException in exportService when service object is
null
---
.../main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java| 3 +++
1 file changed, 3 insertions(+)
diff --git
a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
index 40c3f93..d48283c 100644
--- a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
+++ b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
@@ -225,6 +225,9 @@ public class RemoteServiceAdminCore implements
RemoteServiceAdmin {
}
final BundleContext serviceContext =
serviceBundle.getBundleContext();
final Object serviceO =
serviceContext.getService(serviceReference);
+if (serviceO == null) {
+throw new IllegalStateException("service object is null
(service was unregistered?)");
+}
final Class[] interfaces = getInterfaces(serviceO,
interfaceNames);
final Map eprops =
createEndpointProps(serviceProperties, interfaces);
[aries-rsa] branch master updated (24c75ce -> 2b6c148)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. from 24c75ce Merge pull request #26 from amichair/itest-ports new 8c7b2e9 Upgrade ZooKeeper to 3.4.14 new 4de068d Upgrade Pax Exam to 4.13.0 new 2b6c148 Merge pull request #27 from amichair/dependency-upgrades The 909 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[aries-rsa] branch master updated: Organize itests server port config
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new 6c1f83a Organize itests server port config
new 24c75ce Merge pull request #26 from amichair/itest-ports
6c1f83a is described below
commit 6c1f83ae05bc0c3ad657373fc07c107de32edc87
Author: Amichai Rothman
AuthorDate: Tue May 14 12:10:59 2019 +0300
Organize itests server port config
---
.../java/org/apache/aries/rsa/itests/felix/RsaTestBase.java | 8 ++--
.../rsa/itests/felix/fastbin/TestFastbinRoundTrip.java | 13 +++--
.../apache/aries/rsa/itests/felix/rsa/TestRSAListener.java | 2 +-
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git
a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
index 346960d..c08bfce 100644
---
a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
+++
b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
@@ -70,7 +70,7 @@ public class RsaTestBase {
}
}
-protected int getFreePort() throws IOException {
+protected static int getFreePort() throws IOException {
try (ServerSocket socket = new ServerSocket()) {
socket.setReuseAddress(true); // enables quickly reopening socket
on same port
socket.bind(new InetSocketAddress(0)); // zero finds a free port
@@ -178,10 +178,14 @@ public class RsaTestBase {
.asOption();
}
-protected static Option configFastBinPort(String port) {
+protected static Option configFastBinPort(int port) {
return newConfiguration("org.apache.aries.rsa.provider.fastbin") //
.put("uri", "tcp://0.0.0.0:" + port) //
.asOption();
}
+protected static Option configFastBinFreePort() throws IOException {
+return configFastBinPort(getFreePort());
+}
+
}
diff --git
a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
index 36d86ca..14d4ffd 100644
---
a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
+++
b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
@@ -37,17 +37,10 @@ import org.ops4j.pax.exam.Option;
@RunWith(TwoContainerPaxExam.class)
public class TestFastbinRoundTrip extends RsaTestBase {
-private static String FASTBIN_PORT_SERVER = "2544";
-private static String FASTBIN_PORT_CLIENT = "2545";
@Inject
EchoService echoService;
-
-public TestFastbinRoundTrip() throws IOException {
-FASTBIN_PORT_CLIENT = "" + getFreePort();
-FASTBIN_PORT_SERVER = "" + getFreePort();
-}
-
+
@ServerConfiguration
public static Option[] remoteConfig() throws IOException {
return new Option[] //
@@ -58,7 +51,7 @@ public class TestFastbinRoundTrip extends RsaTestBase {
echoTcpService(), //
configZKServer(), //
configZKDiscovery(), //
- configFastBinPort(FASTBIN_PORT_SERVER),
+ configFastBinFreePort()
};
}
@@ -71,7 +64,7 @@ public class TestFastbinRoundTrip extends RsaTestBase {
rsaProviderFastBin(), //
echoTcpConsumer(), //
configZKDiscovery(), //
- configFastBinPort(FASTBIN_PORT_CLIENT)
+ configFastBinFreePort()
};
}
diff --git
a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java
b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java
index 0371787..3cf0267 100644
---
a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java
+++
b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java
@@ -57,7 +57,7 @@ public class TestRSAListener extends RsaTestBase implements
RemoteServiceAdminLi
rsaCore(), //
rsaProviderFastBin(), //
echoTcpService(), //
- configFastBinPort("2545"),
+ configFastBinFreePort()
};
}
[aries-rsa] branch master updated: ARIES-1913 - Fix event properties
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new 91d2410 ARIES-1913 - Fix event properties
new abf2b2c Merge pull request #25 from amichair/ARIES-1913
91d2410 is described below
commit 91d2410710aa59f057a0c076cf175138052f4b1c
Author: Amichai Rothman
AuthorDate: Wed May 15 12:01:24 2019 +0300
ARIES-1913 - Fix event properties
---
.../aries/rsa/core/event/EventAdminSender.java | 25 +-
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git
a/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java
b/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java
index d36ae45..22974ba 100644
--- a/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java
+++ b/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java
@@ -23,11 +23,13 @@ import java.security.PrivilegedAction;
import java.util.HashMap;
import java.util.Map;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.osgi.service.remoteserviceadmin.EndpointDescription;
+import org.osgi.service.remoteserviceadmin.ImportReference;
import org.osgi.service.remoteserviceadmin.RemoteServiceAdminEvent;
public class EventAdminSender {
@@ -67,15 +69,17 @@ public class EventAdminSender {
private Event toEvent(RemoteServiceAdminEvent rsaEvent) {
String topic = getTopic(rsaEvent);
Map props = new HashMap<>();
-props.put("bundle", rsaEvent.getSource());
-props.put("bundle.id", rsaEvent.getSource().getBundleId());
-props.put("bundle.symbolicname",
rsaEvent.getSource().getSymbolicName());
-props.put("bundle.version", rsaEvent.getSource().getVersion());
+Bundle bundle = rsaEvent.getSource();
+props.put("bundle", bundle);
+props.put("bundle.id", bundle.getBundleId());
+props.put("bundle.symbolicname", bundle.getSymbolicName());
+props.put("bundle.version", bundle.getVersion());
props.put("bundle.signer", ""); // TODO What to put here
-if (rsaEvent.getException() != null) {
-props.put("exception", rsaEvent.getException());
-props.put("exception.class", rsaEvent.getException().getClass());
-props.put("exception.class", rsaEvent.getException().getMessage());
+Throwable exception = rsaEvent.getException();
+if (exception != null) {
+props.put("exception", exception);
+props.put("exception.class", exception.getClass().getName());
+props.put("exception.message", exception.getMessage());
}
if (rsaEvent.getExportReference() != null) {
EndpointDescription endpoint =
rsaEvent.getExportReference().getExportedEndpoint();
@@ -83,8 +87,9 @@ public class EventAdminSender {
props.put("endpoint.id", endpoint.getId());
props.put("objectClass", endpoint.getInterfaces());
}
-if (rsaEvent.getImportReference() != null &&
rsaEvent.getImportReference().getImportedEndpoint() != null) {
-props.put("service.imported.configs",
rsaEvent.getImportReference().getImportedEndpoint().getConfigurationTypes());
+ImportReference importReference = rsaEvent.getImportReference();
+if (importReference != null && importReference.getImportedEndpoint()
!= null) {
+props.put("service.imported.configs",
importReference.getImportedEndpoint().getConfigurationTypes());
}
props.put("timestamp", System.currentTimeMillis());
props.put("event", rsaEvent);
[aries-rsa] branch master updated: ARIES-1907 - Fix IllegalStateException when stopping bundle
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git The following commit(s) were added to refs/heads/master by this push: new 540999b ARIES-1907 - Fix IllegalStateException when stopping bundle new 7a70c2c Merge pull request #24 from amichair/ARIES-1907 540999b is described below commit 540999b50122b0ba47fdc5762feab0dd2282ff03 Author: Amichai Rothman AuthorDate: Tue May 14 10:06:08 2019 +0300 ARIES-1907 - Fix IllegalStateException when stopping bundle --- .../java/org/apache/aries/rsa/core/RemoteServiceAdminFactory.java| 2 +- .../java/org/apache/aries/rsa/core/RemoteServiceAdminInstance.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminFactory.java b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminFactory.java index 92c189b..ef64adf 100644 --- a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminFactory.java +++ b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminFactory.java @@ -46,6 +46,6 @@ public class RemoteServiceAdminFactory implements ServiceFactory
[aries-rsa] branch master updated (d26a8d3 -> e594264)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git.
from d26a8d3 Merge pull request #22 from amichair/fix-fastbin-activator
new bf485e5 Fix typo in class name
new 3c4d29b Fix missing whitespace between parameters
new 532ac25 Remove redundant semicolons
new 9768312 Fix typos
new e594264 Merge pull request #23 from amichair/cleanup
The 900 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
discovery/zookeeper/Readme.md | 2 +-
.../subscribe/EndpointListenerTracker.java | 4 +--
.../main/resources/OSGI-INF/metatype/zookeeper.xml | 2 +-
provider/fastbin/Readme.md | 2 +-
.../aries/rsa/provider/fastbin/Activator.java | 2 +-
.../aries/rsa/provider/fastbin/io/Service.java | 2 +-
.../rsa/provider/fastbin/io/TransportListener.java | 2 +-
.../aries/rsa/provider/fastbin/streams/Chunk.java | 2 +-
.../fastbin/tcp/AbstractInvocationStrategy.java| 8 ++---
.../fastbin/tcp/AsyncFutureInvocationStrategy.java | 2 +-
.../fastbin/tcp/BlockingInvocationStrategy.java| 4 +--
.../provider/fastbin/tcp/ClientInvokerImpl.java| 18 +--
.../provider/fastbin/tcp/LengthPrefixedCodec.java | 2 +-
.../provider/fastbin/tcp/ServerInvokerImpl.java| 8 ++---
.../rsa/provider/fastbin/tcp/TcpTransport.java | 4 +--
.../rsa/provider/fastbin/tcp/TransportPool.java| 4 +--
.../rsa/provider/fastbin/util/URISupport.java | 14 -
.../rsa/provider/fastbin/util/UuidGenerator.java | 4 +--
.../rsa/provider/fastbin/FutureInvocationTest.java | 8 ++---
.../aries/rsa/provider/fastbin/InvocationTest.java | 6 ++--
.../provider/fastbin/PromiseInvocationTest.java| 4 +--
.../rsa/provider/fastbin/StreamInvocationTest.java | 16 +-
.../fastbin/streams/InputStreamProxyTest.java | 36 +++---
.../fastbin/streams/OutputStreamProxyTest.java | 2 +-
.../apache/aries/rsa/provider/tcp/TcpEndpoint.java | 2 +-
.../provider/tcp/ser/BasicObjectInputStream.java | 4 +--
.../aries/rsa/provider/tcp/TcpProviderTest.java| 2 +-
.../rsa/core/DistributionProviderTracker.java | 2 +-
...Factory.java => RemoteServiceAdminFactory.java} | 6 ++--
.../rsa/core/DistributionProviderTrackerTest.java | 4 +--
.../aries/rsa/core/RemoteServiceAdminCoreTest.java | 14 -
.../apache/aries/rsa/spi/DistributionProvider.java | 2 +-
.../org/apache/aries/rsa/spi/ExportPolicy.java | 2 +-
.../EndpointEventListenerTracker.java | 4 +--
.../exporter/TopologyManagerExport.java| 4 +--
.../importer/TopologyManagerImport.java| 10 +++---
.../exporter/TopologyManagerExportTest.java| 2 +-
37 files changed, 108 insertions(+), 108 deletions(-)
rename
rsa/src/main/java/org/apache/aries/rsa/core/{RemoteServiceadminFactory.java =>
RemoteServiceAdminFactory.java} (92%)
[aries-rsa] branch master updated (d42661b -> d26a8d3)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. from d42661b Merge pull request #20 from amichair/refactorings new 392c0c7 Fix fastbin activator starting twice in succession new 1b4be20 Improve fastbin activator thread safety new d26a8d3 Merge pull request #22 from amichair/fix-fastbin-activator The 895 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../aries/rsa/provider/fastbin/BaseActivator.java | 42 ++ 1 file changed, 19 insertions(+), 23 deletions(-)
[aries-rsa] branch master updated (12ef918 -> d42661b)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. from 12ef918 Merge pull request #19 from amichair/ARIES-1906 new e7e7f12 many little refactorings new 340d376 Migrated to Java 7's diamond operator new d42661b Merge pull request #20 from amichair/refactorings The 892 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../discovery/config/PropertyValidatorTest.java| 10 ++--- .../endpoint/EndpointDescriptionParser.java| 2 +- .../rsa/discovery/endpoint/PropertiesMapper.java | 10 ++--- .../local/EndpointDescriptionBundleParser.java | 4 +- .../aries/rsa/discovery/local/LocalDiscovery.java | 17 - .../discovery/endpoint/PropertiesMapperTest.java | 8 ++-- .../local/EndpointDescriptionBundleParserTest.java | 4 +- .../rsa/discovery/local/LocalDiscoveryTest.java| 28 +++--- .../aries/rsa/discovery/zookeeper/Activator.java | 2 +- .../discovery/zookeeper/ZooKeeperDiscovery.java| 5 +-- .../publish/PublishingEndpointListener.java| 2 +- .../repository/ZookeeperEndpointRepository.java| 12 ++ .../rsa/discovery/zookeeper/server/Utils.java | 4 +- .../zookeeper/subscribe/InterestManager.java | 2 +- .../zookeeper/ZookeeperDiscoveryTest.java | 4 +- .../publish/PublishingEndpointListenerTest.java| 2 +- .../zookeeper/server/ZookeeperStarterTest.java | 2 +- .../apache/aries/rsa/eapub/EventAdminHelper.java | 4 +- .../aries/rsa/eapub/EventAdminHelperTest.java | 2 +- .../apache/aries/rsa/itests/felix/RsaTestBase.java | 5 +-- .../aries/rsa/provider/fastbin/BaseActivator.java | 2 +- .../fastbin/api/ProtobufSerializationStrategy.java | 2 +- .../fastbin/tcp/AsyncFutureInvocationStrategy.java | 2 +- .../provider/fastbin/tcp/ClientInvokerImpl.java| 10 ++--- .../provider/fastbin/tcp/LengthPrefixedCodec.java | 2 +- .../provider/fastbin/tcp/ServerInvokerImpl.java| 6 +-- .../rsa/provider/fastbin/tcp/TcpTransport.java | 8 ++-- .../provider/fastbin/tcp/TcpTransportFactory.java | 6 +-- .../provider/fastbin/tcp/TcpTransportServer.java | 2 +- .../rsa/provider/fastbin/tcp/TransportPool.java| 6 +-- .../fastbin/util/ClassLoaderObjectInputStream.java | 2 +- .../fastbin/util/IntrospectionSupport.java | 33 .../rsa/provider/fastbin/util/URISupport.java | 18 - .../rsa/provider/fastbin/FutureInvocationTest.java | 2 +- .../aries/rsa/provider/fastbin/InvocationTest.java | 38 +-- .../provider/fastbin/PromiseInvocationTest.java| 6 +-- .../rsa/provider/fastbin/StreamInvocationTest.java | 2 +- .../rsa/provider/fastbin/TransportFailureTest.java | 4 +- .../fastbin/tcp/LengthPrefixedCodecTest.java | 8 ++-- .../aries/rsa/provider/tcp/LocalHostUtil.java | 2 +- .../aries/rsa/provider/tcp/MethodInvoker.java | 3 +- .../rsa/provider/tcp/TcpInvocationHandler.java | 2 +- .../aries/rsa/provider/tcp/EndpointParserTest.java | 2 +- .../rsa/provider/tcp/TcpProviderIntentTest.java| 6 +-- .../rsa/provider/tcp/TcpProviderPrimitiveTest.java | 4 +- .../aries/rsa/provider/tcp/TcpProviderTest.java| 4 +- .../rsa/provider/tcp/myservice/MyServiceImpl.java | 2 +- .../aries/rsa/core/ClientServiceFactory.java | 2 +- .../rsa/core/DistributionProviderTracker.java | 2 +- .../aries/rsa/core/ImportRegistrationImpl.java | 4 +- .../aries/rsa/core/RemoteServiceAdminCore.java | 44 ++ .../aries/rsa/core/ClientServiceFactoryTest.java | 2 +- .../aries/rsa/core/OverlayPropertiesTest.java | 22 +-- .../aries/rsa/core/RemoteServiceAdminCoreTest.java | 18 - .../aries/rsa/core/event/EventProducerTest.java| 2 +- .../org/apache/aries/rsa/util/EndpointHelper.java | 2 +- .../java/org/apache/aries/rsa/util/StringPlus.java | 4 +- .../aries/rsa/topologymanager/Activator.java | 2 +- .../exporter/EndpointListenerNotifier.java | 8 ++-- .../exporter/ServiceExportsRepository.java | 2 +- .../importer/TopologyManagerImport.java| 10 ++--- .../importer/local/EndpointListenerManager.java| 6 +-- .../importer/local/FilterHelper.java | 2 +- .../importer/local/ReferenceCounter.java | 2 +- .../exporter/EndpointListenerNotifierTest.java | 2 +- .../exporter/TopologyManagerExportTest.java| 2 +- .../importer/local/ListenerHookImplTest.java | 2 +- .../importer/local/ReferenceCounterTest.java | 2 +- 68 files changed, 217 insertions(+), 238 deletions(-)
[aries-rsa] branch master updated: ARIES-1906 - Regression - export of superclass interface fails
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new b4011a0 ARIES-1906 - Regression - export of superclass interface fails
new 12ef918 Merge pull request #19 from amichair/ARIES-1906
b4011a0 is described below
commit b4011a0b22855c26869476853bfcb5cc1e3d4720
Author: Amichai Rothman
AuthorDate: Thu Mar 28 14:49:36 2019 +0200
ARIES-1906 - Regression - export of superclass interface fails
---
.../aries/rsa/core/RemoteServiceAdminCore.java | 42 +++---
1 file changed, 29 insertions(+), 13 deletions(-)
diff --git
a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
index 1586307..f5b6ef1 100644
--- a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
+++ b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
@@ -247,19 +247,35 @@ public class RemoteServiceAdminCore implements
RemoteServiceAdmin {
return new ExportRegistrationImpl(e, closeHandler, eventProducer);
}
}
-
-private Class[] getInterfaces(
-Object serviceO,
-List interfaceNames
-) throws ClassNotFoundException {
-List> interfaces = new ArrayList<>();
-Class[] allInterfaces = serviceO.getClass().getInterfaces();
-for (Class iface : allInterfaces) {
-if (interfaceNames.contains(iface.getName())) {
-interfaces.add(iface);
-}
-}
-return interfaces.toArray(new Class[]{});
+
+/**
+ * Returns the interface classes corresponding to the given service's
interface names.
+ * The classes are returned in the same order as the given names.
+ *
+ * @param service the service implementing the interfaces
+ * @param interfaceNames the interface names
+ * @return the interface classes corresponding to the interface names
+ * @throws ClassNotFoundException if the service does not implement any of
the named interfaces
+ */
+private Class[] getInterfaces(Object service, List
interfaceNames) throws ClassNotFoundException {
+// prepare a map of all of the service's implemented interface names
and classes
+Map> interfaces = new HashMap<>();
+for (Class cls = service.getClass(); cls != null; cls =
cls.getSuperclass()) {
+for (Class interfaceClass : cls.getInterfaces()) {
+interfaces.put(interfaceClass.getName(), interfaceClass);
+}
+}
+// lookup the given names in order, ensuring all are found
+List> interfaceClasses = new ArrayList<>();
+for (String interfaceName : interfaceNames) {
+Class interfaceClass = interfaces.get(interfaceName);
+if (interfaceClass == null) {
+throw new ClassNotFoundException("Service class " +
service.getClass()
++ " does not implement interface " + interfaceName);
+}
+interfaceClasses.add(interfaceClass);
+}
+return interfaceClasses.toArray(new Class[0]);
}
/**
[aries-journaled-events] 01/01: Test PR
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch cschneider-patch-1 in repository https://gitbox.apache.org/repos/asf/aries-journaled-events.git commit d0b2dce49818902f0bc0857c1d30047558f2dce9 Author: Christian Schneider AuthorDate: Tue May 7 16:20:35 2019 +0200 Test PR --- Readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Readme.md b/Readme.md index 8407a04..bf0a511 100644 --- a/Readme.md +++ b/Readme.md @@ -22,3 +22,4 @@ This subproject provides an API (possibly as spec) and backends for journaled st * Each consumer must receive messages in the same order they were sent * The journal of each topic may evict messages that are older than a certain retention time +
[aries-journaled-events] branch cschneider-patch-1 created (now d0b2dce)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch cschneider-patch-1 in repository https://gitbox.apache.org/repos/asf/aries-journaled-events.git. at d0b2dce Test PR This branch includes the following new commits: new d0b2dce Test PR The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[aries-journaled-events] branch master updated: Test PR
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-journaled-events.git The following commit(s) were added to refs/heads/master by this push: new 1ca1e23 Test PR 1ca1e23 is described below commit 1ca1e23b330e2d72b880f6c58ae91064d8da5a67 Author: Christian Schneider AuthorDate: Tue May 7 16:21:03 2019 +0200 Test PR --- Readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Readme.md b/Readme.md index 8407a04..bf0a511 100644 --- a/Readme.md +++ b/Readme.md @@ -22,3 +22,4 @@ This subproject provides an API (possibly as spec) and backends for journaled st * Each consumer must receive messages in the same order they were sent * The journal of each topic may evict messages that are older than a certain retention time +
[aries-journaled-events] branch master updated (2a55915 -> e6b2780)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/aries-journaled-events.git. from 2a55915 Added travis build new 1e68a30 Update Readme.md new eea6f81 Update Readme.md new e6b2780 Merge pull request #20 from cschneider/master The 53 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[aries-journaled-events] branch master updated: Added travis build
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-journaled-events.git The following commit(s) were added to refs/heads/master by this push: new 2a55915 Added travis build 2a55915 is described below commit 2a55915789619b32842b5802b84b8c6c9ec5d9b0 Author: Christian Schneider AuthorDate: Wed Apr 24 10:14:48 2019 +0200 Added travis build --- .travis.yml | 4 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..bf018d2 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: java +jdk: + - oraclejdk8 + \ No newline at end of file
[aries] branch trunk updated: Test
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/aries.git The following commit(s) were added to refs/heads/trunk by this push: new c596300 Test c596300 is described below commit c596300c1dee975871ca3645b0e90a47d6b357ca Author: Christian Schneider AuthorDate: Thu Mar 14 22:31:14 2019 +0100 Test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ccf47a..9f67c93 100644 --- a/README.md +++ b/README.md @@ -26,4 +26,4 @@ Most projects can be built using mvn clean install As the Aries svn hosts a lot of different subprojects it makes sense to only -build the specific subproject. +build the specific subproject.
[aries] 01/01: Update README.md
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch cschneider-patch-1 in repository https://gitbox.apache.org/repos/asf/aries.git commit 755e0ea0fd370b365b79c793aa0821354327de26 Author: Christian Schneider AuthorDate: Thu Mar 14 22:30:16 2019 +0100 Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a827323..8ccf47a 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,9 @@ See [Apache Aries Website](http://aries.apache.org/). ## Source Code -Most of the code is still at the [Aries svn repo](https://svn.apache.org/repos/asf/aries/). -There is also a [github mirror](https://github.com/apache/aries). +The sources are now directly availble in [aries github](https://github.com/apache/aries). -Some of the subproject are already migrated to git: +Some of the subprojects have their own git repos: | Subproject | Apache Git | Github Mirror | | -- | -- | - |
[aries] 01/01: Merge pull request #96 from apache/cschneider-patch-1
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/aries.git commit 21942f3feb7d692640f63afb1f56365b3a7d1cbf Merge: 431eb56 755e0ea Author: Christian Schneider AuthorDate: Thu Mar 14 22:30:30 2019 +0100 Merge pull request #96 from apache/cschneider-patch-1 Update README.md README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
[aries] branch trunk updated (431eb56 -> 21942f3)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/aries.git. from 431eb56 [maven-release-plugin] prepare for next development iteration add 755e0ea Update README.md new 21942f3 Merge pull request #96 from apache/cschneider-patch-1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
[aries] branch cschneider-patch-1 created (now 755e0ea)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch cschneider-patch-1 in repository https://gitbox.apache.org/repos/asf/aries.git. at 755e0ea Update README.md This branch includes the following new commits: new 755e0ea Update README.md The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
svn commit: r1854250 - /aries/trunk/blueprint/blueprint-parent/pom.xml
Author: cschneider Date: Sun Feb 24 11:12:00 2019 New Revision: 1854250 URL: http://svn.apache.org/viewvc?rev=1854250=rev Log: Update to new snapshots Modified: aries/trunk/blueprint/blueprint-parent/pom.xml Modified: aries/trunk/blueprint/blueprint-parent/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parent/pom.xml?rev=1854250=1854249=1854250=diff == --- aries/trunk/blueprint/blueprint-parent/pom.xml (original) +++ aries/trunk/blueprint/blueprint-parent/pom.xml Sun Feb 24 11:12:00 2019 @@ -45,8 +45,8 @@ 1.0.2-SNAPSHOT - 1.10.1-SNAPSHOT -1.3.1-SNAPSHOT + 1.10.2-SNAPSHOT +1.3.2-SNAPSHOT 1.6.1-SNAPSHOT 1.0.1-SNAPSHOT 1.0.0-SNAPSHOT
svn commit: r1854249 - in /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container: BlueprintContainerImpl.java BlueprintExtender.java
Author: cschneider
Date: Sun Feb 24 11:11:56 2019
New Revision: 1854249
URL: http://svn.apache.org/viewvc?rev=1854249=rev
Log:
[ARIES-1886] Globally configurable number of extender threads and grace
period timeout.
VM property "org.apache.aries.blueprint.default.timeout" can be used to
define the default time out.
VM property "org.apache.aries.blueprint.extender.threads" can be used to
define the count of threads used for deployment.
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1854249=1854248=1854249=diff
==
---
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
(original)
+++
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
Sun Feb 24 11:11:56 2019
@@ -111,6 +111,8 @@ public class BlueprintContainerImpl
Runnable, SatisfiableRecipe.SatisfactionListener,
org.apache.aries.blueprint.ExtendedBlueprintContainer {
+private static final String DEFAULT_TIMEOUT_PROPERTY =
"org.apache.aries.blueprint.default.timeout";
+private static final long DEFAULT_TIMEOUT = 5 * 60 * 1000;
private static final Logger LOGGER =
LoggerFactory.getLogger(BlueprintContainerImpl.class);
private static final Class[] SECURITY_BUGFIX = {
@@ -151,7 +153,7 @@ public class BlueprintContainerImpl
private final List processors;
private final Object satisfiablesLock = new Object();
private Map> satisfiables;
-private long timeout = 5 * 60 * 1000;
+private long timeout;
private boolean waitForDependencies = true;
private String xmlValidation;
private ScheduledFuture timeoutFuture;
@@ -174,6 +176,7 @@ public class BlueprintContainerImpl
this.componentDefinitionRegistry = new
ComponentDefinitionRegistryImpl();
this.executors = executor != null ? new
ExecutorServiceWrapper(executor) : null;
this.timer = timer;
+this.timeout = getDefaultTimeout();
this.processors = new ArrayList();
if (System.getSecurityManager() != null) {
this.accessControlContext =
BlueprintDomainCombiner.createAccessControlContext(bundle);
@@ -210,6 +213,20 @@ public class BlueprintContainerImpl
return eventDispatcher;
}
+private long getDefaultTimeout() {
+long timeout = DEFAULT_TIMEOUT;
+try {
+timeout = Long.getLong(DEFAULT_TIMEOUT_PROPERTY, DEFAULT_TIMEOUT);
+if (timeout != DEFAULT_TIMEOUT) {
+LOGGER.debug(DEFAULT_TIMEOUT_PROPERTY + " is set to " +
timeout + ".");
+}
+}
+catch (Exception e) {
+LOGGER.error(DEFAULT_TIMEOUT_PROPERTY + " is not a number. Using
default value " + timeout + ".");
+}
+return timeout;
+}
+
private void readDirectives() {
Dictionary headers = bundle.getHeaders();
String symbolicName = (String)
headers.get(Constants.BUNDLE_SYMBOLICNAME);
@@ -220,6 +237,9 @@ public class BlueprintContainerImpl
LOGGER.debug("Timeout directive: {}", timeoutDirective);
timeout = Integer.parseInt(timeoutDirective);
}
+else {
+ timeout = getDefaultTimeout();
+}
String graceperiod =
paths.get(0).getDirective(BlueprintConstants.GRACE_PERIOD);
if (graceperiod != null) {
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java?rev=1854249=1854248=1854249=diff
==
---
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
(original)
+++
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
Sun Feb 24 11:11:56 2019
@@ -69,6 +69,8 @@ public class BlueprintExtender implement
/** The QuiesceParticipant implementation class name */
private static final String QUIESCE_PARTICIPANT_CLASS =
"org.apache.aries.quiesce.participant.QuiesceParticipant";
+private static final String EXTENDER_THR
svn commit: r1854248 - /aries/trunk/.gitignore
Author: cschneider Date: Sun Feb 24 10:52:06 2019 New Revision: 1854248 URL: http://svn.apache.org/viewvc?rev=1854248=rev Log: Added gitignore Modified: aries/trunk/.gitignore Modified: aries/trunk/.gitignore URL: http://svn.apache.org/viewvc/aries/trunk/.gitignore?rev=1854248=1854247=1854248=diff == --- aries/trunk/.gitignore (original) +++ aries/trunk/.gitignore Sun Feb 24 10:52:06 2019 @@ -1,15 +1,5 @@ -.apt_generated_tests/ -.checkstyle +target +.settings .classpath -.factorypath -.pmd .project -.ruleset -.settings/ -target/ -*.iml -*.iws -*.ipr -.idea velocity.log -derby.log
[aries-rsa] branch master updated (d7344bb -> f5aa5ca)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git. from d7344bb ARIES-1846 - Allow import of clusterinfo services add 148cd3f Update Readme.md new f5aa5ca Merge pull request #18 from apache/cschneider-patch-1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[aries-rsa] 01/01: Merge pull request #18 from apache/cschneider-patch-1
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git commit f5aa5ca62c3948d7e471c3a839089180650cf4f2 Merge: d7344bb 148cd3f Author: Christian Schneider AuthorDate: Thu Feb 14 11:23:36 2019 +0100 Merge pull request #18 from apache/cschneider-patch-1 Update Readme.md Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[aries-jpa] branch master updated: Exclude some resources
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jpa.git
The following commit(s) were added to refs/heads/master by this push:
new f8a04df Exclude some resources
f8a04df is described below
commit f8a04dfabbf0853af07926e4d8f8028b0d829bc8
Author: Christian Schneider
AuthorDate: Thu Feb 14 11:18:46 2019 +0100
Exclude some resources
---
jpa-parent/pom.xml | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index 93749d1..3acc567 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -32,7 +32,7 @@
Apache Aries JPA parent
pom
-
+
2.6.0
false
@@ -79,7 +79,7 @@
org.osgi.service.jpa
1.1.0
-
+
org.apache.geronimo.specs
geronimo-jta_1.1_spec
@@ -246,6 +246,7 @@
${project.build.directory}/${project.build.finalName}.rat
true
+**/.git/**/*
**/target/**/*
**/appended-resources/**/*
**/dependency-reduced-pom.xml
@@ -272,9 +273,11 @@
.gitignore
osgi.bnd
README.md
+Readme.md
*.cfg
derby.log
**/*.sql
+.travis.yml
[aries-jpa] branch master updated: deleted
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jpa.git
The following commit(s) were added to refs/heads/master by this push:
new 85ab286 deleted
85ab286 is described below
commit 85ab28648517bff1c20e3522d216ca4ab1c60541
Author: Christian Schneider
AuthorDate: Wed Feb 13 17:06:12 2019 +0100
deleted
---
release.properties | 12
1 file changed, 12 deletions(-)
diff --git a/release.properties b/release.properties
deleted file mode 100644
index 1fdce44..000
--- a/release.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#release configuration
-#Mon Dec 03 17:07:43 CET 2018
-scm.tagNameFormat=jpa-@{project.version}
-pushChanges=true
-scm.url=scm\:git\:g...@github.com\:apache/aries-jpa.git
-preparationGoals=clean verify
-remoteTagging=true
-projectVersionPolicyId=default
-scm.commentPrefix=[maven-release-plugin]
-exec.additionalArguments=-Papache-release -P artifactory-corp
-exec.snapshotReleasePluginAllowed=false
-completedPhase=scm-check-modifications
[aries-jpa] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-jpa.git The following commit(s) were added to refs/heads/master by this push: new 7d91325 [maven-release-plugin] prepare for next development iteration 7d91325 is described below commit 7d91325aebb41918ebd0ab8589976084b220f841 Author: Christian Schneider AuthorDate: Wed Feb 13 16:43:45 2019 +0100 [maven-release-plugin] prepare for next development iteration --- examples/pom.xml| 2 +- examples/tasklist-blueprint/pom.xml | 2 +- examples/tasklist-ds/pom.xml| 2 +- examples/tasklist-model/pom.xml | 2 +- itests/jpa-container-blueprint-testbundle/pom.xml | 2 +- itests/jpa-container-itest-karaf/pom.xml| 2 +- itests/jpa-container-itest/pom.xml | 2 +- itests/jpa-container-testbundle-eclipselink/pom.xml | 2 +- itests/jpa-container-testbundle/pom.xml | 2 +- itests/pom.xml | 2 +- javax-persistence/2_0/pom.xml | 2 +- javax-persistence/2_1/pom.xml | 2 +- javax-persistence/pom.xml | 2 +- jpa-api/pom.xml | 2 +- jpa-blueprint/pom.xml | 2 +- jpa-container-eclipselink-adapter/pom.xml | 2 +- jpa-container/pom.xml | 2 +- jpa-features/pom.xml| 2 +- jpa-parent/pom.xml | 6 +- jpa-repository/pom.xml | 6 +- jpa-support/pom.xml | 2 +- pom.xml | 4 ++-- 22 files changed, 23 insertions(+), 31 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 207acee..89782e2 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,7 +17,7 @@ org.apache.aries.jpa org.apache.aries.jpa.parent -2.7.2 +2.7.3-SNAPSHOT ../jpa-parent diff --git a/examples/tasklist-blueprint/pom.xml b/examples/tasklist-blueprint/pom.xml index 84b293f..856c78d 100644 --- a/examples/tasklist-blueprint/pom.xml +++ b/examples/tasklist-blueprint/pom.xml @@ -14,7 +14,7 @@ org.apache.aries.jpa.example org.apache.aries.jpa.example.parent - 2.7.2 + 2.7.3-SNAPSHOT .. org.apache.aries.jpa.example.tasklist.blueprint diff --git a/examples/tasklist-ds/pom.xml b/examples/tasklist-ds/pom.xml index ed1c4c8..994b6ee 100644 --- a/examples/tasklist-ds/pom.xml +++ b/examples/tasklist-ds/pom.xml @@ -11,7 +11,7 @@ org.apache.aries.jpa.example org.apache.aries.jpa.example.parent -2.7.2 +2.7.3-SNAPSHOT .. org.apache.aries.jpa.example.tasklist.ds diff --git a/examples/tasklist-model/pom.xml b/examples/tasklist-model/pom.xml index 5370512..8c1cac9 100644 --- a/examples/tasklist-model/pom.xml +++ b/examples/tasklist-model/pom.xml @@ -12,7 +12,7 @@ org.apache.aries.jpa.example org.apache.aries.jpa.example.parent -2.7.2 +2.7.3-SNAPSHOT .. diff --git a/itests/jpa-container-blueprint-testbundle/pom.xml b/itests/jpa-container-blueprint-testbundle/pom.xml index 21299b9..66db7b1 100644 --- a/itests/jpa-container-blueprint-testbundle/pom.xml +++ b/itests/jpa-container-blueprint-testbundle/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.jpa.itest org.apache.aries.jpa.itest.parent -2.7.2 +2.7.3-SNAPSHOT .. diff --git a/itests/jpa-container-itest-karaf/pom.xml b/itests/jpa-container-itest-karaf/pom.xml index 65cb639..af73c19 100644 --- a/itests/jpa-container-itest-karaf/pom.xml +++ b/itests/jpa-container-itest-karaf/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.jpa.itest org.apache.aries.jpa.itest.parent -2.7.2 +2.7.3-SNAPSHOT .. diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml index 8d49a19..095956d 100644 --- a/itests/jpa-container-itest/pom.xml +++ b/itests/jpa-container-itest/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.jpa.itest org.apache.aries.jpa.itest.parent -2.7.2 +2.7.3-SNAPSHOT .. diff --git a/itests/jpa-container-testbundle-eclipselink/pom.xml b/itests/jpa-container-testbundle-eclipselink/pom.xml index 5471c3a..f2cb08e 100644 --- a/itests/jpa-container-testbundle-eclipselink/pom.xml +++ b/itests/jpa-container-testbundle-eclipselink/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.jpa.itest org.apache.aries.jpa.itest.parent -2.7.2 +2.7.3-SNAPSHOT
[aries-jpa] branch master updated: [maven-release-plugin] prepare release jpa-2.7.2
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-jpa.git The following commit(s) were added to refs/heads/master by this push: new 2fb0919 [maven-release-plugin] prepare release jpa-2.7.2 2fb0919 is described below commit 2fb091923a1774a492e569cc5f1cf733bc390d41 Author: Christian Schneider AuthorDate: Wed Feb 13 16:43:28 2019 +0100 [maven-release-plugin] prepare release jpa-2.7.2 --- examples/pom.xml| 2 +- examples/tasklist-blueprint/pom.xml | 2 +- examples/tasklist-ds/pom.xml| 2 +- examples/tasklist-model/pom.xml | 2 +- itests/jpa-container-blueprint-testbundle/pom.xml | 2 +- itests/jpa-container-itest-karaf/pom.xml| 2 +- itests/jpa-container-itest/pom.xml | 2 +- itests/jpa-container-testbundle-eclipselink/pom.xml | 2 +- itests/jpa-container-testbundle/pom.xml | 2 +- itests/pom.xml | 2 +- javax-persistence/2_0/pom.xml | 2 +- javax-persistence/2_1/pom.xml | 2 +- javax-persistence/pom.xml | 2 +- jpa-api/pom.xml | 2 +- jpa-blueprint/pom.xml | 2 +- jpa-container-eclipselink-adapter/pom.xml | 2 +- jpa-container/pom.xml | 2 +- jpa-features/pom.xml| 2 +- jpa-parent/pom.xml | 6 +- jpa-repository/pom.xml | 6 +- jpa-support/pom.xml | 2 +- pom.xml | 4 ++-- 22 files changed, 31 insertions(+), 23 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index c85f4d1..207acee 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,7 +17,7 @@ org.apache.aries.jpa org.apache.aries.jpa.parent -2.7.2-SNAPSHOT +2.7.2 ../jpa-parent diff --git a/examples/tasklist-blueprint/pom.xml b/examples/tasklist-blueprint/pom.xml index c3dabb5..84b293f 100644 --- a/examples/tasklist-blueprint/pom.xml +++ b/examples/tasklist-blueprint/pom.xml @@ -14,7 +14,7 @@ org.apache.aries.jpa.example org.apache.aries.jpa.example.parent - 2.7.2-SNAPSHOT + 2.7.2 .. org.apache.aries.jpa.example.tasklist.blueprint diff --git a/examples/tasklist-ds/pom.xml b/examples/tasklist-ds/pom.xml index 39abc76..ed1c4c8 100644 --- a/examples/tasklist-ds/pom.xml +++ b/examples/tasklist-ds/pom.xml @@ -11,7 +11,7 @@ org.apache.aries.jpa.example org.apache.aries.jpa.example.parent -2.7.2-SNAPSHOT +2.7.2 .. org.apache.aries.jpa.example.tasklist.ds diff --git a/examples/tasklist-model/pom.xml b/examples/tasklist-model/pom.xml index e1500a3..5370512 100644 --- a/examples/tasklist-model/pom.xml +++ b/examples/tasklist-model/pom.xml @@ -12,7 +12,7 @@ org.apache.aries.jpa.example org.apache.aries.jpa.example.parent -2.7.2-SNAPSHOT +2.7.2 .. diff --git a/itests/jpa-container-blueprint-testbundle/pom.xml b/itests/jpa-container-blueprint-testbundle/pom.xml index 65ce38e..21299b9 100644 --- a/itests/jpa-container-blueprint-testbundle/pom.xml +++ b/itests/jpa-container-blueprint-testbundle/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.jpa.itest org.apache.aries.jpa.itest.parent -2.7.2-SNAPSHOT +2.7.2 .. diff --git a/itests/jpa-container-itest-karaf/pom.xml b/itests/jpa-container-itest-karaf/pom.xml index 40eb420..65cb639 100644 --- a/itests/jpa-container-itest-karaf/pom.xml +++ b/itests/jpa-container-itest-karaf/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.jpa.itest org.apache.aries.jpa.itest.parent -2.7.2-SNAPSHOT +2.7.2 .. diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml index 308d66a..8d49a19 100644 --- a/itests/jpa-container-itest/pom.xml +++ b/itests/jpa-container-itest/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.jpa.itest org.apache.aries.jpa.itest.parent -2.7.2-SNAPSHOT +2.7.2 .. diff --git a/itests/jpa-container-testbundle-eclipselink/pom.xml b/itests/jpa-container-testbundle-eclipselink/pom.xml index 1e8ce6c..5471c3a 100644 --- a/itests/jpa-container-testbundle-eclipselink/pom.xml +++ b/itests/jpa-container-testbundle-eclipselink/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.jpa.itest org.apache.aries.jpa.itest.parent -2.7.2-SNAPSHOT +2.7.2 .. diff --git
[aries-jpa] annotated tag jpa-2.7.2 updated (2fb0919 -> 9dd7fd3)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to annotated tag jpa-2.7.2 in repository https://gitbox.apache.org/repos/asf/aries-jpa.git. *** WARNING: tag jpa-2.7.2 was modified! *** from 2fb0919 (commit) to 9dd7fd3 (tag) tagging 2fb091923a1774a492e569cc5f1cf733bc390d41 (commit) replaces jpa-2.7.1 by Christian Schneider on Wed Feb 13 16:43:42 2019 +0100 - Log - [maven-release-plugin] copy for tag jpa-2.7.2 --- No new revisions were added by this update. Summary of changes:
[aries-jpa] branch pr-build-test deleted (was 472fc51)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch pr-build-test in repository https://gitbox.apache.org/repos/asf/aries-jpa.git. was 472fc51 pr build test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[aries-tx-control] branch cschneider-patch-1 deleted (was 0bf22df)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch cschneider-patch-1 in repository https://gitbox.apache.org/repos/asf/aries-tx-control.git. was 0bf22df Update README.md The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[aries-tx-control] branch cschneider-patch-1 created (now 0bf22df)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch cschneider-patch-1 in repository https://gitbox.apache.org/repos/asf/aries-tx-control.git. at 0bf22df Update README.md This branch includes the following new commits: new 95c057f [tx-control] Initial commit of the OSGi Transaction Control API from RFC-221 new add61ea [tx-control] Add a basic TransactionControl service implementation new a55cd80 [tx-control] Add license info and correct the scm links new ab16ff0 [tx-control] Basic local resource provider for JDBC new 17e007a [tx-control] Add simple integration tests for the Local transaction control and JDBC resource provider new 867f50f [tx-control] Add tx-control to the main build, but require Java 8 to build it new bb4f0ad [tx-control] Extend iTests to include exception failures * Possibly some API work needed for checked Exceptions * Still no support for noRollbackFor * Coordinator usage needs some work new 5d59e59 [tx-control] Update to the latest API from the RFC new 25e41b9 [tx-control] Throw the correct Exception types on different kinds of error new a5a1f5f [tx-control] Testing of nested transactions new 0e6d08e [tx-control] Add support for no-rollback exceptions new 964c9dd [tx-control] Add a Spring JdbcTemplate test new 707dd95 [tx-control] Add a Spring rollback test new 64a6b64 [tx-control] Do not prematurely finish inherited transactions new e7a3289 [tx-control] Test using remote H2 in addition to local embedded, also test tx suspension new 8d118fd [tx-control] Configuration-driven Database connections new c9e509c [tx-control] Separate common tx-service code and use it to build an XA Transaction Control service new 373c25d [tx-control] Fix the SCM URLs for the tx-control-service-local and tx-control-service-xa modules new 9585c08 [tx-control] Add support for XA enlisted datasources new a04719b [tx-control] Add README documentation to various tx-control projects new d84a4e7 [tx-control] Markdown formatting, rename to .md so that github renders correctly new 621c903 [tx-control] Document the url configuration property new 504ea63 [tx-control] Add logging to configuration-driven JDBCConnectionProvider services for easier debug new 7492510 [tx-control] Add support for resource local JPA using EclipseLink new 28c22ac [tx-control] Add JPA integration tests for Hibernate 5.0.9 new 120d9a0 [tx-control] Add documentation for the JPA local provider new 970f034 [tx-control] Avoid teardown exception when using Hibernate new a640d69 [tx-control] Add tests for OpenJPA 2.4.1 new 3a10c82 [tx-control] Do not build any of tx-control unless JDK 8 is available new b39b6e4 [tx-control] Add XA support for JPA using Hibernate new 3a15f92 [tx-control] Initial support for XA transactions with EclipseLink and OpenJPA new 53d94dd [tx-control] Actually enlist the XA connection new a112fe5 [tx-control] Ensure that EclipseLink usee the non-jta-datasource for sequence generation new 0316633 [tx-control] Add support for read-only transactions new 2e3278d [tx-control] Remove the link to the Coordinator service as per the latest RFC update new 6a0905f [tx-control] Add an itest using the coordinator to speed up database inserts new 33c9fdf [tx-control] Make the OSGi API version 1.0, but add a mandatory attribute to indicate its instability new e535aec [tx-control] Enhance the Coordinator Optimisation test to show one transaction isn't necessarily better new 1a6982a [tx-control] Mark ScopedWorkException#context as transient so the Exception can be serialized new 78d13ba [tx-control] Integration tests for JPA two phase commit new 46d053b [tx-control] Tidy up JavaDoc for Transaction Control API new 87a84fd [tx-control] Add licence information so that the tx-control project can be released new 59a7fc8 [tx-control] Add Provided and Required Service Capabilities to the tx control bundles new b144741 [tx-control] Switch dependencies to release versions new f8a8808 [tx-control] Test workaround for Hibernate bug HHH-10855 new b4ac43d [tx-control] Move to an internal parent for setting things like JavaDoc JDK version new 8628a9e [tx-control][maven-release-plugin]prepare release tx-control-0.0.1 new dfaf785 [tx-control][maven-release-plugin]prepare for next development iteration new 7e6039c [tx-control] Remove unnecessary Hibernate bug fix after fixing ARIES-1575 new 9569ae4 [tx-control] Simplify Tx Control Service providers, and add configurable recovery logging for XA new 46f96a9 [tx-control] Make local resource support configurable, and permit users to enforce a single last participant new f21a6f1 [tx-control] Move to use the bnd-maven
[aries-jax-rs-whiteboard] branch pr-test deleted (was 27bcfd0)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch pr-test in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git. was 27bcfd0 pr test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
