From 97545a5cb9837884e44cf21b069b92c4bc84de96 Mon Sep 17 00:00:00 2001 From: Serge Huber Date: Mon, 24 Apr 2017 21:35:56 +0200 Subject: [PATCH 1/4] Revert change to OSGi R6 Property back to a property compatible with older OSGi containers --- src/main/java/graphql/servlet/OsgiGraphQLServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/graphql/servlet/OsgiGraphQLServlet.java b/src/main/java/graphql/servlet/OsgiGraphQLServlet.java index 880add24..6e5e6762 100644 --- a/src/main/java/graphql/servlet/OsgiGraphQLServlet.java +++ b/src/main/java/graphql/servlet/OsgiGraphQLServlet.java @@ -38,7 +38,7 @@ @Component( service={javax.servlet.http.HttpServlet.class,javax.servlet.Servlet.class}, - property = {"osgi.http.whiteboard.servlet.pattern=/graphql/*", "jmx.objectname=graphql.servlet:type=graphql"} + property = {"alias=/graphql", "jmx.objectname=graphql.servlet:type=graphql"} ) public class OsgiGraphQLServlet extends GraphQLServlet { From 5df91ac728f0b8308cbaf2034b87e13c656f5a25 Mon Sep 17 00:00:00 2001 From: Serge Huber Date: Mon, 24 Apr 2017 21:54:38 +0200 Subject: [PATCH 2/4] Add ignore for Maven target directories --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 36bc517d..beeb3bb8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ build *.iml *.ipr *.iws -.idea/ \ No newline at end of file +.idea/ +target From 2d89c929a604d30e22b7aecd2d3fcb499f2d40c3 Mon Sep 17 00:00:00 2001 From: Serge Huber Date: Thu, 18 Apr 2019 21:48:33 +0200 Subject: [PATCH 3/4] Update Example to latest versions --- examples/osgi/apache-karaf-feature/pom.xml | 2 +- examples/osgi/apache-karaf-package/pom.xml | 4 ++-- examples/osgi/buildAndRun.sh | 6 +++--- examples/osgi/pom.xml | 6 +++--- examples/osgi/providers/pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/osgi/apache-karaf-feature/pom.xml b/examples/osgi/apache-karaf-feature/pom.xml index c099ae68..adb0eb71 100644 --- a/examples/osgi/apache-karaf-feature/pom.xml +++ b/examples/osgi/apache-karaf-feature/pom.xml @@ -6,7 +6,7 @@ com.graphql-java-kickstart graphql-java-servlet-osgi-examples - 6.2.1-SNAPSHOT + 7.3.4-SNAPSHOT graphql-java-servlet-osgi-examples-karaf-feature diff --git a/examples/osgi/apache-karaf-package/pom.xml b/examples/osgi/apache-karaf-package/pom.xml index 577b1069..57db92d4 100644 --- a/examples/osgi/apache-karaf-package/pom.xml +++ b/examples/osgi/apache-karaf-package/pom.xml @@ -6,7 +6,7 @@ com.graphql-java-kickstart graphql-java-servlet-osgi-examples - 6.2.1-SNAPSHOT + 7.3.4-SNAPSHOT graphql-java-servlet-osgi-examples-apache-karaf-package @@ -112,4 +112,4 @@ - \ No newline at end of file + diff --git a/examples/osgi/buildAndRun.sh b/examples/osgi/buildAndRun.sh index 582379e4..87fdea6d 100755 --- a/examples/osgi/buildAndRun.sh +++ b/examples/osgi/buildAndRun.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash mvn clean install pushd apache-karaf-package/target -tar zxvf graphql-java-servlet-osgi-examples-apache-karaf-package-3.0.1.tar.gz -cd graphql-java-servlet-osgi-examples-apache-karaf-package-3.0.1/bin +tar zxvf graphql-java-servlet-osgi-examples-apache-karaf-package-7.3.4-SNAPSHOT.tar.gz +cd graphql-java-servlet-osgi-examples-apache-karaf-package-7.3.4-SNAPSHOT/bin ./karaf debug -popd \ No newline at end of file +popd diff --git a/examples/osgi/pom.xml b/examples/osgi/pom.xml index 24229915..cdaf086f 100644 --- a/examples/osgi/pom.xml +++ b/examples/osgi/pom.xml @@ -6,13 +6,13 @@ com.graphql-java-kickstart graphql-java-servlet-osgi-examples - 6.2.1-SNAPSHOT + 7.3.4-SNAPSHOT pom 4.1.6 - 6.2.1-SNAPSHOT - 10.0 + 7.3.4-SNAPSHOT + 11.0 diff --git a/examples/osgi/providers/pom.xml b/examples/osgi/providers/pom.xml index 43071c69..b57c1535 100644 --- a/examples/osgi/providers/pom.xml +++ b/examples/osgi/providers/pom.xml @@ -6,7 +6,7 @@ com.graphql-java-kickstart graphql-java-servlet-osgi-examples - 6.2.1-SNAPSHOT + 7.3.4-SNAPSHOT graphql-java-servlet-osgi-examples-providers @@ -54,4 +54,4 @@ - \ No newline at end of file + From 1af7a9b0da48af66c13e2541ce964dc18c4f263f Mon Sep 17 00:00:00 2001 From: Serge Huber Date: Sat, 20 Apr 2019 15:44:41 +0200 Subject: [PATCH 4/4] - Update Karaf to latest stable version (4.2.4) - Add description to hello field. --- examples/osgi/pom.xml | 2 +- .../graphql/servlet/examples/osgi/ExampleGraphQLProvider.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/osgi/pom.xml b/examples/osgi/pom.xml index cdaf086f..9b438b18 100644 --- a/examples/osgi/pom.xml +++ b/examples/osgi/pom.xml @@ -10,7 +10,7 @@ pom - 4.1.6 + 4.2.4 7.3.4-SNAPSHOT 11.0 diff --git a/examples/osgi/providers/src/main/java/graphql/servlet/examples/osgi/ExampleGraphQLProvider.java b/examples/osgi/providers/src/main/java/graphql/servlet/examples/osgi/ExampleGraphQLProvider.java index 129c38bc..10e144c0 100644 --- a/examples/osgi/providers/src/main/java/graphql/servlet/examples/osgi/ExampleGraphQLProvider.java +++ b/examples/osgi/providers/src/main/java/graphql/servlet/examples/osgi/ExampleGraphQLProvider.java @@ -25,6 +25,7 @@ public Collection getQueries() { fieldDefinitions.add(newFieldDefinition() .type(GraphQLString) .name("hello") + .description("Basic example of a GraphQL Java Servlet provider using the Apache Karaf OSGi Runtime") .staticValue("world") .build()); return fieldDefinitions;