diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml index 46fc9983c5..705c1bf828 100644 --- a/.github/workflows/samples.yml +++ b/.github/workflows/samples.yml @@ -49,3 +49,6 @@ jobs: - name: Build samples shell: bash run: mvn -U -e -B -ntp clean install -f samples + - name: Run idverifier + shell: bash + run: timeout --preserve-status 10 bash ./samples/blueprint/idverifier/idverifier-assembly/target/run.sh || exit 0 diff --git a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini index d9f683ecd2..cc7c3054e8 100644 --- a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini +++ b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini @@ -19,8 +19,8 @@ osgi.bundles=\ cm-${cmVersion}.jar@start,\ services-${servicesVersion}.jar@start,\ asm-all-${asmVersion}.jar@start,\ -pax-logging-api-${paxLoggingApiVersion}.jar@start,\ -pax-logging-service-${paxLoggingServiceVersion}.jar@start,\ +pax-logging-api-${pax-logging.version}.jar@start,\ +pax-logging-service-${pax-logging.version}.jar@start,\ derby-${derbyVersion}.jar@start,\ commons-collections-${commonsCollectionsVersion}.jar@start,\ commons-lang-${commonsLangVersion}.jar@start,\ diff --git a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini b/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini index ef0d144b73..18326904ea 100644 --- a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini +++ b/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini @@ -19,8 +19,8 @@ osgi.bundles=\ cm-${cmVersion}@start,\ services-${servicesVersion}.jar@start,\ asm-all-${asmVersion}.jar@start,\ -pax-logging-api-${paxLoggingApiVersion}.jar@start,\ -pax-logging-service-${paxLoggingServiceVersion}.jar@start,\ +pax-logging-api-${pax-logging.version}.jar@start,\ +pax-logging-service-${pax-logging.version}.jar@start,\ derby-${derbyVersion}.jar@start,\ pax-web-jetty-bundle-${paxWebJettyBundleVersion}.jar@start,\ pax-web-extender-war-${paxWebExtenderWarVersion}.jar@start,\ diff --git a/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini b/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini index 95c4a13de8..1b97b31748 100644 --- a/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini +++ b/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini @@ -18,8 +18,8 @@ osgi.bundles=\ cm-${cmVersion}@start,\ services-${servicesVersion}@start,\ -pax-logging-api-${paxLoggingApiVersion}.jar@start,\ -pax-logging-service-${paxLoggingServiceVersion}.jar@start,\ +pax-logging-api-${pax-logging.version}.jar@start,\ +pax-logging-service-${pax-logging.version}.jar@start,\ asm-all-${asmVersion}.jar@start,\ org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\ org.apache.aries.util-${ariesUtilVersion}.jar@start,\ diff --git a/samples/blueprint/idverifier/idverifier-assembly/pom.xml b/samples/blueprint/idverifier/idverifier-assembly/pom.xml index 57b864a174..a90f1c0801 100644 --- a/samples/blueprint/idverifier/idverifier-assembly/pom.xml +++ b/samples/blueprint/idverifier/idverifier-assembly/pom.xml @@ -37,27 +37,57 @@ org.apache.felix org.apache.felix.main - + + org.fusesource.jansi + jansi + + + org.jline + jline + org.apache.felix - org.apache.felix.shell + org.apache.felix.bundlerepository - org.apache.felix - org.apache.felix.shell.tui + org.apache.felix.gogo.command + + + org.apache.felix + org.apache.felix.gogo.jline + + + org.apache.felix + org.apache.felix.gogo.runtime org.apache.felix org.apache.felix.configadmin - org.apache.felix org.apache.felix.eventadmin + + org.ow2.asm + asm + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + org.ow2.asm + asm-analysis + + org.ops4j.pax.logging pax-logging-api @@ -75,20 +105,20 @@ org.apache.aries.blueprint - org.apache.aries.blueprint + org.apache.aries.blueprint.api - - org.apache.aries - org.apache.aries.util + org.apache.aries.blueprint + org.apache.aries.blueprint.core - org.apache.aries.jmx - org.apache.aries.jmx.blueprint + org.apache.aries.blueprint + org.apache.aries.blueprint.cm + - asm - asm-all + org.apache.aries + org.apache.aries.util diff --git a/samples/blueprint/idverifier/idverifier-assembly/src/main/filtered-resources/conf/config.properties b/samples/blueprint/idverifier/idverifier-assembly/src/main/filtered-resources/conf/config.properties index 455a2c3de4..d5db64cc8d 100644 --- a/samples/blueprint/idverifier/idverifier-assembly/src/main/filtered-resources/conf/config.properties +++ b/samples/blueprint/idverifier/idverifier-assembly/src/main/filtered-resources/conf/config.properties @@ -19,452 +19,10 @@ ############################## # Felix settings ############################## -org.osgi.framework.storage=./cache/ +felix.log.level=1 + org.osgi.framework.startlevel.beginning=10 felix.startlevel.bundle=10 -org.osgi.framework.storage.clean=onFirstInit -org.osgi.framework.executionenvironment=J2SE-1.2,J2SE-1.3,J2SE-1.4,J2SE-1.5,JRE-1.1,JavaSE-1.6,OSGi/Minimum-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.2 -org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \ - org.osgi.framework.launch; version=1.0.0, \ - org.osgi.framework.hooks.service; version=1.0.0, \ - org.osgi.service.packageadmin; version=1.2.0, \ - org.osgi.service.startlevel; version=1.1.0, \ - org.osgi.service.url; version=1.0.0, \ - org.osgi.util.tracker; version=1.4.0 \ - ${jre-${java.specification.version}} - -# -# Java platform package export properties. -# -jre-1.3=, \ - javax.accessibility; \ - javax.naming; \ - javax.naming.directory; \ - javax.naming.event; \ - javax.naming.ldap; \ - javax.naming.spi; \ - javax.rmi; \ - javax.rmi.CORBA; \ - javax.sound.midi; \ - javax.sound.midi.spi; \ - javax.sound.sampled; \ - javax.sound.sampled.spi; \ - javax.swing; \ - javax.swing.border; \ - javax.swing.colorchooser; \ - javax.swing.event; \ - javax.swing.filechooser; \ - javax.swing.plaf; \ - javax.swing.plaf.basic; \ - javax.swing.plaf.metal; \ - javax.swing.plaf.multi; \ - javax.swing.table; \ - javax.swing.text; \ - javax.swing.text.html; \ - javax.swing.text.html.parser; \ - javax.swing.text.rtf; \ - javax.swing.tree; \ - javax.swing.undo; \ - javax.transaction; \ - org.omg.CORBA; \ - org.omg.CORBA_2_3; \ - org.omg.CORBA_2_3.portable; \ - org.omg.CORBA.DynAnyPackage; \ - org.omg.CORBA.ORBPackage; \ - org.omg.CORBA.portable; \ - org.omg.CORBA.TypeCodePackage; \ - org.omg.CosNaming; \ - org.omg.CosNaming.NamingContextPackage; \ - org.omg.SendingContext; \ - org.omg.stub.java.rmi; \ - version="1.3.0" - -jre-1.4=, \ - javax.accessibility; \ - javax.crypto; \ - javax.crypto.interfaces; \ - javax.crypto.spec; \ - javax.imageio; \ - javax.imageio.event; \ - javax.imageio.metadata; \ - javax.imageio.plugins.jpeg; \ - javax.imageio.spi; \ - javax.imageio.stream; \ - javax.naming; \ - javax.naming.directory; \ - javax.naming.event; \ - javax.naming.ldap; \ - javax.naming.spi; \ - javax.net; \ - javax.net.ssl; \ - javax.print; \ - javax.print.attribute; \ - javax.print.attribute.standard; \ - javax.print.event; \ - javax.rmi; \ - javax.rmi.CORBA; \ - javax.security.auth; \ - javax.security.auth.callback; \ - javax.security.auth.kerberos; \ - javax.security.auth.login; \ - javax.security.auth.spi; \ - javax.security.auth.x500; \ - javax.security.cert; \ - javax.sound.midi; \ - javax.sound.midi.spi; \ - javax.sound.sampled; \ - javax.sound.sampled.spi; \ - javax.sql; \ - javax.swing; \ - javax.swing.border; \ - javax.swing.colorchooser; \ - javax.swing.event; \ - javax.swing.filechooser; \ - javax.swing.plaf; \ - javax.swing.plaf.basic; \ - javax.swing.plaf.metal; \ - javax.swing.plaf.multi; \ - javax.swing.table; \ - javax.swing.text; \ - javax.swing.text.html; \ - javax.swing.text.html.parser; \ - javax.swing.text.rtf; \ - javax.swing.tree; \ - javax.swing.undo; \ - javax.transaction; \ - javax.transaction.xa; \ - javax.xml.parsers; \ - javax.xml.transform; \ - javax.xml.transform.dom; \ - javax.xml.transform.sax; \ - javax.xml.transform.stream; \ - org.ietf.jgss; \ - org.omg.CORBA; \ - org.omg.CORBA_2_3; \ - org.omg.CORBA_2_3.portable; \ - org.omg.CORBA.DynAnyPackage; \ - org.omg.CORBA.ORBPackage; \ - org.omg.CORBA.portable; \ - org.omg.CORBA.TypeCodePackage; \ - org.omg.CosNaming; \ - org.omg.CosNaming.NamingContextExtPackage; \ - org.omg.CosNaming.NamingContextPackage; \ - org.omg.Dynamic; \ - org.omg.DynamicAny; \ - org.omg.DynamicAny.DynAnyFactoryPackage; \ - org.omg.DynamicAny.DynAnyPackage; \ - org.omg.IOP; \ - org.omg.IOP.CodecFactoryPackage; \ - org.omg.IOP.CodecPackage; \ - org.omg.Messaging; \ - org.omg.PortableInterceptor; \ - org.omg.PortableInterceptor.ORBInitInfoPackage; \ - org.omg.PortableServer; \ - org.omg.PortableServer.CurrentPackage; \ - org.omg.PortableServer.POAManagerPackage; \ - org.omg.PortableServer.POAPackage; \ - org.omg.PortableServer.portable; \ - org.omg.PortableServer.ServantLocatorPackage; \ - org.omg.SendingContext; \ - org.omg.stub.java.rmi; \ - org.w3c.dom; \ - org.w3c.dom.css; \ - org.w3c.dom.events; \ - org.w3c.dom.html; \ - org.w3c.dom.stylesheets; \ - org.w3c.dom.traversal; \ - org.w3c.dom.views; \ - org.xml.sax; \ - org.xml.sax.ext; \ - org.xml.sax.helpers; \ - version="1.4.0" - -jre-1.5=, \ - javax.accessibility; \ - javax.activity; \ - javax.crypto; \ - javax.crypto.interfaces; \ - javax.crypto.spec; \ - javax.imageio; \ - javax.imageio.event; \ - javax.imageio.metadata; \ - javax.imageio.plugins.bmp; \ - javax.imageio.plugins.jpeg; \ - javax.imageio.spi; \ - javax.imageio.stream; \ - javax.management; \ - javax.management.loading; \ - javax.management.modelmbean; \ - javax.management.monitor; \ - javax.management.openmbean; \ - javax.management.relation; \ - javax.management.remote; \ - javax.management.remote.rmi; \ - javax.management.timer; \ - javax.naming; \ - javax.naming.directory; \ - javax.naming.event; \ - javax.naming.ldap; \ - javax.naming.spi; \ - javax.net; \ - javax.net.ssl; \ - javax.print; \ - javax.print.attribute; \ - javax.print.attribute.standard; \ - javax.print.event; \ - javax.rmi; \ - javax.rmi.CORBA; \ - javax.rmi.ssl; \ - javax.security.auth; \ - javax.security.auth.callback; \ - javax.security.auth.kerberos; \ - javax.security.auth.login; \ - javax.security.auth.spi; \ - javax.security.auth.x500; \ - javax.security.cert; \ - javax.security.sasl; \ - javax.sound.midi; \ - javax.sound.midi.spi; \ - javax.sound.sampled; \ - javax.sound.sampled.spi; \ - javax.sql; \ - javax.sql.rowset; \ - javax.sql.rowset.serial; \ - javax.sql.rowset.spi; \ - javax.swing; \ - javax.swing.border; \ - javax.swing.colorchooser; \ - javax.swing.event; \ - javax.swing.filechooser; \ - javax.swing.plaf; \ - javax.swing.plaf.basic; \ - javax.swing.plaf.metal; \ - javax.swing.plaf.multi; \ - javax.swing.plaf.synth; \ - javax.swing.table; \ - javax.swing.text; \ - javax.swing.text.html; \ - javax.swing.text.html.parser; \ - javax.swing.text.rtf; \ - javax.swing.tree; \ - javax.swing.undo; \ - javax.transaction; \ - javax.transaction.xa; \ - javax.xml; \ - javax.xml.datatype; \ - javax.xml.namespace; \ - javax.xml.parsers; \ - javax.xml.transform; \ - javax.xml.transform.dom; \ - javax.xml.transform.sax; \ - javax.xml.transform.stream; \ - javax.xml.validation; \ - javax.xml.xpath; \ - org.ietf.jgss; \ - org.omg.CORBA; \ - org.omg.CORBA_2_3; \ - org.omg.CORBA_2_3.portable; \ - org.omg.CORBA.DynAnyPackage; \ - org.omg.CORBA.ORBPackage; \ - org.omg.CORBA.portable; \ - org.omg.CORBA.TypeCodePackage; \ - org.omg.CosNaming; \ - org.omg.CosNaming.NamingContextExtPackage; \ - org.omg.CosNaming.NamingContextPackage; \ - org.omg.Dynamic; \ - org.omg.DynamicAny; \ - org.omg.DynamicAny.DynAnyFactoryPackage; \ - org.omg.DynamicAny.DynAnyPackage; \ - org.omg.IOP; \ - org.omg.IOP.CodecFactoryPackage; \ - org.omg.IOP.CodecPackage; \ - org.omg.Messaging; \ - org.omg.PortableInterceptor; \ - org.omg.PortableInterceptor.ORBInitInfoPackage; \ - org.omg.PortableServer; \ - org.omg.PortableServer.CurrentPackage; \ - org.omg.PortableServer.POAManagerPackage; \ - org.omg.PortableServer.POAPackage; \ - org.omg.PortableServer.portable; \ - org.omg.PortableServer.ServantLocatorPackage; \ - org.omg.SendingContext; \ - org.omg.stub.java.rmi; \ - org.omg.stub.javax.management.remote.rmi; \ - org.w3c.dom; \ - org.w3c.dom.bootstrap; \ - org.w3c.dom.css; \ - org.w3c.dom.events; \ - org.w3c.dom.html; \ - org.w3c.dom.ls; \ - org.w3c.dom.ranges; \ - org.w3c.dom.stylesheets; \ - org.w3c.dom.traversal; \ - org.w3c.dom.views; \ - org.xml.sax; \ - org.xml.sax.ext; \ - org.xml.sax.helpers; \ - version="1.5.0" - -jre-1.6=, \ - javax.accessibility; \ - javax.activation; \ - javax.activity; \ - javax.annotation; \ - javax.annotation.processing; \ - javax.crypto; \ - javax.crypto.interfaces; \ - javax.crypto.spec; \ - javax.imageio; \ - javax.imageio.event; \ - javax.imageio.metadata; \ - javax.imageio.plugins.bmp; \ - javax.imageio.plugins.jpeg; \ - javax.imageio.spi; \ - javax.imageio.stream; \ - javax.jws; \ - javax.jws.soap; \ - javax.lang.model; \ - javax.lang.model.element; \ - javax.lang.model.type; \ - javax.lang.model.util; \ - javax.management; \ - javax.management.loading; \ - javax.management.modelmbean; \ - javax.management.monitor; \ - javax.management.openmbean; \ - javax.management.relation; \ - javax.management.remote; \ - javax.management.remote.rmi; \ - javax.management.timer; \ - javax.naming; \ - javax.naming.directory; \ - javax.naming.event; \ - javax.naming.ldap; \ - javax.naming.spi; \ - javax.net; \ - javax.net.ssl; \ - javax.print; \ - javax.print.attribute; \ - javax.print.attribute.standard; \ - javax.print.event; \ - javax.rmi; \ - javax.rmi.CORBA; \ - javax.rmi.ssl; \ - javax.script; \ - javax.security.auth; \ - javax.security.auth.callback; \ - javax.security.auth.kerberos; \ - javax.security.auth.login; \ - javax.security.auth.spi; \ - javax.security.auth.x500; \ - javax.security.cert; \ - javax.security.sasl; \ - javax.sound.midi; \ - javax.sound.midi.spi; \ - javax.sound.sampled; \ - javax.sound.sampled.spi; \ - javax.sql; \ - javax.sql.rowset; \ - javax.sql.rowset.serial; \ - javax.sql.rowset.spi; \ - javax.swing; \ - javax.swing.border; \ - javax.swing.colorchooser; \ - javax.swing.event; \ - javax.swing.filechooser; \ - javax.swing.plaf; \ - javax.swing.plaf.basic; \ - javax.swing.plaf.metal; \ - javax.swing.plaf.multi; \ - javax.swing.plaf.synth; \ - javax.swing.table; \ - javax.swing.text; \ - javax.swing.text.html; \ - javax.swing.text.html.parser; \ - javax.swing.text.rtf; \ - javax.swing.tree; \ - javax.swing.undo; \ - javax.tools; \ - javax.transaction; \ - javax.transaction.xa; \ - javax.xml; \ - javax.xml.bind; \ - javax.xml.bind.annotation; \ - javax.xml.bind.annotation.adapters; \ - javax.xml.bind.attachment; \ - javax.xml.bind.helpers; \ - javax.xml.bind.util; \ - javax.xml.crypto; \ - javax.xml.crypto.dom; \ - javax.xml.crypto.dsig; \ - javax.xml.crypto.dsig.dom; \ - javax.xml.crypto.dsig.keyinfo; \ - javax.xml.crypto.dsig.spec; \ - javax.xml.datatype; \ - javax.xml.namespace; \ - javax.xml.parsers; \ - javax.xml.soap; \ - javax.xml.stream; \ - javax.xml.stream.events; \ - javax.xml.stream.util; \ - javax.xml.transform; \ - javax.xml.transform.dom; \ - javax.xml.transform.sax; \ - javax.xml.transform.stax; \ - javax.xml.transform.stream; \ - javax.xml.validation; \ - javax.xml.ws; \ - javax.xml.ws.handler; \ - javax.xml.ws.handler.soap; \ - javax.xml.ws.http; \ - javax.xml.ws.soap; \ - javax.xml.ws.spi; \ - javax.xml.xpath; \ - org.ietf.jgss; \ - org.omg.CORBA; \ - org.omg.CORBA_2_3; \ - org.omg.CORBA_2_3.portable; \ - org.omg.CORBA.DynAnyPackage; \ - org.omg.CORBA.ORBPackage; \ - org.omg.CORBA.portable; \ - org.omg.CORBA.TypeCodePackage; \ - org.omg.CosNaming; \ - org.omg.CosNaming.NamingContextExtPackage; \ - org.omg.CosNaming.NamingContextPackage; \ - org.omg.Dynamic; \ - org.omg.DynamicAny; \ - org.omg.DynamicAny.DynAnyFactoryPackage; \ - org.omg.DynamicAny.DynAnyPackage; \ - org.omg.IOP; \ - org.omg.IOP.CodecFactoryPackage; \ - org.omg.IOP.CodecPackage; \ - org.omg.Messaging; \ - org.omg.PortableInterceptor; \ - org.omg.PortableInterceptor.ORBInitInfoPackage; \ - org.omg.PortableServer; \ - org.omg.PortableServer.CurrentPackage; \ - org.omg.PortableServer.POAManagerPackage; \ - org.omg.PortableServer.POAPackage; \ - org.omg.PortableServer.portable; \ - org.omg.PortableServer.ServantLocatorPackage; \ - org.omg.SendingContext; \ - org.omg.stub.java.rmi; \ - org.omg.stub.javax.management.remote.rmi; \ - org.w3c.dom; \ - org.w3c.dom.bootstrap; \ - org.w3c.dom.css; \ - org.w3c.dom.events; \ - org.w3c.dom.html; \ - org.w3c.dom.ls; \ - org.w3c.dom.ranges; \ - org.w3c.dom.stylesheets; \ - org.w3c.dom.traversal; \ - org.w3c.dom.views; \ - org.w3c.dom.xpath; \ - org.xml.sax; \ - org.xml.sax.ext; \ - org.xml.sax.helpers; \ - version=\"1.6.0\" ############################## # Log setting @@ -474,22 +32,30 @@ org.ops4j.pax.logging.DefaultServiceLog.level=INFO ############################## # Client bundles to install ############################## -felix.auto.start.1=\ -"file:bundles/org.apache.felix.shell-${felixShellVersion}.jar" \ -"file:bundles/org.apache.felix.shell.tui-${felixShellTuiVersion}.jar" +# enable gogo to have access to command line in interactive mode +#felix.auto.start.1=\ +#"file:bundles/jansi-${jansi.version}.jar" \ +#"file:bundles/jline-${jline.version}.jar" \ +#"file:bundles/org.apache.felix.gogo.command-${org.apache.felix.gogo.command.version}.jar" \ +#"file:bundles/org.apache.felix.gogo.jline-${org.apache.felix.gogo.jline.version}.jar" \ +#"file:bundles/org.apache.felix.gogo.runtime-${org.apache.felix.gogo.runtime.version}.jar" felix.auto.start.2=\ -"file:bundles/pax-logging-service-${paxLoggingServiceVersion}.jar" \ -"file:bundles/pax-logging-api-${paxLoggingApiVersion}.jar" \ -"file:bundles/org.apache.felix.eventadmin-${felixEventadminVersion}.jar" \ -"file:bundles/org.apache.felix.configadmin-${felixConfigadminVersion}.jar" \ -"file:bundles/org.apache.aries.util-${ariesUtilVersion}.jar" +"file:bundles/org.apache.felix.bundlerepository-${org.apache.felix.bundlerepository.version}.jar" \ +"file:bundles/pax-logging-api-${pax-logging.version}.jar" \ +"file:bundles/pax-logging-service-${pax-logging.version}.jar" \ +"file:bundles/org.apache.felix.eventadmin-${org.apache.felix.eventadmin.version}.jar" \ +"file:bundles/org.apache.felix.configadmin-${org.apache.felix.configadmin.version}.jar" \ +"file:bundles/org.apache.aries.util-${org.apache.aries.util.version}.jar" felix.auto.start.3=\ -"file:bundles/asm-all-${asmVersion}.jar" \ -"file:bundles/org.apache.aries.proxy-${ariesProxyVersion}.jar" \ -"file:bundles/org.apache.aries.blueprint-${ariesBlueprintVersion}.jar" -felix.auto.start.4=\ -"file:bundles/org.apache.aries.jmx.blueprint-${ariesJmxBlueprintVersion}.jar" -felix.auto.install.10=\ +"file:bundles/asm-${asm.version}.jar" \ +"file:bundles/asm-commons-${asm.version}.jar" \ +"file:bundles/asm-tree-${asm.version}.jar" \ +"file:bundles/asm-analysis-${asm.version}.jar" \ +"file:bundles/org.apache.aries.proxy-${org.apache.aries.proxy.version}.jar" \ +"file:bundles/org.apache.aries.blueprint.api-${org.apache.aries.blueprint.api.version}.jar" \ +"file:bundles/org.apache.aries.blueprint.cm-${org.apache.aries.blueprint.cm.version}.jar" \ +"file:bundles/org.apache.aries.blueprint.core-${org.apache.aries.blueprint.core.version}.jar" +felix.auto.start.5=\ "file:bundles/org.apache.aries.samples.blueprint.idverifier.server-${project.version}.jar" \ "file:bundles/org.apache.aries.samples.blueprint.idverifier.client-${project.version}.jar" \ "file:bundles/org.apache.aries.samples.blueprint.idverifier.api-${project.version}.jar" diff --git a/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.bat b/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.bat index 422b2f1046..24f4d986a5 100755 --- a/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.bat +++ b/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.bat @@ -18,4 +18,4 @@ @REM ################################################################################ @echo off set JAVA_OPTS=-Dcom.sun.management.jmxremote.port=8888 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -java %JAVA_OPTS% -jar bundles/org.apache.felix.main-2.0.4.jar +java %JAVA_OPTS% -jar bundles/org.apache.felix.main-7.0.5.jar diff --git a/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.sh b/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.sh index 6d8b7866b3..0d210cb9c9 100755 --- a/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.sh +++ b/samples/blueprint/idverifier/idverifier-assembly/src/main/resources/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ################################################################################ # Copyright 2010 # @@ -17,5 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ################################################################################ +SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" +cd $SCRIPT_DIR JAVA_OPTS="-Dcom.sun.management.jmxremote.port=8888 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" -java $JAVA_OPTS -jar bundles/org.apache.felix.main-2.0.4.jar +java $JAVA_OPTS -jar bundles/org.apache.felix.main-7.0.5.jar diff --git a/samples/blueprint/idverifier/idverifier-client/pom.xml b/samples/blueprint/idverifier/idverifier-client/pom.xml index f9d333936e..342be39463 100644 --- a/samples/blueprint/idverifier/idverifier-client/pom.xml +++ b/samples/blueprint/idverifier/idverifier-client/pom.xml @@ -29,16 +29,14 @@ Example blueprint application to demo inlined managers definitions. - - 3.5.0.v20090520 - - - org.eclipse - osgi - ${osgi.version} - provided + org.osgi + osgi.core + + + org.slf4j + slf4j-api org.apache.aries.blueprint diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/BankInfo.java b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/BankInfo.java index 347a815b6b..5f76899273 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/BankInfo.java +++ b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/BankInfo.java @@ -18,11 +18,16 @@ */ package org.apache.aries.samples.blueprint.idverifier.client; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author forrestxm * */ public class BankInfo { + private static final Logger log = LoggerFactory.getLogger(BankInfo.class); + private String bankname; private String bankaddress; private String banklegalpersonname; @@ -47,7 +52,7 @@ public String getBankaddress() { return bankaddress; } /** - * @param bandaddress the bandaddress to set + * @param bankaddress the bandaddress to set */ public void setBankaddress(String bankaddress) { this.bankaddress = bankaddress; @@ -78,12 +83,12 @@ public void setBankregistrationnumber(String bankregistrationnumber) { } @Override public String toString(){ - System.out.println("********Start of Printing Bank Info**********"); - System.out.println("Bank Name: " + this.getBankname()); - System.out.println("Bank Address: " + this.getBankaddress()); - System.out.println("Bank Legal Person: "+ this.getBanklegalpersonname()); - System.out.println("Bank Reg. Number: "+ this.getBankregistrationnumber()); - System.out.println("********End of Printing Bank Info**********"); + log.info("********Start of Printing Bank Info**********"); + log.info("Bank Name: " + this.getBankname()); + log.info("Bank Address: " + this.getBankaddress()); + log.info("Bank Legal Person: "+ this.getBanklegalpersonname()); + log.info("Bank Reg. Number: "+ this.getBankregistrationnumber()); + log.info("********End of Printing Bank Info**********"); String delimiter = ","; StringBuffer sb = new StringBuffer(); sb.append("["); diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditQueryRegistrationListener.java b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditQueryRegistrationListener.java index 4f0a641c1c..0f7b467762 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditQueryRegistrationListener.java +++ b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditQueryRegistrationListener.java @@ -18,6 +18,9 @@ */ package org.apache.aries.samples.blueprint.idverifier.client; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -27,23 +30,24 @@ * */ public class CreditQueryRegistrationListener { + private static final Logger log = LoggerFactory.getLogger(CreditQueryRegistrationListener.class); public void reg(CreditRecordOperationImpl svcobject, Map props){ //svcobject.doAfterReg(); - System.out.println("********Registered bean "+svcobject.getClass().getName()+" as a service**********"); - System.out.println("********Start of Printing service properties**************"); + log.info("********Registered bean "+svcobject.getClass().getName()+" as a service**********"); + log.info("********Start of Printing service properties**************"); Set keyset = props.keySet(); Iterator iter = keyset.iterator(); while(iter.hasNext()){ Object keyobj = iter.next(); Object valueobj = props.get(keyobj); - System.out.println(keyobj + "=" + valueobj); + log.info(keyobj + "=" + valueobj); } - System.out.println("********End of Printing service properties**************"); + log.info("********End of Printing service properties**************"); } public void unreg(CreditRecordOperationImpl svcobject, Map props){ - System.out.println("********Unregistering service bean "+svcobject.getClass().getName()+"**********"); + log.info("********Unregistering service bean "+svcobject.getClass().getName()+"**********"); } } diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditRecordFactory.java b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditRecordFactory.java index c1ca4931c0..a6a9954bd1 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditRecordFactory.java +++ b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditRecordFactory.java @@ -18,11 +18,16 @@ */ package org.apache.aries.samples.blueprint.idverifier.client; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author forrestxm * */ public class CreditRecordFactory { + private static final Logger log = LoggerFactory.getLogger(CreditRecordFactory.class); + public static CreditRecord staticCreateBean(String record) { staticcount++; return new CreditRecord(record); @@ -42,10 +47,10 @@ public CreditRecord dynamicCreateBean(String record) { } public void creationStatistics() { - System.out.println("**********Bean factory " + log.info("**********Bean factory " + this.getClass().getSimpleName() + " says goodbye!************"); - System.out.println("**********I created " + staticcount + " " + log.info("**********I created " + staticcount + " " + targetbeanname + " with static factory, " + dynamiccount + " " + targetbeanname + " with dynamic factory.***********"); } diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonBankBean.java b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonBankBean.java index 4320505c87..c732ef07a5 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonBankBean.java +++ b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonBankBean.java @@ -29,11 +29,16 @@ import org.apache.aries.samples.blueprint.idverifier.api.*; import org.osgi.framework.BundleContext; +import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceRegistration; import org.osgi.framework.ServiceReference; import org.osgi.service.blueprint.container.BlueprintContainer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PersonBankBean { + private static final Logger log = LoggerFactory.getLogger(PersonBankBean.class); + private PersonalInfo personinfo; private BankInfo bankinfo; private String bankinfobeanid; @@ -131,28 +136,28 @@ public void setBpbundlecontext(BundleContext bpbundlecontext) { this.bpbundlecontext = bpbundlecontext; } - public void startUp(){ - System.out.println("*******Start of Printing Personal Bank/Credit Information************"); + public void startUp() { + log.info("*******Start of Printing Personal Bank/Credit Information************"); this.personinfo.toString(); // get component instance of BankInfo at runtime this.setBankinfo((BankInfo)bpcontainer.getComponentInstance(this.getBankinfobeanid())); this.bankinfo.toString(); - + // get inlined service object from service registration object - ServiceReference svcref = this.svcreg4cro.getReference(); - this.setCro((CreditRecordOperation)this.bpbundlecontext.getService(svcref)); +// ServiceReference svcref = this.svcreg4cro.getReference(); +// this.setCro((CreditRecordOperation)this.bpbundlecontext.getService(svcref)); Set allcreditrecords = cro.query(this.personinfo.getPersonid()); if (allcreditrecords.isEmpty()){ - System.out.println("No credit records for id " + this.personinfo.getPersonid()); + log.info("No credit records for id " + this.personinfo.getPersonid()); } else { - System.out.println("The credit records for id " + this.personinfo.getPersonid() + " are as follows:"); + log.info("The credit records for id " + this.personinfo.getPersonid() + " are as follows:"); for (String arecord : allcreditrecords){ - System.out.println(arecord); + log.info(arecord); } } - System.out.println("*******End of Printing Personal Bank/Credit Information**************"); + log.info("*******End of Printing Personal Bank/Credit Information**************"); } } diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonalInfo.java b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonalInfo.java index 8a927f8a31..443510cf28 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonalInfo.java +++ b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonalInfo.java @@ -19,11 +19,16 @@ package org.apache.aries.samples.blueprint.idverifier.client; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author forrestxm * */ public class PersonalInfo { + private static final Logger log = LoggerFactory.getLogger(PersonalInfo.class); + private String personid; private String area; private String birthday; @@ -93,11 +98,11 @@ public void setGender(String suffixCode) { } @Override public String toString(){ - System.out.println("********Start of Printing Personal Info**********"); - System.out.println("Area: " + this.getArea()); - System.out.println("Birthday: " + this.getBirthday()); - System.out.println("Gender: "+ this.getGender()); - System.out.println("********End of Printing Personal Info************"); + log.info("********Start of Printing Personal Info**********"); + log.info("Area: " + this.getArea()); + log.info("Birthday: " + this.getBirthday()); + log.info("Gender: "+ this.getGender()); + log.info("********End of Printing Personal Info************"); String delimiter = ","; StringBuffer sb = new StringBuffer(); sb.append("PersonInfo ["); diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/VerifierServiceReferenceListener.java b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/VerifierServiceReferenceListener.java index 32b163ebb4..771ca890f3 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/VerifierServiceReferenceListener.java +++ b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/VerifierServiceReferenceListener.java @@ -28,14 +28,18 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author forrestxm * */ public class VerifierServiceReferenceListener { + private static final Logger log = LoggerFactory.getLogger(VerifierServiceReferenceListener.class); + public void bind(ServiceReference svcref) { - System.out.println("**********" + this.getClass().getSimpleName() + " bind method via ServiceReference!*********"); + log.info("**********" + this.getClass().getSimpleName() + " bind method via ServiceReference!*********"); // Get specific PersonIDVerifier implementation class Bundle svcproviderbundle = svcref.getBundle(); BundleContext svcproviderbundlectx = svcproviderbundle.getBundleContext(); @@ -46,29 +50,29 @@ public void bind(ServiceReference svcref) { } else if (svcbean instanceof PersonIDVerifierComplexImpl){ svcbeanname = ((PersonIDVerifierComplexImpl)svcbean).getClass().getCanonicalName(); } - System.out.println("Bundle " + svcproviderbundle.getSymbolicName() + " provides this service implemented by " + svcbeanname); + log.info("Bundle " + svcproviderbundle.getSymbolicName() + " provides this service implemented by " + svcbeanname); // Print service users information - System.out.println("**********Start of printing service's users**********"); + log.info("**********Start of printing service's users**********"); Bundle[] usingbundles = svcref.getUsingBundles(); if (usingbundles != null) { int len = usingbundles.length; - System.out.println("The service has " + len + " users!"); - System.out.println("They are:"); + log.info("The service has " + len + " users!"); + log.info("They are:"); for (int i = 0; i < len; i++) { - System.out.println(usingbundles[i].getSymbolicName()); + log.info(usingbundles[i].getSymbolicName()); } - System.out.println("All users are printed out!"); + log.info("All users are printed out!"); } - System.out.println("**********End of printing service's users**********"); + log.info("**********End of printing service's users**********"); } public void bind(PersonIDVerifier svc) { - System.out.println("**********This is service object proxy bind method!***********"); + log.info("**********This is service object proxy bind method!***********"); } public void unbind(ServiceReference svcref) { - System.out.println("**********" + this.getClass().getSimpleName() + " unbind method via ServiceReference!*********"); + log.info("**********" + this.getClass().getSimpleName() + " unbind method via ServiceReference!*********"); // Get specific PersonIDVerifier implementation class Bundle svcproviderbundle = svcref.getBundle(); BundleContext svcproviderbundlectx = svcproviderbundle.getBundleContext(); @@ -79,33 +83,33 @@ public void unbind(ServiceReference svcref) { } else if (svcbean instanceof PersonIDVerifierComplexImpl){ svcbeanname = ((PersonIDVerifierComplexImpl)svcbean).getClass().getCanonicalName(); } - System.out.println("Bundle " + svcproviderbundle.getSymbolicName() + " provides this service implemented by " + svcbeanname); + log.info("Bundle " + svcproviderbundle.getSymbolicName() + " provides this service implemented by " + svcbeanname); // Print service users information - System.out.println("**********Start of printing service's users**********"); + log.info("**********Start of printing service's users**********"); Bundle[] usingbundles = svcref.getUsingBundles(); if (usingbundles != null) { int len = usingbundles.length; - System.out.println("The service has " + len + " users!"); - System.out.println("They are:"); + log.info("The service has " + len + " users!"); + log.info("They are:"); for (int i = 0; i < len; i++) { - System.out.println(usingbundles[i].getSymbolicName()); + log.info(usingbundles[i].getSymbolicName()); } - System.out.println("All users are printed out!"); + log.info("All users are printed out!"); } - System.out.println("**********End of printing service's users**********"); + log.info("**********End of printing service's users**********"); } public void unbind(PersonIDVerifier svc, Map props) { - System.out.println("**********This is service object proxy unbind method!***********"); - System.out.println("**********Start of printing service properties***********"); - System.out.println("Service properties are:"); + log.info("**********This is service object proxy unbind method!***********"); + log.info("**********Start of printing service properties***********"); + log.info("Service properties are:"); Set keys = props.keySet(); for (Object obj : keys) { Object valueobj = props.get(obj); - System.out.println(obj + "=" + valueobj); + log.info(obj + "=" + valueobj); } - System.out.println("**********End of printing service properties***********"); + log.info("**********End of printing service properties***********"); } } diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/resources/OSGI-INF/blueprint/blueprint-sample-idverifier-client.xml b/samples/blueprint/idverifier/idverifier-client/src/main/resources/OSGI-INF/blueprint/blueprint-sample-idverifier-client.xml index 3d5c21f74f..ef17720500 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/resources/OSGI-INF/blueprint/blueprint-sample-idverifier-client.xml +++ b/samples/blueprint/idverifier/idverifier-client/src/main/resources/OSGI-INF/blueprint/blueprint-sample-idverifier-client.xml @@ -48,73 +48,124 @@ - - - Inlined service about querying credit records. - - org.apache.aries.samples.blueprint.idverifier.api.CreditRecordOperation - - - - - - - - Inlined service registration bean - - - - Inlined bean for CreditRecordOperation interface implementation - - inlined bean for CreditRecordStore - - - - - - 310115197011076874:003:2009-12-30:good:4rd donation to charity. - - - - - 310115197011076874:004:2009-12-18:good:3rd donation to charity. - - - - - 310115197011277844:001:2009-12-29:good:Donation to charity - - - - - 310115197011277844:002:2009-12-01:bad:No pay to bill. - - - - - 110108197710016853:002:2009-12-02:good:Paied the bill. - - - - - 110108197710016853:001:1977-10-01:good:I'm born. - - - - - 11010819541001366X:001:1954-10-01:good:I'm born. - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Inlined bean for CreditRecordOperation interface implementation + + inlined bean for CreditRecordStore + + + + + + 310115197011076874:003:2009-12-30:good:4rd donation to charity. + + + + + 310115197011076874:004:2009-12-18:good:3rd donation to charity. + + + + + 310115197011277844:001:2009-12-29:good:Donation to charity + + + + + 310115197011277844:002:2009-12-01:bad:No pay to bill. + + + + + 110108197710016853:002:2009-12-02:good:Paied the bill. + + + + + 110108197710016853:001:1977-10-01:good:I'm born. + + + + + 11010819541001366X:001:1954-10-01:good:I'm born. + + + + + + + + diff --git a/samples/blueprint/idverifier/idverifier-server/pom.xml b/samples/blueprint/idverifier/idverifier-server/pom.xml index bec6f4525e..b108e380a9 100644 --- a/samples/blueprint/idverifier/idverifier-server/pom.xml +++ b/samples/blueprint/idverifier/idverifier-server/pom.xml @@ -29,10 +29,6 @@ Example blueprint application to demo inlined managers definitions. - - 3.5.0.v20090520 - - @@ -45,7 +41,6 @@ org.apache.aries.samples.blueprint.idverifier.api;provide:=true, * - @@ -53,10 +48,12 @@ - org.eclipse - osgi - ${osgi.version} - provided + org.osgi + osgi.core + + + org.slf4j + slf4j-api org.apache.aries.blueprint diff --git a/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/ComplexVerifierRegistrationListener.java b/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/ComplexVerifierRegistrationListener.java index d4155f1447..04cf4c9395 100644 --- a/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/ComplexVerifierRegistrationListener.java +++ b/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/ComplexVerifierRegistrationListener.java @@ -18,6 +18,9 @@ */ package org.apache.aries.samples.blueprint.idverifier.server; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -27,22 +30,23 @@ * */ public class ComplexVerifierRegistrationListener { + private static final Logger log = LoggerFactory.getLogger(ComplexVerifierRegistrationListener.class); public void reg(PersonIDVerifierComplexImpl svcobject, Map props){ //svcobject.doAfterReg(); - System.out.println("********Registered bean "+svcobject.getClass().getName()+" as a service**********"); - System.out.println("********Print service properties**************"); + log.info("********Registered bean "+svcobject.getClass().getName()+" as a service**********"); + log.info("********Print service properties**************"); Set keyset = props.keySet(); Iterator iter = keyset.iterator(); while(iter.hasNext()){ Object keyobj = iter.next(); Object valueobj = props.get(keyobj); - System.out.println(keyobj + "=" + valueobj); + log.info(keyobj + "=" + valueobj); } } public void unreg(PersonIDVerifierComplexImpl svcobject, Map props){ - System.out.println("********Unregistering service bean "+svcobject.getClass().getName()+"**********"); + log.info("********Unregistering service bean "+svcobject.getClass().getName()+"**********"); } } diff --git a/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/SimpleVerifierRegistrationListener.java b/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/SimpleVerifierRegistrationListener.java index 813bdf8b4e..f69f624e06 100644 --- a/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/SimpleVerifierRegistrationListener.java +++ b/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/SimpleVerifierRegistrationListener.java @@ -18,6 +18,9 @@ */ package org.apache.aries.samples.blueprint.idverifier.server; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -27,22 +30,23 @@ * */ public class SimpleVerifierRegistrationListener { + private static final Logger log = LoggerFactory.getLogger(SimpleVerifierRegistrationListener.class); public void reg(PersonIDVerifierSimpleImpl svcobject, Map props){ //svcobject.doAfterReg(); - System.out.println("********Registered bean "+svcobject.getClass().getName()+" as a service**********"); - System.out.println("********Print service properties**************"); + log.info("********Registered bean "+svcobject.getClass().getName()+" as a service**********"); + log.info("********Print service properties**************"); Set keyset = props.keySet(); Iterator iter = keyset.iterator(); while(iter.hasNext()){ Object keyobj = iter.next(); Object valueobj = props.get(keyobj); - System.out.println(keyobj + "=" + valueobj); + log.info(keyobj + "=" + valueobj); } } public void unreg(PersonIDVerifierSimpleImpl svcobject, Map props){ - System.out.println("********Unregistering service bean "+svcobject.getClass().getName()+"**********"); + log.info("********Unregistering service bean "+svcobject.getClass().getName()+"**********"); } } diff --git a/samples/blueprint/idverifier/readme.txt b/samples/blueprint/idverifier/readme.txt index 0c9d36d3a9..e4d35ce468 100644 --- a/samples/blueprint/idverifier/readme.txt +++ b/samples/blueprint/idverifier/readme.txt @@ -17,26 +17,26 @@ # limitations under the License. ################################################################################ -Apache Aries Samples ----------------------------------------------------------------------- - -This sample demonstrates blueprint inlined managers usage. - -This README uses the following aliases to describe directories. These aliases should be replaced with your actual directory paths. - %SAMPLE_HOME% refers to the root directory where Aries samples are extracted. - - -BUILD ------ -1. cd %SAMPLE_HOME%/blueprint/idverifier -2. mvn clean install - - -RUN ---- -1. cd %SAMPLE_HOME%/blueprint/idverifier/idverifier-assembly/target +Apache Aries Samples +---------------------------------------------------------------------- + +This sample demonstrates blueprint inlined managers usage. + +This README uses the following aliases to describe directories. These aliases should be replaced with your actual directory paths. + %SAMPLE_HOME% refers to the root directory where Aries samples are extracted. + + +BUILD +----- +1. cd %SAMPLE_HOME%/blueprint/idverifier +2. mvn clean install + + +RUN +--- +1. cd %SAMPLE_HOME%/blueprint/idverifier/idverifier-assembly/target 2. run.bat|.sh MEMO ---- -After the sample is running, you can connect to it via JConsole to check the sample bundles via blueprint MBeans. +You can change configuration file to include gogo bundles and enable shell diff --git a/samples/pom.xml b/samples/pom.xml index cfc666ae85..b9a54e1189 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -128,8 +128,6 @@ 3.2.0-v20070116 3.1.200-v20070605 3.2 - 1.5.0 - 1.5.0 10.14.2.0 3.2.2 2.5 @@ -150,58 +148,142 @@ 0.8.1 3.1.4 - 1.6.4 - 2.0.4 - 1.4.2 - 1.4.1 - 1.2.2 - 2.0.10 - 1.2.4 1.13.1 1.2 2.0.10 * + + + 1.18 + 3.13.2 + 2.0.10 + 1.9.26 + 1.6.4 + 1.1.2 + 1.1.8 + 1.1.4 + 7.0.5 + + + 9.7.1 + 8.0.0 + 1.7.36 + 1.11.17 + + + 1.0.1 + 1.3.2 + 1.10.3 + 1.1.14 + 1.1.3 - asm - asm-all - ${asmVersion} + org.osgi + osgi.core + ${osgi.core.version} + provided - org.apache.felix org.apache.felix.main - ${felixMainVersion} + ${org.apache.felix.main.version} + + + org.fusesource.jansi + jansi + ${jansi.version} + + + org.jline + jline + ${jline.version} - org.apache.felix - org.apache.felix.configadmin - ${felixConfigadminVersion} + org.apache.felix.bundlerepository + ${org.apache.felix.bundlerepository.version} + + + org.apache.felix + org.apache.felix.gogo.command + ${org.apache.felix.gogo.command.version} + + + org.apache.felix + org.apache.felix.gogo.jline + ${org.apache.felix.gogo.jline.version} - org.apache.felix - org.apache.felix.shell - ${felixShellVersion} + org.apache.felix.gogo.runtime + ${org.apache.felix.gogo.runtime.version} + + + + org.ow2.asm + asm + ${asm.version} + provided + + + org.ow2.asm + asm-commons + ${asm.version} + provided + + + org.ow2.asm + asm-tree + ${asm.version} + provided + + + org.ow2.asm + asm-analysis + ${asm.version} + provided + + + + org.slf4j + slf4j-api + ${slf4j.version} + provided + + + + asm + asm-all + ${asmVersion} org.apache.felix - org.apache.felix.shell.tui - ${felixShellTuiVersion} + org.apache.felix.configadmin + ${org.apache.felix.configadmin.version} org.apache.felix org.apache.felix.eventadmin - ${felixEventadminVersion} + ${org.apache.felix.eventadmin.version} + + + + org.ops4j.pax.logging + pax-logging-api + ${pax-logging.version} + + + org.ops4j.pax.logging + pax-logging-service + ${pax-logging.version} org.ops4j.pax.web @@ -304,11 +386,6 @@ org.apache.felix.fileinstall ${felixFileinstallVersion} - - org.apache.felix - org.apache.felix.bundlerepository - ${felixBundlerepositoryVersion} - net.homeip.yusuke @@ -417,7 +494,7 @@ org.apache.aries.blueprint org.apache.aries.blueprint.api - ${ariesBlueprintApiVersion} + ${org.apache.aries.blueprint.api.version} org.apache.aries.blueprint @@ -427,12 +504,12 @@ org.apache.aries.blueprint org.apache.aries.blueprint.cm - ${ariesBlueprintCmVersion} + ${org.apache.aries.blueprint.cm.version} org.apache.aries.blueprint org.apache.aries.blueprint.core - ${ariesBlueprintCoreVersion} + ${org.apache.aries.blueprint.core.version} @@ -531,7 +608,7 @@ org.apache.aries.proxy org.apache.aries.proxy - ${ariesProxyVersion} + ${org.apache.aries.proxy.version} org.apache.aries.proxy @@ -580,7 +657,7 @@ org.apache.aries org.apache.aries.util - ${ariesUtilVersion} + ${org.apache.aries.util.version}