Skip to content

Commit

Permalink
Merge pull request #51 from asha15/frameworkUpgrade
Browse files Browse the repository at this point in the history 
Update to Pax Logging and reformat the pom
  • Loading branch information
@asha15
asha15 authored Nov 29, 2024
2 parents e15b42a + 14de92d commit 72503d4
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 177 deletions.
78 changes: 44 additions & 34 deletions component/helper/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,45 @@
<packaging>bundle</packaging>
<name>WSO2 Carbon - Library For Identity Extension Helper</name>
<url>http://wso2.org</url>

<dependencies>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<version>${pax.logging.api.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.application.common</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.core</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.core</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.mgt</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.5</version>
<extensions>true</extensions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0</version>
<inherited>true</inherited>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand All @@ -62,19 +85,19 @@
org.wso2.carbon.extension.identity.helper.internal
</Private-Package>
<Import-Package>
org.apache.commons.logging.*; version="1.0.4",
org.apache.commons.logging.*; version="${commons-logging.osgi.version.range}",
org.osgi.framework,
org.wso2.carbon.identity.application.authentication.framework.*; version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.application.common.model; version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.base; version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.core.model; version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.core.util; version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.mgt; version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.mgt.dto; version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.mgt.store; version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.application.authentication.framework.*; version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.identity.application.common.model; version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.identity.base; version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.identity.core.model; version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.identity.core.util; version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.identity.mgt; version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.identity.mgt.dto; version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.identity.mgt.store; version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.user.core.*; version="${carbon.kernel.package.import.version.range}",
javax.servlet,
javax.servlet.http,
org.apache.oltu.oauth2.*; version="${oltu.package.import.version.range}",
*;resolution:=optional
</Import-Package>
<Export-Package>
Expand All @@ -85,19 +108,6 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<version>1.7.2</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
<goals>
<goal>scr</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
15 changes: 8 additions & 7 deletions ...va/org/wso2/carbon/extension/identity/helper/internal/IdentityHelperServiceComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.extension.identity.helper.FederatedAuthenticatorUtil;
import org.wso2.carbon.identity.application.authentication.framework.ApplicationAuthenticator;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;

import java.util.Hashtable;

/**
* @scr.component name="identity.application.helper.AuthenticationFramework.component" immediate="true"
*/
@Component(name = "identity.application.helper.AuthenticationFramework.component", immediate = true)
public class IdentityHelperServiceComponent {

private static Log log = LogFactory.getLog(IdentityHelperServiceComponent.class);

@Activate
protected void activate(ComponentContext ctxt) {

try {
if (log.isDebugEnabled()) {
log.debug("Authentication Common Extension Framework is activated");
Expand All @@ -43,7 +42,9 @@ protected void activate(ComponentContext ctxt) {
}
}

@Deactivate
protected void deactivate(ComponentContext ctxt) {

if (log.isDebugEnabled()) {
log.debug("Authentication Common Extension Framework is deactivated");
}
Expand Down
192 changes: 56 additions & 136 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,134 +17,61 @@
~ 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">
<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>org.wso2</groupId>
<artifactId>wso2</artifactId>
<version>1</version>
<version>1.2</version>
</parent>
<groupId>org.wso2.carbon.extension.identity.authenticator.utils</groupId>
<artifactId>identity-extension-utils</artifactId>
<version>1.0.20-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon Extension - Identity Extension Utils Pom</name>
<url>http://wso2.org</url>
<profiles>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>component/helper</module>
<module>feature</module>
</modules>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.idp.mgt</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.application.common</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.user.profile</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.user.account.association</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.core</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.notification.mgt</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.provisioning</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.core</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.application.mgt</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${org.apache.oltu.oauth2.client-version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.common</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.application.authenticator.openid</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.application.authenticator.oidc</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.json.wso2</groupId>
<artifactId>json</artifactId>
<version>${wso2.json}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity</groupId>
<artifactId>org.wso2.carbon.identity.mgt</artifactId>
<version>5.2.0</version>
</dependency>
</dependencies>

<modules>
<module>component/helper</module>
<module>feature</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<version>${pax.logging.api.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.application.common</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.core</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.core</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.mgt</artifactId>
<version>${carbon.identity.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<scm>
<connection>scm:git:https://github.com/wso2-extensions/identity-extension-utils.git
</connection>
Expand Down Expand Up @@ -193,30 +120,17 @@
<version>2.3.1</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<version>1.7.2</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
<goals>
<goal>scr</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.5</version>
<version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<obrRepository>NONE</obrRepository>
Expand Down Expand Up @@ -331,14 +245,20 @@
<properties>
<carbon.identity.package.export.project.version>${project.version}
</carbon.identity.package.export.project.version>
<carbon.identity.version>5.0.7</carbon.identity.version>
<carbon.identity.version>7.7.1</carbon.identity.version>
<commons-logging.version>4.4.3</commons-logging.version>
<carbon.kernel.version>4.4.3</carbon.kernel.version>
<carbon.kernel.version>4.10.24</carbon.kernel.version>
<oltu.version>1.0.0.wso2v2</oltu.version>
<org.apache.oltu.oauth2.client-version>0.31</org.apache.oltu.oauth2.client-version>
<org.apache.oltu.oauth2.client.version>1.0.0</org.apache.oltu.oauth2.client.version>
<oltu.package.import.version.range>[1.0.0, 2.0.0)</oltu.package.import.version.range>
<wso2.json>3.0.0.wso2v5</wso2.json>
<carbon.identity.package.import.version.range>[5.0.0, 8.0.0)</carbon.identity.package.import.version.range>
<carbon.identity.framework.imp.pkg.version.range>[5.14.0, 8.0.0)
</carbon.identity.framework.imp.pkg.version.range>
<carbon.kernel.package.import.version.range>[4.5.0, 5.0.0)</carbon.kernel.package.import.version.range>

<!-- Pax Logging Version -->
<pax.logging.api.version>1.10.1</pax.logging.api.version>
<commons-logging.osgi.version.range>[1.2.0,2.0.0)</commons-logging.osgi.version.range>
</properties>
</project>

0 comments on commit 72503d4

Please sign in to comment.