Osgi updates for Grouper 5 #211
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
|
|
||
| Copyright 2014 Internet2 | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
|
|
||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
|
|
||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>edu.internet2.middleware.grouper</groupId> | ||
| <artifactId>grouper-parent</artifactId> | ||
| <version>5.0.0-SNAPSHOT</version> | ||
| <relativePath>../../grouper-parent</relativePath> | ||
| </parent> | ||
|
|
||
| <name>Grouper Test plugin</name> | ||
| <description>A Grouper test plugin. This can also be used as a protype/sample for creating a plugin</description> | ||
| <artifactId>grouper-test-plugin</artifactId> | ||
| <packaging>bundle</packaging> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.osgi</groupId> | ||
| <artifactId>osgi.core</artifactId> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>javax</groupId> | ||
| <artifactId>javaee-web-api</artifactId> | ||
| <version>8.0.1</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-jar-plugin</artifactId> | ||
| <configuration> | ||
| <archive> | ||
| <index>true</index> | ||
| <manifestEntries> | ||
| <Specification-Title>${project.name}</Specification-Title> | ||
| <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> | ||
| <Implementation-Title>${project.artifactId}</Implementation-Title> | ||
| <Implementation-Version>${project.version}</Implementation-Version> | ||
| <Implementation-URL>${project.url}</Implementation-URL> | ||
| <Build-Timestamp>${maven.build.timestamp}</Build-Timestamp> | ||
| </manifestEntries> | ||
| </archive> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <instructions> | ||
| <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> | ||
| <Bundle-Name>${project.artifactId}-bundle</Bundle-Name> | ||
| <Bundle-Version>${project.version}</Bundle-Version> | ||
| <Bundle-Activator>edu.internet2.middleware.grouper.plugin.test.TestPlugin</Bundle-Activator> | ||
| <Export-Package>edu.internet2.middleware.grouper.plugin.test.filter</Export-Package> | ||
| <Private-Package>edu.internet2.middleware.grouper.plugin.*</Private-Package> | ||
| <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency> | ||
| <Embed-Transitive>false</Embed-Transitive> | ||
| <Import-Package> | ||
| !* | ||
| </Import-Package> | ||
| </instructions> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-jarsigner-plugin</artifactId> | ||
| <version>3.0.0</version> | ||
| <executions> | ||
| <execution> | ||
| <id>sign</id> | ||
| <goals> | ||
| <goal>sign</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <keystore>${project.basedir}/src/main/signing/signing.jks</keystore> | ||
| <alias>signing</alias> | ||
| <storepass>signing</storepass> | ||
| <keypass>signing</keypass> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package edu.internet2.middleware.grouper.plugin.test; | ||
|
|
||
| import org.osgi.framework.BundleActivator; | ||
| import org.osgi.framework.BundleContext; | ||
| import org.osgi.framework.ServiceRegistration; | ||
|
|
||
| import javax.servlet.ServletContainerInitializer; | ||
| import java.util.HashMap; | ||
| import java.util.Hashtable; | ||
| import java.util.Map; | ||
|
|
||
| public class TestPlugin implements BundleActivator { | ||
| private Map<String, ServiceRegistration> registrationMap = new HashMap<>(); | ||
|
|
||
| @Override | ||
| public void start(BundleContext bundleContext) throws Exception { | ||
| TestPluginServletContainerInitializer initializer = new TestPluginServletContainerInitializer(); | ||
| ServiceRegistration registration = bundleContext.registerService(ServletContainerInitializer.class, initializer, new Hashtable<>()); | ||
| registrationMap.put(TestPluginServletContainerInitializer.class.getCanonicalName(), registration); | ||
| } | ||
|
|
||
| @Override | ||
| public void stop(BundleContext bundleContext) throws Exception { | ||
| registrationMap.values().forEach(x -> { x.unregister(); } ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package edu.internet2.middleware.grouper.plugin.test; | ||
|
|
||
| import edu.internet2.middleware.grouper.plugin.test.filter.TestFilter; | ||
|
|
||
| import javax.servlet.FilterRegistration; | ||
| import javax.servlet.ServletContainerInitializer; | ||
| import javax.servlet.ServletContext; | ||
| import javax.servlet.ServletException; | ||
| import java.util.Set; | ||
|
|
||
| public class TestPluginServletContainerInitializer implements ServletContainerInitializer { | ||
| @Override | ||
| public void onStartup(Set<Class<?>> set, ServletContext servletContext) throws ServletException { | ||
| TestFilter testFilter = new TestFilter(); | ||
| FilterRegistration.Dynamic testFilterRegistration = servletContext.addFilter("testFilter", testFilter); | ||
| testFilterRegistration.addMappingForUrlPatterns(null, false, "/*"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package edu.internet2.middleware.grouper.plugin.test.filter; | ||
|
|
||
| import javax.servlet.Filter; | ||
| import javax.servlet.FilterChain; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.ServletRequest; | ||
| import javax.servlet.ServletResponse; | ||
| import java.io.IOException; | ||
|
|
||
| public class TestFilter implements Filter { | ||
| @Override | ||
| public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { | ||
| filterChain.doFilter(servletRequest, servletResponse); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| These files are strictly examples and for testing. Do not use them in your own projects! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| -----BEGIN CERTIFICATE----- | ||
| MIIDczCCAlugAwIBAgIILehkAIY5xvQwDQYJKoZIhvcNAQELBQAwaDEQMA4GA1UE | ||
| BhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQ | ||
| MA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEMMAoGA1UEAwwDSmoh | ||
| MB4XDTIzMTAxMjAwMjE1OFoXDTMzMTAxMTAwMjE1OFowaDEQMA4GA1UEBhMHVW5r | ||
| bm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQMA4GA1UE | ||
| ChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEMMAoGA1UEAwwDSmohMIIBIjAN | ||
| BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9Y8HkztTbh1gXW+lIB175CYiqR5U | ||
| qPVaCe9efvLd89zzyKpO1wxdp7lbJwwHfepuFhsGPMl38aD6YXeQDRKj3m7u2m94 | ||
| I1PAiAYslRSN/3oWyv7RQwP3gn4XAegpR4kBCNJoXLTPK80oyYA62okVNtCH/dFq | ||
| Z3k3A1O+OoeqcDBq5KzuPatViFAjEyyLCcV1g0mLQlCfzrWFw5OVp2U6q2D0qLKF | ||
| 5i2bFkIlwxcWY0tfvv0S8Lp7+JpPN/etXGByKigM4Cu9CnfLBUs0v9h4wH5wv/Zj | ||
| /XGfViD+pemIgkR82BqPM31TeWU0ONOYapS0LS4RpZBOcLtXcwgBMIch2QIDAQAB | ||
| oyEwHzAdBgNVHQ4EFgQU5cbJ7MBtBDej6XYd3iukheyNO5kwDQYJKoZIhvcNAQEL | ||
| BQADggEBAMjtgjBespxleA5Po49A3kng/A1n24m0SuGDVRmtWm5OGi34e+A64GIo | ||
| kgiux+r0HOSDHUaIfao1L84FIxIBGGSHW/hcZ8RJr1qSYvW7KnD9PfgAcghtokKx | ||
| 38fx3Q3RUDB6Gcz2vigTkJ7OzR1wkyzVvfnLEOL3kA1P49Eb/wyMKEmmLDQyij6n | ||
| JG+T6+M4+QKiA8W9yIIAAjJFoNL0LBczsdVn6o34buwqLPhjhVoGazDbax5cXxkJ | ||
| 8TRdktqQNbBqDk+6mOto8MCJUtg7d+Run+HvtgjNsdYLI6J+6K9+51STLtXST90V | ||
| voa3jXptx9Tl/BFoJK2sJWdoIwG3zug= | ||
| -----END CERTIFICATE----- |
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| grouper.osgi.enable = true | ||
| grouper.osgi.security.enable=false | ||
|
|
||
| # directory of plugins, default to /opt/grouper/grouperWebapp/WEB-INF/grouperPlugins | ||
| # {valueType: "string", required: true, order: 1000} | ||
| grouper.osgi.jar.dir = /Users/jj/Documents/workspace/community/grouper-ext-auth/target | ||
|
|
||
| # directory of felix cache of plugins, default to /opt/grouper/grouperWebapp/WEB-INF/grouperFelixCache | ||
| # {valueType: "string", required: true, order: 2000} | ||
| grouper.felix.cache.rootdir = /tmp/grouperFelixCache | ||
|
|
||
| grouper.osgi.plugin.extauth.location=file:/Users/jj/Documents/workspace/community/grouper-ext-auth/target/grouper-authentication-plugin-0.0.1-SNAPSHOT.jar | ||
|
There was a problem hiding this comment. need to change this to something more generic |
||
|
|
||
| # grouper.osgi.framework.system.packages.extra=javax.*,org.osgi.*,org.osgi,org.apache.commons.logging,edu.internet2.middleware.grouperClient.config,edu.internet2.middleware.grouper.app.externalSystem,org.w3c.dom.* | ||
| # grouper.osgi.framework.boot.delegation=javax.*,org.osgi.*,org.osgi,org.apache.commons.logging,edu.internet2.middleware.grouperClient.config,edu.internet2.middleware.grouper.app.externalSystem,org.w3c.dom.* | ||
File renamed without changes.
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Take this out
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I remember why this is here, but need to verify: ddls for some reason were missing from the classpath
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DDLs should be packaged in the grouper jar now