http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml new file mode 100644 index 0000000..4e9d515 --- /dev/null +++ b/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml @@ -0,0 +1,79 @@ +<?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. +--> + +<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.apache.stratos</groupId> + <artifactId>stratos-mgt-parent-feature</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>org.apache.stratos.manager.feature</artifactId> + <packaging>pom</packaging> + <name>Apache Stratos Management Composite Feature</name> + <url>http://apache.org</url> + <description>This feature contains the core bundles required for Stratos Manager</description> + + <dependencies> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.manager.server.feature</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.adc.topology.mgt.feature</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.wso2.maven</groupId> + <artifactId>carbon-p2-plugin</artifactId> + <version>${carbon.p2.plugin.version}</version> + <executions> + <execution> + <id>p2-feature-generation</id> + <phase>package</phase> + <goals> + <goal>p2-feature-gen</goal> + </goals> + <configuration> + <id>org.apache.stratos.manager</id> + <propertiesFile>../../../../etc/feature.properties</propertiesFile> + <includedFeatures> + <includedFeatureDef>org.apache.stratos:org.apache.stratos.manager.server.feature:${project.version}</includedFeatureDef> + <includedFeatureDef>org.apache.stratos:org.apache.stratos.adc.topology.mgt.feature:${project.version}</includedFeatureDef> + </includedFeatures> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml new file mode 100644 index 0000000..654919b --- /dev/null +++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml @@ -0,0 +1,145 @@ +<?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. +--> + +<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.apache.stratos</groupId> + <artifactId>stratos-mgt-parent-feature</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>org.apache.stratos.manager.server.feature</artifactId> + <packaging>pom</packaging> + <name>Apache Stratos -Stratos Management Core Feature</name> + <url>http://apache.org</url> + <description>This feature contains the core bundles required for Stratos Manager</description> + + <dependencies> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.manager</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.wso2.andes.wso2</groupId> + <artifactId>andes-client</artifactId> + <version>0.13.wso2v8</version> + </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.manager.stub</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.gitblit</groupId> + <artifactId>gitblit</artifactId> + <version>1.2.0.wso2v1</version> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>org.eclipse.jgit</groupId> + <artifactId>org.eclipse.jgit</artifactId> + <version>2.1.0.wso2v1</version> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + <version>0.1.49.wso2v1</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>prefilter-resources</id> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>src/main/resources</outputDirectory> + <resources> + <resource> + <directory>resources</directory> + <includes> + <include>conf/agent.properties</include> + <include>p2.inf</include> + <include>build.properties</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.wso2.maven</groupId> + <artifactId>carbon-p2-plugin</artifactId> + <version>${carbon.p2.plugin.version}</version> + <executions> + <execution> + <id>p2-feature-generation</id> + <phase>package</phase> + <goals> + <goal>p2-feature-gen</goal> + </goals> + <configuration> + <id>org.apache.stratos.manager.server</id> + <propertiesFile>../../etc/feature.properties</propertiesFile> + <adviceFile> + <properties> + <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef> + <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef> + </properties> + </adviceFile> + <bundles> + <bundleDef>org.apache.stratos:org.apache.stratos.manager:${project.version}</bundleDef> + <bundleDef>org.apache.stratos:org.apache.stratos.manager.stub:${project.version}</bundleDef> + <bundleDef>org.wso2.andes.wso2:andes-client:0.13.wso2v8</bundleDef> + <bundleDef>org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version}</bundleDef> + <bundleDef>com.gitblit:gitblit:1.2.0.wso2v1</bundleDef> + <bundleDef>com.google.code.gson:gson:2.1</bundleDef> + <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef> + <bundleDef>org.eclipse.jgit:org.eclipse.jgit:2.1.0.wso2v1</bundleDef> + <bundleDef>com.jcraft:jsch:0.1.49.wso2v1</bundleDef> + </bundles> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/build.properties ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/build.properties b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/build.properties new file mode 100644 index 0000000..6deb744 --- /dev/null +++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/build.properties @@ -0,0 +1,22 @@ +# +# +# 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. +# +# + +custom = true http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/cartridge-config.properties ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/cartridge-config.properties b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/cartridge-config.properties new file mode 100644 index 0000000..2f7c7f9 --- /dev/null +++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/cartridge-config.properties @@ -0,0 +1,64 @@ +# +# +# 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 properties + +sc.ip=stratos_ip +autoscalerService.url=https://cc.wso2.com:9444/services/CloudControllerService/ +autoscaler.time.out=190000 +cartridge.agent.epr=https://stratos_ip:9447/services/CartridgeAgentService +git.host.name=s2_hostname +git.host.ip=stratos_ip +git.repo.notification.url=https://sc.wso2.com:9445/services/RepoNotificationService/ +identity.server.url=https://sc.wso2.com:9447/services/RepoNotificationService/ + +adc.jdbc.url=jdbc:h2:repository/database/WSO2S2_DB +adc.jdbc.username=wso2carbon +adc.jdbc.password=wso2carbon +adc.jdbc.driver=org.h2.Driver + +mb.ip=mb.stratos.apache.org +mb.port=5677 +cep.ip=cep.stratos.apache.org +cep.port=7615 + +feature.externalrepo.validation.enabled=true +feature.internalrepo.enabled=false +feature.multitenant.multiplesubscription.enabled=false + +internal.repo.username=admin +internal.repo.password=admin + +append.script=SCRIPT_PATH/add_entry_zone_file.sh +remove.script=SCRIPT_PATH/remove_entry_zone_file.sh +bind.file.path=/etc/bind/db.STRATOS_DOMAIN +elb.ip=stratos_ip + +bam.ip=stratos_ip +bam.port=7714 + +max.attempts=1000 + +cartridge.key=KEYPATH + +repository.info.epr=https://stratos_ip:9445/services/RepositoryInformationService + +puppet.ip=127.0.0.1 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/etc/policies.xsd ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/etc/policies.xsd b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/etc/policies.xsd new file mode 100644 index 0000000..b9c0503 --- /dev/null +++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/etc/policies.xsd @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + 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. +--> +<xs:schema attributeFormDefault="unqualified" + elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema";> + <xs:element name="policies"> + <xs:annotation> + <xs:documentation>Use below section to specify auto-scaling policies + for cartridges. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element name="policy" maxOccurs="unbounded" + minOccurs="1"> + <xs:annotation> + <xs:documentation>You can have 1..n policy elements. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element type="xs:string" name="description" /> + <xs:element type="xs:integer" name="min_app_instances" /> + <xs:element type="xs:integer" name="max_app_instances" /> + <xs:element type="xs:integer" name="max_requests_per_second" /> + <xs:element type="xs:decimal" name="alarming_upper_rate" /> + <xs:element type="xs:decimal" name="alarming_lower_rate" /> + <xs:element type="xs:decimal" name="scale_down_factor" /> + <xs:element type="xs:integer" name="rounds_to_average" /> + </xs:sequence> + <xs:attribute type="xs:string" name="name" use="required" /> + <xs:attribute type="xs:boolean" name="isDefault" use="required" /> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> +</xs:schema> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/policies.xml ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/policies.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/policies.xml new file mode 100644 index 0000000..efc24b7 --- /dev/null +++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/conf/policies.xml @@ -0,0 +1,44 @@ +<?xml version='1.0'?> +<!-- + + 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. + +--> + +<policies> + <policy name="single" isDefault="true"> + <description>Single - Instances: Min 1, Max 1</description> + <min_app_instances>1</min_app_instances> + <max_app_instances>1</max_app_instances> + <max_requests_per_second>5</max_requests_per_second> + <alarming_upper_rate>0.7</alarming_upper_rate> + <alarming_lower_rate>0.2</alarming_lower_rate> + <scale_down_factor>0.25</scale_down_factor> + <rounds_to_average>2</rounds_to_average> + </policy> + <policy name="elastic" isDefault="false"> + <description>Elastic - Instances: Min 1, Max 4</description> + <min_app_instances>1</min_app_instances> + <max_app_instances>4</max_app_instances> + <max_requests_per_second>5</max_requests_per_second> + <alarming_upper_rate>0.7</alarming_upper_rate> + <alarming_lower_rate>0.2</alarming_lower_rate> + <scale_down_factor>0.25</scale_down_factor> + <rounds_to_average>2</rounds_to_average> + </policy> +</policies> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/p2.inf ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/p2.inf b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/p2.inf new file mode 100644 index 0000000..0c2b33e --- /dev/null +++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/src/main/resources/p2.inf @@ -0,0 +1,22 @@ +# 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. + +instructions.configure = \ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.manager.server_${feature.version}/conf/cartridge-config.properties,target:${installFolder}/../../conf/cartridge-config.properties,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.manager.server_${feature.version}/conf/policies.xml,target:${installFolder}/../../conf/policies.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.manager.server_${feature.version}/conf/etc/policies.xsd,target:${installFolder}/../../conf/etc/policies.xsd,overwrite:true);\ + http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/features/manager/stratos-mgt/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/pom.xml b/features/manager/stratos-mgt/pom.xml new file mode 100644 index 0000000..4b9450e --- /dev/null +++ b/features/manager/stratos-mgt/pom.xml @@ -0,0 +1,43 @@ +<?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. + --> +<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.apache.stratos</groupId> + <artifactId>stratos-manager-features</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>stratos-mgt-parent-feature</artifactId> + <packaging>pom</packaging> + <name>Apache Stratos - Stratos Management Aggregator Module</name> + <url>http://apache.org</url> + + <modules> + <module>org.apache.stratos.manager.server.feature</module> + <module>org.apache.stratos.adc.topology.mgt.feature</module> + <module>org.apache.stratos.manager.feature</module> + </modules> + +</project> + http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/features/pom.xml ---------------------------------------------------------------------- diff --git a/features/pom.xml b/features/pom.xml index b3945f8..9382d1e 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -39,8 +39,6 @@ <module>load-balancer</module> <!-- Auto-Scaler --> <module>autoscaler</module> - <!-- Artifact Distribution Coordinator --> - <module>adc</module> <!-- Coud Controller --> <module>cloud-controller</module> <!-- Manager --> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/products/stratos-cli/distribution/src/main/license/LICENSE ---------------------------------------------------------------------- diff --git a/products/stratos-cli/distribution/src/main/license/LICENSE b/products/stratos-cli/distribution/src/main/license/LICENSE index bcda232..88aa1e7 100644 --- a/products/stratos-cli/distribution/src/main/license/LICENSE +++ b/products/stratos-cli/distribution/src/main/license/LICENSE @@ -223,7 +223,7 @@ org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:1.0.1 org.apache.geronimo.specs.wso2:geronimo-stax-api_1.0_spec:1.0.1.wso2v1 org.apache.httpcomponents.wso2:httpcore:4.1.0-wso2v1 org.apache.neethi.wso2:neethi:2.0.4.wso2v4 -org.apache.stratos:org.apache.stratos.adc.mgt.stub:4.0.0-SNAPSHOT +org.apache.stratos:org.apache.stratos.manager.stub:4.0.0-SNAPSHOT org.apache.woden.wso2:woden:1.0.0.M8-wso2v1 org.apache.ws.commons.axiom:axiom-api:1.2.11 org.apache.ws.commons.axiom:axiom-impl:1.2.11 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/products/stratos-manager/modules/distribution/src/main/license/LICENSE ---------------------------------------------------------------------- diff --git a/products/stratos-manager/modules/distribution/src/main/license/LICENSE b/products/stratos-manager/modules/distribution/src/main/license/LICENSE index 774a5a9..8b3a324 100644 --- a/products/stratos-manager/modules/distribution/src/main/license/LICENSE +++ b/products/stratos-manager/modules/distribution/src/main/license/LICENSE @@ -269,8 +269,8 @@ org.apache.stratos.account.mgt_4.0.0.SNAPSHOT.jar, org.apache.stratos.account.mgt.stub_4.0.0.SNAPSHOT.jar, org.apache.stratos.account.mgt.ui_4.0.0.SNAPSHOT.jar, org.apache.stratos.activation_4.0.0.SNAPSHOT.jar, -org.apache.stratos.adc.mgt_4.0.0.SNAPSHOT.jar, -org.apache.stratos.adc.mgt.stub_4.0.0.SNAPSHOT.jar, +org.apache.stratos.manager_4.0.0.SNAPSHOT.jar, +org.apache.stratos.manager.stub_4.0.0.SNAPSHOT.jar, org.apache.stratos.adc.reponotification.service.stub_4.0.0.SNAPSHOT.jar, org.apache.stratos.adc.topology.mgt_4.0.0.SNAPSHOT.jar, org.apache.stratos.cartridge.mgt.ui_4.0.0.SNAPSHOT.jar, http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/products/stratos-manager/modules/p2-profile-gen/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos-manager/modules/p2-profile-gen/pom.xml b/products/stratos-manager/modules/p2-profile-gen/pom.xml index a07e0c6..adfe580 100644 --- a/products/stratos-manager/modules/p2-profile-gen/pom.xml +++ b/products/stratos-manager/modules/p2-profile-gen/pom.xml @@ -247,7 +247,7 @@ <!-- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.throttle.feature:${carbon.version}</featureArtifactDef> --> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.caching.feature:${carbon.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.rm.server.feature:4.2.0</featureArtifactDef> - <featureArtifactDef>org.apache.stratos:org.apache.stratos.adc.mgt.feature:${project.version}</featureArtifactDef> + <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> @@ -430,7 +430,7 @@ <version>${project.version}</version> </feature> <feature> - <id>org.apache.stratos.adc.mgt.feature.group</id> + <id>org.apache.stratos.manager.feature.group</id> <version>${project.version}</version> </feature> <feature> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9d280533/service-stubs/org.apache.stratos.adc.mgt.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.adc.mgt.stub/pom.xml b/service-stubs/org.apache.stratos.adc.mgt.stub/pom.xml deleted file mode 100644 index c12cdb2..0000000 --- a/service-stubs/org.apache.stratos.adc.mgt.stub/pom.xml +++ /dev/null @@ -1,143 +0,0 @@ -<?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. - --> -<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.apache.stratos</groupId> - <artifactId>stratos-service-stubs-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.stratos.adc.mgt.stub</artifactId> - <packaging>bundle</packaging> - <name>Apache Stratos - Cartridge app Management Stub</name> - <url>http://apache.org</url> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>source-code-generation</id> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <path id="wsdl2java.classpath"> - <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar"/> - <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar"/> - <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar"/> - </path> - <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> - <arg line="-uri src/main/resources/ApplicationManagementService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.adc.mgt.stub -ns2p http://exception.mgt.adc.stratos.apache.org/xsd=org.apache.stratos.adc.mgt.exception,http://dto.mgt.adc.stratos.apache.org/xsd=org.apache.stratos.adc.mgt.dto"/> - <classpath refid="wsdl2java.classpath"/> - <classpath refid="maven.dependency.classpath"/> - <classpath refid="maven.compile.classpath"/> - <classpath refid="maven.runtime.classpath"/> - </java> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source> - target/generated-code/src - </source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Bundle-Name>${project.artifactId}</Bundle-Name> - <Private-Package> - </Private-Package> - <Export-Package> - org.apache.stratos.adc.mgt.stub.*; version="${project.version}", - org.apache.stratos.adc.mgt.service.*; version="${project.version}", - org.apache.stratos.adc.mgt.dto.*; version="${project.version}", - org.apache.stratos.adc.mgt.exception.*; version="${project.version}" - </Export-Package> - <Import-Package> - !org.apache.stratos.adc.mgt.stub.* - </Import-Package> - <DynamicImport-Package>*</DynamicImport-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.apache.axis2.wso2</groupId> - <artifactId>axis2</artifactId> - </dependency> - <dependency> - <groupId>org.apache.axis2.wso2</groupId> - <artifactId>axis2-client</artifactId> - </dependency> - <dependency> - <groupId>wsdl4j.wso2</groupId> - <artifactId>wsdl4j</artifactId> - </dependency> - <!--dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.schema.wso2</groupId> - <artifactId>XmlSchema</artifactId> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom.wso2</groupId> - <artifactId>axiom</artifactId> - </dependency> - <dependency> - <groupId>org.apache.neethi.wso2</groupId> - <artifactId>neethi</artifactId> - </dependency--> - </dependencies> - -</project>
