Cleanup

Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
geckoprojects-org · Aug 29, 2023 · b56a9eb · b56a9eb
1 parent fc42cf7
commit b56a9eb
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ generated/
 .metadata
 bin/
 build/
+bin_test/
diff --git a/cnf/ext/rsa.mvn b/cnf/ext/rsa.mvn
@@ -32,7 +32,6 @@ net.bytebuddy:byte-buddy-agent:1.12.6
 org.objenesis:objenesis:3.2
 
 org.apache.felix:org.apache.felix.configadmin:1.9.22
-org.apache.felix:org.apache.felix.configurator:1.0.14
 org.apache.felix:org.apache.felix.converter:1.0.14
 org.apache.felix:org.apache.felix.coordinator:1.0.2
 org.apache.felix:org.apache.felix.eventadmin:1.6.2
@@ -139,3 +138,4 @@ org.bouncycastle:bcpkix-jdk15on:1.70
 org.bouncycastle:bcprov-jdk15on:1.70
 org.bouncycastle:bctls-jdk15on:1.70
 org.bouncycastle:bcutil-jdk15on:1.70
+org.apache.felix:org.apache.felix.configurator:1.0.18
diff --git a/maven/.gitignore b/maven/.gitignore
@@ -0,0 +1,4 @@
+target/
+.settings/
+.project
+.classpath
diff --git a/org.gecko.playground.ds.config/config/config.json b/org.gecko.playground.ds.config/config/config.json
@@ -11,6 +11,6 @@
 	{
 		"name": "Happy",
 		"year": 2010,
-		"album": "I wanna be shappy" 
+		"album": "I wanna be happy" 
 	}
 }
diff --git a/org.gecko.playground.ds.filter/src/org/gecko/playground/ds/filter/GrussImpl.java b/org.gecko.playground.ds.filter/src/org/gecko/playground/ds/filter/GrussImpl.java
@@ -2,7 +2,7 @@
 
 import org.osgi.service.component.annotations.Component;
 
-@Component(property = "lang=RE")
+@Component(property = "lang=DE")
 public class GrussImpl implements GreeterService {
 
 	@Override

diff --git a/org.gecko.playground.saxon/bnd.bnd b/org.gecko.playground.saxon/bnd.bnd
@@ -4,8 +4,8 @@ lib.version: 12.3.0
 	net.sf.saxon:Saxon-HE;version=${lib.version}
 
 -includeresource: \
-	OSGI-OPT/src=@${repo;net.sf.saxon:Saxon-HE:jar:sources;${lib.version};EXACT},\
 	@${repo;net.sf.saxon:Saxon-HE:jar;${lib.version};EXACT}!/META-INF/services/*
+#	OSGI-OPT/src=@${repo;net.sf.saxon:Saxon-HE:jar:sources;${lib.version};EXACT},\
 
 Bundle-Version: ${lib.version}
 Bundle-Name: Saxon Re-packaged JAR

diff --git a/org.gecko.playground.xslt/launch-saxon.bndrun b/org.gecko.playground.xslt/launch-saxon.bndrun
@@ -25,7 +25,6 @@
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	org.gecko.playground.saxon;version=snapshot,\
-	org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.6,1.3.7)',\
 	org.apache.xerces;version='[2.12.2,2.12.3)',\
 	org.apache.xml.resolver;version='[1.2.0,1.2.1)',\
 	org.gecko.playground.xmlresolver;version=snapshot,\

diff --git a/org.gecko.playground.xslt/src/org/gecko/playground/xslt/ExampleXSLT.java b/org.gecko.playground.xslt/src/org/gecko/playground/xslt/ExampleXSLT.java
@@ -36,12 +36,17 @@ public class ExampleXSLT {
 	@Activate
 	public void activate(BundleContext ctx) {
 		System.out.println("Transform some book XML into HTML");
-//		TransformerFactory tf = new TransformerFactoryImpl();
+// 		Alternative 1
+//		tf = new TransformerFactoryImpl();
+		// BundleContext ctx = ...
 		Optional<Bundle> saxon = Arrays.stream(ctx.getBundles()).
 				filter(b->"org.gecko.playground.saxon".equals(b.getSymbolicName())).
 				findFirst();
 		saxon.ifPresent(b->{
 			BundleWiring wiring = b.adapt(BundleWiring.class);
+//	 		Alternative 2
+//			tf = Class.forName("net.sf.saxon.BasicTransformerFactory", false, wiring.getClassLoader());
+//	 		Alternative 3
 			tf = TransformerFactory.newInstance("net.sf.saxon.BasicTransformerFactory", wiring.getClassLoader());
 		});
 		if (Objects.isNull(tf)) {