This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 06b93adf62c999a3449729b8c3e9fae5a9c6155c Merge: 5a0038e c4e399e Author: Jean-Baptiste Onofré <jbono...@apache.org> AuthorDate: Fri Aug 17 21:02:19 2018 +0200 Merge pull request #484 from jbonofre/DEV_GUIDE [KARAF-2511] Add examples in the distribution assemblies/apache-karaf/pom.xml | 39 +-- assemblies/demos/pom.xml | 65 ---- assemblies/pom.xml | 1 - demos/branding/README.txt | 69 ---- demos/command/README.txt | 60 ---- .../org/apache/karaf/demos/command/MyCommand.java | 40 --- .../apache/karaf/demos/command/MyCompleter.java | 46 --- demos/deployer/bundle/README.TXT | 86 ----- .../karaf/demos/deployer/bundle/Activator.java | 34 -- demos/deployer/kar/.gitignore | 2 - demos/deployer/kar/README.txt | 73 ---- demos/dump/README.txt | 68 ---- demos/web/README.txt | 125 ------- demos/web/pom.xml | 178 ---------- .../java/org/apache/karaf/web/WebAppListener.java | 63 ---- .../webapp/WEB-INF/karaf/etc/config.properties | 387 --------------------- .../webapp/WEB-INF/karaf/etc/startup.properties | 30 -- .../3.0.0/org.apache.felix.http.bridge-3.0.0.jar | Bin 247974 -> 0 bytes demos/web/src/main/webapp/WEB-INF/web.xml | 51 --- .../main/feature/feature.xml => examples/README.md | 49 ++- examples/karaf-blueprint-example/README.md | 65 ++++ .../karaf-blueprint-example-client}/pom.xml | 27 +- .../examples/blueprint/client/ClientService.java | 29 ++ .../blueprint/client/ClientServiceImpl.java | 48 +++ .../karaf/examples/blueprint/client/Display.java | 96 +++++ .../main/resources/OSGI-INF/blueprint/client.xml | 29 +- .../karaf-blueprint-example-common}/pom.xml | 28 +- .../karaf/examples/blueprint/common/Booking.java | 61 ++++ .../examples/blueprint/common/BookingService.java | 32 ++ .../karaf-blueprint-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 39 +++ .../karaf-blueprint-example-provider}/pom.xml | 31 +- .../provider/internal/BookingServiceImpl.java | 46 +++ .../main/resources/OSGI-INF/blueprint/provider.xml | 23 +- .../karaf-blueprint-example}/pom.xml | 22 +- examples/karaf-branding-example/README.md | 81 +++++ .../karaf-branding-example}/pom.xml | 31 +- .../org/apache/karaf/branding/branding.properties | 2 +- examples/karaf-bundle-example/README.md | 66 ++++ .../karaf-bundle-example-client}/pom.xml | 35 +- .../karaf/examples/bundle/client/Activator.java | 66 ++++ .../examples/bundle/client/ClientService.java | 29 ++ .../examples/bundle/client/ClientServiceImpl.java | 48 +++ .../karaf/examples/bundle/client/Display.java | 96 +++++ .../karaf-bundle-example-common}/pom.xml | 28 +- .../karaf/examples/bundle/common/Booking.java | 61 ++++ .../examples/bundle/common/BookingService.java | 32 ++ .../karaf-bundle-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 35 ++ .../karaf-bundle-example-provider}/pom.xml | 34 +- .../bundle/provider/internal/Activator.java | 43 +++ .../provider/internal/BookingServiceImpl.java | 49 +++ {demos => examples/karaf-bundle-example}/pom.xml | 22 +- examples/karaf-command-example/README.md | 85 +++++ .../karaf-command-example-api}/pom.xml | 28 +- .../apache/karaf/examples/command/api/Booking.java | 52 +++ .../karaf/examples/command/api/BookingService.java | 33 ++ .../karaf-command-example-command}/pom.xml | 33 +- .../karaf/examples/command/command/AddCommand.java | 61 ++++ .../examples/command/command/ListCommand.java | 47 +++ .../examples/command/command/RemoveCommand.java | 49 +++ .../command/completers/BookingIdCompleter.java | 45 +++ .../karaf-command-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 38 ++ .../karaf-command-example-provider}/pom.xml | 45 +-- .../karaf/examples/command/provider/Activator.java | 37 ++ .../command/provider/BookingServiceMemoryImpl.java | 51 +++ {demos => examples/karaf-command-example}/pom.xml | 23 +- examples/karaf-deployer-example/README.md | 67 ++++ .../karaf-deployer-example}/pom.xml | 38 +- .../karaf/examples/deployer/ExampleDeployer.java | 52 +++ examples/karaf-dump-example/README.md | 68 ++++ .../dump => examples/karaf-dump-example}/pom.xml | 24 +- .../examples/dump}/ScreenshotDumpProvider.java | 116 +++--- examples/karaf-itest-example/README.md | 47 +++ examples/karaf-itest-example/pom.xml | 109 ++++++ .../apache/karaf/examples/itests/ExampleITest.java | 97 ++++++ examples/karaf-jdbc-example/README.md | 94 +++++ .../karaf-jdbc-example-api}/pom.xml | 28 +- .../apache/karaf/examples/jdbc/api/Booking.java | 52 +++ .../karaf/examples/jdbc/api/BookingService.java | 33 ++ .../karaf-jdbc-example-command}/pom.xml | 33 +- .../karaf/examples/jdbc/command/AddCommand.java | 61 ++++ .../karaf/examples/jdbc/command/GetCommand.java | 55 +++ .../karaf/examples/jdbc/command/ListCommand.java | 47 +++ .../karaf/examples/jdbc/command/RemoveCommand.java | 49 +++ .../jdbc/completers/BookingIdCompleter.java | 45 +++ .../karaf-jdbc-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 62 ++++ .../karaf-jdbc-example-provider}/pom.xml | 50 +-- .../jdbc/provider/BookingServiceJdbcImpl.java | 245 +++++++++++++ {demos => examples/karaf-jdbc-example}/pom.xml | 23 +- examples/karaf-jms-example/README.md | 86 +++++ .../karaf-jms-example-command}/pom.xml | 31 +- .../karaf/examples/jms/command/ConsumeCommand.java | 55 +++ .../karaf/examples/jms/command/SendCommand.java | 54 +++ .../karaf-jms-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 52 +++ .../karaf-jms-example}/pom.xml | 18 +- examples/karaf-jpa-example/README.md | 110 ++++++ .../karaf-jpa-example-command}/pom.xml | 33 +- .../karaf/examples/jpa/command/AddCommand.java | 45 +++ .../karaf/examples/jpa/command/GetCommand.java | 53 +++ .../karaf/examples/jpa/command/ListCommand.java | 47 +++ .../karaf/examples/jpa/command/RemoveCommand.java | 49 +++ .../jpa/completers/BookingIdCompleter.java | 45 +++ .../karaf-jpa-example-features/pom.xml | 100 ++++++ .../src/main/feature/feature.xml | 85 +++++ .../karaf-jpa-example-provider-api}/pom.xml | 30 +- .../org/apache/karaf/examples/jpa/Booking.java | 59 ++++ .../apache/karaf/examples/jpa/BookingService.java | 36 ++ .../pom.xml | 43 ++- .../blueprint/eclipselink/BookingServiceImpl.java | 84 +++++ .../src/main/resources/META-INF/persistence.xml | 39 +++ .../resources/OSGI-INF/blueprint/blueprint.xml | 29 +- .../pom.xml | 43 ++- .../blueprint/hibernate/BookingServiceImpl.java | 84 +++++ .../src/main/resources/META-INF/persistence.xml | 39 +++ .../resources/OSGI-INF/blueprint/blueprint.xml | 29 +- .../pom.xml | 43 ++- .../blueprint/openjpa/BookingServiceImpl.java | 84 +++++ .../src/main/resources/META-INF/persistence.xml | 38 ++ .../resources/OSGI-INF/blueprint/blueprint.xml | 29 +- .../karaf-jpa-example-provider-blueprint}/pom.xml | 26 +- .../pom.xml | 60 ++-- .../ds/eclipselink/BookingServiceImpl.java | 77 ++++ .../src/main/resources/META-INF/persistence.xml | 39 +++ .../pom.xml | 60 ++-- .../provider/ds/hibernate/BookingServiceImpl.java | 77 ++++ .../src/main/resources/META-INF/persistence.xml | 39 +++ .../karaf-jpa-example-provider-ds-openjpa}/pom.xml | 60 ++-- .../provider/ds/openjpa/BookingServiceImpl.java | 81 +++++ .../src/main/resources/META-INF/persistence.xml | 38 ++ .../karaf-jpa-example-provider-ds}/pom.xml | 26 +- .../karaf-jpa-example-provider}/pom.xml | 20 +- .../karaf-jpa-example}/pom.xml | 18 +- examples/karaf-log-appender-example/README.md | 63 ++++ .../karaf-log-appender-example-core}/pom.xml | 30 +- .../karaf/examples/log/ExampleLogAppender.java | 36 ++ .../karaf-log-appender-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 55 +-- .../karaf-log-appender-example}/pom.xml | 17 +- examples/karaf-maven-example/README.md | 109 ++++++ .../karaf-maven-example-assembly/pom.xml | 84 +++++ .../karaf-maven-example-client}/pom.xml | 29 +- .../karaf-maven-example-deploy}/pom.xml | 43 ++- .../org/apache/karaf/examples/maven/Activator.java | 34 ++ .../karaf-maven-example-kar}/pom.xml | 23 +- .../src/features/features-repo.xml | 27 ++ .../karaf-maven-example-run-bundle}/pom.xml | 43 ++- .../org/apache/karaf/examples/maven/Activator.java | 34 ++ .../karaf-maven-example-run}/pom.xml | 27 +- {demos => examples/karaf-maven-example}/pom.xml | 25 +- examples/karaf-mbean-example/README.md | 79 +++++ .../karaf-mbean-example-api}/pom.xml | 26 +- .../apache/karaf/examples/mbean/api/Booking.java | 52 +++ .../karaf/examples/mbean/api/BookingService.java | 33 ++ .../karaf-mbean-example-blueprint}/pom.xml | 28 +- .../examples/mbean/blueprint/BookingMBean.java | 30 ++ .../examples/mbean/blueprint/BookingMBeanImpl.java | 77 ++++ .../src/main/resources/OSGI-INF/blueprint/jmx.xml | 30 +- .../karaf-mbean-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 47 +++ .../karaf-mbean-example-provider}/pom.xml | 38 +- .../karaf/examples/mbean/provider/Activator.java | 37 ++ .../mbean/provider/BookingServiceMemoryImpl.java | 53 +++ .../karaf-mbean-example-scr}/pom.xml | 29 +- .../karaf/examples/mbean/scr/BookingMBean.java | 30 ++ .../karaf/examples/mbean/scr/BookingMBeanImpl.java | 83 +++++ .../karaf-mbean-example-simple}/pom.xml | 43 ++- .../karaf/examples/mbean/simple/Activator.java | 47 +++ .../karaf/examples/mbean/simple/BookingMBean.java | 30 ++ .../examples/mbean/simple/BookingMBeanImpl.java | 77 ++++ {demos => examples/karaf-mbean-example}/pom.xml | 25 +- examples/karaf-profile-example/README.md | 92 +++++ .../karaf-profile-example-dynamic}/pom.xml | 11 +- .../karaf-profile-example-registry}/pom.xml | 14 +- .../resources/activemq/broker.profile/profile.cfg | 0 .../resources/activemq/client.profile/profile.cfg | 0 .../src/main/resources/camel.profile/profile.cfg | 0 .../src/main/resources/default.profile/jetty.xml | 0 .../default.profile/org.ops4j.pax.web.cfg | 0 .../src/main/resources/default.profile/profile.cfg | 0 .../src/main/resources/default.profile/version.cfg | 0 .../karaf.profile/org.ops4j.pax.logging.cfg | 0 .../karaf.profile/org.ops4j.pax.logging.cfg#static | 0 .../src/main/resources/karaf.profile/profile.cfg | 0 .../resources}/loanbroker/bank1.profile/bank1.xml | 0 .../loanbroker/bank1.profile/profile.cfg | 0 .../resources}/loanbroker/bank2.profile/bank2.xml | 0 .../loanbroker/bank2.profile/profile.cfg | 0 .../resources}/loanbroker/bank3.profile/bank3.xml | 0 .../loanbroker/bank3.profile/profile.cfg | 0 .../resources}/loanbroker/base.profile/profile.cfg | 0 .../loanbroker/broker.profile/loanBroker.xml | 0 .../loanbroker/broker.profile/profile.cfg | 0 .../karaf-profile-example-static}/pom.xml | 11 +- .../karaf-profile-example}/pom.xml | 16 +- examples/karaf-rest-example/README.md | 86 +++++ .../karaf-rest-example-api}/pom.xml | 28 +- .../apache/karaf/examples/rest/api/Booking.java | 51 +++ .../karaf/examples/rest/api/BookingService.java | 35 ++ .../karaf-rest-example-client-cxf/pom.xml | 77 ++++ .../rest/client/cxf/AddBookingCommand.java | 68 ++++ .../rest/client/cxf/ListBookingCommand.java | 52 +++ .../karaf-rest-example-client-http}/pom.xml | 30 +- .../rest/client/http/AddBookingCommand.java | 79 +++++ .../rest/client/http/ListBookingCommand.java | 58 +++ .../karaf-rest-example-client}/pom.xml | 18 +- .../karaf-rest-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 51 +++ .../karaf-rest-example-provider}/pom.xml | 28 +- .../examples/rest/provider/BookingServiceRest.java | 79 +++++ .../src/main/resources/OSGI-INF/blueprint/rest.xml | 46 +++ {demos => examples/karaf-rest-example}/pom.xml | 28 +- examples/karaf-scheduler-example/README.md | 73 ++++ .../karaf-scheduler-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 53 +-- .../karaf-scheduler-example-runnable}/pom.xml | 26 +- .../karaf/examples/scheduler/RunnableService.java | 35 ++ .../karaf-scheduler-example}/pom.xml | 17 +- examples/karaf-scr-example/README.md | 70 ++++ .../karaf-scr-example-api}/pom.xml | 26 +- .../org/apache/karaf/examples/scr/api/Booking.java | 52 +++ .../karaf/examples/scr/api/BookingService.java | 33 ++ .../karaf-scr-example-client}/pom.xml | 29 +- .../karaf/examples/scr/client/ConsoleClient.java | 73 ++++ .../karaf-scr-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 36 ++ .../karaf-scr-example-provider}/pom.xml | 36 +- .../scr/provider/BookingServiceMemoryImpl.java | 55 +++ {demos => examples/karaf-scr-example}/pom.xml | 23 +- examples/karaf-servlet-example/README.md | 87 +++++ .../karaf-servlet-example-annotation}/pom.xml | 26 +- .../servlet/annotation/ExampleServlet.java | 54 +++ .../src/main/webapp/WEB-INF/web.xml | 24 ++ .../karaf-servlet-example-blueprint}/pom.xml | 28 +- .../examples/servlet/blueprint/ExampleServlet.java | 42 +++ .../main/resources/OSGI-INF/blueprint/servlet.xml | 29 +- .../karaf-servlet-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 45 +++ .../karaf-servlet-example-registration}/pom.xml | 40 ++- .../examples/servlet/registration/Activator.java | 59 ++++ .../servlet/registration/ExampleServlet.java | 42 +++ .../karaf-servlet-example-scr}/pom.xml | 29 +- .../karaf/examples/servlet/scr/ExampleServlet.java | 48 +++ {demos => examples/karaf-servlet-example}/pom.xml | 24 +- examples/karaf-soap-example/README.md | 90 +++++ .../karaf-soap-example-api}/pom.xml | 28 +- .../apache/karaf/examples/soap/api/Booking.java | 52 +++ .../karaf/examples/soap/api/BookingService.java | 33 ++ .../karaf-soap-example-client}/pom.xml | 30 +- .../karaf/examples/soap/client/AddCommand.java | 53 +++ .../karaf/examples/soap/client/CxfClient.java | 44 +++ .../karaf/examples/soap/client/ListCommand.java | 49 +++ .../karaf-soap-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 41 +++ .../karaf-soap-example-provider}/pom.xml | 28 +- .../examples/soap/provider/BookingServiceSoap.java | 26 ++ .../soap/provider/BookingServiceSoapImpl.java | 49 +++ .../src/main/resources/OSGI-INF/blueprint/soap.xml | 41 +++ {demos => examples/karaf-soap-example}/pom.xml | 27 +- .../karaf-url-namespace-handler-example/README.md | 63 ++++ .../pom.xml | 36 +- .../karaf/examples/url/ExampleUrlHandler.java | 64 ++++ .../pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 60 ++-- .../karaf-url-namespace-handler-example}/pom.xml | 19 +- .../karaf-war-example/README.md | 69 ++-- .../karaf-war-example-features/pom.xml | 99 ++++++ .../src/main/feature/feature.xml | 52 +-- .../karaf-war-example-webapp}/pom.xml | 18 +- .../src/main/webapp/WEB-INF/web.xml | 48 ++- .../src/main/webapp/index.jsp | 37 +- .../karaf-war-example}/pom.xml | 18 +- examples/pom.xml | 66 ++++ .../org/apache/karaf/itests/KarafTestSupport.java | 70 ++++ itests/test/pom.xml | 47 +++ .../itests/examples/BlueprintExampleTest.java | 64 ++++ .../karaf/itests/examples/BundleExampleTest.java | 64 ++++ .../karaf/itests/examples/CommandExampleTest.java | 47 +++ .../karaf/itests/examples/DeployerExampleTest.java | 42 +++ .../karaf/itests/examples/DumpExampleTest.java | 41 +++ .../karaf/itests/examples/JdbcExampleTest.java | 57 +++ .../karaf/itests/examples/JmsExampleTest.java | 86 +++++ .../karaf/itests/examples/JpaExampleTest.java | 86 +++++ .../itests/examples/LogAppenderExampleTest.java | 40 +++ .../karaf/itests/examples/MBeanExampleTest.java | 66 ++++ .../examples/NamespaceHandlerExampleTest.java | 49 +++ .../karaf/itests/examples/RestExampleTest.java | 62 ++++ .../itests/examples/SchedulerExampleTest.java | 40 +++ .../karaf/itests/examples/ScrExampleTest.java | 45 +++ .../karaf/itests/examples/ServletExampleTest.java | 97 ++++++ .../karaf/itests/examples/SoapExampleTest.java | 45 +++ .../karaf/itests/examples/WarExampleTest.java | 64 ++++ .../itests/features/StandardFeaturesTest.java | 4 +- .../main/asciidoc/developer-guide/blueprint.adoc | 15 - .../main/asciidoc/developer-guide/branding.adoc | 111 +----- .../asciidoc/developer-guide/creating-bundles.adoc | 49 +-- .../developer-guide/custom-distribution.adoc | 3 +- .../src/main/asciidoc/developer-guide/dev-cdi.adoc | 15 - manual/src/main/asciidoc/developer-guide/ds.adoc | 15 - .../main/asciidoc/developer-guide/extending.adoc | 338 +----------------- .../developer-guide/karaf-maven-plugin.adoc | 2 + .../main/asciidoc/developer-guide/services.adoc | 15 - .../asciidoc/developer-guide/writing-tests.adoc | 355 +------------------ manual/src/main/asciidoc/index.adoc | 66 +++- .../asciidoc/user-guide/directory-structure.adoc | 2 +- manual/src/main/asciidoc/user-guide/remote.adoc | 2 +- pom.xml | 18 +- profile/pom.xml | 6 - .../apache/karaf/profile/assembly/BuilderTest.java | 44 --- 312 files changed, 11634 insertions(+), 3925 deletions(-)