Repository: stratos Updated Branches: refs/heads/4.0.0-grouping dab0855e2 -> 8526e913e
http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/features/manager/metadataservice/org.apache.stratos.metadataservice.feature/src/main/resources/tomcat/webapp-classloading-environments.xml ---------------------------------------------------------------------- diff --git a/features/manager/metadataservice/org.apache.stratos.metadataservice.feature/src/main/resources/tomcat/webapp-classloading-environments.xml b/features/manager/metadataservice/org.apache.stratos.metadataservice.feature/src/main/resources/tomcat/webapp-classloading-environments.xml new file mode 100644 index 0000000..7e7dd0a --- /dev/null +++ b/features/manager/metadataservice/org.apache.stratos.metadataservice.feature/src/main/resources/tomcat/webapp-classloading-environments.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- + ~ Copyright 2005-2013 WSO2, Inc. (http://wso2.com) + ~ + ~ 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. + --> + +<!-- + This file defines the different classloading environments. This is container level config file. Individual webapps are not allowed to override these elements. + + ${carbon.home} represents the carbon.home system property. + Other system properties can be specified in a similar manner. +--> +<Classloading xmlns="http://wso2.org/projects/as/classloading-environments";> + + <!-- + We define three different environments. + + 1) Delegated environment - This is a virtual environment where all the resources belongs to these environments are loaded from the parent. This way you can control whats being loaded from the parent classloader. Only the packages and resources specified in the delegated environments are loaded from the parent. All the others are loaded from the local webapp's classpath. If a webapps has speficied two or more delegated environments, they all get merged at runtime. + --> + <DelegatedEnvironments> + + <DelegatedEnvironment> + <Name>Tomcat</Name> + <DelegatedPackages>javax.annotation.*,javax.ejb,javax.el,javax.persistence,javax.servlet.*,javax.xml,javax.xml.ws,org.apache.catalina.*,org.apache.coyote.*,org.apache.el.*,com.sun.el.*,org.apache.jasper.*,org.apache.naming.*,org.apache.tomcat.*,org.wso2.carbon.tomcat.jndi.*</DelegatedPackages> + </DelegatedEnvironment> + + <DelegatedEnvironment> + <Name>Carbon</Name> + <DelegatedPackages>*,!org.springframework.*</DelegatedPackages> + </DelegatedEnvironment> + + </DelegatedEnvironments> + + + <!-- + 2) Shared environment - These environments are loaded once and shared between multiple webapps. Certain runtimes can be shared by multiple webapps. So no need to load them per webapp. + --> + + <!--SharedEnvironments> + <SharedEnvironment> + <name>Spring</name> + <Classpath></Classpath> + </SharedEnvironment> + </SharedEnvironments--> + + <!-- + 3) Exclusive environment - These environments are loaded per webapp. Exclusive environments define a set of resources(jars) which should be loaded per webapp. e.g. CXF runtime. + --> + <ExclusiveEnvironments> + <ExclusiveEnvironment> + <Name>CXF</Name> + <Classpath>${carbon.home}/lib/runtimes/cxf/*.jar;${carbon.home}/lib/runtimes/cxf/</Classpath> + </ExclusiveEnvironment> + </ExclusiveEnvironments> + +</Classloading> http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/features/manager/metadataservice/org.apache.stratos.metadataservice.feature/src/main/resources/tomcat/webapp-classloading.xml ---------------------------------------------------------------------- diff --git a/features/manager/metadataservice/org.apache.stratos.metadataservice.feature/src/main/resources/tomcat/webapp-classloading.xml b/features/manager/metadataservice/org.apache.stratos.metadataservice.feature/src/main/resources/tomcat/webapp-classloading.xml new file mode 100644 index 0000000..f42616f --- /dev/null +++ b/features/manager/metadataservice/org.apache.stratos.metadataservice.feature/src/main/resources/tomcat/webapp-classloading.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- + ~ Copyright 2005-2013 WSO2, Inc. (http://wso2.com) + ~ + ~ 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. + --> + +<!-- + This file defines class loading policy of the whole container. But this behaviour can be overridden by individual webapps by putting this file into the META-INF/ directory. +--> +<Classloading xmlns="http://wso2.org/projects/as/classloading";> + + <!-- Parent-first or child-first. Default behaviour is child-first.--> + <ParentFirst>false</ParentFirst> + + <!-- + Default environments that contains provides to all the webapps. This can be overridden by individual webapps by specifing required environments + Tomcat environment is the default and every webapps gets it even if they didn't specify it. + e.g. If a webapps requires CXF, they will get both Tomcat and CXF. + --> + <Environments>Carbon</Environments> +</Classloading> http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml index 109a987..fd8457b 100644 --- a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml +++ b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml @@ -216,6 +216,16 @@ <artifactId>carbon-cxf</artifactId> <version>1.0.0</version> </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.registry.ws.client</artifactId> + <version>4.2.0</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.registry.ws.stub</artifactId> + <version>4.2.0</version> + </dependency> <!--dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId> http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/products/stratos/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml index 05c0af8..38242cd 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -629,6 +629,12 @@ <filtered>true</filtered> <fileMode>755</fileMode> </file> + <file> + <source>src/main/conf/metadataservice.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <filtered>true</filtered> + <fileMode>755</fileMode> + </file> <file> <source>src/main/conf/mincheck.drl</source> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> @@ -862,6 +868,12 @@ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory> <fileMode>644</fileMode> </file> + <!-- Meta data service --> + <file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/stratosmetadataservice.war</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory> + <fileMode>644</fileMode> + </file> <!-- End of REST endpoint webapp --> <file> <source>../../conf/data-bridge/data-bridge-config.xml</source> http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/products/stratos/modules/distribution/src/bin/stratos.sh ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/bin/stratos.sh b/products/stratos/modules/distribution/src/bin/stratos.sh index 644b8a6..eda3730 100755 --- a/products/stratos/modules/distribution/src/bin/stratos.sh +++ b/products/stratos/modules/distribution/src/bin/stratos.sh @@ -17,7 +17,7 @@ # specific language governing permissions and limitations # under the License. # ---------------------------------------------------------------------------- -# Main Script for the Apache Stratos +# Main Script for the Apache Stratos (incubating) # # Environment Variable Prerequisites # @@ -183,7 +183,7 @@ elif [ "$CMD" = "start" ]; then fi export CARBON_HOME=$CARBON_HOME # using nohup bash to avoid erros in solaris OS.TODO - nohup bash $CARBON_HOME/bin/stratos.sh $args < /dev/null > /dev/null 2>&1 & + nohup bash $CARBON_HOME/bin/stratos.sh $args > /dev/null 2>&1 & exit 0 elif [ "$CMD" = "stop" ]; then export CARBON_HOME=$CARBON_HOME @@ -202,7 +202,7 @@ elif [ "$CMD" = "restart" ]; then done # using nohup bash to avoid erros in solaris OS.TODO - nohup bash $CARBON_HOME/bin/stratos.sh $args < /dev/null > /dev/null 2>&1 & + nohup bash $CARBON_HOME/bin/stratos.sh $args > /dev/null 2>&1 & exit 0 elif [ "$CMD" = "test" ]; then JAVACMD="exec "$JAVACMD"" http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/products/stratos/modules/distribution/src/main/conf/metadataservice.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/metadataservice.xml b/products/stratos/modules/distribution/src/main/conf/metadataservice.xml new file mode 100644 index 0000000..d871bc0 --- /dev/null +++ b/products/stratos/modules/distribution/src/main/conf/metadataservice.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF 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. +--> +<configuration> + <metadataservice> + <govenanceregistrytype>OWN</govenanceregistrytype> + <serverurl>https://localhost:9445/services/</serverurl> + <username>admin</username> + <password>admin</password> + + <mainResource>stratos</mainResource> + <axis2Repo>repository/deployment/client</axis2Repo> + <axis2Conf>repository/conf/axis2/axis2_client.xml</axis2Conf> + <trustStore>repository/resources/security/wso2carbon.jks</trustStore> + <trustStorePassword>wso2carbon</trustStorePassword> + <trustStoreType>JKS</trustStoreType> + + + + </metadataservice> +</configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/products/stratos/modules/distribution/src/main/license/LICENSE ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/license/LICENSE b/products/stratos/modules/distribution/src/main/license/LICENSE index cb34d1d..a7e9dc5 100644 --- a/products/stratos/modules/distribution/src/main/license/LICENSE +++ b/products/stratos/modules/distribution/src/main/license/LICENSE @@ -704,9 +704,6 @@ tcpmon-1.0.jar, xstream-1.4.1.jar, dhtmlHistory.js -Copyright (c) 2010 Terence Parr -All rights reserved. - [The BSD License] Redistribution and use in source and binary forms, with or without modification, @@ -1049,6 +1046,7 @@ Scriptaculous-1.7.0 The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/products/stratos/modules/p2-profile-gen/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml index 1500759..48161dc 100644 --- a/products/stratos/modules/p2-profile-gen/pom.xml +++ b/products/stratos/modules/p2-profile-gen/pom.xml @@ -207,6 +207,7 @@ <featureArtifactDef>org.apache.stratos:org.apache.stratos.manager.feature:${project.version}</featureArtifactDef> <featureArtifactDef>org.apache.stratos:org.apache.stratos.cartridge.mgt.ui.feature:${project.version}</featureArtifactDef> <featureArtifactDef>org.apache.stratos:org.apache.stratos.rest.endpoint.feature:${project.version}</featureArtifactDef> + <featureArtifactDef>org.apache.stratos:org.apache.stratos.metadataservice.feature:${project.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef> @@ -217,7 +218,7 @@ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:4.2.1</featureArtifactDef> <featureArtifactDef>org.apache.stratos:org.apache.stratos.messaging.feature:${project.version}</featureArtifactDef> <featureArtifactDef>org.apache.stratos:org.apache.stratos.autoscaler.feature:${project.version}</featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.version}</featureArtifactDef>--> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.logging.mgt.feature:${carbon.version}</featureArtifactDef> <featureArtifactDef>org.apache.stratos:org.apache.stratos.cloud.controller.feature:${project.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.apache.synapse.wso2.feature:${synapse.version}</featureArtifactDef> @@ -412,6 +413,10 @@ <version>${project.version}</version> </feature> <feature> + <id>org.apache.stratos.metadataservice.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> <id>org.apache.stratos.messaging.feature.group</id> <version>${project.version}</version> </feature> @@ -491,6 +496,14 @@ <id>org.wso2.carbon.registry.resource.properties.feature.group</id> <version>${carbon.platform.patch.version.4.2.1}</version> </feature> + <feature> + <id>org.apache.stratos.metadataservice.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.metadataservice.feature.group</id> + <version>${project.version}</version> + </feature> </features> </configuration> </execution> @@ -573,6 +586,10 @@ <id>org.wso2.carbon.event.server.feature.group</id> <version>${carbon.platform.patch.version.4.2.1}</version> </feature> + <feature> + <id>org.apache.stratos.metadataservice.feature.group</id> + <version>${project.version}</version> + </feature> </features> </configuration> </execution> @@ -687,6 +704,10 @@ <id>org.apache.stratos.rest.endpoint.feature.group</id> <version>${project.version}</version> </feature> + <feature> + <id>org.apache.stratos.metadataservice.feature.group</id> + <version>${project.version}</version> + </feature> <feature> <id>org.apache.stratos.messaging.feature.group</id> <version>${project.version}</version> @@ -808,6 +829,10 @@ <id>org.wso2.carbon.cassandra.common.feature.group</id> <version>${carbon.platform.version}</version> </feature> + <feature> + <id>org.apache.stratos.metadataservice.feature.group</id> + <version>${project.version}</version> + </feature> </features> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/products/stratos/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/pom.xml b/products/stratos/pom.xml index c13eb9e..c7be494 100755 --- a/products/stratos/pom.xml +++ b/products/stratos/pom.xml @@ -228,6 +228,7 @@ <artifactId>org.apache.stratos.redirector.servlet</artifactId> <version>${project.version}</version> </dependency> + <dependency> <groupId>org.apache.batik.wso2</groupId> <artifactId>batik</artifactId> http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/tools/stratos-installer/conf/setup.conf ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf index 9522bc2..9d77162 100644 --- a/tools/stratos-installer/conf/setup.conf +++ b/tools/stratos-installer/conf/setup.conf @@ -103,3 +103,8 @@ export userstore_db_schema="userstore" export userstore_db_port="3306" export userstore_db_user="root" export userstore_db_pass="root" + + +# GREG +export greg_pack_zip=$stratos_packs/"wso2greg-4.6.0.zip" +export greg_extract_path=$stratos_path/"wso2greg-4.6.0" http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/tools/stratos-installer/config/all/repository/conf/metadataservice.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/all/repository/conf/metadataservice.xml b/tools/stratos-installer/config/all/repository/conf/metadataservice.xml new file mode 100644 index 0000000..690e056 --- /dev/null +++ b/tools/stratos-installer/config/all/repository/conf/metadataservice.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF 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. +--> +<configuration> + <metadataservice> + <govenanceregistrytype>GREG</govenanceregistrytype> + <serverurl>https://localhost:9445/services/</serverurl> + <username>admin</username> + <password>admin</password> + + <mainResource>stratos</mainResource> + <axis2Repo>repository/deployment/client</axis2Repo> + <axis2Conf>repository/conf/axis2/axis2_client.xml</axis2Conf> + <trustStore>repository/resources/security/wso2carbon.jks</trustStore> + <trustStorePassword>wso2carbon</trustStorePassword> + <trustStoreType>JKS</trustStoreType> + + + + </metadataservice> +</configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/tools/stratos-installer/config/greg/repository/conf/carbon.xml ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/greg/repository/conf/carbon.xml b/tools/stratos-installer/config/greg/repository/conf/carbon.xml new file mode 100644 index 0000000..84d97db --- /dev/null +++ b/tools/stratos-installer/config/greg/repository/conf/carbon.xml @@ -0,0 +1,609 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- + ~ Copyright 2005-2011 WSO2, Inc. (http://wso2.com) + ~ + ~ 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. + --> + +<!-- + This is the main server configuration file + + ${carbon.home} represents the carbon.home system property. + Other system properties can be specified in a similar manner. +--> +<Server xmlns="http://wso2.org/projects/carbon/carbon.xml";> + + <!-- + Product Name + --> + <Name>WSO2 Governance Registry</Name> + + <!-- + machine readable unique key to identify each product + --> + <ServerKey>Greg</ServerKey> + + <!-- + Product Version + --> + <Version>4.6.0</Version> + + <!-- + Host name or IP address of the machine hosting this server + e.g. www.wso2.org, 192.168.1.10 + This is will become part of the End Point Reference of the + services deployed on this server instance. + --> + <!--HostName>www.wso2.org</HostName--> + + <!-- + Host name to be used for the Carbon management console + --> + <!--MgtHostName>mgt.wso2.org</MgtHostName--> + + <!-- + The URL of the back end server. This is where the admin services are hosted and + will be used by the clients in the front end server. + This is required only for the Front-end server. This is used when seperating BE server from FE server + --> + <ServerURL>local:/${carbon.context}/services/</ServerURL> + <!-- + <ServerURL>https://${carbon.local.ip}:${carbon.management.port}${carbon.context}/services/</ServerURL> + --> + <!-- + The URL of the index page. This is where the user will be redirected after signing in to the + carbon server. + --> + <!-- IndexPageURL>/carbon/admin/index.jsp</IndexPageURL--> + + <!-- + For cApp deployment, we have to identify the roles that can be acted by the current server. + The following property is used for that purpose. Any number of roles can be defined here. + Regular expressions can be used in the role. + Ex : <Role>.*</Role> means this server can act any role + --> + <ServerRoles> + <Role>GovernanceRegistry</Role> + </ServerRoles> + + <!-- uncommnet this line to subscribe to a bam instance automatically --> + <!--<BamServerURL>https://bamhost:bamport/services/</BamServerURL>--> + + <!-- + The fully qualified name of the server + --> + <Package>org.wso2.carbon</Package> + + <!-- + Webapp context root of WSO2 Carbon. + --> + <WebContextRoot>/</WebContextRoot> + + <!-- In-order to get the registry http Port from the back-end when the default http transport is not the same--> + <!--RegistryHttpPort>9763</RegistryHttpPort--> + + <!-- + Number of items to be displayed on a management console page. This is used at the + backend server for pagination of various items. + --> + <ItemsPerPage>15</ItemsPerPage> + + <!-- The endpoint URL of the cloud instance management Web service --> + <!--<InstanceMgtWSEndpoint>https://ec2.amazonaws.com/</InstanceMgtWSEndpoint>--> + + <!-- + Ports used by this server + --> + <Ports> + + <!-- Ports offset. This entry will set the value of the ports defined below to + the define value + Offset. + e.g. Offset=2 and HTTPS port=9443 will set the effective HTTPS port to 9445 + --> + <Offset>2</Offset> + + <!-- The JMX Ports --> + <JMX> + <!--The port RMI registry is exposed--> + <RMIRegistryPort>9999</RMIRegistryPort> + <!--The port RMI server should be exposed--> + <RMIServerPort>11111</RMIServerPort> + </JMX> + + <!-- Embedded LDAP server specific ports --> + <EmbeddedLDAP> + <!-- Port which embedded LDAP server runs --> + <LDAPServerPort>10389</LDAPServerPort> + <!-- Port which KDC (Kerberos Key Distribution Center) server runs --> + <KDCServerPort>8000</KDCServerPort> + </EmbeddedLDAP> + + <!-- Embedded Qpid broker ports --> + <EmbeddedQpid> + <!-- Broker TCP Port --> + <BrokerPort>5672</BrokerPort> + <!-- SSL Port --> + <BrokerSSLPort>8672</BrokerSSLPort> + </EmbeddedQpid> + + <!-- + Override datasources JNDIproviderPort defined in bps.xml and datasources.properties files + --> + <!--<JNDIProviderPort>2199</JNDIProviderPort>--> + <!--Override receive port of thrift based entitlement service.--> + <ThriftEntitlementReceivePort>10500</ThriftEntitlementReceivePort> + + </Ports> + + <!-- + JNDI Configuration + --> + <JNDI> + <!-- + The fully qualified name of the default initial context factory + --> + <DefaultInitialContextFactory>org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory</DefaultInitialContextFactory> + <!-- + The restrictions that are done to various JNDI Contexts in a Multi-tenant environment + --> + <Restrictions> + <!-- + Contexts that will be available only to the super-tenant + --> + <!-- <SuperTenantOnly> + <UrlContexts> + <UrlContext> + <Scheme>foo</Scheme> + </UrlContext> + <UrlContext> + <Scheme>bar</Scheme> + </UrlContext> + </UrlContexts> + </SuperTenantOnly> --> + <!-- + Contexts that are common to all tenants + --> + <AllTenants> + <UrlContexts> + <UrlContext> + <Scheme>java</Scheme> + </UrlContext> + <!-- <UrlContext> + <Scheme>foo</Scheme> + </UrlContext> --> + </UrlContexts> + </AllTenants> + <!-- + All other contexts not mentioned above will be available on a per-tenant basis + (i.e. will not be shared among tenants) + --> + </Restrictions> + </JNDI> + + <!-- + Property to determine if the server is running an a cloud deployment environment. + This property should only be used to determine deployment specific details that are + applicable only in a cloud deployment, i.e when the server deployed *-as-a-service. + --> + <IsCloudDeployment>false</IsCloudDeployment> + + <!-- + Property to determine whether usage data should be collected for metering purposes + --> + <EnableMetering>false</EnableMetering> + + <!-- The Max time a thread should take for execution in seconds --> + <MaxThreadExecutionTime>600</MaxThreadExecutionTime> + + <!-- + A flag to enable or disable Ghost Deployer. By default this is set to false. That is + because the Ghost Deployer works only with the HTTP/S transports. If you are using + other transports, don't enable Ghost Deployer. + --> + <GhostDeployment> + <Enabled>false</Enabled> + <PartialUpdate>false</PartialUpdate> + </GhostDeployment> + + <!-- + Axis2 related configurations + --> + <Axis2Config> + <!-- + Location of the Axis2 Services & Modules repository + + This can be a directory in the local file system, or a URL. + + e.g. + 1. /home/wso2wsas/repository/ - An absolute path + 2. repository - In this case, the path is relative to CARBON_HOME + 3. file:///home/wso2wsas/repository/ + 4. http://wso2wsas/repository/ + --> + <RepositoryLocation>${carbon.home}/repository/deployment/server/</RepositoryLocation> + + <!-- + Deployment update interval in seconds. This is the interval between repository listener + executions. + --> + <DeploymentUpdateInterval>15</DeploymentUpdateInterval> + + <!-- + Location of the main Axis2 configuration descriptor file, a.k.a. axis2.xml file + + This can be a file on the local file system, or a URL + + e.g. + 1. /home/repository/axis2.xml - An absolute path + 2. conf/axis2.xml - In this case, the path is relative to CARBON_HOME + 3. file:///home/carbon/repository/axis2.xml + 4. http://repository/conf/axis2.xml + --> + <ConfigurationFile>${carbon.home}/repository/conf/axis2/axis2.xml</ConfigurationFile> + + <!-- + ServiceGroupContextIdleTime, which will be set in ConfigurationContex + for multiple clients which are going to access the same ServiceGroupContext + Default Value is 30 Sec. + --> + <ServiceGroupContextIdleTime>30000</ServiceGroupContextIdleTime> + + <!-- + This repository location is used to crete the client side configuration + context used by the server when calling admin services. + --> + <ClientRepositoryLocation>${carbon.home}/repository/deployment/client/</ClientRepositoryLocation> + <!-- This axis2 xml is used in createing the configuration context by the FE server + calling to BE server --> + <clientAxis2XmlLocation>${carbon.home}/repository/conf/axis2/axis2_client.xml</clientAxis2XmlLocation> + <!-- If this parameter is set, the ?wsdl on an admin service will not give the admin service wsdl. --> + <HideAdminServiceWSDLs>true</HideAdminServiceWSDLs> + + <!--WARNING-Use With Care! Uncommenting bellow parameter would expose all AdminServices in HTTP transport. + With HTTP transport your credentials and data routed in public channels are vulnerable for sniffing attacks. + Use bellow parameter ONLY if your communication channels are confirmed to be secured by other means --> + <!--HttpAdminServices>*</HttpAdminServices--> + + </Axis2Config> + + <!-- + The default user roles which will be created when the server + is started up for the first time. + --> + <ServiceUserRoles> + <Role> + <Name>admin</Name> + <Description>Default Administrator Role</Description> + </Role> + <Role> + <Name>user</Name> + <Description>Default User Role</Description> + </Role> + </ServiceUserRoles> + + <!-- + Enable following config to allow Emails as usernames. + --> + <!--EnableEmailUserName>true</EnableEmailUserName--> + + <!-- + Security configurations + --> + <Security> + <!-- + KeyStore which will be used for encrypting/decrypting passwords + and other sensitive information. + --> + <KeyStore> + <!-- Keystore file location--> + <Location>${carbon.home}/repository/resources/security/wso2carbon.jks</Location> + <!-- Keystore type (JKS/PKCS12 etc.)--> + <Type>JKS</Type> + <!-- Keystore password--> + <Password>wso2carbon</Password> + <!-- Private Key alias--> + <KeyAlias>wso2carbon</KeyAlias> + <!-- Private Key password--> + <KeyPassword>wso2carbon</KeyPassword> + </KeyStore> + + <!-- + System wide trust-store which is used to maintain the certificates of all + the trusted parties. + --> + <TrustStore> + <!-- trust-store file location --> + <Location>${carbon.home}/repository/resources/security/client-truststore.jks</Location> + <!-- trust-store type (JKS/PKCS12 etc.) --> + <Type>JKS</Type> + <!-- trust-store password --> + <Password>wso2carbon</Password> + </TrustStore> + + <!-- + The Authenticator configuration to be used at the JVM level. We extend the + java.net.Authenticator to make it possible to authenticate to given servers and + proxies. + --> + <NetworkAuthenticatorConfig> + <!-- + Below is a sample configuration for a single authenticator. Please note that + all child elements are mandatory. Not having some child elements would lead to + exceptions at runtime. + --> + <!-- <Credential> --> + <!-- + the pattern that would match a subset of URLs for which this authenticator + would be used + --> + <!-- <Pattern>regularExpression</Pattern> --> + <!-- + the type of this authenticator. Allowed values are: + 1. server + 2. proxy + --> + <!-- <Type>proxy</Type> --> + <!-- the username used to log in to server/proxy --> + <!-- <Username>username</Username> --> + <!-- the password used to log in to server/proxy --> + <!-- <Password>password</Password> --> + <!-- </Credential> --> + </NetworkAuthenticatorConfig> + + <!-- + The Tomcat realm to be used for hosted Web applications. Allowed values are; + 1. UserManager + 2. Memory + + If this is set to 'UserManager', the realm will pick users & roles from the system's + WSO2 User Manager. If it is set to 'memory', the realm will pick users & roles from + CARBON_HOME/repository/conf/tomcat/tomcat-users.xml + --> + <TomcatRealm>UserManager</TomcatRealm> + + <!--Option to disable storing of tokens issued by STS--> + <DisableTokenStore>false</DisableTokenStore> + + <!-- + Security token store class name. If this is not set, default class will be + org.wso2.carbon.security.util.SecurityTokenStore + --> + <!--TokenStoreClassName>org.wso2.carbon.identity.sts.store.DBTokenStore</TokenStoreClassName--> + </Security> + + <!-- + The temporary work directory + --> + <WorkDirectory>${carbon.home}/tmp/work</WorkDirectory> + + <!-- + House-keeping configuration + --> + <HouseKeeping> + + <!-- + true - Start House-keeping thread on server startup + false - Do not start House-keeping thread on server startup. + The user will run it manually as and when he wishes. + --> + <AutoStart>true</AutoStart> + + <!-- + The interval in *minutes*, between house-keeping runs + --> + <Interval>10</Interval> + + <!-- + The maximum time in *minutes*, temp files are allowed to live + in the system. Files/directories which were modified more than + "MaxTempFileLifetime" minutes ago will be removed by the + house-keeping task + --> + <MaxTempFileLifetime>30</MaxTempFileLifetime> + </HouseKeeping> + + <!-- + Configuration for handling different types of file upload & other file uploading related + config parameters. + To map all actions to a particular FileUploadExecutor, use + <Action>*</Action> + --> + <FileUploadConfig> + <!-- + The total file upload size limit in MB + --> + <TotalFileSizeLimit>100</TotalFileSizeLimit> + + <Mapping> + <Actions> + <Action>keystore</Action> + <Action>certificate</Action> + <Action>*</Action> + </Actions> + <Class>org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor</Class> + </Mapping> + + <Mapping> + <Actions> + <Action>jarZip</Action> + </Actions> + <Class>org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor</Class> + </Mapping> + <Mapping> + <Actions> + <Action>dbs</Action> + </Actions> + <Class>org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor</Class> + </Mapping> + <Mapping> + <Actions> + <Action>tools</Action> + </Actions> + <Class>org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor</Class> + </Mapping> + <Mapping> + <Actions> + <Action>toolsAny</Action> + </Actions> + <Class>org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor</Class> + </Mapping> + </FileUploadConfig> + + <!-- + Processors which process special HTTP GET requests such as ?wsdl, ?policy etc. + + In order to plug in a processor to handle a special request, simply add an entry to this + section. + + The value of the Item element is the first parameter in the query string(e.g. ?wsdl) + which needs special processing + + The value of the Class element is a class which implements + org.wso2.carbon.transport.HttpGetRequestProcessor + --> + <HttpGetRequestProcessors> + <Processor> + <Item>info</Item> + <Class>org.wso2.carbon.core.transports.util.InfoProcessor</Class> + </Processor> + <Processor> + <Item>wsdl</Item> + <Class>org.wso2.carbon.core.transports.util.Wsdl11Processor</Class> + </Processor> + <Processor> + <Item>wsdl2</Item> + <Class>org.wso2.carbon.core.transports.util.Wsdl20Processor</Class> + </Processor> + <Processor> + <Item>xsd</Item> + <Class>org.wso2.carbon.core.transports.util.XsdProcessor</Class> + </Processor> + </HttpGetRequestProcessors> + + <!-- Deployment Synchronizer Configuration. t Enabled value to true when running with "svn based" dep sync. + In master nodes you need to set both AutoCommit and AutoCheckout to true + and in worker nodes set only AutoCheckout to true. + --> + <DeploymentSynchronizer> + <Enabled>false</Enabled> + <AutoCommit>false</AutoCommit> + <AutoCheckout>true</AutoCheckout> + <RepositoryType>svn</RepositoryType> + <SvnUrl>http://svnrepo.example.com/repos/</SvnUrl> + <SvnUser>username</SvnUser> + <SvnPassword>password</SvnPassword> + <SvnUrlAppendTenantId>true</SvnUrlAppendTenantId> + </DeploymentSynchronizer> + + <!-- Deployment Synchronizer Configuration. Uncomment the following section when running with "registry based" dep sync. + In master nodes you need to set both AutoCommit and AutoCheckout to true + and in worker nodes set only AutoCheckout to true. + --> + <!--<DeploymentSynchronizer> + <Enabled>true</Enabled> + <AutoCommit>false</AutoCommit> + <AutoCheckout>true</AutoCheckout> + </DeploymentSynchronizer>--> + + <!-- Mediation persistence configurations. Only valid if mediation features are available i.e. ESB --> + <!--<MediationConfig> + <LoadFromRegistry>false</LoadFromRegistry> + <SaveToFile>false</SaveToFile> + <Persistence>enabled</Persistence> + <RegistryPersistence>enabled</RegistryPersistence> + </MediationConfig>--> + + <!-- + Server intializing code, specified as implementation classes of org.wso2.carbon.core.ServerInitializer. + This code will be run when the Carbon server is initialized + --> + <ServerInitializers> + <!--<Initializer></Initializer>--> + </ServerInitializers> + + <!-- + Indicates whether the Carbon Servlet is required by the system, and whether it should be + registered + --> + <RequireCarbonServlet>${require.carbon.servlet}</RequireCarbonServlet> + + <!-- + Carbon H2 OSGI Configuration + By default non of the servers start. + name="web" - Start the web server with the H2 Console + name="webPort" - The port (default: 8082) + name="webAllowOthers" - Allow other computers to connect + name="webSSL" - Use encrypted (HTTPS) connections + name="tcp" - Start the TCP server + name="tcpPort" - The port (default: 9092) + name="tcpAllowOthers" - Allow other computers to connect + name="tcpSSL" - Use encrypted (SSL) connections + name="pg" - Start the PG server + name="pgPort" - The port (default: 5435) + name="pgAllowOthers" - Allow other computers to connect + name="trace" - Print additional trace information; for all servers + name="baseDir" - The base directory for H2 databases; for all servers + --> + <!--H2DatabaseConfiguration> + <property name="web" /> + <property name="webPort">8082</property> + <property name="webAllowOthers" /> + <property name="webSSL" /> + <property name="tcp" /> + <property name="tcpPort">9092</property> + <property name="tcpAllowOthers" /> + <property name="tcpSSL" /> + <property name="pg" /> + <property name="pgPort">5435</property> + <property name="pgAllowOthers" /> + <property name="trace" /> + <property name="baseDir">${carbon.home}</property> + </H2DatabaseConfiguration--> + <!--Disabling statistics reporter by default--> + <StatisticsReporterDisabled>true</StatisticsReporterDisabled> + + <!-- Enable accessing Admin Console via HTTP --> + <!-- EnableHTTPAdminConsole>true</EnableHTTPAdminConsole --> + + <!-- + Default Feature Repository of WSO2 Carbon. + --> + <FeatureRepository> + <RepositoryName>default repository</RepositoryName> + <RepositoryURL>http://dist.wso2.org/p2/carbon/releases/4.2.0</RepositoryURL> + </FeatureRepository> + + <!-- + Configure API Management + --> + <APIManagement> + + <!--Uses the embedded API Manager by default. If you want to use an external + API Manager instance to manage APIs, configure below externalAPIManager--> + + <Enabled>true</Enabled> + + <!--Uncomment and configure API Gateway and + Publisher URLs to use external API Manager instance--> + + <!--ExternalAPIManager> + + <APIGatewayURL>http://localhost:8281</APIGatewayURL> + <APIPublisherURL>http://localhost:8281/publisher</APIPublisherURL> + + </ExternalAPIManager--> + + <LoadAPIContextsInServerStartup>true</LoadAPIContextsInServerStartup> + </APIManagement> +</Server> http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/tools/stratos-installer/setup.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh index 9966c69..5035af9 100755 --- a/tools/stratos-installer/setup.sh +++ b/tools/stratos-installer/setup.sh @@ -33,6 +33,7 @@ profile="default" config_mb="true" mb_client_lib_path="" auto_start_servers="false" +config_greg="true" function help { echo "" @@ -227,11 +228,24 @@ function cc_setup() { pushd $stratos_extract_path + + + popd echo "End configuring the Cloud Controller" } +# Setup greg +function greg_setup() { + echo "Setup GREG" >> $LOG + echo "Configuring the GREG" + cp -f ./config/all/repository/conf/metadataservice.xml $stratos_extract_path/repository/conf/ + cp -f ./config/greg/repository/conf/carbon.xml $greg_extract_path/repository/conf/ + + + echo "End configuring the GREG" +} # AS related functions # ------------------------------------------------------------------- function as_related_popup() { @@ -508,6 +522,7 @@ if [ "$UID" -ne "0" ]; then fi general_conf_validate + if [[ $profile = "cc" ]]; then cc_conf_validate elif [[ $profile = "as" ]]; then @@ -539,7 +554,21 @@ if [[ ($profile = "default" && $config_mb = "true") ]]; then sed -r -i -e 's@^(\s*)(<transportConnector name="amqp".*\s*)$@\1<!--\2-->@g' $stratos_path/apache-activemq-5.9.1/conf/activemq.xml fi +if [[ ($profile = "default" && $config_greg = "true") ]]; then + echo "Extracting wso2 greg" + unzip -q $greg_pack_zip -d $stratos_path + +fi + general_setup + +if [[ ($profile = "default" && $config_greg = "true") ]]; then + echo "Running the GREG" + greg_setup + +fi + + if [[ $profile = "cc" ]]; then cc_setup elif [[ $profile = "as" ]]; then http://git-wip-us.apache.org/repos/asf/stratos/blob/a495dc13/tools/stratos-installer/start-servers.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/start-servers.sh b/tools/stratos-installer/start-servers.sh index b709abf..7661d0e 100755 --- a/tools/stratos-installer/start-servers.sh +++ b/tools/stratos-installer/start-servers.sh @@ -86,9 +86,12 @@ if [[ $profile = "default" ]]; then sleep 10 fi +echo "Starting wso2 greg server ..." >> $LOG +echo "$greg_extract_path/bin/wso2server.sh -Dprofile=$profile start" +$greg_extract_path/bin/wso2server.sh -Dprofile=$profile start +echo "Stratos server started" >> $LOG + echo "Starting Stratos server ..." >> $LOG echo "$stratos_extract_path/bin/stratos.sh -Dprofile=$profile start" $stratos_extract_path/bin/stratos.sh -Dprofile=$profile start echo "Stratos server started" >> $LOG - -
