Merge remote-tracking branch 'origin/osgi_refactoring' into release-4…

….4.1 Conflicts: components/agents/org.wso2.carbon.identity.entitlement.filter/pom.xml components/agents/org.wso2.carbon.identity.entitlement.proxy/pom.xml components/application-authenticators/org.wso2.carbon.identity.application.authenticator.basicauth/pom.xml components/application-authenticators/org.wso2.carbon.identity.application.authenticator.facebook/pom.xml components/application-authenticators/org.wso2.carbon.identity.application.authenticator.iwa/pom.xml components/application-authenticators/org.wso2.carbon.identity.application.authenticator.oidc.ext/pom.xml components/application-authenticators/org.wso2.carbon.identity.application.authenticator.oidc/pom.xml components/application-authenticators/org.wso2.carbon.identity.application.authenticator.openid/pom.xml components/application-authenticators/org.wso2.carbon.identity.application.authenticator.passive.sts/pom.xml components/application-authenticators/org.wso2.carbon.identity.application.authenticator.requestpath.basicauth/pom.xml components/application-authenticators/org.wso2.carbon.identity.application.authenticator.requestpath.oauth/pom.xml components/application-authenticators/org.wso2.carbon.identity.application.authenticator.samlsso/pom.xml components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml components/carbon-authenticators/iwa-authenticator/org.wso2.carbon.identity.authenticator.iwa.ui/pom.xml components/carbon-authenticators/iwa-authenticator/org.wso2.carbon.identity.authenticator.iwa/pom.xml components/carbon-authenticators/mutual-ssl-authenticator/pom.xml components/carbon-authenticators/org.wso2.carbon.identity.thrift.authentication/pom.xml components/carbon-authenticators/saml2-sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso.common/pom.xml components/carbon-authenticators/saml2-sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso.ui/pom.xml components/carbon-authenticators/saml2-sso-authenticator/org.wso2.carbon.identity.authenticator.saml2.sso/pom.xml components/carbon-authenticators/signedjwt-authenticator/pom.xml components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml components/entitlement/org.wso2.carbon.identity.entitlement.common/pom.xml components/entitlement/org.wso2.carbon.identity.entitlement.ui/pom.xml components/identity-core/org.wso2.carbon.identity.menu.ui/pom.xml components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml components/identity/org.wso2.carbon.identity.authentication/pom.xml components/identity/org.wso2.carbon.identity.authorization.core/pom.xml components/identity/org.wso2.carbon.identity.authorization.ui/pom.xml components/identity/org.wso2.carbon.identity.entitlement.pep.agent/pom.xml components/identity/org.wso2.carbon.identity.provider.openid.admin.ui/pom.xml components/identity/org.wso2.carbon.identity.provider.openid.admin/pom.xml components/identity/org.wso2.carbon.identity.provider.ui/pom.xml components/openid/org.wso2.carbon.identity.provider.openid.ui/pom.xml components/provisioning/org.wso2.carbon.identity.provisioning.connector.google/pom.xml components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml components/sso-saml/org.wso2.carbon.identity.sso.saml/pom.xml pom.xml
Kanapriya · Apr 28, 2015 · 8426c50 · 8426c50
2 parents 3143e65 + a97dbe1
commit 8426c50
Show file tree

Hide file tree

Showing 97 changed files with 2,794 additions and 2,172 deletions.
diff --git a/components/agents/org.wso2.carbon.identity.entitlement.filter/pom.xml b/components/agents/org.wso2.carbon.identity.entitlement.filter/pom.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- ~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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/xsd/maven-4.0.0.xsd">
+  ~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~  WSO2 Inc. licenses this file to you 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/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.carbon.identity</groupId>
@@ -98,22 +101,23 @@
                             !org.osgi.framework,
                             !javax.servlet,
                             !javax.servlet.http,
-                            !org.apache.axis2.databinding,
-                            !org.apache.axis2.databinding.utils.reader,
-                            !org.pache.axis2.databinding.utils.writer,
-                            !org.wso2.carbon.identity.entitlement.filter.*,
-                            org.wso2.carbon.identity.entitlement.stub.*;
-                            version="${carbon.identity.package.import.version.range}",
+                            !javax.xml.namespace,
+                            org.apache.axiom.*; version="${axiom.osgi.version.range}",
+                            org.apache.axis2.*; version="${axis2.osgi.version.range}",
+                            org.apache.commons.codec.binary; version="${commons-codec.wso2.osgi.version.range}",
+                            org.apache.commons.logging.*; version="${commons-logging.osgi.version.range}",
                             org.wso2.carbon.authenticator.stub.*;
                             version="${carbon.kernel.package.import.version.range}",
-                            *; resolution:=optional
+                            org.wso2.carbon.identity.entitlement.proxy.*;
+                            version="${carbon.identity.package.import.version.range}",
                         </Import-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
+                        <Export-Package>
+                            org.wso2.carbon.identity.entitlement.filter.*;
+                            version="${carbon.identity.package.export.version}"
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-
-
 </project>
diff --git a/components/agents/org.wso2.carbon.identity.entitlement.proxy/pom.xml b/components/agents/org.wso2.carbon.identity.entitlement.proxy/pom.xml
@@ -14,7 +14,8 @@
  ~ 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">
+<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">
 
     <parent>
         <groupId>org.wso2.carbon.identity</groupId>
@@ -156,26 +157,34 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            org.wso2.carbon.identity.entitlement.proxy.*,
-                        </Export-Package>
                         <Import-Package>
                             !javax.xml.namespace,
-                            org.apache.commons.logging.*; version="1.0.4",
-                            !org.osgi.framework,
-                            !javax.servlet,
-                            !javax.servlet.http,
-                            !org.apache.axis2.databinding,
-                            !org.apache.axis2.databinding.utils.reader,
-                            !org.pache.axis2.databinding.utils.writer,
-                            !org.wso2.carbon.identity.entitlement.proxy.*,
-                            org.wso2.carbon.identity.entitlement.stub.*;
-                            version="${carbon.identity.package.import.version.range}",
+                            javax.xml.parsers,
+                            javax.cache; version="${carbon.kernel.package.import.version.range}",
+                            javax.crypto,
+                            org.apache.axiom.om.*; version="${axiom.osgi.version.range}",
+                            org.apache.axis2.*; version="${axis2.osgi.version.range}",
+                            org.apache.commons.httpclient.*; version="${commons-httpclient.wso2.osgi.version}",
+                            org.apache.commons.logging.*; version="${commons-logging.osgi.version.range}",
+                            org.apache.commons.pool.*; version="${commons-pool.wso2.osgi.version.range}",
+                            org.apache.thrift.*; version="${libthrift.wso2.osgi.version.range}",
+                            org.apache.xerces.util,
+                            org.apache.xml.security.*; version="${wss4j.xml.security.imp.pkg.version.range}",
+                            org.joda.time; version="${opensaml2.wso2.osgi.version.range}",
+                            org.opensaml.*; version="${opensaml2.wso2.osgi.version.range}",
+                            org.slf4j; version="${slf4j.wso2.version.range}",
+                            org.w3c.dom.*,
+                            org.xml.sax,
                             org.wso2.carbon.authenticator.stub.*;
                             version="${carbon.kernel.package.import.version.range}",
-                            *; resolution:=optional
+                            org.wso2.carbon.base; version="${carbon.base.imp.pkg.version.range}",
+                            org.wso2.carbon.identity.entitlement.stub.*;
+                            version="${carbon.identity.package.import.version.range}",
                         </Import-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
+                        <Export-Package>
+                            org.wso2.carbon.identity.entitlement.proxy.*;
+                            version="${carbon.identity.package.export.version}"
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/agents/org.wso2.carbon.identity.sso.agent/pom.xml b/components/agents/org.wso2.carbon.identity.sso.agent/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~  WSO2 Inc. licenses this file to you under the Apache License,
   ~  Version 2.0 (the "License"); you may not use this file except
@@ -82,13 +82,29 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Import-Package>
-                            javax.servlet.http;version=3.1.0,
-                            org.opensaml.*;version=2.6.1,
-                            org.joda.*;version=2.2,
-                            *;resolution:=optional
+                            javax.crypto,
+                            javax.net.ssl,
+                            javax.servlet;version="${imp.pkg.version.javax.servlet}",
+                            javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
+                            javax.xml.namespace,
+                            javax.xml.parsers,
+                            com.google.gson;version="${com.google.code.gson.osgi.version.range}",
+                            org.apache.http.conn.ssl; version="${httpcomponents-httpclient.imp.pkg.version.range}",
+                            org.apache.xerces.util,
+                            org.apache.xml.security.*; version="${wss4j.xml.security.imp.pkg.version.range}",
+                            org.joda.time;version="${opensaml2.wso2.osgi.version.range}",
+                            org.openid4java.*;version="${openid4java.wso2.osgi.version.range}",
+                            org.opensaml.*; version="${opensaml2.wso2.osgi.version.range}",
+                            org.w3c.dom.*,
+                            org.xml.sax,
+                            org.wso2.carbon.core.util; version="${carbon.kernel.package.import.version.range}",
+                            org.wso2.carbon.user.core.*; version="${carbon.kernel.package.import.version.range}",
+                            org.wso2.carbon.user.api; version="${carbon.user.api.imp.pkg.version.range}",
+                            org.wso2.carbon.identity.core.util;
+                            version="${carbon.identity.package.import.version.range}",
                         </Import-Package>
                         <Export-Package>
-                            org.wso2.carbon.identity.sso.agent.*; version=4.3.4-SNAPSHOT,
+                            org.wso2.carbon.identity.sso.agent.*; version="${carbon.identity.package.export.version}",
                         </Export-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>

diff --git a/...ation-authenticators/org.wso2.carbon.identity.application.authenticator.basicauth/pom.xml b/...ation-authenticators/org.wso2.carbon.identity.application.authenticator.basicauth/pom.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ 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">
 ~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights
 Reserved. ~ ~ Licensed under the Apache License, Version 2.0 (the
 "License"); ~ you may not use this file except in compliance with the
@@ -72,28 +88,36 @@ limitations under the License.
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Private-Package>org.wso2.carbon.identity.application.authenticator.basicauth.internal,
+                        <Private-Package>
+                            org.wso2.carbon.identity.application.authenticator.basicauth.internal
                         </Private-Package>
-                        <Import-Package>org.apache.axis2.*;
-                            version="${axis2.osgi.version.range}",
-                            org.apache.axiom.*;
-                            version="${axiom.osgi.version.range}",
-                            org.apache.rahas.*,
-                            org.wso2.carbon.core.utils.*,
-                            org.wso2.carbon.core.*,
-                            org.wso2.carbon.registry.core.*,
-                            org.wso2.carbon.utils.*,
-                            org.apache.commons.logging.*; version="1.0.4",
-                            org.osgi.framework,
-                            org.wso2.carbon.identity.application.authentication.framework.*,
-                            javax.servlet;version="${imp.pkg.version.javax.servlet}",
-                            javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
-                            *;resolution:=optional
+                        <Import-Package>
+                            javax.servlet.http; version="${imp.pkg.version.javax.servlet}",
+
+                            org.apache.commons.logging; version="${commons-logging.osgi.version.range}",
+
+                            org.osgi.framework; version="${osgi.framework.imp.pkg.version.range}",
+                            org.osgi.service.component; version="${osgi.service.component.imp.pkg.version.range}",
+
+                            org.wso2.carbon.identity.application.authentication.framework.*;
+                            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.user.api; version="${carbon.user.api.imp.pkg.version.range}",
+                            org.wso2.carbon.user.core; version="${carbon.kernel.package.import.version.range}",
+                            org.wso2.carbon.user.core.service; version="${carbon.kernel.package.import.version.range}",
+                            org.wso2.carbon.user.core.util; version="${carbon.kernel.package.import.version.range}",
+                            org.wso2.carbon.utils.multitenancy; version="${carbon.kernel.package.import.version.range}"
                         </Import-Package>
-                        <Export-Package>!org.wso2.carbon.identity.application.authenticator.basicauth.internal,
-                            org.wso2.carbon.identity.application.authenticator.basicauth.*
+                        <Export-Package>
+                            !org.wso2.carbon.identity.application.authenticator.basicauth.internal,
+                            org.wso2.carbon.identity.application.authenticator.basicauth.*;
+                            version="${carbon.identity.package.export.version}"
                         </Export-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
                 </configuration>
             </plugin>