Fixed issues of publishing APIs to synapse gateway

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherStartupHandler.java

@@ -0,0 +1,67 @@
+/*
+ *   Copyright (c) 2016, 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.
+ *
+ */
+
+package org.wso2.carbon.apimgt.webapp.publisher;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.apimgt.api.model.API;
+import org.wso2.carbon.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
+import org.wso2.carbon.core.ServerStartupObserver;
+
+public class APIPublisherStartupHandler implements ServerStartupObserver {
+
+    private static final Log log = LogFactory.getLog(APIPublisherStartupHandler.class);
+
+    @Override
+    public void completingServerStartup() {
+
+    }
+
+    @Override
+    public void completedServerStartup() {
+        // adding temporary due to a bug in the platform
+        Thread t = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Thread.sleep(5000);
+                } catch (InterruptedException e) {
+                    log.error("Error occurred while sleeping", e);
+                }
+                APIPublisherDataHolder.getInstance().setServerStarted(true);
+                log.info("Server has just started, hence started publishing unpublished APIs");
+                if (log.isDebugEnabled()) {
+                    log.debug("Total number of unpublished APIs: "
+                            + APIPublisherDataHolder.getInstance().getUnpublishedApis().size());
+                }
+                APIPublisherService publisher = APIPublisherDataHolder.getInstance().getApiPublisherService();
+                while (!APIPublisherDataHolder.getInstance().getUnpublishedApis().isEmpty()) {
+                    API api = APIPublisherDataHolder.getInstance().getUnpublishedApis().pop();
+                    try {
+                        publisher.publishAPI(api);
+                    } catch (java.lang.Exception e) {
+                        log.error("Error occurred while publishing API '" + api.getId().getApiName(), e);
+                    }
+                }
+            }
+        });
+        t.start();
+    }
+}

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherDataHolder.java

@@ -19,12 +19,15 @@
 package org.wso2.carbon.apimgt.webapp.publisher.internal;
 
 
+import org.wso2.carbon.apimgt.api.model.API;
 import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherService;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.user.core.tenant.TenantManager;
 import org.wso2.carbon.utils.ConfigurationContextService;
 
+import java.util.Stack;
+
 public class APIPublisherDataHolder {
 
     private APIPublisherService apiPublisherService;
@@ -32,6 +35,8 @@ public class APIPublisherDataHolder {
     private RealmService realmService;
     private TenantManager tenantManager;
     private RegistryService registryService;
+    private boolean isServerStarted;
+    private Stack<API> unpublishedApis = new Stack<>();
 
     private static APIPublisherDataHolder thisInstance = new APIPublisherDataHolder();
 
@@ -94,4 +99,20 @@ public class APIPublisherDataHolder {
     public void setRegistryService(RegistryService registryService) {
         this.registryService = registryService;
     }
+
+    public boolean isServerStarted() {
+        return isServerStarted;
+    }
+
+    public void setServerStarted(boolean serverStarted) {
+        isServerStarted = serverStarted;
+    }
+
+    public Stack<API> getUnpublishedApis() {
+        return unpublishedApis;
+    }
+
+    public void setUnpublishedApis(Stack<API> unpublishedApis) {
+        this.unpublishedApis = unpublishedApis;
+    }
 }

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherServiceComponent.java

@@ -25,6 +25,8 @@ import org.osgi.service.component.ComponentContext;
 import org.wso2.carbon.apimgt.impl.APIManagerConfigurationService;
 import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherService;
 import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherServiceImpl;
+import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherStartupHandler;
+import org.wso2.carbon.core.ServerStartupObserver;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.utils.ConfigurationContextService;
@@ -84,6 +86,7 @@ public class APIPublisherServiceComponent {
         APIPublisherService publisher = new APIPublisherServiceImpl();
         APIPublisherDataHolder.getInstance().setApiPublisherService(publisher);
         bundleContext.registerService(APIPublisherService.class, publisher, null);
+        bundleContext.registerService(ServerStartupObserver.class, new APIPublisherStartupHandler(), null);
     }
 
     protected void setAPIManagerConfigurationService(APIManagerConfigurationService service) {

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java

@@ -74,6 +74,8 @@ public class APIPublisherLifecycleListener implements LifecycleListener {
                             if (isTenantActive) {
                                 apiConfig.init();
                                 API api = APIPublisherUtil.getAPI(apiConfig);
+                                boolean isServerStarted = APIPublisherDataHolder.getInstance().isServerStarted();
+                                if (isServerStarted) {
                                     APIPublisherService apiPublisherService =
                                             APIPublisherDataHolder.getInstance().getApiPublisherService();
                                     if (apiPublisherService == null) {
@@ -81,6 +83,13 @@ public class APIPublisherLifecycleListener implements LifecycleListener {
                                                 "API Publisher service is not initialized properly");
                                     }
                                     apiPublisherService.publishAPI(api);
+                                } else {
+                                    if (log.isDebugEnabled()) {
+                                        log.debug("Server has not started yet. Hence adding API '" +
+                                                api.getId().getApiName() + "' to the queue");
+                                    }
+                                    APIPublisherDataHolder.getInstance().getUnpublishedApis().push(api);
+                                }
                             } else {
                                 log.error("No tenant [" + apiConfig.getTenantDomain() + "] " +
                                         "found when publishing the Web app");

components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml

@@ -146,7 +146,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.commons</groupId>
+            <groupId>org.wso2.carbon.identity</groupId>
             <artifactId>org.wso2.carbon.user.mgt</artifactId>
             <scope>provided</scope>
         </dependency>

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml

@@ -120,6 +120,10 @@
                                 <bundleDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
                                 </bundleDef>
+                                <!-- Below should be bundled with the email verification -->
+                                <bundleDef>
+                                    org.apache.axiom.om
+                                </bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>

pom.xml

@@ -1375,16 +1375,16 @@
                 <artifactId>org.wso2.carbon.databridge.core</artifactId>
                 <version>${carbon.analytics.common.version}</version>
             </dependency>
-            <dependency>
+            <!--<dependency>-->
-                <groupId>org.wso2.carbon.commons</groupId>
+                <!--<groupId>org.wso2.carbon.commons</groupId>-->
-                <artifactId>org.wso2.carbon.databridge.commons</artifactId>
+                <!--<artifactId>org.wso2.carbon.databridge.commons</artifactId>-->
-                <version>${carbon.commons.version}</version>
+                <!--<version>${carbon.commons.version}</version>-->
-            </dependency>
+            <!--</dependency>-->
-            <dependency>
+            <!--<dependency>-->
-                <groupId>org.wso2.carbon.commons</groupId>
+                <!--<groupId>org.wso2.carbon.commons</groupId>-->
-                <artifactId>org.wso2.carbon.databridge.commons.thrift</artifactId>
+                <!--<artifactId>org.wso2.carbon.databridge.commons.thrift</artifactId>-->
-                <version>${carbon.commons.version}</version>
+                <!--<version>${carbon.commons.version}</version>-->
-            </dependency>
+            <!--</dependency>-->
             <dependency>
                 <groupId>org.wso2.carbon.analytics-common</groupId>
                 <artifactId>org.wso2.carbon.databridge.commons</artifactId>
@@ -1445,9 +1445,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.wso2.carbon.commons</groupId>
+                <groupId>org.wso2.carbon.identity</groupId>
                 <artifactId>org.wso2.carbon.user.mgt</artifactId>
-                <version>${carbon.commons.version}</version>
+                <version>${carbon.identity.version}</version>
                 <scope>provided</scope>
             </dependency>
 
@@ -1672,8 +1672,8 @@
 
     <properties>
         <testng.version>6.1.1</testng.version>
-        <carbon.kernel.version>4.4.3</carbon.kernel.version>
+        <carbon.kernel.version>4.4.5</carbon.kernel.version>
-        <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
+        <carbon.kernel.version.range>[4.4.0, 5.0.0)</carbon.kernel.version.range>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
@@ -1715,14 +1715,11 @@
         <carbon.deployment.version>4.6.0</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.version>5.0.7</carbon.identity.version>
+        <carbon.identity.version>5.0.9-SNAPSHOT</carbon.identity.version>
 
         <!-- Carbon Multi-tenancy -->
         <carbon.multitenancy.version>4.5.0</carbon.multitenancy.version>
 
-        <!-- Carbon Registry -->
-        <carbon.registry.version>4.4.8</carbon.registry.version>
-
         <!-- Carbon Governance -->
         <carbon.governance.version>4.5.8</carbon.governance.version>
 
@@ -1735,7 +1732,7 @@
         <carbon.device.mgt.version>1.1.0-SNAPSHOT</carbon.device.mgt.version>
 
         <!-- Carbon Commons -->
-        <carbon.commons.version>4.4.8</carbon.commons.version>
+        <carbon.commons.version>4.5.2</carbon.commons.version>
         <version.commons.codec>1.4.0.wso2v1</version.commons.codec>
         <version.commons.io>2.4.0.wso2v1</version.commons.io>
         <version.commons.lang>2.6.0.wso2v1</version.commons.lang>
@@ -1749,8 +1746,8 @@
         <carbon.analytics.common.version.range>[5.0.11,6.0.0)</carbon.analytics.common.version.range>
 
         <!-- Carbon Registry -->
-        <carbon.registry.version>4.4.8</carbon.registry.version>
+        <carbon.registry.version>4.5.2</carbon.registry.version>
-        <carbon.registry.imp.pkg.version.range>[4.4.8, 5.0.0)</carbon.registry.imp.pkg.version.range>
+        <carbon.registry.imp.pkg.version.range>[4.5.2, 5.0.0)</carbon.registry.imp.pkg.version.range>
 
         <!--CXF properties-->
         <cxf.version>2.7.16</cxf.version>