Skip to content

Commit

Permalink
ECE Changes
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
  • Loading branch information
maho7791 committed Nov 22, 2023
1 parent 8a3ef01 commit f84ee53
Show file tree
Hide file tree
Showing 97 changed files with 13,176 additions and 47 deletions.
1 change: 1 addition & 0 deletions cnf/build.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# Needed because we enabled library 'gecko-dimc'
github-project: org.gecko.playground
base-version: 1.0.0
dimcBaselining: false

-fixupmessages \
"No metadata for revision";is:=ignore
Expand Down
75 changes: 50 additions & 25 deletions cnf/central.maven
Original file line number Diff line number Diff line change
Expand Up @@ -47,31 +47,31 @@ org.apache.commons:commons-lang3:3.12.0


#Jersey
org.glassfish.jersey.core:jersey-common:3.1.1
org.glassfish.jersey.core:jersey-client:3.1.1
org.glassfish.jersey.core:jersey-server:3.1.1
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.1
org.glassfish.jersey.containers:jersey-container-jetty-servlet:3.1.1
org.glassfish.jersey.containers:jersey-container-servlet:3.1.1
org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.1
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.1
org.glassfish.jersey.media:jersey-media-json-binding:3.1.1
org.glassfish.jersey.media:jersey-media-jaxb:3.1.1
org.glassfish.jersey.media:jersey-media-multipart:3.1.1
org.glassfish.jersey.media:jersey-media-sse:3.1.1
org.glassfish.jersey.media:jersey-media-moxy:3.1.1
org.glassfish.jersey.media:jersey-media-json-processing:3.1.1
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.1
org.glassfish.jersey.ext:jersey-bean-validation:3.1.1
org.glassfish.jersey.security:oauth1-server:3.1.1
org.glassfish.jersey.security:oauth1-client:3.1.1
org.glassfish.jersey.security:oauth2-client:3.1.1
org.glassfish.jersey.inject:jersey-hk2:3.1.1
org.glassfish.hk2:osgi-adapter:3.0.3
org.glassfish.hk2:hk2-api:3.0.3
org.glassfish.hk2:hk2-locator:3.0.3
org.glassfish.hk2:hk2-utils:3.0.3
org.glassfish.hk2.external:aopalliance-repackaged:3.0.3
org.glassfish.jersey.core:jersey-common:3.1.3
org.glassfish.jersey.core:jersey-client:3.1.3
org.glassfish.jersey.core:jersey-server:3.1.3
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.3
org.glassfish.jersey.containers:jersey-container-jetty-servlet:3.1.3
org.glassfish.jersey.containers:jersey-container-servlet:3.1.3
org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.3
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.3
org.glassfish.jersey.media:jersey-media-json-binding:3.1.3
org.glassfish.jersey.media:jersey-media-jaxb:3.1.3
org.glassfish.jersey.media:jersey-media-multipart:3.1.3
org.glassfish.jersey.media:jersey-media-sse:3.1.3
org.glassfish.jersey.media:jersey-media-moxy:3.1.3
org.glassfish.jersey.media:jersey-media-json-processing:3.1.3
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.3
org.glassfish.jersey.ext:jersey-bean-validation:3.1.3
org.glassfish.jersey.security:oauth1-server:3.1.3
org.glassfish.jersey.security:oauth1-client:3.1.3
org.glassfish.jersey.security:oauth2-client:3.1.3
org.glassfish.jersey.inject:jersey-hk2:3.1.3
org.glassfish.hk2:osgi-adapter:3.0.5
org.glassfish.hk2:hk2-api:3.0.5
org.glassfish.hk2:hk2-locator:3.0.5
org.glassfish.hk2:hk2-utils:3.0.5
org.glassfish.hk2.external:aopalliance-repackaged:3.0.5
org.glassfish.hk2.external:jakarta.inject:2.6.1
org.glassfish.hk2:osgi-resource-locator:1.0.3
org.glassfish.jersey.bundles.repackaged:jersey-guava:2.26-b03
Expand Down Expand Up @@ -189,3 +189,28 @@ org.eclipse.parsson:jakarta.json:1.1.2
#
biz.aQute:biz.aQute.trace.gui:1.9.0
biz.aQute:biz.aQute.trace.runpath:1.9.0

org.eclipse.platform:org.eclipse.equinox.http.jetty:3.8.300
org.eclipse.platform:org.eclipse.equinox.http.servlet:1.7.400
org.eclipse.platform:org.eclipse.equinox.http.registry:1.3.300
org.eclipse.jetty.osgi:jetty-osgi-boot:10.0.11
org.eclipse.jetty:jetty-deploy:10.0.11
org.eclipse.jetty:jetty-webapp:10.0.11
org.eclipse.jetty:jetty-xml:10.0.11
org.eclipse.jetty:jetty-plus:10.0.11
org.eclipse.jetty:jetty-jndi:10.0.11
org.eclipse.jetty:jetty-annotations:10.0.11
org.eclipse.jetty:jetty-annotations:10.0.11
org.eclipse.jetty.websocket:websocket-javax-server:10.0.11
org.eclipse.jetty.websocket:websocket-javax-common:10.0.11
org.eclipse.jetty.websocket:websocket-javax-client:10.0.11
org.eclipse.jetty.websocket:websocket-jetty-api:10.0.11
org.eclipse.jetty.websocket:websocket-jetty-client:10.0.11
org.eclipse.jetty.websocket:websocket-jetty-common:10.0.11
org.eclipse.jetty.websocket:websocket-jetty-server:10.0.11
jakarta.transaction:jakarta.transaction-api:1.3.3
jakarta.enterprise:jakarta.enterprise.cdi-api:2.0.2
jakarta.interceptor:jakarta.interceptor-api:1.2.5
org.apache.felix:org.apache.felix.http.whiteboard:2.3.2


39 changes: 39 additions & 0 deletions cnf/ext/jakarta_namespace.maven
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,45 @@ org.apache.felix:org.apache.felix.http.servlet-api:2.1.0
org.osgi:org.osgi.service.servlet:2.0.0
org.osgi:org.osgi.service.jakartars:2.0.0

#Jersey
org.glassfish.jersey.core:jersey-common:3.1.1
org.glassfish.jersey.core:jersey-client:3.1.1
org.glassfish.jersey.core:jersey-server:3.1.1
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.1
org.glassfish.jersey.containers:jersey-container-jetty-servlet:3.1.1
org.glassfish.jersey.containers:jersey-container-servlet:3.1.1
org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.1
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.1
org.glassfish.jersey.media:jersey-media-json-binding:3.1.1
org.glassfish.jersey.media:jersey-media-jaxb:3.1.1
org.glassfish.jersey.media:jersey-media-multipart:3.1.1
org.glassfish.jersey.media:jersey-media-sse:3.1.1
org.glassfish.jersey.media:jersey-media-moxy:3.1.1
org.glassfish.jersey.media:jersey-media-json-processing:3.1.1
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.1
org.glassfish.jersey.ext:jersey-bean-validation:3.1.1
org.glassfish.jersey.security:oauth1-server:3.1.1
org.glassfish.jersey.security:oauth1-client:3.1.1
org.glassfish.jersey.security:oauth2-client:3.1.1
org.glassfish.jersey.inject:jersey-hk2:3.1.1
org.glassfish.hk2:osgi-adapter:3.0.3
org.glassfish.hk2:hk2-api:3.0.3
org.glassfish.hk2:hk2-locator:3.0.3
org.glassfish.hk2:hk2-utils:3.0.3
org.glassfish.hk2.external:aopalliance-repackaged:3.0.3
org.glassfish.hk2.external:jakarta.inject:2.6.1
org.glassfish.hk2:osgi-resource-locator:1.0.3
org.glassfish.jersey.bundles.repackaged:jersey-guava:2.26-b03
org.javassist:javassist:3.29.2-GA
org.jvnet.mimepull:mimepull:jar:1.10.0

# ASM
org.ow2.asm:asm:9.5
org.ow2.asm:asm-tree:9.5
org.ow2.asm:asm-commons:9.5
org.ow2.asm:asm-analysis:9.5
org.ow2.asm:asm-util:9.5

# Gecko
org.geckoprojects.jakartars:org.gecko.rest.jersey:6.0.0.RC2
org.geckoprojects.jakartars:org.gecko.rest.jersey.sse:6.0.0.RC2
Expand Down
46 changes: 45 additions & 1 deletion cnf/local/index.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1684650057411">
<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1694012127726">
<resource>
<capability namespace="osgi.identity">
<attribute name="license" value="Eclipse Public License 2.0"/>
Expand Down Expand Up @@ -355,6 +355,50 @@
<directive name="filter" value="(&amp;(osgi.extender=osgi.component)(version&gt;=1.4.0)(!(version&gt;=2.0.0)))"/>
</requirement>
</resource>
<resource>
<capability namespace="osgi.identity">
<attribute name="license" value="Eclipse Public License 2.0"/>
<attribute name="copyright" value="Data In Motion Consuling GmbH - All rights reserved"/>
<attribute name="osgi.identity" value="org.gecko.playground.template"/>
<attribute name="documentation" value="https://github.com/geckoprojects-org/org.gecko.playground"/>
<attribute name="type" value="osgi.bundle"/>
<attribute name="version" value="1.0.0.202309051331-SNAPSHOT" type="Version"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="bundle-version" value="1.0.0.202309051331-SNAPSHOT" type="Version"/>
<attribute name="osgi.wiring.bundle" value="org.gecko.playground.template"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="bundle-version" value="1.0.0.202309051331-SNAPSHOT" type="Version"/>
<attribute name="osgi.wiring.host" value="org.gecko.playground.template"/>
</capability>
<capability namespace="org.bndtools.template">
<attribute name="help" value="ext-lib-help.xml"/>
<attribute name="engine" value="mustache"/>
<attribute name="name" value="Library Repacking"/>
<attribute name="metaType" value="ext-lib-metatype.xml"/>
<attribute name="ranking" value="1010.0" type="Double"/>
<attribute name="org.bndtools.template" value="project"/>
<attribute name="category" value="bbb/Gecko BND Templates"/>
<attribute name="dir" value="templates/ext-libs"/>
</capability>
<capability namespace="org.bndtools.template">
<attribute name="help" value="ui-bundle-help.xml"/>
<attribute name="engine" value="mustache"/>
<attribute name="name" value="UI Bundle"/>
<attribute name="metaType" value="ui-bundle-metatype.xml"/>
<attribute name="ranking" value="1020.0" type="Double"/>
<attribute name="org.bndtools.template" value="project"/>
<attribute name="category" value="bbb/Gecko BND Templates"/>
<attribute name="dir" value="templates/ui-bundle"/>
</capability>
<capability namespace="osgi.content">
<attribute name="size" value="11780" type="Long"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
<attribute name="url" value="org.gecko.playground.template/org.gecko.playground.template-1.0.0.jar"/>
<attribute name="osgi.content" value="CFD038DA3BCD2704627F7A5118C0E38B6DC3E8CBB24C70C56F6CF697468BA301"/>
</capability>
</resource>
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="com.paremus.dosgi.topology.common"/>
Expand Down
Binary file not shown.
11 changes: 11 additions & 0 deletions de.gecko.playground.ds.inject/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
23 changes: 23 additions & 0 deletions de.gecko.playground.ds.inject/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>de.gecko.playground.ds.inject</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>bndtools.core.bndbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>bndtools.core.bndnature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
eclipse.preferences.version=1
encoding//configs/config.json=UTF-8
encoding/<project>=UTF-8
encoding/bnd.bnd=UTF-8
1 change: 1 addition & 0 deletions de.gecko.playground.ds.inject/bnd.bnd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-sub: *.bnd
3 changes: 3 additions & 0 deletions de.gecko.playground.ds.inject/config.bnd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-includeresource: OSGI-INF/configurator/=configs/
Require-Capability: osgi.extender;filter:='(osgi.extender=osgi.configurator)'
-resourceonly: true
8 changes: 8 additions & 0 deletions de.gecko.playground.ds.inject/configs/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
":configurator:resource-version": 1,

"TestConfig":
{
"salutation": "Hello"
}
}
1 change: 1 addition & 0 deletions de.gecko.playground.ds.inject/impl.bnd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-privatepackage: de.gecko.playground.ds.inject
23 changes: 23 additions & 0 deletions de.gecko.playground.ds.inject/launch.bndrun
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
-runee: JavaSE-17
-runrequires: \
osgi.identity;filter:='(&(osgi.identity=org.apache.felix.configadmin)(version>=1.9.26))',\
bnd.identity;id='org.apache.felix.gogo.command',\
bnd.identity;id='org.apache.felix.gogo.shell',\
bnd.identity;id='de.gecko.playground.ds.inject.config',\
bnd.identity;id='de.gecko.playground.ds.inject.impl'
-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]'
-runbundles: \
org.apache.felix.cm.json;version='[2.0.0,2.0.1)',\
org.apache.felix.configurator;version='[1.0.18,1.0.19)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.parsson.jakarta.json;version='[1.1.2,1.1.3)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
org.osgi.util.converter;version='[1.0.9,1.0.10)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)',\
org.apache.felix.gogo.shell;version='[1.1.4,1.1.5)',\
de.gecko.playground.ds.inject.config;version=snapshot,\
de.gecko.playground.ds.inject.impl;version=snapshot
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/**
* Copyright (c) 2012 - 2023 Data In Motion and others.
* All rights reserved.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Data In Motion - initial API and implementation
*/
package de.gecko.playground.ds.inject;

/**
*
* @author mark
* @since 14.11.2023
*/
public interface ITest {

public String sayHello(String name);

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/**
* Copyright (c) 2012 - 2023 Data In Motion and others.
* All rights reserved.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Data In Motion - initial API and implementation
*/
package de.gecko.playground.ds.inject;

import java.util.concurrent.atomic.AtomicReference;

import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
import org.osgi.service.component.annotations.Modified;

/**
*
* @author mark
* @since 14.11.2023
*/
@Component(name="TestConfig", configurationPolicy = ConfigurationPolicy.REQUIRE)
public class Test implements ITest {

private AtomicReference<Config> config = new AtomicReference<>();

@interface Config {
String salutation();
}

@Activate
public void activate(Config config) {
this.config.compareAndSet(null, config);
System.out.println("activate config");
}

@Modified
public void modified(Config config) {
Config current = this.config.get();
this.config.compareAndSet(current, config);
System.out.println("modified config");
}

/*
* (non-Javadoc)
* @see de.gecko.playground.ds.inject.ITest#sayHello(java.lang.String)
*/
@Override
public String sayHello(String name) {
return config.get().salutation() + " " + name;
}

}
Loading

0 comments on commit f84ee53

Please sign in to comment.