Revert change to OSGi R6 Property back to a property compatible with … (#25)

sergehuber · apottere · commit a4717f2105a1 · 2017-04-24T17:31:25.000-04:00
* Revert change to OSGi R6 Property back to a property compatible with older OSGi containers

* Add ignore for Maven target directories
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ build
 *.iml
 *.ipr
 *.iws
-.idea/
+.idea/
+target
diff --git 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 {
 

-Original file line number
+Diff line change
 *.iml
 *.ipr
 *.iws
 -.idea/
 +.idea/
 +target
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`
`39`	`39`	`@Component(`
`40`	`40`	`service={javax.servlet.http.HttpServlet.class,javax.servlet.Servlet.class},`
`41`		`- property = {"osgi.http.whiteboard.servlet.pattern=/graphql/*", "jmx.objectname=graphql.servlet:type=graphql"}`
	`41`	`+ property = {"alias=/graphql", "jmx.objectname=graphql.servlet:type=graphql"}`
`42`	`42`	`)`
`43`	`43`	`public class OsgiGraphQLServlet extends GraphQLServlet {`
`44`	`44`