diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 6ce4cd3f..fb1f1b3d 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1102,15 +1102,6 @@ true - - src/broker/resources/STRATOS_ROOT - - ${pom.artifactId}-${pom.version}/wso2/broker/repository/deployment/server/webapps/STRATOS_ROOT - - 644 - 775 - - ../p2-profile/broker-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/components diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/bottom.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/bottom.gif deleted file mode 100644 index 56792668..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/bottom.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/content-bg.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/content-bg.gif deleted file mode 100644 index 6d0a5795..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/content-bg.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/favicon.ico b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/favicon.ico deleted file mode 100644 index f7b2bbfb..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/favicon.ico and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/feature-01-icon.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/feature-01-icon.gif deleted file mode 100644 index b4ea8cda..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/feature-01-icon.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/feature-02-icon.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/feature-02-icon.gif deleted file mode 100644 index 8754de14..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/feature-02-icon.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/feature-03-icon.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/feature-03-icon.gif deleted file mode 100644 index d81f1fec..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/feature-03-icon.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/intro-bg.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/intro-bg.gif deleted file mode 100644 index a38a0dfa..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/intro-bg.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/logo.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/logo.gif deleted file mode 100644 index ee9beef1..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/logo.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/powered-logo.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/powered-logo.gif deleted file mode 100644 index fb478bf9..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/powered-logo.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/register.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/register.gif deleted file mode 100644 index 98c53620..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/register.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/sign-in.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/sign-in.gif deleted file mode 100644 index 9e992cc2..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/sign-in.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/title-bg.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/title-bg.gif deleted file mode 100644 index 2d539a7e..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/title-bg.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/top.gif b/modules/distribution/src/broker/resources/STRATOS_ROOT/images/top.gif deleted file mode 100644 index 9ed482c2..00000000 Binary files a/modules/distribution/src/broker/resources/STRATOS_ROOT/images/top.gif and /dev/null differ diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/index.html b/modules/distribution/src/broker/resources/STRATOS_ROOT/index.html deleted file mode 100644 index cc82a56b..00000000 --- a/modules/distribution/src/broker/resources/STRATOS_ROOT/index.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - StratosLive - - - - - - - -
- -
-
-
- - -
-

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.

-
-
-
-

Features

-
- -

Bring CEP to SOA

-

- Bring CEP to SOA by processing XML events and produce results as XML events. -

-
-
- -

Registry Storage

-

- Ability to define different event streams, queries and out put streams and store them in the registry as a bucket. -

-
-
- -

Esper and Fusion

-

- Support Esper and fusion back end runtimes. -

-
-
-
-
-
- -
- - - - diff --git a/modules/distribution/src/broker/resources/STRATOS_ROOT/style.css b/modules/distribution/src/broker/resources/STRATOS_ROOT/style.css deleted file mode 100644 index f91a662a..00000000 --- a/modules/distribution/src/broker/resources/STRATOS_ROOT/style.css +++ /dev/null @@ -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; } \ No newline at end of file diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index 57903821..747d44c2 100644 --- a/modules/p2-profile/broker-profile/pom.xml +++ b/modules/p2-profile/broker-profile/pom.xml @@ -103,18 +103,9 @@ org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version} - - org.wso2.carbon.commons:org.wso2.carbon.soaptracer.feature:${carbon.commons.version} - org.wso2.carbon.identity.framework:org.wso2.carbon.security.mgt.feature:${carbon.identity.framework.version} - - org.wso2.carbon.commons:org.wso2.carbon.message.flows.feature:${carbon.commons.version} - - - org.wso2.carbon.commons:org.wso2.carbon.tryit.feature:${carbon.commons.version} - org.wso2.carbon.registry:org.wso2.carbon.registry.core.feature:${carbon.registry.version} @@ -124,24 +115,15 @@ org.wso2.carbon.registry:org.wso2.carbon.registry.resource.properties.feature:${carbon.registry.version} - - org.wso2.carbon.commons:org.wso2.carbon.wsdl.tools.feature:${carbon.commons.version} - - - org.wso2.carbon.identity.user.ws:org.wso2.carbon.um.ws.service.feature:${carbon.um.ws.version} - org.wso2.carbon.messaging:org.wso2.carbon.andes.feature:${carbon.messaging.version} - 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} org.wso2.carbon.commons:org.wso2.carbon.tenant.mgt.common.feature:${carbon.commons.version} - - org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.usage.agent.feature:${carbon.multitenancy.version} - org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.throttling.agent.feature:${carbon.multitenancy.version} @@ -157,6 +139,12 @@ org.wso2.carbon.identity.framework:org.wso2.carbon.identity.core.feature:${carbon.identity.framework.version} + + org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.server.feature:${carbon.deployment.version} + + + org.wso2.carbon.deployment:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.deployment.version} + org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version} @@ -173,9 +161,6 @@ org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher.tool.version} - - org.wso2.carbon.analytics.shared:org.wso2.carbon.analytics.shared.data.agents.log4j.feature:${analytics.shared.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature:${carbon.device.mgt.plugin.version} @@ -241,23 +226,6 @@ org.wso2.carbon.system.statistics.feature.group ${carbon.commons.version} - - org.wso2.carbon.soaptracer.feature.group - ${carbon.commons.version} - - - org.wso2.carbon.security.mgt.feature.group - ${carbon.identity.framework.version} - - - org.wso2.carbon.message.flows.feature.group - ${carbon.commons.version} - - - - org.wso2.carbon.tryit.feature.group - ${carbon.commons.version} - org.wso2.carbon.registry.contentsearch.feature.group ${carbon.registry.version} @@ -271,14 +239,6 @@ ${carbon.registry.version} - - org.wso2.carbon.wsdl.tools.feature.group - ${carbon.commons.version} - - - org.wso2.carbon.um.ws.service.feature.group - ${carbon.um.ws.version} - org.wso2.carbon.messaging.andes.feature.group ${carbon.messaging.version} @@ -290,22 +250,20 @@ - org.wso2.carbon.tenant.common.server.feature.group + org.wso2.carbon.tenant.common.feature.group ${carbon.multitenancy.version} - - org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group - - ${identity.carbon.auth.saml2.version} + org.wso2.carbon.tenant.throttling.agent.feature.group + ${carbon.multitenancy.version} - org.wso2.carbon.tenant.usage.agent.feature.group - ${carbon.multitenancy.version} + org.wso2.carbon.security.mgt.feature.group + ${carbon.identity.framework.version} - org.wso2.carbon.tenant.throttling.agent.feature.group - ${carbon.multitenancy.version} + org.wso2.carbon.identity.authenticator.saml2.sso.feature.group + ${identity.carbon.auth.saml2.version} org.wso2.carbon.user.mgt.feature.group @@ -329,14 +287,17 @@ ${cipher.tool.version} - org.wso2.carbon.analytics.shared.data.agents.log4j.feature.group - ${analytics.shared.version} + org.wso2.carbon.webapp.mgt.server.feature.group + ${carbon.deployment.version} + + + org.wso2.carbon.as.runtimes.cxf.feature.group + ${carbon.deployment.version} org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature.group ${carbon.device.mgt.plugin.version} - diff --git a/pom.xml b/pom.xml index 5999bb1d..a03145a1 100644 --- a/pom.xml +++ b/pom.xml @@ -1489,7 +1489,7 @@ 4.7.15 - 5.11.124 + 5.11.139 [5.2.0, 6.0.0) 5.3.7 @@ -1526,13 +1526,13 @@ 3.1.3 - [3.0.0, 4.0.0) + [3.1.0, 4.0.0) ${project.version} - 4.1.0 + 4.1.1 6.2.170 @@ -1646,7 +1646,7 @@ 5.1.5 - 1.0.0-wso2v5 + 1.0.0-wso2v6 3.0.4.wso2v1 @@ -1656,7 +1656,7 @@ github-scm - 1.2.2 + 1.2.3 4.5.2