Merge pull request #1765 from charithag/master

Fix issues in broker startup
merge-requests/1/head
Geeth 7 years ago committed by GitHub
commit c8c42f600b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1102,15 +1102,6 @@
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>src/broker/resources/STRATOS_ROOT</directory>
<outputDirectory>
${pom.artifactId}-${pom.version}/wso2/broker/repository/deployment/server/webapps/STRATOS_ROOT
</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>775</directoryMode>
</fileSet>
<fileSet>
<directory>../p2-profile/broker-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
</directory>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 523 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

@ -1,69 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head> <script type="text/javascript" src="../../carbon/googleanalytics/js/jquery.min.js"></script>
<script type="text/javascript" src="../../carbon/googleanalytics/js/googleAnalyticsProcessor.js"></script>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<title>StratosLive</title>
<link href="style.css" rel="stylesheet" type="text/css" media="all" />
<link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
<meta name="description" content="WSO2 is the lean enterprise middleware company, delivering the only complete open source enterprise SOA middleware stack available internally and in the cloud." />
<meta name="keywords" content="cloud, platform-as-a-service, PaaS" />
</head>
<body>
<div id="main-content">
<div id="header">
<div class="logo"><img src="images/logo.gif"/></div>
</div>
<div id="content">
<div class="intro">
<div class="register">
<a href="https://stratoslive.wso2.com/carbon/tenant-register/select_domain.jsp"><img src="images/register.gif"/></a>
<a href="../carbon/sso-acs/redirect_ajaxprocessor.jsp"><img src="images/sign-in.gif"/></a>
</div>
<p>WSO2 MB brings Event Driven Architecture capabilities to WSO2 Carbon platform. It provides WS-Eventing, JMS and SQS interfaces to client. It uses Apache Qpid as the underling broker which supports AMQP.</p>
</div>
<div class="clear"></div>
<div class="features">
<h2>Features</h2>
<div class="feature feature-left">
<img src="images/feature-01-icon.gif"/>
<h2>Bring CEP to SOA</h2>
<p>
Bring CEP to SOA by processing XML events and produce results as XML events.
</p>
</div>
<div class="feature">
<img src="images/feature-02-icon.gif"/>
<h2>Registry Storage</h2>
<p>
Ability to define different event streams, queries and out put streams and store them in the registry as a bucket.
</p>
</div>
<div class="feature">
<img src="images/feature-03-icon.gif"/>
<h2>Esper and Fusion</h2>
<p>
Support Esper and fusion back end runtimes.
</p>
</div>
<div class="clear"></div>
</div>
<div class="clear"></div>
</div>
<div id="footer">
<div class="footer-links">
<a href="http://www.wso2.com/cloud/services/terms-of-use" target="_blank">Terms of Service</a> | <a href="http://www.wso2.com/cloud/services/privacy-policy" target="_blank">Privacy Policy</a> | <a href="http://www.wso2.com/cloud/services/support" target="_blank">Support</a>
</div>
<div class="powered">
<span>Powered by</span><img src="images/powered-logo.gif" alt="ESB"/>
</div>
<span class="copyright">&copy;stratoslive.wso2.com copyright 2010-2011 WSO2, Inc. </span>
</div>
</div>
</div>
</body>
</html>

@ -1,46 +0,0 @@
body { font-family: "Calibri","Lucida Grande","Lucida Sans","Microsoft Sans Serif","Lucida Sans Unicode","Verdana","Sans-serif","trebuchet ms"; font-size: .85em; line-height: 135%; color: #434343; margin: 0px; padding: 0px; background-color: #94C8EC;}
p { }
td { }
a:link { text-decoration: none; }
a:visited { text-decoration: none; }
a:hover { text-decoration: none; }
a:active { text-decoration: none; }
a img { border: 0px; }
div
.clear { clear: both; }
div#main-content { width: 960px; margin: auto; background-image: url(images/top.gif); background-repeat: no-repeat; background-position: left top; }
div#header { height: 125px; }
div.logo { float: left; margin-top: 35px; }
div.sign-in { float: right; margin-top: 35px; }
div#content { background-color: #ffffff; background-image: url(images/content-bg.gif); background-repeat: repeat-y; background-position: left top; }
div.intro { padding: 35px; padding-top: 10px; padding-bottom: 20px; font-size: 125%; line-height: 130%; float: left; background-image: url(images/intro-bg.gif); background-position: left bottom; background-repeat: no-repeat; }
div.intro p { margin-top: 0px; margin-bottom: 0px; }
div.register { float: right; margin-left: 40px; margin-top: 0px; margin-right: 0px; width: 400px; text-align: center;}
div.register a img { margin-bottom: 7px; }
div.register a:hover img { opacity:0.7;filter:alpha(opacity=70) }
div.features { margin-top: 20px; }
div.features h2 { margin-top: 0px; margin-bottom: 0px; font-size: 24px; color: #003A63; margin-left: 35px; margin-right: 35px; border-bottom: solid 0px #79BDE8; padding-bottom: 10px; background-image: url(images/title-bg.gif); background-repeat: no-repeat; background-position: left bottom; }
div.feature { float: left; width: 230px; margin-left: 30px; margin-top: 7px; padding: 20px; text-align: left; }
div.feature img { float: left; margin-right: 10px; width: 64px; }
div.feature h2 { margin-top: 0px; margin-bottom: 7px; color: #0499CC; font-size: 140%; line-height: 110%; font-weight: normal; border-bottom: 0px; margin-left: 0px; margin-right: 0px; padding-bottom: 0px; background-image: none; }
div.feature p { margin-top: 0px; padding-top: 0px; }
div.feature-left { margin-left: 41px; }
div#footer { height: 80px; background-image: url(images/bottom.gif); background-position: left top; background-repeat: no-repeat; padding-top: 25px; }
div#footer div.powered { color: #333333; float: right; font-size: 85%; margin-right: 10px; }
div#footer div.powered span { float: left; line-height: 23px; margin-right: 5px; }
div.footer-links { padding-bottom: 5px; padding-left: 10px; border-bottom: solid 1px #4E84C4; margin-bottom: 10px; color: #4E84C4; }
div#footer span.copyright { font-size: 90%; padding-left: 10px; }

@ -103,18 +103,9 @@
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.soaptracer.feature:${carbon.commons.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity.framework:org.wso2.carbon.security.mgt.feature:${carbon.identity.framework.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.message.flows.feature:${carbon.commons.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.tryit.feature:${carbon.commons.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.registry:org.wso2.carbon.registry.core.feature:${carbon.registry.version}
</featureArtifactDef>
@ -124,24 +115,15 @@
<featureArtifactDef>
org.wso2.carbon.registry:org.wso2.carbon.registry.resource.properties.feature:${carbon.registry.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.wsdl.tools.feature:${carbon.commons.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity.user.ws:org.wso2.carbon.um.ws.service.feature:${carbon.um.ws.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.messaging:org.wso2.carbon.andes.feature:${carbon.messaging.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version}
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.feature:${carbon.multitenancy.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.tenant.mgt.common.feature:${carbon.commons.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.usage.agent.feature:${carbon.multitenancy.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.throttling.agent.feature:${carbon.multitenancy.version}
</featureArtifactDef>
@ -157,6 +139,12 @@
<featureArtifactDef>
org.wso2.carbon.identity.framework:org.wso2.carbon.identity.core.feature:${carbon.identity.framework.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.server.feature:${carbon.deployment.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.deployment:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.deployment.version}
</featureArtifactDef>
<!--carbon core features -->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version}
@ -173,9 +161,6 @@
<featureArtifactDef>
org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher.tool.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics.shared:org.wso2.carbon.analytics.shared.data.agents.log4j.feature:${analytics.shared.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
@ -241,23 +226,6 @@
<id>org.wso2.carbon.system.statistics.feature.group</id>
<version>${carbon.commons.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.soaptracer.feature.group</id>
<version>${carbon.commons.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.security.mgt.feature.group</id>
<version>${carbon.identity.framework.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.message.flows.feature.group</id>
<version>${carbon.commons.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.tryit.feature.group</id>
<version>${carbon.commons.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.contentsearch.feature.group</id>
<version>${carbon.registry.version}</version>
@ -271,14 +239,6 @@
</id>
<version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.wsdl.tools.feature.group</id>
<version>${carbon.commons.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.um.ws.service.feature.group</id>
<version>${carbon.um.ws.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.messaging.andes.feature.group</id>
<version>${carbon.messaging.version}</version>
@ -290,22 +250,20 @@
</feature>
<!-- multitenancy feature groups -->
<feature>
<id>org.wso2.carbon.tenant.common.server.feature.group</id>
<id>org.wso2.carbon.tenant.common.feature.group</id>
<version>${carbon.multitenancy.version}</version>
</feature>
<feature>
<id>
org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group
</id>
<version>${identity.carbon.auth.saml2.version}</version>
<id>org.wso2.carbon.tenant.throttling.agent.feature.group</id>
<version>${carbon.multitenancy.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.tenant.usage.agent.feature.group</id>
<version>${carbon.multitenancy.version}</version>
<id>org.wso2.carbon.security.mgt.feature.group</id>
<version>${carbon.identity.framework.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.tenant.throttling.agent.feature.group</id>
<version>${carbon.multitenancy.version}</version>
<id>org.wso2.carbon.identity.authenticator.saml2.sso.feature.group</id>
<version>${identity.carbon.auth.saml2.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.user.mgt.feature.group</id>
@ -329,14 +287,17 @@
<version>${cipher.tool.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.shared.data.agents.log4j.feature.group</id>
<version>${analytics.shared.version}</version>
<id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
<version>${carbon.deployment.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
<version>${carbon.deployment.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features>
</configuration>
</execution>

@ -1489,7 +1489,7 @@
<carbon.deployment.version>4.7.15</carbon.deployment.version>
<!-- Carbon Identity -->
<carbon.identity.framework.version>5.11.124</carbon.identity.framework.version>
<carbon.identity.framework.version>5.11.139</carbon.identity.framework.version>
<carbon.identity.framework.version.range>[5.2.0, 6.0.0)
</carbon.identity.framework.version.range>
<identity.local.auth.basicauth.version>5.3.7</identity.local.auth.basicauth.version>
@ -1525,14 +1525,14 @@
<carbon.governance.version>4.7.23</carbon.governance.version>
<!-- Carbon Device Management-->
<carbon.device.mgt.version>3.1.3-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
<carbon.device.mgt.version>3.1.3</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management -->
<product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
<carbon.device.mgt.plugin.version>4.1.1</carbon.device.mgt.plugin.version>
<!-- API Management -->
<carbon.api.mgt.version>6.2.170</carbon.api.mgt.version>
@ -1542,7 +1542,7 @@
<carbon.mediation.version>4.6.61</carbon.mediation.version>
<!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.1.32</carbon.analytics.common.version>
<carbon.analytics.common.version>5.1.33</carbon.analytics.common.version>
<carbon.analytics.version>1.3.16</carbon.analytics.version>
<carbon.analytics.das.version>1.3.16</carbon.analytics.das.version>
<product.iot.analytics.version>${project.version}</product.iot.analytics.version>
@ -1646,7 +1646,7 @@
<carbon.um.ws.version>5.1.5</carbon.um.ws.version>
<!-- Cipher tool version-->
<cipher.tool.version>1.0.0-wso2v5</cipher.tool.version>
<cipher.tool.version>1.0.0-wso2v6</cipher.tool.version>
<!--XMPP/MQTT Version-->
<smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
@ -1656,7 +1656,7 @@
<project.scm.id>github-scm</project.scm.id>
<!-- Carbon Metrics Features -->
<carbon.metrics.version>1.2.2</carbon.metrics.version>
<carbon.metrics.version>1.2.3</carbon.metrics.version>
<!--http client version-->
<httpclient.version>4.5.2</httpclient.version>

Loading…
Cancel
Save